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, 18 insertions, 17 deletions

diff --git a/krita/core/kis_group_layer.h b/krita/core/kis_group_layer.h
index 7b1a764a..3a2e042a 100644
--- a/krita/core/kis_group_layer.h
+++ b/krita/core/kis_group_layer.h
@@ -37,9 +37,10 @@ class KisGroupLayer : public KisLayer {
     typedef KisLayer super;
 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KisGroupLayer(KisImage *img, const QString &name, Q_UINT8 opacity);
+    KisGroupLayer(KisImage *img, const TQString &name, TQ_UINT8 opacity);
     KisGroupLayer(const KisGroupLayer& rhs);
     virtual ~KisGroupLayer();
 
@@ -47,46 +48,46 @@ public:
 public:
 
     /**
-     * Set the entire layer extent dirty; this percolates up to parent layers all the
+     * Set the entire layer extent dirty; this percolates up to tqparent layers all the
      * way to the root layer.
      */
     virtual void setDirty(bool propagate = true);
 
     /**
      * Add the given rect to the set of dirty rects for this layer;
-     * this percolates up to parent layers all the way to the root
+     * this percolates up to tqparent layers all the way to the root
      * layer.
      */
-    virtual void setDirty(const QRect & rect, bool propagate = true);
+    virtual void setDirty(const TQRect & rect, bool propagate = true);
 
     virtual void activate() {};
 
     virtual void deactivate() {};
 
-    virtual Q_INT32 x() const;
-    virtual void setX(Q_INT32);
+    virtual TQ_INT32 x() const;
+    virtual void setX(TQ_INT32);
 
-    virtual Q_INT32 y() const;
-    virtual void setY(Q_INT32);
+    virtual TQ_INT32 y() const;
+    virtual void setY(TQ_INT32);
 
     // Sets this layer and all its descendants' owner image to the given image.
     virtual void setImage(KisImage *image);
 
-    virtual QRect extent() const;
-    virtual QRect exactBounds() const;
+    virtual TQRect extent() const;
+    virtual TQRect exactBounds() const;
 
     virtual bool accept(KisLayerVisitor &v)
         {
 //            kdDebug(41001) << "GROUP\t\t" << name()
 //                    << " dirty: " << dirty()
-//                    << ", " << m_layers.count() << " children "
+//                    << ", " << m_layers.count() << " tqchildren "
 //                    << ", projection: " << m_projection
 //                    << "\n";
             return v.visit(this);
         };
 
     virtual void resetProjection(KisPaintDevice* to = 0); /// will copy from to, if !0, CoW!!
-    virtual KisPaintDeviceSP projection(const QRect & rect);
+    virtual KisPaintDeviceSP projection(const TQRect & rect);
 
     virtual uint childCount() const;
 
@@ -116,24 +117,24 @@ public:
     /// Removes the layer from this group. Fails if there's no such layer in this group.
     virtual bool removeLayer(KisLayerSP layer);
 
-    virtual QImage createThumbnail(Q_INT32 w, Q_INT32 h);
+    virtual TQImage createThumbnail(TQ_INT32 w, TQ_INT32 h);
 
     /// Returns if the layer will induce the projection hack (if the only layer in this group)
     virtual bool paintLayerInducesProjectionOptimization(KisPaintLayer* l);
 signals:
 
-    void sigDirty(QRect rc);
+    void sigDirty(TQRect rc);
     
 private:
     
-    void updateProjection(const QRect & rc);
+    void updateProjection(const TQRect & rc);
     
     inline int reverseIndex(int index) const { return childCount() - 1 - index; };
     vKisLayerSP m_layers; // Contains the list of all layers
     KisPaintDeviceSP m_projection; // The cached composition of all layers in this group
 
-    Q_INT32 m_x;
-    Q_INT32 m_y;
+    TQ_INT32 m_x;
+    TQ_INT32 m_y;
 };
 
 #endif // KIS_GROUP_LAYER_H_