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

diff --git a/kugar/lib/mlabelobject.h b/kugar/lib/mlabelobject.h
index 7f4a5164..2b35f233 100644
--- a/kugar/lib/mlabelobject.h
+++ b/kugar/lib/mlabelobject.h
@@ -9,8 +9,8 @@
 #ifndef MLABELOBJECT_H
 #define MLABELOBJECT_H
 
-#include <qstring.h>
-#include <qfontmetrics.h>
+#include <tqstring.h>
+#include <tqfontmetrics.h>
 
 #include "mreportobject.h"
 
@@ -27,9 +27,9 @@ class MLabelObject : public MReportObject
 public:
     /** Font weight constants */
     enum FontWeight { Light = 25, Normal = 50, DemiBold = 63, Bold = 75, Black = 87 };
-    /** Horizontal alignment constants */
+    /**Qt::Horizontal tqalignment constants */
     enum HAlignment { Left = 0, Center, Right };
-    /** Vertial alignment constants */
+    /** Vertial tqalignment constants */
     enum VAlignment { Top = 0, Middle, Bottom };
 
     /** Constructor */
@@ -43,18 +43,18 @@ public:
 
 protected:
     /** Label text */
-    QString text;
+    TQString text;
     /** Label text font family  */
-    QString fontFamily;
+    TQString fontFamily;
     /** Label text font size in points */
     int fontSize;
     /** Label text font weight */
     int fontWeight;
     /** Label text font italic flag */
     bool fontItalic;
-    /** Lable text horizontal alignment */
+    /** Lable text horizontal tqalignment */
     int hAlignment;
-    /** Label text vertical alignment  */
+    /** Label text vertical tqalignment  */
     int vAlignment;
     /** Label text word wrap flag  */
     bool wordWrap;
@@ -67,17 +67,17 @@ private:
 
 public:
     /** Sets the label's text string - default is an empty string*/
-    virtual void setText( const QString txt );
+    virtual void setText( const TQString txt );
     /** Sets the label's text font - default is Times,10,Normal,false */
-    void setFont( const QString family, int size, int weight, bool italic );
-    /** Sets the label's horizontal alignment -default is Left */
+    void setFont( const TQString family, int size, int weight, bool italic );
+    /** Sets the label's horizontal tqalignment -default is Left */
     void setHorizontalAlignment( int a );
-    /** Sets the label's vertical alignment - default is Top */
+    /** Sets the label's vertical tqalignment - default is Top */
     void setVerticalAlignment( int a );
     /** Sets the label's word wrap flag - default is false */
     void setWordWrap( bool state );
     /** Draws the label using the specificed painter & x/y-offsets */
-    void draw( QPainter* p, int xoffset, int yoffset );
+    void draw( TQPainter* p, int xoffset, int yoffset );
 
 private:
     /** Copies member data from one object to another.