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

diff --git a/krita/core/tiles/kis_memento.h b/krita/core/tiles/kis_memento.h
index 696f8129..5942dc44 100644
--- a/krita/core/tiles/kis_memento.h
+++ b/krita/core/tiles/kis_memento.h
@@ -19,8 +19,8 @@
 #ifndef KIS_MEMENTO_H_
 #define KIS_MEMENTO_H_
 
-#include <qglobal.h>
-#include <qrect.h>
+#include <tqglobal.h>
+#include <tqrect.h>
 
 #include <ksharedptr.h>
 
@@ -33,7 +33,7 @@ typedef KSharedPtr<KisMemento> KisMementoSP;
 class KisMemento : public KShared
 {
 public:
-    KisMemento(Q_UINT32 pixelSize);
+    KisMemento(TQ_UINT32 pixelSize);
     ~KisMemento();
 /*
     // For consolidating transactions
@@ -42,10 +42,10 @@ public:
     virtual KisTransaction &operator+(const KisTransaction &,
                   const KisTransaction &) = 0;
 */
-    void extent(Q_INT32 &x, Q_INT32 &y, Q_INT32 &w, Q_INT32 &h) const;
-    QRect extent() const;
+    void extent(TQ_INT32 &x, TQ_INT32 &y, TQ_INT32 &w, TQ_INT32 &h) const;
+    TQRect extent() const;
 
-    bool containsTile(Q_INT32 col, Q_INT32 row, Q_UINT32 tileHash) const;
+    bool containsTile(TQ_INT32 col, TQ_INT32 row, TQ_UINT32 tileHash) const;
 
     // For debugging use
     bool valid() const { return m_valid; }
@@ -55,20 +55,20 @@ private:
 
     class DeletedTile {
     public:
-        DeletedTile(Q_INT32 col, Q_INT32 row, const DeletedTile *next)
+        DeletedTile(TQ_INT32 col, TQ_INT32 row, const DeletedTile *next)
             : m_col(col),
               m_row(row),
               m_next(next)
         {
         }
 
-        Q_INT32 col() const { return m_col; }
-        Q_INT32 row() const { return m_row; }
+        TQ_INT32 col() const { return m_col; }
+        TQ_INT32 row() const { return m_row; }
         const DeletedTile *next() const { return m_next; }
 
     private:
-        Q_INT32 m_col;
-        Q_INT32 m_row;
+        TQ_INT32 m_col;
+        TQ_INT32 m_row;
         const DeletedTile *m_next;
     };
 
@@ -81,7 +81,7 @@ private:
 
         ~DeletedTileList();
 
-        void addTile(Q_INT32 col, Q_INT32 row)
+        void addTile(TQ_INT32 col, TQ_INT32 row)
         {
             DeletedTile *d = new DeletedTile(col, row, m_firstDeletedTile);
             Q_CHECK_PTR(d);
@@ -100,7 +100,7 @@ private:
         DeletedTile *m_firstDeletedTile;
     };
 
-    void addTileToDeleteOnRedo(Q_INT32 col, Q_INT32 row)
+    void addTileToDeleteOnRedo(TQ_INT32 col, TQ_INT32 row)
     {
         m_redoDelTilesList.addTile(col, row);
     }
@@ -115,7 +115,7 @@ private:
         m_redoDelTilesList.clear();
     }
 
-    void addTileToDeleteOnUndo(Q_INT32 col, Q_INT32 row)
+    void addTileToDeleteOnUndo(TQ_INT32 col, TQ_INT32 row)
     {
         m_undoDelTilesList.addTile(col, row);
     }
@@ -133,12 +133,12 @@ private:
     friend class KisTiledDataManager;
     KisTiledDataManager *originator;
     KisTile **m_hashTable;
-    Q_UINT32 m_numTiles;
+    TQ_UINT32 m_numTiles;
     KisTile **m_redoHashTable;
     DeletedTileList m_redoDelTilesList;
     DeletedTileList m_undoDelTilesList;
-    Q_UINT8 *m_defPixel;
-    Q_UINT8 *m_redoDefPixel;
+    TQ_UINT8 *m_defPixel;
+    TQ_UINT8 *m_redoDefPixel;
     void deleteAll(KisTile *tile);
 
     bool m_valid;