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

diff --git a/kpresenter/KPrEffectHandler.h b/kpresenter/KPrEffectHandler.h
index 8128b264..877ed2f0 100644
--- a/kpresenter/KPrEffectHandler.h
+++ b/kpresenter/KPrEffectHandler.h
@@ -21,14 +21,14 @@
 #ifndef EFFECTHANDLER_H
 #define EFFECTHANDLER_H
 
-#include <qpixmap.h>
-#include <qptrlist.h>
-#include <qstring.h>
+#include <tqpixmap.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
 
 #include "global.h"
 #include "presstep.h"
 
-class QPaintDevice;
+class TQPaintDevice;
 class KPrObject;
 class KPrView;
 
@@ -45,7 +45,7 @@ public:
    * objects all objects of the page
    * view    pointer to the active KPrView
    */
-  KPrEffectHandler( PresStep step, bool back, QPaintDevice *dst, QPixmap *src, const QPtrList<KPrObject> &objects, KPrView *view, int _presSpeed );
+  KPrEffectHandler( PresStep step, bool back, TQPaintDevice *dst, TQPixmap *src, const TQPtrList<KPrObject> &objects, KPrView *view, int _presSpeed );
 
   /**
    * Delete the KPrEffectHandler.
@@ -253,7 +253,7 @@ protected:
    * Draws the object object to the pixmap screen with the offset defined
    * in x and y. If clipRect is set the only the clipRect will be painted.
    */
-  void drawObject( KPrObject *object, int x, int y, QPixmap *screen, QRect *clipRect = 0 );
+  void drawObject( KPrObject *object, int x, int y, TQPixmap *screen, TQRect *clipRect = 0 );
 
   /**
    * The internal step of the effect. This is used to calculate the position
@@ -274,37 +274,37 @@ protected:
   /**
    * Paint device on which the effects will be displayed
    */
-  QPaintDevice *m_dst;
+  TQPaintDevice *m_dst;
 
   /**
    * Pixmap used as source for displaying on.
    * m_src contains all objects which are allready on the
    * final position.
    */
-  QPixmap *m_src;
+  TQPixmap *m_src;
 
   /**
    * Is used for printing all objects before bitblt to m_dst
    */
-  QPixmap m_paint;
+  TQPixmap m_paint;
 
   /**
    * List of all objects of the current page
    */
-  QPtrList<KPrObject> m_objects;
+  TQPtrList<KPrObject> m_objects;
 
   /**
    * List of all objects which appear in the current step.
    * If a object has reached its final position it is removed from
    * this list
    */
-  QPtrList<KPrObject> m_appearEffectObjects;
+  TQPtrList<KPrObject> m_appearEffectObjects;
 
   /**
    * List of all objects which disappear in the current step.
    * If a object has disappeared it is removed from this list
    */
-  QPtrList<KPrObject> m_disappearEffectObjects;
+  TQPtrList<KPrObject> m_disappearEffectObjects;
 
   /// the active KPrView
   KPrView *m_view;
@@ -322,18 +322,18 @@ protected:
   /**
    * The rects which have to be bitblt
    */
-  QPtrList<QRect> m_repaintRects;
+  TQPtrList<TQRect> m_tqrepaintRects;
 
   /**
    * The rects which have to be bitblt as the objects
    * are no longer there.
    */
-  QPtrList<QRect> m_lastRepaintRects;
+  TQPtrList<TQRect> m_lastRepaintRects;
 
   /**
    * The filename of the sound file which should be played during the effect.
    */
-  QString m_soundEffect;
+  TQString m_soundEffect;
 
   /**
    * Used the set the autopresentation timer.