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, 16 insertions, 15 deletions

diff --git a/krita/ui/kis_paintop_box.h b/krita/ui/kis_paintop_box.h
index da158194..38b88ddb 100644
--- a/krita/ui/kis_paintop_box.h
+++ b/krita/ui/kis_paintop_box.h
@@ -23,13 +23,13 @@
 
 #include <map>
 
-#include <qwidget.h>
-#include <qcombobox.h>
-#include <qvaluelist.h>
+#include <tqwidget.h>
+#include <tqcombobox.h>
+#include <tqvaluelist.h>
 
 #include "kis_input_device.h"
 
-class QString;
+class TQString;
 
 class KWidgetAction;
 class KisView;
@@ -47,14 +47,15 @@ class KisColorSpace;
  *
  * XXX: instead of text, use pretty pictures.
  */
-class KisPaintopBox : public QWidget {
+class KisPaintopBox : public TQWidget {
 
     Q_OBJECT
+  TQ_OBJECT
 
-    typedef QWidget super;
+    typedef TQWidget super;
 
 public:
-    KisPaintopBox (KisView * view,  QWidget * parent, const char * name = 0);
+    KisPaintopBox (KisView * view,  TQWidget * tqparent, const char * name = 0);
 
     ~KisPaintopBox();
 
@@ -65,7 +66,7 @@ signals:
 
 private slots:
 
-    void addItem(const KisID & paintop, const QString & category = "");
+    void addItem(const KisID & paintop, const TQString & category = "");
 
 private slots:
 
@@ -74,7 +75,7 @@ private slots:
     void slotInputDeviceChanged(const KisInputDevice & inputDevice);
 
 private:
-    QPixmap paintopPixmap(const KisID & paintop);
+    TQPixmap paintopPixmap(const KisID & paintop);
     void updateOptionWidget();
     const KisID & currentPaintop();
     void setCurrentPaintop(const KisID & paintop);
@@ -83,17 +84,17 @@ private:
 
 private:
     KisCanvasController *m_canvasController;
-    QComboBox * m_cmbPaintops;
-    QHBoxLayout * m_layout;
-    QWidget * m_optionWidget;
+    TQComboBox * m_cmbPaintops;
+    TQHBoxLayout * m_layout;
+    TQWidget * m_optionWidget;
     
-    QValueList<KisID> * m_paintops;
-    QValueList<KisID> * m_displayedOps;
+    TQValueList<KisID> * m_paintops;
+    TQValueList<KisID> * m_displayedOps;
 
     typedef std::map<KisInputDevice, KisID> InputDevicePaintopMap;
     InputDevicePaintopMap m_currentID;
 
-    typedef std::map<KisInputDevice, QValueVector<KisPaintOpSettings *> > InputDevicePaintopSettingsMap;
+    typedef std::map<KisInputDevice, TQValueVector<KisPaintOpSettings *> > InputDevicePaintopSettingsMap;
     InputDevicePaintopSettingsMap m_inputDevicePaintopSettings;
 };