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, 26 insertions, 25 deletions

diff --git a/kchart/kdchart/KDChartTextPiece.h b/kchart/kdchart/KDChartTextPiece.h
index 16d5a1ba..adb176b2 100644
--- a/kchart/kdchart/KDChartTextPiece.h
+++ b/kchart/kdchart/KDChartTextPiece.h
@@ -29,26 +29,27 @@
 #ifndef __KDCHARTTEXTPIECE_H__
 #define __KDCHARTTEXTPIECE_H__
 
-#include <qstring.h>
-#include <qfont.h>
-#include <qregion.h>
-#include <qpalette.h>
-#include <qobject.h>
+#include <tqstring.h>
+#include <tqfont.h>
+#include <tqregion.h>
+#include <tqpalette.h>
+#include <tqobject.h>
 #include <kdchart_export.h>
 
-class QBrush;
-class QPainter;
-class QSimpleRichText;
-class QFontMetrics;
+class TQBrush;
+class TQPainter;
+class TQSimpleRichText;
+class TQFontMetrics;
 
-class KDCHART_EXPORT KDChartTextPiece :public QObject
+class KDCHART_EXPORT KDChartTextPiece :public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
         KDChartTextPiece();
-        KDChartTextPiece( const QString& text, const QFont& font );
-        KDChartTextPiece( QPainter* painter, const QString& text, const QFont& font );
+        KDChartTextPiece( const TQString& text, const TQFont& font );
+        KDChartTextPiece( TQPainter* painter, const TQString& text, const TQFont& font );
         virtual ~KDChartTextPiece();
         /**
           Copy the settings of text piece \c source into this box.
@@ -72,29 +73,29 @@ class KDCHART_EXPORT KDChartTextPiece :public QObject
         const KDChartTextPiece* clone() const;
 
     private:
-        KDChartTextPiece( const KDChartTextPiece& ) : QObject(0) {}
+        KDChartTextPiece( const KDChartTextPiece& ) : TQObject(0) {}
 
     public slots:
         virtual int width() const;
         virtual int height() const;
         virtual int fontLeading() const;
-        virtual QRect rect( QPainter *p, const QRect& clipRect) const;
-        virtual void draw( QPainter *p, int x, int y, const QRect& clipRect,
-                const QColor& color, const QBrush* paper = 0 ) const;
-        virtual void draw( QPainter *p, int x, int y, const QRegion& clipRegion,
-                const QColor& color, const QBrush* paper = 0 ) const;
-
-        QString text() const;
-        QFont font() const;
+        virtual TQRect rect( TQPainter *p, const TQRect& clipRect) const;
+        virtual void draw( TQPainter *p, int x, int y, const TQRect& clipRect,
+                const TQColor& color, const TQBrush* paper = 0 ) const;
+        virtual void draw( TQPainter *p, int x, int y, const TQRegion& clipRegion,
+                const TQColor& color, const TQBrush* paper = 0 ) const;
+
+        TQString text() const;
+        TQFont font() const;
         bool isRichText() const;
         
 
     protected:
         bool _isRichText;
-        QSimpleRichText* _richText; // used when _isRichText == true
-        QString _text; // used when _isRichText == false
-        QFont _font; // used when _isRichText == false
-        QFontMetrics* _metrics;
+        TQSimpleRichText* _richText; // used when _isRichText == true
+        TQString _text; // used when _isRichText == false
+        TQFont _font; // used when _isRichText == false
+        TQFontMetrics* _metrics;
         bool _dirtyMetrics;
 };