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, 11 insertions, 10 deletions

diff --git a/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.h b/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.h
index 6335eadb..7df7df8f 100644
--- a/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.h
+++ b/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.h
@@ -21,17 +21,18 @@
 #ifndef _KIS_IMAGE_RASTERED_CACHE_H_
 #define _KIS_IMAGE_RASTERED_CACHE_H_
 
-#include <qobject.h>
-#include <qvaluevector.h>
-#include <qvaluelist.h>
-#include <qtimer.h>
+#include <tqobject.h>
+#include <tqvaluevector.h>
+#include <tqvaluelist.h>
+#include <tqtimer.h>
 
 #include <kis_paint_device.h>
 
 class KisView;
 
-class KisImageRasteredCache : public QObject {
+class KisImageRasteredCache : public TQObject {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
     class Observer {
@@ -48,8 +49,8 @@ signals:
     void cacheUpdated();
 
 private slots:
-    void imageUpdated(QRect rc);
-    void imageSizeChanged(Q_INT32 w, Q_INT32 h);
+    void imageUpdated(TQRect rc);
+    void imageSizeChanged(TQ_INT32 w, TQ_INT32 h);
     void timeOut();
 
 private:
@@ -59,15 +60,15 @@ private:
         Observer* observer;
         bool valid;
     };
-    typedef QValueVector< QValueVector<Element*> > Raster;
-    typedef QValueList<Element*> Queue;
+    typedef TQValueVector< TQValueVector<Element*> > Raster;
+    typedef TQValueList<Element*> Queue;
 
     void cleanUpElements();
 
     Observer* m_observer;
     Raster m_raster;
     Queue m_queue;
-    QTimer m_timer;
+    TQTimer m_timer;
     int m_timeOutMSec;
     int m_rasterSize;
     int m_width, m_height;