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

diff --git a/kspread/dialogs/kspread_dlg_formula.h b/kspread/dialogs/kspread_dlg_formula.h
index d4e224e7..62ffef19 100644
--- a/kspread/dialogs/kspread_dlg_formula.h
+++ b/kspread/dialogs/kspread_dlg_formula.h
@@ -27,18 +27,18 @@
 #ifndef __kspread_dlg_formula__
 #define __kspread_dlg_formula__
 
-#include <qframe.h>
+#include <tqframe.h>
 
 #include <kcompletion.h>
 #include <kdialogbase.h>
 
-class QComboBox;
-class QLabel;
-class QLineEdit;
-class QListBox;
-class QPushButton;
-class QTabWidget;
-class QTextBrowser;
+class TQComboBox;
+class TQLabel;
+class TQLineEdit;
+class TQListBox;
+class TQPushButton;
+class TQTabWidget;
+class TQTextBrowser;
 class KLineEdit;
 
 namespace KSpread
@@ -50,20 +50,21 @@ class View;
 class FormulaDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-  FormulaDialog( View* parent, const char* name,const QString& formulaName=0);
+  FormulaDialog( View* tqparent, const char* name,const TQString& formulaName=0);
   ~FormulaDialog();
 private:
     /**
      * Turns the @p text into a parameter that koscript can understand. The type
      * of this parameter is extracted by looking at parameter number @p param in @ref #m_desc.
      */
-    QString createParameter( const QString& _text, int param );
+    TQString createParameter( const TQString& _text, int param );
     /**
      * Reads the text out of @ref #firstElement and friends and creates a parameter
      * list for the function.
      */
-    QString createFormula();
+    TQString createFormula();
 
 private slots:
     /**
@@ -78,27 +79,27 @@ private slots:
      * Called if a function name was selected but not double clicked.
      * This will just show the help page for the function.
      */
-    void slotSelected( const QString& function );
+    void slotSelected( const TQString& function );
     /**
      * Called if the user clicked on one of the "related function"
      * This will switch the active function and show help page
      * of the function as well.
      */
-    void slotShowFunction( const QString& function );
+    void slotShowFunction( const TQString& function );
     /**
      * Called if the user double clicked on some method name.
      * That will switch into editing mode, allowing the user
      * to enter the parameters for the function.
      */
-    void slotDoubleClicked( QListBoxItem* item );
+    void slotDoubleClicked( TQListBoxItem* item );
     /**
      * Called if a category of methods has been selected.
      */
-    void slotActivated(const QString& category );
+    void slotActivated(const TQString& category );
     /**
      * Called if the text of @ref #firstElement, @ref #secondElement etc. changes.
      */
-    void slotChangeText(const QString& text );
+    void slotChangeText(const TQString& text );
     /**
      * Connected to @ref View to get notified if the selection in the
      * sheet changes.
@@ -112,7 +113,7 @@ private slots:
     /**
      * Called if the user changes some character in @ref #searchFunct.
      */
-    void slotSearchText(const QString& text );
+    void slotSearchText(const TQString& text );
     /**
      * Called if the user pressed return in @ref #searchFunct.
      */
@@ -122,50 +123,50 @@ public:
     /**
      * Find out which widget got focus.
      */
-    bool eventFilter( QObject* obj, QEvent* ev );
+    bool eventFilter( TQObject* obj, TQEvent* ev );
 protected:
-       virtual void closeEvent ( QCloseEvent * );
+       virtual void closeEvent ( TQCloseEvent * );
 private:
     View* m_pView;
 
-    QTabWidget* m_tabwidget;
-    QTextBrowser* m_browser;
-    QWidget* m_input;
+    TQTabWidget* m_tabwidget;
+    TQTextBrowser* m_browser;
+    TQWidget* m_input;
 
-    QPushButton *selectFunction;
-    QComboBox *typeFunction;
-    QListBox *functions;
-    QLineEdit *result;
+    TQPushButton *selectFunction;
+    TQComboBox *typeFunction;
+    TQListBox *functions;
+    TQLineEdit *result;
 
     KLineEdit *searchFunct;
     KCompletion listFunct;
 
-    QLabel* label1;
-    QLabel* label2;
-    QLabel* label3;
-    QLabel* label4;
-    QLabel* label5;
-    QLineEdit *firstElement;
-    QLineEdit *secondElement;
-    QLineEdit *thirdElement;
-    QLineEdit *fourElement;
-    QLineEdit *fiveElement;
+    TQLabel* label1;
+    TQLabel* label2;
+    TQLabel* label3;
+    TQLabel* label4;
+    TQLabel* label5;
+    TQLineEdit *firstElement;
+    TQLineEdit *secondElement;
+    TQLineEdit *thirdElement;
+    TQLineEdit *fourElement;
+    TQLineEdit *fiveElement;
     /**
      * Tells which of the lineedits has the logical focus currently.
      * It may happen that a lineedit does not have qt focus but
      * logical focus but not the other way round.
      */
-    QLineEdit* m_focus;
+    TQLineEdit* m_focus;
 
     int m_column;
     int m_row;
-    QString m_oldText;
+    TQString m_oldText;
 
-    QString m_funcName;
-    QString m_sheetName;
+    TQString m_funcName;
+    TQString m_sheetName;
 
-    QString m_rightText;
-    QString m_leftText;
+    TQString m_rightText;
+    TQString m_leftText;
     /**
      * A lock for @ref #slotChangeText.
      */