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, 34 insertions, 34 deletions

diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil.h b/kivio/kiviopart/kiviosdk/kivio_stencil.h
index 926993f8..ef056c3d 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil.h
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil.h
@@ -20,11 +20,11 @@
 #ifndef KIVIO_STENCIL_H
 #define KIVIO_STENCIL_H
 
-#include <qfont.h>
-#include <qcolor.h>
-#include <qdom.h>
-#include <qptrlist.h>
-#include <qbitarray.h>
+#include <tqfont.h>
+#include <tqcolor.h>
+#include <tqdom.h>
+#include <tqptrlist.h>
+#include <tqbitarray.h>
 #include <KoPoint.h>
 #include <kglobalsettings.h>
 #include <KoRect.h>
@@ -128,8 +128,8 @@ class KIVIO_EXPORT KivioStencil
     KivioStencilSpawner *m_pSpawner;
 
     // The protection bits of the stencil
-    QBitArray *m_pProtection;
-    QBitArray *m_pCanProtect;
+    TQBitArray *m_pProtection;
+    TQBitArray *m_pCanProtect;
 
     // The stemcil type
     KivioStencilType m_type;
@@ -175,11 +175,11 @@ class KIVIO_EXPORT KivioStencil
     virtual void setPosition( double f1, double f2 ) { m_x=f1; m_y=f2;  updateGeometry(); }
     virtual void setDimensions( double f1, double f2 ) { m_w=f1; m_h=f2;  updateGeometry(); }
 
-    virtual QColor fgColor() { return QColor(0,0,0); }
-    virtual void setFGColor( QColor ) { ; }
+    virtual TQColor fgColor() { return TQColor(0,0,0); }
+    virtual void setFGColor( TQColor ) { ; }
 
-    virtual void setBGColor( QColor ) { ; }
-    virtual QColor bgColor() { return QColor(0,0,0); }
+    virtual void setBGColor( TQColor ) { ; }
+    virtual TQColor bgColor() { return TQColor(0,0,0); }
     virtual void setFillPattern(int) { ; }
     virtual int fillPattern() { return 1; }
 
@@ -194,11 +194,11 @@ class KIVIO_EXPORT KivioStencil
     virtual int linePattern() { return 1; }
 
     // FOnt stuff
-    virtual QColor textColor() { return QColor(0,0,0); }
-    virtual void setTextColor( QColor ) {;}
+    virtual TQColor textColor() { return TQColor(0,0,0); }
+    virtual void setTextColor( TQColor ) {;}
 
-    virtual QFont textFont() { return KGlobalSettings::generalFont(); }
-    virtual void setTextFont( const QFont & ) {;}
+    virtual TQFont textFont() { return KGlobalSettings::generalFont(); }
+    virtual void setTextFont( const TQFont & ) {;}
 
     virtual int hTextAlign() { return -1; }
     virtual int vTextAlign() { return -1; }
@@ -206,8 +206,8 @@ class KIVIO_EXPORT KivioStencil
     virtual void setHTextAlign(int) { ; }
     virtual void setVTextAlign(int) { ; }
 
-    virtual void setText( const QString & ) { ; }
-    virtual QString text() { return QString(""); }
+    virtual void setText( const TQString & ) { ; }
+    virtual TQString text() { return TQString(""); }
 
     virtual void setRotation(int d);
     virtual int rotation() { return m_rotation; }
@@ -224,19 +224,19 @@ class KIVIO_EXPORT KivioStencil
     virtual void customDrag( KivioCustomDragData * );
 
 
-    virtual bool loadXML( const QDomElement & );
-    virtual QDomElement saveXML( QDomDocument & );
+    virtual bool loadXML( const TQDomElement & );
+    virtual TQDomElement saveXML( TQDomDocument & );
 
     virtual bool isSelected() { return m_selected; }
     virtual void select() { m_selected = true; }
     virtual void unselect() { m_selected = false; }
     virtual void subSelect( const double &, const double & ) { ; }
 
-    virtual QBitArray *protection() { return m_pProtection; }
-    virtual QBitArray *canProtect() { return m_pCanProtect; }
+    virtual TQBitArray *protection() { return m_pProtection; }
+    virtual TQBitArray *canProtect() { return m_pCanProtect; }
 
     virtual void addToGroup( KivioStencil * );
-    virtual QPtrList<KivioStencil>* groupList() { return NULL; }
+    virtual TQPtrList<KivioStencil>* groupList() { return NULL; }
 
     virtual void updateGeometry();
     virtual void updateConnectorPoints(KivioConnectorPoint *, double oldX, double oldY);
@@ -259,27 +259,27 @@ class KIVIO_EXPORT KivioStencil
     
     /**
       Returns the name of the text box that is at the specified point.
-      If there exist no text box at the specified point then it returns QString::null.
+      If there exist no text box at the specified point then it returns TQString().
     */
-    virtual QString getTextBoxName(const KoPoint& /*p*/) { return QString::null; }
+    virtual TQString getTextBoxName(const KoPoint& /*p*/) { return TQString(); }
 
-    virtual void setText(const QString& /*text*/, const QString& /*name*/) { ; }
-    virtual QString text(const QString& /*name*/) { return QString(""); }
+    virtual void setText(const TQString& /*text*/, const TQString& /*name*/) { ; }
+    virtual TQString text(const TQString& /*name*/) { return TQString(""); }
 
     /// Returns true if the stencil has a text box
     virtual bool hasTextBox() const { return false; }
 
-    virtual QColor textColor(const QString& /*textBoxName*/) { return QColor(); }
-    virtual void setTextColor(const QString& /*textBoxName*/, const QColor& /*color*/) {}
+    virtual TQColor textColor(const TQString& /*textBoxName*/) { return TQColor(); }
+    virtual void setTextColor(const TQString& /*textBoxName*/, const TQColor& /*color*/) {}
 
-    virtual QFont textFont(const QString& /*textBoxName*/) { return KGlobalSettings::generalFont(); }
-    virtual void setTextFont(const QString& /*textBoxName*/, const QFont& /*font*/) {}
+    virtual TQFont textFont(const TQString& /*textBoxName*/) { return KGlobalSettings::generalFont(); }
+    virtual void setTextFont(const TQString& /*textBoxName*/, const TQFont& /*font*/) {}
 
-    virtual int hTextAlign(const QString& /*textBoxName*/) { return -1; }
-    virtual int vTextAlign(const QString& /*textBoxName*/) { return -1; }
+    virtual int hTextAlign(const TQString& /*textBoxName*/) { return -1; }
+    virtual int vTextAlign(const TQString& /*textBoxName*/) { return -1; }
 
-    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*/) {}
 
     virtual void setPinPoint(const KoPoint& p) { m_pinPoint = p; }
     virtual KoPoint pinPoint() const { return m_pinPoint; }