TQt4 port Abakus

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/abakus@1231045 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 28 insertions, 27 deletions

diff --git a/src/mainwindow.h b/src/mainwindow.h
index bd6fecb..5ff9c95 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -23,14 +23,14 @@
 
 #include "numerictypes.h"
 
-class QPoint;
-class QVBox;
-class QCheckBox;
-class QRadioButton;
-class QBoxLayout;
-class QListViewItem;
-class QSplitter;
-class QTimer;
+class TQPoint;
+class TQVBox;
+class TQCheckBox;
+class TQRadioButton;
+class TQBoxLayout;
+class TQListViewItem;
+class TQSplitter;
+class TQTimer;
 
 //class KComboBox;
 class Editor;
@@ -42,18 +42,19 @@ class ResultListViewText;
 
 class AbakusIface;
 
-// Main window class, handles events and layout and stuff
+// Main window class, handles events and tqlayout and stuff
 class MainWindow : public KMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
     MainWindow();
 
     bool inRPNMode() const;
 
     protected:
-    virtual void contextMenuEvent(QContextMenuEvent *e);
-    virtual bool eventFilter(QObject *o, QEvent *e);
+    virtual void contextMenuEvent(TQContextMenuEvent *e);
+    virtual bool eventFilter(TQObject *o, TQEvent *e);
     virtual bool queryExit();
     virtual void polish();
 
@@ -74,8 +75,8 @@ class MainWindow : public KMainWindow
     void slotDegrees();
     void slotRadians();
 
-    void slotEntrySelected(const QString &text);
-    void slotResultSelected(const QString &text);
+    void slotEntrySelected(const TQString &text);
+    void slotResultSelected(const TQString &text);
 
     void slotToggleMenuBar();
     void slotToggleFunctionList();
@@ -84,15 +85,15 @@ class MainWindow : public KMainWindow
     void slotToggleCompactMode();
     void slotToggleExpressionMode();
 
-    void slotNewValue(const QString &name, Abakus::number_t value);
-    void slotChangeValue(const QString &name, Abakus::number_t value);
-    void slotRemoveValue(const QString &name);
+    void slotNewValue(const TQString &name, Abakus::number_t value);
+    void slotChangeValue(const TQString &name, Abakus::number_t value);
+    void slotRemoveValue(const TQString &name);
 
-    void slotNewFunction(const QString &name);
-    void slotRemoveFunction(const QString &name);
+    void slotNewFunction(const TQString &name);
+    void slotRemoveFunction(const TQString &name);
 
     private:
-    int getParenthesesLevel(const QString &str);
+    int getParenthesesLevel(const TQString &str);
 
     void redrawResults();
     void selectCorrectPrecisionAction();
@@ -101,7 +102,7 @@ class MainWindow : public KMainWindow
     void saveConfig();
     void setupLayout();
     void populateListViews();
-    QString interpolateExpression(const QString &text, ResultListViewText *after);
+    TQString interpolateExpression(const TQString &text, ResultListViewText *after);
 
     // Donated via JuK
     KAction *action(const char *key) const;
@@ -112,17 +113,17 @@ class MainWindow : public KMainWindow
     }
 
     private:
-    QVBox *m_history;
-    QRadioButton *m_degrees;
-    QRadioButton *m_radians;
+    TQVBox *m_history;
+    TQRadioButton *m_degrees;
+    TQRadioButton *m_radians;
     Editor *m_edit;
     KPopupMenu *m_popup;
     ResultListView *m_result;
-    QString m_lastError;
-    QBoxLayout *m_layout;
+    TQString m_lastError;
+    TQBoxLayout *m_layout;
     KListView *m_fnList, *m_varList;
-    QSplitter *m_mainSplitter, *m_listSplitter;
-    QSize m_newSize, m_oldSize;
+    TQSplitter *m_mainSplitter, *m_listSplitter;
+    TQSize m_newSize, m_oldSize;
 
     AbakusIface *m_dcopInterface;