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

diff --git a/krita/core/kis_random_accessor.h b/krita/core/kis_random_accessor.h
index dddd94b6..118fc4fc 100644
--- a/krita/core/kis_random_accessor.h
+++ b/krita/core/kis_random_accessor.h
@@ -31,17 +31,17 @@ class KisTiledDataManager;
 
 class KisRandomAccessor{
     public:
-        KisRandomAccessor(KisTiledDataManager *ktm, Q_INT32 x, Q_INT32 y, Q_INT32 offsetx, Q_INT32 offsety, bool writable);
+        KisRandomAccessor(KisTiledDataManager *ktm, TQ_INT32 x, TQ_INT32 y, TQ_INT32 offsetx, TQ_INT32 offsety, bool writable);
         KisRandomAccessor(const KisRandomAccessor& rhs);
         ~KisRandomAccessor();
     public:
         /// Move to a given x,y position, fetch tiles and data
-        void moveTo(Q_INT32 x, Q_INT32 y);
-        Q_UINT8* rawData() const;
-        const Q_UINT8* oldRawData() const;
+        void moveTo(TQ_INT32 x, TQ_INT32 y);
+        TQ_UINT8* rawData() const;
+        const TQ_UINT8* oldRawData() const;
     private:
         KisTiledRandomAccessorSP m_accessor;
-        Q_INT32 m_offsetx, m_offsety;
+        TQ_INT32 m_offsetx, m_offsety;
 };
 
 class KisRandomAccessorPixelTrait {
@@ -57,27 +57,27 @@ class KisRandomAccessorPixelTrait {
         {
             return (m_selectionAccessor) ? *(m_selectionAccessor->rawData()) > SELECTION_THRESHOLD : true;
         };
-        inline Q_UINT8 operator[](int index) const
+        inline TQ_UINT8 operator[](int index) const
         { return m_underlyingAccessor->rawData()[index]; };
         /**
          * Returns the degree of selectedness of the pixel.
          */
-        inline Q_UINT8 selectedness() const
+        inline TQ_UINT8 selectedness() const
         {
             return (m_selectionAccessor) ? *(m_selectionAccessor->rawData()) : MAX_SELECTED;
         };
 
         /**
-         * Returns the selectionmask from the current point; this is guaranteed
+         * Returns the selectiontqmask from the current point; this is guaranteed
          * to have the same number of consecutive pixels that the iterator has
          * at a given point. It return a 0 if there is no selection.
          */
-        inline Q_UINT8 * selectionMask() const
+        inline TQ_UINT8 * selectionMask() const
         {
             return ( m_selectionAccessor ) ? m_selectionAccessor->rawData() : 0;
         }
 
-        inline void moveTo(Q_INT32 x, Q_INT32 y) { if(m_selectionAccessor) m_selectionAccessor->moveTo(x,y); }
+        inline void moveTo(TQ_INT32 x, TQ_INT32 y) { if(m_selectionAccessor) m_selectionAccessor->moveTo(x,y); }
         
     private:
         KisRandomAccessor* m_underlyingAccessor;
@@ -86,9 +86,9 @@ class KisRandomAccessorPixelTrait {
 
 class KisRandomAccessorPixel : public KisRandomAccessor, public KisRandomAccessorPixelTrait {
     public:
-        KisRandomAccessorPixel(KisTiledDataManager *ktm, KisTiledDataManager *ktmselect, Q_INT32 x, Q_INT32 y, Q_INT32 offsetx, Q_INT32 offsety, bool writable);
+        KisRandomAccessorPixel(KisTiledDataManager *ktm, KisTiledDataManager *ktmselect, TQ_INT32 x, TQ_INT32 y, TQ_INT32 offsetx, TQ_INT32 offsety, bool writable);
     public:
-        inline void moveTo(Q_INT32 x, Q_INT32 y) { KisRandomAccessor::moveTo(x,y); KisRandomAccessorPixelTrait::moveTo(x,y); }
+        inline void moveTo(TQ_INT32 x, TQ_INT32 y) { KisRandomAccessor::moveTo(x,y); KisRandomAccessorPixelTrait::moveTo(x,y); }
 };