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

diff --git a/krita/core/kis_fill_painter.h b/krita/core/kis_fill_painter.h
index 63591350..da244a67 100644
--- a/krita/core/kis_fill_painter.h
+++ b/krita/core/kis_fill_painter.h
@@ -19,7 +19,7 @@
 #ifndef KIS_FILL_PAINTER_H_
 #define KIS_FILL_PAINTER_H_
 
-#include <qrect.h>
+#include <tqrect.h>
 
 #include "kis_meta_registry.h"
 #include "kis_color.h"
@@ -55,39 +55,39 @@ public:
     /**
      * Fill a rectangle with black transparent pixels (0, 0, 0, 0 for RGBA).
      */
-    void eraseRect(Q_INT32 x1, Q_INT32 y1, Q_INT32 w, Q_INT32 h);
+    void eraseRect(TQ_INT32 x1, TQ_INT32 y1, TQ_INT32 w, TQ_INT32 h);
     /**
      * Overloaded version of the above function.
      */
-    void eraseRect(const QRect& rc);
+    void eraseRect(const TQRect& rc);
 
     /**
      * Fill a rectangle with a certain color.
      */
-    void fillRect(Q_INT32 x, Q_INT32 y, Q_INT32 w, Q_INT32 h, const KisColor& c);
+    void fillRect(TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 h, const KisColor& c);
     /**
      * Overloaded version of the above function.
      */
-    void fillRect(const QRect& rc, const KisColor& c);
+    void fillRect(const TQRect& rc, const KisColor& c);
 
     /**
      * Fill a rectangle with a certain color and opacity.
      */
-    void fillRect(Q_INT32 x, Q_INT32 y, Q_INT32 w, Q_INT32 h, const KisColor& c, Q_UINT8 opacity);
+    void fillRect(TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 h, const KisColor& c, TQ_UINT8 opacity);
     /**
      * Overloaded version of the above function.
      */
-    void fillRect(const QRect& rc, const KisColor& c, Q_UINT8 opacity);
+    void fillRect(const TQRect& rc, const KisColor& c, TQ_UINT8 opacity);
 
     /**
      * Fill a rectangle with a certain pattern. The pattern is repeated if it does not fit the
      * entire rectangle.
      */
-    void fillRect(Q_INT32 x1, Q_INT32 y1, Q_INT32 w, Q_INT32 h, KisPattern * pattern);
+    void fillRect(TQ_INT32 x1, TQ_INT32 y1, TQ_INT32 w, TQ_INT32 h, KisPattern * pattern);
     /**
      * Overloaded version of the above function.
      */
-    void fillRect(const QRect& rc, KisPattern * pattern);
+    void fillRect(const TQRect& rc, KisPattern * pattern);
 
     /**
      * Fills the enclosed area around the point with the set color. If there is a
@@ -102,7 +102,7 @@ public:
     void fillPattern(int startX, int startY);
 
     /**
-     * Returns a selection mask for the floodfill starting at the specified position.
+     * Returns a selection tqmask for the floodfill starting at the specified position.
      **/
     KisSelectionSP createFloodSelection(int startX, int startY);
 
@@ -150,7 +150,7 @@ private:
     int m_threshold;
     int m_size;
     int m_width, m_height;
-    QRect m_rect;
+    TQRect m_rect;
     bool m_sampleMerged;
     bool m_careForSelection;
     bool m_fuzzy;
@@ -158,41 +158,41 @@ private:
 
 
 inline
-void KisFillPainter::fillRect(Q_INT32 x, Q_INT32 y, Q_INT32 w, Q_INT32 h, const KisColor& c)
+void KisFillPainter::fillRect(TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 h, const KisColor& c)
 {
     fillRect(x, y, w, h, c, OPACITY_OPAQUE);
 }
 
 inline
-void KisFillPainter::fillRect(const QRect& rc, const KisColor& c)
+void KisFillPainter::fillRect(const TQRect& rc, const KisColor& c)
 {
     fillRect(rc.x(), rc.y(), rc.width(), rc.height(), c, OPACITY_OPAQUE);
 }
 
 inline
-void KisFillPainter::eraseRect(Q_INT32 x1, Q_INT32 y1, Q_INT32 w, Q_INT32 h)
+void KisFillPainter::eraseRect(TQ_INT32 x1, TQ_INT32 y1, TQ_INT32 w, TQ_INT32 h)
 {
     KisColorSpace * cs = KisMetaRegistry::instance()->csRegistry()->getRGB8();
-    KisColor c(Qt::black, cs);
+    KisColor c(TQt::black, cs);
     fillRect(x1, y1, w, h, c, OPACITY_TRANSPARENT);
 }
 
 inline
-void KisFillPainter::eraseRect(const QRect& rc)
+void KisFillPainter::eraseRect(const TQRect& rc)
 {
     KisColorSpace * cs = KisMetaRegistry::instance()->csRegistry()->getRGB8();
-    KisColor c(Qt::black, cs);
+    KisColor c(TQt::black, cs);
     fillRect(rc.x(), rc.y(), rc.width(), rc.height(), c, OPACITY_TRANSPARENT);
 }
 
 inline
-void KisFillPainter::fillRect(const QRect& rc, const KisColor& c, Q_UINT8 opacity)
+void KisFillPainter::fillRect(const TQRect& rc, const KisColor& c, TQ_UINT8 opacity)
 {
     fillRect(rc.x(), rc.y(), rc.width(), rc.height(), c, opacity);
 }
 
 inline
-void KisFillPainter::fillRect(const QRect& rc, KisPattern *pattern)
+void KisFillPainter::fillRect(const TQRect& rc, KisPattern *pattern)
 {
     fillRect(rc.x(), rc.y(), rc.width(), rc.height(), pattern);
 }