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, 69 insertions, 68 deletions

diff --git a/kspread/dialogs/kspread_dlg_database.h b/kspread/dialogs/kspread_dlg_database.h
index ae958d40..d2e921fe 100644
--- a/kspread/dialogs/kspread_dlg_database.h
+++ b/kspread/dialogs/kspread_dlg_database.h
@@ -22,24 +22,24 @@
 #ifndef __kspread_dlg_database__
 #define __kspread_dlg_database__
 
-#include <qdialog.h>
-#include <qrect.h>
+#include <tqdialog.h>
+#include <tqrect.h>
 
 #include <kwizard.h>
 
-class QCheckBox;
-class QComboBox;
-class QFrame;
-class QGridLayout;
-class QLabel;
-class QLineEdit;
-class QListViewItem;
-class QHBoxLayout;
-class QRadioButton;
-class QSqlDatabase;
-class QTextEdit;
-class QVBoxLayout;
-class QWidget;
+class TQCheckBox;
+class TQComboBox;
+class TQFrame;
+class TQGridLayout;
+class TQLabel;
+class TQLineEdit;
+class TQListViewItem;
+class TQHBoxLayout;
+class TQRadioButton;
+class TQSqlDatabase;
+class TQTextEdit;
+class TQVBoxLayout;
+class TQWidget;
 
 class KListView;
 class KPushButton;
@@ -50,11 +50,12 @@ class View;
 class DatabaseDialog : public KWizard
 {
   Q_OBJECT
+  TQ_OBJECT
 
  public:
   enum PageId { eDatabase = 0, eSheets = 1, eColumns = 2, eOptions = 3, eResult = 4 };
 
-  DatabaseDialog( View * parent, QRect const & rect, const char * name = 0, bool modal = FALSE, WFlags fl = 0 );
+  DatabaseDialog( View * tqparent, TQRect const & rect, const char * name = 0, bool modal = FALSE, WFlags fl = 0 );
   virtual ~DatabaseDialog();
 
  private slots:
@@ -63,70 +64,70 @@ class DatabaseDialog : public KWizard
   void startingCell_clicked();
   void startingRegion_clicked();
   void connectButton_clicked();
-  void databaseNameChanged( const QString & s );
-  void databaseHostChanged( const QString & s );
+  void databaseNameChanged( const TQString & s );
+  void databaseHostChanged( const TQString & s );
   void databaseDriverChanged( int );
-  void popupSheetViewMenu( QListViewItem *, const QPoint &, int );
-  void sheetViewClicked( QListViewItem * );
+  void popupSheetViewMenu( TQListViewItem *, const TQPoint &, int );
+  void sheetViewClicked( TQListViewItem * );
   void accept();
 
  protected:
   void next();
   void back();
 
-  QGridLayout  * m_databaseLayout;
-  QGridLayout  * m_sheetLayout;
-  QGridLayout  * m_columnsLayout;
-  QGridLayout  * m_optionsLayout;
-  QGridLayout  * m_resultLayout;
+  TQGridLayout  * m_databaseLayout;
+  TQGridLayout  * m_sheetLayout;
+  TQGridLayout  * m_columnsLayout;
+  TQGridLayout  * m_optionsLayout;
+  TQGridLayout  * m_resultLayout;
 
  private:
   int            m_currentPage;
   View  * m_pView;
-  QRect          m_targetRect;
-  QSqlDatabase * m_dbConnection;
-
-  QWidget      * m_database;
-  QLabel       * m_databaseStatus;
-  QLineEdit    * m_username;
-  QLineEdit    * m_port;
-  QLineEdit    * m_databaseName;
-  QComboBox    * m_driver;
-  QLineEdit    * m_password;
-  QLineEdit    * m_host;
-  QLabel       * m_Type;
-  QWidget      * m_sheet;
-  QComboBox    * m_databaseList;
+  TQRect          m_targetRect;
+  TQSqlDatabase * m_dbConnection;
+
+  TQWidget      * m_database;
+  TQLabel       * m_databasetqStatus;
+  TQLineEdit    * m_username;
+  TQLineEdit    * m_port;
+  TQLineEdit    * m_databaseName;
+  TQComboBox    * m_driver;
+  TQLineEdit    * m_password;
+  TQLineEdit    * m_host;
+  TQLabel       * m_Type;
+  TQWidget      * m_sheet;
+  TQComboBox    * m_databaseList;
   KPushButton  * m_connectButton;
-  QLabel       * m_sheetStatus;
-  QLabel       * m_SelectSheetLabel;
+  TQLabel       * m_sheettqStatus;
+  TQLabel       * m_SelectSheetLabel;
   KListView    * m_sheetView;
-  QWidget      * m_columns;
+  TQWidget      * m_columns;
   KListView    * m_columnView;
-  QLabel       * m_columnsStatus;
-  QWidget      * m_options;
-  QComboBox    * m_columns_1;
-  QComboBox    * m_columns_2;
-  QComboBox    * m_columns_3;
-  QComboBox    * m_operator_1;
-  QComboBox    * m_operator_2;
-  QComboBox    * m_operator_3;
-  QLineEdit    * m_operatorValue_1;
-  QLineEdit    * m_operatorValue_2;
-  QLineEdit    * m_operatorValue_3;
-  QRadioButton * m_andBox;
-  QRadioButton * m_orBox;
-  QComboBox    * m_columnsSort_1;
-  QComboBox    * m_columnsSort_2;
-  QComboBox    * m_sortMode_1;
-  QComboBox    * m_sortMode_2;
-  QCheckBox    * m_distinct;
-  QWidget      * m_result;
-  QTextEdit    * m_sqlQuery;
-  QRadioButton * m_startingRegion;
-  QLineEdit    * m_cell;
-  QLineEdit    * m_region;
-  QRadioButton * m_startingCell;
+  TQLabel       * m_columnstqStatus;
+  TQWidget      * m_options;
+  TQComboBox    * m_columns_1;
+  TQComboBox    * m_columns_2;
+  TQComboBox    * m_columns_3;
+  TQComboBox    * m_operator_1;
+  TQComboBox    * m_operator_2;
+  TQComboBox    * m_operator_3;
+  TQLineEdit    * m_operatorValue_1;
+  TQLineEdit    * m_operatorValue_2;
+  TQLineEdit    * m_operatorValue_3;
+  TQRadioButton * m_andBox;
+  TQRadioButton * m_orBox;
+  TQComboBox    * m_columnsSort_1;
+  TQComboBox    * m_columnsSort_2;
+  TQComboBox    * m_sortMode_1;
+  TQComboBox    * m_sortMode_2;
+  TQCheckBox    * m_distinct;
+  TQWidget      * m_result;
+  TQTextEdit    * m_sqlQuery;
+  TQRadioButton * m_startingRegion;
+  TQLineEdit    * m_cell;
+  TQLineEdit    * m_region;
+  TQRadioButton * m_startingCell;
 
   void switchPage( int id );
   bool databaseDoNext();
@@ -134,8 +135,8 @@ class DatabaseDialog : public KWizard
   bool columnsDoNext();
   bool optionsDoNext();
 
-  QString exchangeWildcards(QString const & value);
-  QString getWhereCondition( QString const &, QString const &, int );
+  TQString exchangeWildcards(TQString const & value);
+  TQString getWhereCondition( TQString const &, TQString const &, int );
 };
 
 } // namespace KSpread