TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 25 insertions, 25 deletions

diff --git a/kivio/kiviopart/kiviosdk/kivio_group_stencil.h b/kivio/kiviopart/kiviosdk/kivio_group_stencil.h
index e2ae148f..a9084dde 100644
--- a/kivio/kiviopart/kiviosdk/kivio_group_stencil.h
+++ b/kivio/kiviopart/kiviosdk/kivio_group_stencil.h
@@ -22,7 +22,7 @@
 
 #include "kivio_stencil.h"
 
-#include <qdom.h>
+#include <tqdom.h>
 
 class KivioIntraStencilData;
 class KivioLayer;
@@ -33,7 +33,7 @@ class KivioGroupStencil : public KivioStencil
 {
   protected:
     // The list of child stencils
-    QPtrList<KivioStencil> *m_pGroupList;
+    TQPtrList<KivioStencil> *m_pGroupList;
     int checkForCollision(const KoPoint& p);
 
   public:
@@ -42,8 +42,8 @@ class KivioGroupStencil : public KivioStencil
 
 
     // File I/O routines
-    virtual bool loadXML( const QDomElement &, KivioLayer * );
-    virtual QDomElement saveXML( QDomDocument & );
+    virtual bool loadXML( const TQDomElement &, KivioLayer * );
+    virtual TQDomElement saveXML( TQDomDocument & );
 
 
     // Painting routines
@@ -57,17 +57,17 @@ class KivioGroupStencil : public KivioStencil
 
 
     // FG/Color operations
-    virtual void setFGColor( QColor );
-    virtual void setBGColor( QColor );
+    virtual void setFGColor( TQColor );
+    virtual void setBGColor( TQColor );
 
 
 
     // Text operations
-    virtual QColor textColor();
-    virtual void setTextColor( QColor );
+    virtual TQColor textColor();
+    virtual void setTextColor( TQColor );
 
-    virtual QFont textFont();
-    virtual void setTextFont( const QFont & );
+    virtual TQFont textFont();
+    virtual void setTextFont( const TQFont & );
 
     virtual int hTextAlign();
     virtual int vTextAlign();
@@ -75,8 +75,8 @@ class KivioGroupStencil : public KivioStencil
     virtual void setHTextAlign(int);
     virtual void setVTextAlign(int);
 
-    virtual void setText( const QString & );
-    virtual QString text();
+    virtual void setText( const TQString & );
+    virtual TQString text();
 
 
     // Line width
@@ -89,7 +89,7 @@ class KivioGroupStencil : public KivioStencil
 
     // Group operations
     virtual void addToGroup( KivioStencil * );
-    virtual QPtrList<KivioStencil> *groupList() { return m_pGroupList; }
+    virtual TQPtrList<KivioStencil> *groupList() { return m_pGroupList; }
 
 
     // Position / Dimension operations
@@ -115,26 +115,26 @@ class KivioGroupStencil : public KivioStencil
 
     /**
       Returns the name of the text box that is at @param p.
-      If there exist no text box at @param p then it returns QString::null.
+      If there exist no text box at @param p then it returns TQString().
     */
-    virtual QString getTextBoxName(const KoPoint& p);
+    virtual TQString getTextBoxName(const KoPoint& p);
 
-    virtual void setText(const QString& text, const QString& name);
-    virtual QString text(const QString& name);
+    virtual void setText(const TQString& text, const TQString& name);
+    virtual TQString text(const TQString& name);
 
     virtual bool hasTextBox() const;
 
-    virtual QColor textColor(const QString& textBoxName);
-    virtual void setTextColor(const QString& textBoxName, const QColor& color);
+    virtual TQColor textColor(const TQString& textBoxName);
+    virtual void setTextColor(const TQString& textBoxName, const TQColor& color);
 
-    virtual QFont textFont(const QString& textBoxName);
-    virtual void setTextFont(const QString& textBoxName, const QFont& font);
+    virtual TQFont textFont(const TQString& textBoxName);
+    virtual void setTextFont(const TQString& textBoxName, const TQFont& font);
 
-    virtual int hTextAlign(const QString& textBoxName);
-    virtual int vTextAlign(const QString& textBoxName);
+    virtual int hTextAlign(const TQString& textBoxName);
+    virtual int vTextAlign(const TQString& textBoxName);
 
-    virtual void setHTextAlign(const QString& textBoxName, int align);
-    virtual void setVTextAlign(const QString& textBoxName, int align);
+    virtual void setHTextAlign(const TQString& textBoxName, int align);
+    virtual void setVTextAlign(const TQString& textBoxName, int align);
 };
 
 #endif