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, 16 deletions

diff --git a/krita/ui/kis_opengl_image_context.h b/krita/ui/kis_opengl_image_context.h
index d1ba6278..03833cd2 100644
--- a/krita/ui/kis_opengl_image_context.h
+++ b/krita/ui/kis_opengl_image_context.h
@@ -26,23 +26,24 @@
 
 #include <map>
 
-#include <qgl.h>
-#include <qobject.h>
-#include <qvaluevector.h>
+#include <tqgl.h>
+#include <tqobject.h>
+#include <tqvaluevector.h>
 
 #include <koffice_export.h>
 
 #include "kis_types.h"
 
-class QRegion;
+class TQRegion;
 
 class KisOpenGLImageContext;
 typedef KSharedPtr<KisOpenGLImageContext> KisOpenGLImageContextSP;
 class KisColorSpace;
 
-class KRITACORE_EXPORT KisOpenGLImageContext : public QObject , public KShared {
+class KRITACORE_EXPORT KisOpenGLImageContext : public TQObject , public KShared {
 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     static KisOpenGLImageContextSP getImageContext(KisImageSP image, KisProfile *monitorProfile);
@@ -53,8 +54,8 @@ public:
 public:
     // In order to use the image textures, the caller must pass
     // the sharedContextWidget() as the shareWidget argument to the 
-    // QGLWidget constructor.
-    QGLWidget *sharedContextWidget() const;
+    // TQGLWidget constructor.
+    TQGLWidget *sharedContextWidget() const;
 
     void setMonitorProfile(KisProfile *profile);
     void setHDRExposure(float exposure);
@@ -82,7 +83,7 @@ public:
      * 
      * @param imageRect The rectangle to update in image coordinates.
      */
-    void update(const QRect& imageRect);
+    void update(const TQRect& imageRect);
 
 signals:
     /**
@@ -97,7 +98,7 @@ signals:
      *
      * @param rc     The rect that has been recomposited.
      */
-    void sigImageUpdated(QRect rc);
+    void sigImageUpdated(TQRect rc);
 
     /**
      * Emitted whenever the image size changes.
@@ -105,7 +106,7 @@ signals:
      * @param width  New image width 
      * @param height New image height
      */
-    void sigSizeChanged(Q_INT32 width, Q_INT32 height);
+    void sigSizeChanged(TQ_INT32 width, TQ_INT32 height);
 
 protected:
     KisOpenGLImageContext(KisImageSP image, KisProfile *monitorProfile);
@@ -114,14 +115,14 @@ protected:
     void createImageTextureTiles();
     void destroyImageTextureTiles();
     int imageTextureTileIndex(int x, int y) const;
-    void updateImageTextureTiles(const QRect& rect);
+    void updateImageTextureTiles(const TQRect& rect);
 
     static KisColorSpace* textureColorSpaceForImageColorSpace(KisColorSpace *imageColorSpace);
     static bool imageCanShareImageContext(KisImageSP image);
 
 protected slots:
-    void slotImageUpdated(QRect r);
-    void slotImageSizeChanged(Q_INT32 w, Q_INT32 h);
+    void slotImageUpdated(TQRect r);
+    void slotImageSizeChanged(TQ_INT32 w, TQ_INT32 h);
 
 private:
     KisImageSP m_image;
@@ -134,15 +135,15 @@ private:
     static const int PREFERRED_IMAGE_TEXTURE_WIDTH = 256;
     static const int PREFERRED_IMAGE_TEXTURE_HEIGHT = 256;
 
-    QValueVector<GLuint> m_imageTextureTiles;
+    TQValueVector<GLuint> m_imageTextureTiles;
     int m_imageTextureTileWidth;
     int m_imageTextureTileHeight;
     int m_numImageTextureTileColumns;
 
     // We create a single OpenGL context and share it between all views
-    // in the process. Apparently with some OpenGL implementations, only
+    // in the process. Aptqparently with some OpenGL implementations, only
     // one context will be hardware accelerated.
-    static QGLWidget *SharedContextWidget;
+    static TQGLWidget *SharedContextWidget;
     static int SharedContextWidgetRefCount;
 
     typedef std::map<KisImageSP, KisOpenGLImageContext*> ImageContextMap;