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, 21 insertions, 19 deletions

diff --git a/kspread/dialogs/kspread_dlg_conditional.h b/kspread/dialogs/kspread_dlg_conditional.h
index 4b0e065c..9ecba7be 100644
--- a/kspread/dialogs/kspread_dlg_conditional.h
+++ b/kspread/dialogs/kspread_dlg_conditional.h
@@ -24,11 +24,11 @@
 #define __kspread_dlg_conditional__
 
 #include <kdialogbase.h>
-#include <qwidget.h>
+#include <tqwidget.h>
 
 #include "kspread_condition.h"
 
-class QComboBox;
+class TQComboBox;
 class KLineEdit;
 
 namespace KSpread
@@ -36,42 +36,44 @@ namespace KSpread
 class Style;
 class View;
 
-class ConditionalWidget : public QWidget
+class ConditionalWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
  public:
-  ConditionalWidget( QWidget * parent = 0, const char * name = 0, WFlags fl = 0 );
+  ConditionalWidget( TQWidget * tqparent = 0, const char * name = 0, WFlags fl = 0 );
   ~ConditionalWidget();
 
-  QComboBox * m_condition_1;
-  QComboBox * m_style_1;
+  TQComboBox * m_condition_1;
+  TQComboBox * m_style_1;
   KLineEdit * m_firstValue_1;
   KLineEdit * m_secondValue_1;
 
-  QComboBox * m_condition_2;
-  QComboBox * m_style_2;
+  TQComboBox * m_condition_2;
+  TQComboBox * m_style_2;
   KLineEdit * m_firstValue_2;
   KLineEdit * m_secondValue_2;
 
-  QComboBox * m_condition_3;
-  QComboBox * m_style_3;
+  TQComboBox * m_condition_3;
+  TQComboBox * m_style_3;
   KLineEdit * m_firstValue_3;
   KLineEdit * m_secondValue_3;
 
  public slots:
-  void slotTextChanged1( const QString & );
-  void slotTextChanged2( const QString & );
-  void slotTextChanged3( const QString & );
+  void slotTextChanged1( const TQString & );
+  void slotTextChanged2( const TQString & );
+  void slotTextChanged3( const TQString & );
 };
 
 
 class ConditionalDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
  public:
-  ConditionalDialog( View * parent, const char * name,
-                         const QRect & marker );
+  ConditionalDialog( View * tqparent, const char * name,
+                         const TQRect & marker );
 
   void init();
 
@@ -81,19 +83,19 @@ class ConditionalDialog : public KDialogBase
  protected:
   View *              m_view;
   ConditionalWidget * m_dlg;
-  QRect               m_marker;
+  TQRect               m_marker;
   Conditional::Type   m_result;
 
  private:
    void init( Conditional const & tmp, int numCondition );
-   Conditional::Type typeOfCondition( QComboBox const * const cb ) const;
+   Conditional::Type typeOfCondition( TQComboBox const * const cb ) const;
 
   bool checkInputData( KLineEdit const * const edit1,
                        KLineEdit const * const edit2 );
   bool checkInputData();
-  bool getCondition( Conditional & newCondition, const QComboBox * cb,
+  bool getCondition( Conditional & newCondition, const TQComboBox * cb,
                      const KLineEdit * edit1, const KLineEdit * edit2,
-                     const QComboBox * sb, Style * style );
+                     const TQComboBox * sb, Style * style );
 
 };