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, 49 insertions, 42 deletions

diff --git a/kword/KWConfig.h b/kword/KWConfig.h
index 1b563f92..afe41b74 100644
--- a/kword/KWConfig.h
+++ b/kword/KWConfig.h
@@ -27,27 +27,28 @@ namespace KFormula {
 }
 
 class KWView;
-class QCheckBox;
+class TQCheckBox;
 class KIntNumInput;
 class KoUnitDoubleSpinBox;
 class KConfig;
-class QComboBox;
+class TQComboBox;
 class KIntNumInput;
 class KCommand;
 class KWDocument;
 class KListView;
-class QVGroupBox;
-class QLabel;
+class TQVGroupBox;
+class TQLabel;
 
 namespace KSpell2 {
     class ConfigWidget;
 }
 
-class ConfigureSpellPage : public QObject
+class ConfigureSpellPage : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ConfigureSpellPage( KWView *view, QVBox *box, char *name = 0 );
+    ConfigureSpellPage( KWView *view, TQVBox *box, char *name = 0 );
     void apply();
     void slotDefault();
 private:
@@ -56,11 +57,12 @@ private:
     KSpell2::ConfigWidget *m_spellConfigWidget;
 };
 
-class ConfigureInterfacePage : public QObject
+class ConfigureInterfacePage : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ConfigureInterfacePage( KWView *view, QVBox *box, char *name = 0 );
+    ConfigureInterfacePage( KWView *view, TQVBox *box, char *name = 0 );
     void apply();
     void slotDefault();
     void setUnit( KoUnit::Unit unit );
@@ -71,20 +73,21 @@ signals:
 private:
     KWView* m_pView;
     KConfig* config;
-    QComboBox *m_unitCombo;
+    TQComboBox *m_unitCombo;
     KoUnitDoubleSpinBox* gridX,*gridY;
     KoUnitDoubleSpinBox* indent;
     KIntNumInput* recentFiles;
-    QCheckBox *showStatusBar, *showScrollBar, *pgUpDownMovesCaret;
+    TQCheckBox *showStatusBar, *showScrollBar, *pgUpDownMovesCaret;
     int oldNbRecentFiles;
     KIntNumInput *m_nbPagePerRow;
 };
 
-class ConfigureMiscPage : public QObject
+class ConfigureMiscPage : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ConfigureMiscPage( KWView *view, QVBox *box, char *name = 0 );
+    ConfigureMiscPage( KWView *view, TQVBox *box, char *name = 0 );
     KCommand* apply();
     void slotDefault();
     void setUnit( KoUnit::Unit unit );
@@ -94,16 +97,17 @@ private:
     KIntNumInput* m_undoRedoLimit;
     int m_oldNbRedo;
     bool m_oldFormattingEndParag, m_oldFormattingSpace, m_oldFormattingTabs, m_oldFormattingBreak;
-    QCheckBox* m_displayLink, *m_displayComment, *m_underlineLink, *m_displayFieldCode;
-    QCheckBox* m_cbViewFormattingEndParag, *m_cbViewFormattingSpace;
-    QCheckBox* m_cbViewFormattingTabs, *m_cbViewFormattingBreak;
+    TQCheckBox* m_displayLink, *m_displayComment, *m_underlineLink, *m_displayFieldCode;
+    TQCheckBox* m_cbViewFormattingEndParag, *m_cbViewFormattingSpace;
+    TQCheckBox* m_cbViewFormattingTabs, *m_cbViewFormattingBreak;
 };
 
-class ConfigureDefaultDocPage : public QObject
+class ConfigureDefaultDocPage : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ConfigureDefaultDocPage( KWView *view, QVBox *box, char *name = 0 );
+    ConfigureDefaultDocPage( KWView *view, TQVBox *box, char *name = 0 );
     ~ConfigureDefaultDocPage();
     KCommand* apply();
     void slotDefault();
@@ -113,9 +117,9 @@ public slots:
 private:
     KWView* m_pView;
     KConfig* config;
-    QFont *font;
-    QLabel *fontName;
-    QLabel *tabStop;
+    TQFont *font;
+    TQLabel *fontName;
+    TQLabel *tabStop;
 
     KoUnitDoubleSpinBox* m_columnSpacing;
 
@@ -127,61 +131,64 @@ private:
     bool m_oldBackupFile;
     KIntNumInput* m_variableNumberOffset;
     KoUnitDoubleSpinBox *m_tabStopWidth;
-    QCheckBox *m_cursorInProtectedArea;
-    QCheckBox *m_createBackupFile;
-//     QCheckBox *m_directInsertCursor;
-    QCheckBox *m_autoHyphenation;
-    QComboBox *m_globalLanguage;
-    QString m_oldLanguage;
+    TQCheckBox *m_cursorInProtectedArea;
+    TQCheckBox *m_createBackupFile;
+//     TQCheckBox *m_directInsertCursor;
+    TQCheckBox *m_autoHyphenation;
+    TQComboBox *m_globalLanguage;
+    TQString m_oldLanguage;
     bool m_oldHyphenation;
 };
 
-class ConfigurePathPage : public QObject
+class ConfigurePathPage : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ConfigurePathPage( KWView *view, QVBox *box, char *name = 0 );
+    ConfigurePathPage( KWView *view, TQVBox *box, char *name = 0 );
     void slotDefault();
     void apply();
 private slots:
     void slotModifyPath();
-    void slotSelectionChanged(QListViewItem *);
+    void slotSelectionChanged(TQListViewItem *);
 private:
     KWView* m_pView;
     KConfig* config;
     KListView* m_pPathView;
-    QPushButton *m_modifyPath;
+    TQPushButton *m_modifyPath;
 };
 
-class ConfigureTTSPage : public QObject
+class ConfigureTTSPage : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ConfigureTTSPage( KWView *view, QVBox *box, char *name = 0 );
+    ConfigureTTSPage( KWView *view, TQVBox *box, char *name = 0 );
     void slotDefault();
     void apply();
 private slots:
     void screenReaderOptionChanged();
 private:
     KConfig* config;
-    QCheckBox* m_cbSpeakPointerWidget;
-    QCheckBox* m_cbSpeakFocusWidget;
-    QVGroupBox* m_gbScreenReaderOptions;
-    QCheckBox* m_cbSpeakTooltips;
-    QCheckBox* m_cbSpeakWhatsThis;
-    QCheckBox* m_cbSpeakDisabled;
-    QCheckBox* m_cbSpeakAccelerators;
-    QLabel* m_lblAcceleratorPrefix;
-    QLineEdit* m_leAcceleratorPrefixWord;
+    TQCheckBox* m_cbSpeakPointerWidget;
+    TQCheckBox* m_cbSpeakFocusWidget;
+    TQVGroupBox* m_gbScreenReaderOptions;
+    TQCheckBox* m_cbSpeakTooltips;
+    TQCheckBox* m_cbSpeakWhatsThis;
+    TQCheckBox* m_cbSpeakDisabled;
+    TQCheckBox* m_cbSpeakAccelerators;
+    TQLabel* m_lblAcceleratorPrefix;
+    TQLineEdit* m_leAcceleratorPrefixWord;
     KIntNumInput* m_iniPollingInterval;
 };
 
 class KWConfig : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     enum { KW_KSPELL=1,KP_INTERFACE=2,KP_MISC=4, KP_DOCUMENT=8, KP_FORMULA=16, KP_PATH = 32};
-    KWConfig( KWView* parent );
+    KWConfig( KWView* tqparent );
     void openPage(int flags);
 public slots:
     void slotApply();