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, 51 insertions, 51 deletions

diff --git a/krita/core/tiles/kis_tilediterator.h b/krita/core/tiles/kis_tilediterator.h
index 02431f4b..958876cd 100644
--- a/krita/core/tiles/kis_tilediterator.h
+++ b/krita/core/tiles/kis_tilediterator.h
@@ -18,7 +18,7 @@
 #ifndef KIS_TILED_ITERATOR_H_
 #define KIS_TILED_ITERATOR_H_
 
-#include <qglobal.h>
+#include <tqglobal.h>
 
 #include <ksharedptr.h>
 
@@ -32,22 +32,22 @@ class KRITACORE_EXPORT KisTiledIterator : public KShared {
 
 protected:
     KisTiledDataManager *m_ktm;
-    Q_INT32 m_pixelSize;        // bytes per pixel
-    Q_INT32 m_x;        // current x position
-    Q_INT32 m_y;        // cirrent y position
-    Q_INT32 m_row;    // row in tilemgr
-    Q_INT32 m_col;    // col in tilemgr
-    Q_UINT8 *m_data;
-    Q_UINT8 *m_oldData;
-    Q_INT32 m_offset;
+    TQ_INT32 m_pixelSize;        // bytes per pixel
+    TQ_INT32 m_x;        // current x position
+    TQ_INT32 m_y;        // cirrent y position
+    TQ_INT32 m_row;    // row in tilemgr
+    TQ_INT32 m_col;    // col in tilemgr
+    TQ_UINT8 *m_data;
+    TQ_UINT8 *m_oldData;
+    TQ_INT32 m_offset;
     KisTile *m_tile;
     KisTile* m_oldTile;
     bool m_writable;
 
 protected:
-    inline Q_UINT32 xToCol(Q_UINT32 x) const { if (m_ktm) return m_ktm->xToCol(x); else return 0; };
-    inline Q_UINT32 yToRow(Q_UINT32 y) const { if (m_ktm) return m_ktm->yToRow(y); else return 0; };
-    void fetchTileData(Q_INT32 col, Q_INT32 row);
+    inline TQ_UINT32 xToCol(TQ_UINT32 x) const { if (m_ktm) return m_ktm->xToCol(x); else return 0; };
+    inline TQ_UINT32 yToRow(TQ_UINT32 y) const { if (m_ktm) return m_ktm->yToRow(y); else return 0; };
+    void fetchTileData(TQ_INT32 col, TQ_INT32 row);
 
 public:
     KisTiledIterator( KisTiledDataManager *ktm);
@@ -57,16 +57,16 @@ public:
 
 public:
     // current x position
-    Q_INT32 x() const { return m_x; };
+    TQ_INT32 x() const { return m_x; };
 
     // cirrent y position
-    Q_INT32 y() const { return m_y; };
+    TQ_INT32 y() const { return m_y; };
 
     /// Returns a pointer to the pixel data. Do NOT interpret the data - leave that to a colorstrategy
-    Q_UINT8 *rawData() const;
+    TQ_UINT8 *rawData() const;
 
     /// Returns a pointer to the pixel data as it was at the moment tof he last memento creation.
-    const Q_UINT8 * oldRawData() const;
+    const TQ_UINT8 * oldRawData() const;
 };
 
 /**
@@ -78,13 +78,13 @@ class KRITACORE_EXPORT KisTiledRectIterator : public KisTiledIterator
 
 public:
     /// do not call constructor directly use factory method in KisDataManager instead.
-    KisTiledRectIterator( KisTiledDataManager *dm, Q_INT32  x, Q_INT32  y, Q_INT32  w, Q_INT32  h, bool writable);
+    KisTiledRectIterator( KisTiledDataManager *dm, TQ_INT32  x, TQ_INT32  y, TQ_INT32  w, TQ_INT32  h, bool writable);
     KisTiledRectIterator(const KisTiledRectIterator&);
     KisTiledRectIterator& operator=(const KisTiledRectIterator&);
     ~KisTiledRectIterator();
 
 public:
-    Q_INT32 nConseqPixels() const;
+    TQ_INT32 nConseqPixels() const;
     
     /// Advances a number of pixels until it reaches the end of the rect
     KisTiledRectIterator & operator+=(int n);
@@ -100,20 +100,20 @@ public:
 
 
 protected:
-     Q_INT32 m_left;
-     Q_INT32 m_top;
-     Q_INT32 m_w;
-     Q_INT32 m_h;
-     Q_INT32 m_topRow;
-     Q_INT32 m_bottomRow;
-     Q_INT32 m_leftCol;
-     Q_INT32 m_rightCol;
-     Q_INT32 m_xInTile;
-     Q_INT32 m_yInTile;
-     Q_INT32 m_leftInTile;
-     Q_INT32 m_rightInTile;
-     Q_INT32 m_topInTile;
-     Q_INT32 m_bottomInTile;
+     TQ_INT32 m_left;
+     TQ_INT32 m_top;
+     TQ_INT32 m_w;
+     TQ_INT32 m_h;
+     TQ_INT32 m_topRow;
+     TQ_INT32 m_bottomRow;
+     TQ_INT32 m_leftCol;
+     TQ_INT32 m_rightCol;
+     TQ_INT32 m_xInTile;
+     TQ_INT32 m_yInTile;
+     TQ_INT32 m_leftInTile;
+     TQ_INT32 m_rightInTile;
+     TQ_INT32 m_topInTile;
+     TQ_INT32 m_bottomInTile;
      bool m_beyondEnd;
 
 private:
@@ -129,7 +129,7 @@ class KRITACORE_EXPORT KisTiledHLineIterator : public KisTiledIterator
 
 public:
     /// do not call constructor directly use factory method in KisDataManager instead.
-    KisTiledHLineIterator( KisTiledDataManager *dm, Q_INT32  x, Q_INT32  y, Q_INT32 w, bool writable);
+    KisTiledHLineIterator( KisTiledDataManager *dm, TQ_INT32  x, TQ_INT32  y, TQ_INT32 w, bool writable);
     KisTiledHLineIterator(const KisTiledHLineIterator&);
     KisTiledHLineIterator& operator=(const KisTiledHLineIterator&);
     ~KisTiledHLineIterator();
@@ -140,7 +140,7 @@ public:
 
     /// Returns the number of consequtive horizontal pixels that we point at
     /// This is useful for optimizing
-    Q_INT32 nConseqHPixels() const;
+    TQ_INT32 nConseqHPixels() const;
 
     /// Advances a number of pixels until it reaches the end of the line
     KisTiledHLineIterator & operator+=(int);
@@ -155,14 +155,14 @@ public:
     void nextRow();
 
 protected:
-     Q_INT32 m_right;
-     Q_INT32 m_left;
-     Q_INT32 m_leftCol;
-     Q_INT32 m_rightCol;
-     Q_INT32 m_xInTile;
-     Q_INT32 m_yInTile;
-     Q_INT32 m_leftInTile;
-     Q_INT32 m_rightInTile;
+     TQ_INT32 m_right;
+     TQ_INT32 m_left;
+     TQ_INT32 m_leftCol;
+     TQ_INT32 m_rightCol;
+     TQ_INT32 m_xInTile;
+     TQ_INT32 m_yInTile;
+     TQ_INT32 m_leftInTile;
+     TQ_INT32 m_rightInTile;
 
 private:
      void nextTile();
@@ -178,7 +178,7 @@ class KRITACORE_EXPORT KisTiledVLineIterator : public KisTiledIterator
 
 public:
     /// do not call constructor directly use factory method in KisDataManager instead.
-    KisTiledVLineIterator( KisTiledDataManager *dm, Q_INT32  x, Q_INT32 y, Q_INT32 h, bool writable);
+    KisTiledVLineIterator( KisTiledDataManager *dm, TQ_INT32  x, TQ_INT32 y, TQ_INT32 h, bool writable);
     KisTiledVLineIterator(const KisTiledVLineIterator&);
     KisTiledVLineIterator& operator=(const KisTiledVLineIterator&);
     ~KisTiledVLineIterator();
@@ -197,14 +197,14 @@ public:
     void nextCol();
 
 protected:
-    Q_INT32 m_top;
-    Q_INT32 m_bottom;
-    Q_INT32 m_topRow;
-    Q_INT32 m_bottomRow;
-    Q_INT32 m_xInTile;
-    Q_INT32 m_yInTile;
-    Q_INT32 m_topInTile;
-    Q_INT32 m_bottomInTile;
+    TQ_INT32 m_top;
+    TQ_INT32 m_bottom;
+    TQ_INT32 m_topRow;
+    TQ_INT32 m_bottomRow;
+    TQ_INT32 m_xInTile;
+    TQ_INT32 m_yInTile;
+    TQ_INT32 m_topInTile;
+    TQ_INT32 m_bottomInTile;
 
 private:
      void nextTile();