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, 23 insertions, 22 deletions

diff --git a/krita/ui/kis_layerbox.h b/krita/ui/kis_layerbox.h
index dab83d63..e5440e42 100644
--- a/krita/ui/kis_layerbox.h
+++ b/krita/ui/kis_layerbox.h
@@ -22,17 +22,17 @@
 #ifndef KIS_LAYERBOX_H
 #define KIS_LAYERBOX_H
 
-#include <qframe.h>
+#include <tqframe.h>
 #include <kdebug.h>
-#include <qtimer.h>
+#include <tqtimer.h>
 
 #include "kis_types.h"
 #include "kis_colorspace.h"
 
 class WdgLayerBox;
-class QButton;
-class QPainter;
-class QWidget;
+class TQButton;
+class TQPainter;
+class TQWidget;
 class KIconLoader;
 class KPopupMenu;
 class KoDocumentEntry;
@@ -41,12 +41,13 @@ class KisLayerList;
 class LayerItem;
 class KisCanvasSubject;
 
-class KisLayerBox : public QFrame {
-        typedef QFrame super;
+class KisLayerBox : public TQFrame {
+        typedef TQFrame super;
         Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KisLayerBox(KisCanvasSubject *subject, QWidget *parent = 0, const char *name = 0);
+    KisLayerBox(KisCanvasSubject *subject, TQWidget *tqparent = 0, const char *name = 0);
     virtual ~KisLayerBox();
 
     void clear();
@@ -61,17 +62,17 @@ public slots:
     void slotLayerMoved(KisLayerSP layer, KisGroupLayerSP wasParent, KisLayerSP wasAboveThis);
     void slotLayerPropertiesChanged(KisLayerSP layer);
     void slotLayersChanged(KisGroupLayerSP rootLayer);
-    void slotLayerUpdated(KisLayerSP layer, QRect rc);
+    void slotLayerUpdated(KisLayerSP layer, TQRect rc);
 
     void slotSetCompositeOp(const KisCompositeOp& compositeOp);
     void slotSetOpacity(int opacity);
     void slotSetColorSpace(const KisColorSpace * colorSpace);
 
 signals:
-    void sigRequestLayer(KisGroupLayerSP parent, KisLayerSP above);
-    void sigRequestGroupLayer(KisGroupLayerSP parent, KisLayerSP above);
-    void sigRequestAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above);
-    void sigRequestPartLayer(KisGroupLayerSP parent, KisLayerSP above, const KoDocumentEntry& entry);
+    void sigRequestLayer(KisGroupLayerSP tqparent, KisLayerSP above);
+    void sigRequestGroupLayer(KisGroupLayerSP tqparent, KisLayerSP above);
+    void sigRequestAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above);
+    void sigRequestPartLayer(KisGroupLayerSP tqparent, KisLayerSP above, const KoDocumentEntry& entry);
     void sigRequestLayerProperties(KisLayerSP layer);
 
     void sigOpacityChanged(int opacity, bool withSlider);
@@ -84,13 +85,13 @@ private:
 private slots:
     // connect to LayerList signals
     void slotLayerActivated(LayerItem* layer);
-    void slotLayerDisplayNameChanged(LayerItem* layer, const QString& displayName);
-    void slotLayerPropertyChanged(LayerItem* layer, const QString& name, bool on);
-    void slotLayerMoved(LayerItem* layer, LayerItem* parent, LayerItem* after);
-    void slotRequestNewLayer(LayerItem* parent, LayerItem* after);
-    void slotRequestNewFolder(LayerItem* parent, LayerItem* after);
-    void slotRequestNewAdjustmentLayer(LayerItem* parent, LayerItem* after);
-    void slotRequestNewObjectLayer(LayerItem* parent, LayerItem* item, const KoDocumentEntry& entry);
+    void slotLayerDisplayNameChanged(LayerItem* layer, const TQString& displayName);
+    void slotLayerPropertyChanged(LayerItem* layer, const TQString& name, bool on);
+    void slotLayerMoved(LayerItem* layer, LayerItem* tqparent, LayerItem* after);
+    void slotRequestNewLayer(LayerItem* tqparent, LayerItem* after);
+    void slotRequestNewFolder(LayerItem* tqparent, LayerItem* after);
+    void slotRequestNewAdjustmentLayer(LayerItem* tqparent, LayerItem* after);
+    void slotRequestNewObjectLayer(LayerItem* tqparent, LayerItem* item, const KoDocumentEntry& entry);
     void slotRequestRemoveLayer(LayerItem* layer);
     void slotRequestLayerProperties(LayerItem* layer);
 
@@ -105,14 +106,14 @@ private slots:
 
 private:
     void updateUI();
-    QPixmap loadPixmap(const QString& filename, const KIconLoader& il, int size);
+    TQPixmap loadPixmap(const TQString& filename, const KIconLoader& il, int size);
     KisLayerList* list() const;
     void markModified(KisLayer *layer);
 
     KPopupMenu *m_newLayerMenu;
     KoPartSelectAction *m_partLayerAction;
     KisImageSP m_image;
-    QValueList<int> m_modified;
+    TQValueList<int> m_modified;
     WdgLayerBox *m_lst;
 
     void printKritaLayers() const;