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

diff --git a/lib/kotext/KoFontDiaPreview.h b/lib/kotext/KoFontDiaPreview.h
index 2b0411a7..5cba0fbc 100644
--- a/lib/kotext/KoFontDiaPreview.h
+++ b/lib/kotext/KoFontDiaPreview.h
@@ -20,31 +20,32 @@
 #ifndef __kofontdiapreview_h__
 #define __kofontdiapreview_h__
 
-#include <qframe.h>
-#include <qstring.h>
-#include <qcolor.h>
-#include <qfont.h>
-#include <qpainter.h>
+#include <tqframe.h>
+#include <tqstring.h>
+#include <tqcolor.h>
+#include <tqfont.h>
+#include <tqpainter.h>
 
 /**
  * The font dialog Preview
  */
-class KoFontDiaPreview : public QFrame
+class KoFontDiaPreview : public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
     * Constructor
     */
-    KoFontDiaPreview( QWidget* parent =0, const char* name = 0, WFlags fl = 0 );
+    KoFontDiaPreview( TQWidget* tqparent =0, const char* name = 0, WFlags fl = 0 );
     ~KoFontDiaPreview();
 
-    void setText( const QString &text );
-    void setFont( const QFont &font );
-    void setFontColor( const QColor &textColor );
-    void setBackgroundColor( const QColor &backgroundColor );
-    void setShadow( double sdx, double sdy, QColor shadowColor );
-    void setUnderlining( int underlining, int underliningStyle, const QColor underliningColor, bool wordByWord );
+    void setText( const TQString &text );
+    void setFont( const TQFont &font );
+    void setFontColor( const TQColor &textColor );
+    void setBackgroundColor( const TQColor &backgroundColor );
+    void setShadow( double sdx, double sdy, TQColor shadowColor );
+    void setUnderlining( int underlining, int underliningStyle, const TQColor underliningColor, bool wordByWord );
     void setWordByWord( bool wordByWord );
     void setStrikethrough( int strikethrough, int strikethroughStylestrikethrough, bool wordByWord );
     void setCapitalisation( int capitalisation );
@@ -52,21 +53,21 @@ public:
 
 
 private:
-    void drawContents( QPainter* );
+    void drawContents( TQPainter* );
 
-    QString m_text;
-    QString displayText;
-    QFont m_font;
-    QFont displayFont;
+    TQString m_text;
+    TQString displayText;
+    TQFont m_font;
+    TQFont displayFont;
     int m_fontSize;
-    QColor m_textColor;
-    QColor m_backgroundColor;
+    TQColor m_textColor;
+    TQColor m_backgroundColor;
     double m_shadowDistanceX;
     double m_shadowDistanceY;
-    QColor m_shadowColor;
+    TQColor m_shadowColor;
     int m_underlining;
     int m_underliningStyle;
-    QColor m_underliningColor;
+    TQColor m_underliningColor;
     bool m_wordByWord;
     int m_strikethrough;
     int m_strikethroughStyle;
@@ -75,10 +76,10 @@ private:
     int m_offset;
     double m_relativeSize;
 
-    QString formatCapitalisation( const QString &string );
-    void drawUnderline( int x, int y, int width, int thickness, QColor & color, QPainter *p );
-    void drawUnderlineWave( int x, int y, int width, int thickness, QColor & color, QPainter *p );
-    void drawStrikethrough( int x, int y, int width, int thickness, QPainter *p );
+    TQString formatCapitalisation( const TQString &string );
+    void drawUnderline( int x, int y, int width, int thickness, TQColor & color, TQPainter *p );
+    void drawUnderlineWave( int x, int y, int width, int thickness, TQColor & color, TQPainter *p );
+    void drawStrikethrough( int x, int y, int width, int thickness, TQPainter *p );
 };
 
 #endif