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, 56 insertions, 48 deletions

diff --git a/kspread/dialogs/kspread_dlg_preference.h b/kspread/dialogs/kspread_dlg_preference.h
index d23739b8..ec4abf11 100644
--- a/kspread/dialogs/kspread_dlg_preference.h
+++ b/kspread/dialogs/kspread_dlg_preference.h
@@ -33,10 +33,10 @@ class KConfig;
 class KIntNumInput;
 class KDoubleNumInput;
 class KSpellConfig;
-class QCheckBox;
-class QComboBox;
-class QVGroupBox;
-class QPushButton;
+class TQCheckBox;
+class TQComboBox;
+class TQVGroupBox;
+class TQPushButton;
 class KColorButton;
 
 namespace KSpread
@@ -44,11 +44,12 @@ namespace KSpread
 class Sheet;
 class View;
 
-class parameterLocale :  public QObject
+class parameterLocale :  public TQObject
 {
  Q_OBJECT
+  TQ_OBJECT
 public:
-   parameterLocale( View* _view,QVBox *box, char *name = 0);
+   parameterLocale( View* _view,TQVBox *box, char *name = 0);
  void apply();
 public slots:
    void updateDefaultSystemConfig();
@@ -58,17 +59,18 @@ public slots:
     */
    void updateToMatchLocale(KLocale* locale);
 
-   QLabel *m_shortDate,*m_time,*m_money,*m_date,*m_language,*m_number;
-   QPushButton *m_updateButton;
+   TQLabel *m_shortDate,*m_time,*m_money,*m_date,*m_language,*m_number;
+   TQPushButton *m_updateButton;
    View* m_pView;
    bool m_bUpdateLocale;
 };
 
-class configure : public QObject
+class configure : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  configure( View* _view,QVBox *box, char *name = 0 );
+  configure( View* _view,TQVBox *box, char *name = 0 );
   void apply();
   void slotDefault();
 protected:
@@ -76,14 +78,14 @@ protected:
   KIntNumInput  *nbPage;
   KIntNumInput* nbRecentFile;
   KIntNumInput* autoSaveDelay;
-  QCheckBox *showVScrollBar;
-  QCheckBox *showHScrollBar;
-  QCheckBox *showColHeader;
-  QCheckBox *showRowHeader;
-  QCheckBox *showTabBar;
-  QCheckBox *showFormulaBar;
-    QCheckBox *showStatusBar;
-    QCheckBox *m_createBackupFile;
+  TQCheckBox *showVScrollBar;
+  TQCheckBox *showHScrollBar;
+  TQCheckBox *showColHeader;
+  TQCheckBox *showRowHeader;
+  TQCheckBox *showTabBar;
+  TQCheckBox *showFormulaBar;
+    TQCheckBox *showStatusBar;
+    TQCheckBox *m_createBackupFile;
   bool m_oldBackupFile;
 
   KConfig* config;
@@ -92,18 +94,19 @@ protected:
 } ;
 
 
-class miscParameters : public QObject
+class miscParameters : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  miscParameters( View* _view, QVBox *box, char *name = 0 );
+  miscParameters( View* _view, TQVBox *box, char *name = 0 );
   void apply();
   void slotDefault();
 
   void initComboBox();
 
 public slots:
-  void slotTextComboChanged(const QString &);
+  void slotTextComboChanged(const TQString &);
 
 protected:
   View* m_pView;
@@ -114,20 +117,21 @@ protected:
    */
   KoUnit::Unit indentUnit;
   KConfig* config;
-  QComboBox *typeCompletion;
-  QComboBox *typeCalc;
-  QComboBox *typeOfMove;
-  QCheckBox *msgError;
+  TQComboBox *typeCompletion;
+  TQComboBox *typeCalc;
+  TQComboBox *typeOfMove;
+  TQCheckBox *msgError;
   KIntNumInput* m_undoRedoLimit;
   bool comboChanged;
   int m_oldNbRedo;
 } ;
 
-class colorParameters : public QObject
+class colorParameters : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  colorParameters( View* _view, QVBox *box, char *name = 0 );
+  colorParameters( View* _view, TQVBox *box, char *name = 0 );
   void apply();
   void slotDefault();
 protected:
@@ -137,19 +141,20 @@ protected:
   KConfig* config;
 } ;
 
-class configureLayoutPage : public QObject
+class configureLayoutPage : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  configureLayoutPage( View* _view,QVBox *box, char *name = 0 );
+  configureLayoutPage( View* _view,TQVBox *box, char *name = 0 );
   void apply();
   void slotDefault();
   void initCombo();
 protected:
   View* m_pView;
-  QComboBox *defaultOrientationPage;
-  QComboBox *defaultSizePage;
-  QComboBox *defaultUnit;
+  TQComboBox *defaultOrientationPage;
+  TQComboBox *defaultSizePage;
+  TQComboBox *defaultUnit;
   //store old config
   int paper;
   int orientation;
@@ -158,51 +163,54 @@ protected:
   KConfig* config;
 } ;
 
-class configureSpellPage : public QObject
+class configureSpellPage : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  configureSpellPage( View* _view, QVBox *box, char *name = 0 );
+  configureSpellPage( View* _view, TQVBox *box, char *name = 0 );
   void apply();
   void slotDefault();
 protected:
   View * m_pView;
   KConfig * config;
     KSpellConfig *m_spellConfigWidget;
-    QCheckBox *dontCheckUpperWord;
-    QCheckBox *dontCheckTitleCase;
+    TQCheckBox *dontCheckUpperWord;
+    TQCheckBox *dontCheckTitleCase;
 } ;
 
-class configureTTSPage : public QObject
+class configureTTSPage : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  configureTTSPage( View *_view, QVBox *box, char *name = 0 );
+  configureTTSPage( View *_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 PreferenceDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   enum { KS_PREFERENCES = 1, KS_LOCALE = 2, KS_INTERFACE = 4,
          KS_MISC = 8, KS_COLOR = 16, KS_LAYOUT = 32, KS_SPELLING = 64 };
-  PreferenceDialog( View* parent, const char* name);
+  PreferenceDialog( View* tqparent, const char* name);
 public slots:
   void slotApply();
   void slotDefault();