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

diff --git a/krita/core/kis_pattern.h b/krita/core/kis_pattern.h
index 4b5868f3..7d18f1f3 100644
--- a/krita/core/kis_pattern.h
+++ b/krita/core/kis_pattern.h
@@ -27,23 +27,24 @@
 #include "kis_resource.h"
 #include "kis_types.h"
 
-class QPoint;
-class QImage;
+class TQPoint;
+class TQImage;
 class KisColorSpace;
 class KisPaintDevice;
 
 class KisPattern : public KisResource {
     typedef KisResource super;
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KisPattern(const QString& file);
+    KisPattern(const TQString& file);
     KisPattern(KisPaintDevice* image, int x, int y, int w, int h);
     virtual ~KisPattern();
 
     virtual bool load();
     virtual bool save();
-    virtual QImage img();
+    virtual TQImage img();
 
     /**
      * returns a KisPaintDeviceSP made with colorSpace as the ColorSpace strategy
@@ -51,28 +52,28 @@ public:
      **/
     KisPaintDeviceSP image(KisColorSpace * colorSpace);
 
-    Q_INT32 width() const;
-    Q_INT32 height() const;
+    TQ_INT32 width() const;
+    TQ_INT32 height() const;
 
-    void setImage(const QImage& img);
+    void setImage(const TQImage& img);
 
     KisPattern* clone() const;
 
 protected:
-    void setWidth(Q_INT32 w);
-    void setHeight(Q_INT32 h);
+    void setWidth(TQ_INT32 w);
+    void setHeight(TQ_INT32 h);
 
 private:
     bool init();
 
 private:
-    QByteArray m_data;
-    QImage m_img;
-    QMap<QString, KisPaintDeviceSP> m_colorspaces;
+    TQByteArray m_data;
+    TQImage m_img;
+    TQMap<TQString, KisPaintDeviceSP> m_colorspaces;
     bool m_hasFile;
 
-    Q_INT32 m_width;
-    Q_INT32 m_height;
+    TQ_INT32 m_width;
+    TQ_INT32 m_height;
 };
 
 #endif