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, 35 insertions, 33 deletions

diff --git a/lib/kformula/kformulaconfigpage.h b/lib/kformula/kformulaconfigpage.h
index c5bc9b73..e3ff716a 100644
--- a/lib/kformula/kformulaconfigpage.h
+++ b/lib/kformula/kformulaconfigpage.h
@@ -21,22 +21,22 @@
 #ifndef kfconfigpages_h
 #define kfconfigpages_h
 
-#include <qfont.h>
-#include <qvaluevector.h>
+#include <tqfont.h>
+#include <tqvaluevector.h>
 
 #include <kdialogbase.h>
 
 #include "kformuladefs.h"
 
-class QButtonGroup;
-class QCheckBox;
-class QColor;
-class QGridLayout;
-class QLabel;
-class QPushButton;
-class QSpinBox;
-class QStringList;
-class QWidget;
+class TQButtonGroup;
+class TQCheckBox;
+class TQColor;
+class TQGridLayout;
+class TQLabel;
+class TQPushButton;
+class TQSpinBox;
+class TQStringList;
+class TQWidget;
 
 class KColorButton;
 class KConfig;
@@ -49,18 +49,19 @@ KFORMULA_NAMESPACE_BEGIN
 
 class Document;
 
-class KOFORMULA_EXPORT ConfigurePage : public QObject
+class KOFORMULA_EXPORT ConfigurePage : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
-    ConfigurePage( Document* document, QWidget* view, KConfig* config, QVBox* box, char* name = 0 );
+    ConfigurePage( Document* document, TQWidget* view, KConfig* config, TQVBox* box, char* name = 0 );
     void apply();
     void slotDefault();
 
 protected:
 
-    bool selectFont( QFont & );
+    bool selectFont( TQFont & );
 
 protected slots:
 
@@ -75,48 +76,49 @@ protected slots:
 
 private:
 
-    QPushButton* buildFontLine( QWidget* fontWidget, QGridLayout* layout, int number,
-                                QFont font, QString name, QLabel*& fontName );
+    TQPushButton* buildFontLine( TQWidget* fontWidget, TQGridLayout* tqlayout, int number,
+                                TQFont font, TQString name, TQLabel*& fontName );
 
-    void updateFontLabel( QFont font, QLabel* label );
+    void updateFontLabel( TQFont font, TQLabel* label );
 
     Document* m_document;
-    QWidget* m_view;
+    TQWidget* m_view;
     KConfig* m_config;
 
-    QFont defaultFont;
-    QFont nameFont;
-    QFont numberFont;
-    QFont operatorFont;
+    TQFont defaultFont;
+    TQFont nameFont;
+    TQFont numberFont;
+    TQFont operatorFont;
 
     KIntNumInput* sizeSpin;
 
-    QLabel* defaultFontName;
-    QLabel* nameFontName;
-    QLabel* numberFontName;
-    QLabel* operatorFontName;
+    TQLabel* defaultFontName;
+    TQLabel* nameFontName;
+    TQLabel* numberFontName;
+    TQLabel* operatorFontName;
 
 //     KColorButton* defaultColorBtn;
 //     KColorButton* numberColorBtn;
 //     KColorButton* operatorColorBtn;
 //     KColorButton* emptyColorBtn;
 //     KColorButton* errorColorBtn;
-    QCheckBox* syntaxHighlighting;
+    TQCheckBox* syntaxHighlighting;
 
     bool m_changed;
 };
 
 
-// class MathFontsConfigurePage : public QObject
+// class MathFontsConfigurePage : public TQObject
 // {
 //     Q_OBJECT
+//     TQ_OBJECT
 // public:
 
-//     MathFontsConfigurePage( Document* document, QWidget* view, KConfig* config, QVBox* box, char* name = 0 );
+//     MathFontsConfigurePage( Document* document, TQWidget* view, KConfig* config, TQVBox* box, char* name = 0 );
 //     void apply();
 //     void slotDefault();
 
-//     QValueVector<QString>::iterator findUsedFont( QString name );
+//     TQValueVector<TQString>::iterator findUsedFont( TQString name );
 
 // protected slots:
 
@@ -127,10 +129,10 @@ private:
 
 // private:
 
-//     void setupLists( const QStringList& usedFonts );
+//     void setupLists( const TQStringList& usedFonts );
 
 //     Document* m_document;
-//     QWidget* m_view;
+//     TQWidget* m_view;
 //     KConfig* m_config;
 
 //     KListView* availableFonts;
@@ -141,7 +143,7 @@ private:
 //     KPushButton* moveUp;
 //     KPushButton* moveDown;
 
-//     QValueVector<QString> usedFontList;
+//     TQValueVector<TQString> usedFontList;
 // };