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, 35 insertions, 33 deletions

diff --git a/kivio/kiviopart/stencilbardockmanager.h b/kivio/kiviopart/stencilbardockmanager.h
index ecf655d9..12eb18c9 100644
--- a/kivio/kiviopart/stencilbardockmanager.h
+++ b/kivio/kiviopart/stencilbardockmanager.h
@@ -19,17 +19,17 @@
 #ifndef STENCILBARDOCKMANAGER_H
 #define STENCILBARDOCKMANAGER_H
 
-#include <qwidget.h>
-#include <qptrlist.h>
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#include <tqwidget.h>
+#include <tqptrlist.h>
+#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #endif
 #include <koffice_export.h>
-class QTimer;
+class TQTimer;
 
-class QSplitter;
+class TQSplitter;
 namespace Kivio {
 class DragBarButton;
 }
@@ -38,9 +38,10 @@ class KoToolDockMoveManager;
 class KivioDoc;
 class KivioView;
 
-class StencilBarDockManager : public QWidget
+class StencilBarDockManager : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     enum BarPos {
       Left = 0,
@@ -52,14 +53,14 @@ class StencilBarDockManager : public QWidget
       OnTopLevelBar = 6
     };
   
-    StencilBarDockManager( KivioView* parent, const char* name = 0 );
+    StencilBarDockManager( KivioView* tqparent, const char* name = 0 );
     ~StencilBarDockManager();
   
-    void insertStencilSet( QWidget*,  const QString&, BarPos = AutoSelect,
-                           QRect r = QRect(), KivioStackBar* destinationBar = 0L );
+    void insertStencilSet( TQWidget*,  const TQString&, BarPos = AutoSelect,
+                           TQRect r = TQRect(), KivioStackBar* destinationBar = 0L );
   
   public slots:
-    void slotDeleteStencilSet( DragBarButton*,QWidget*,KivioStackBar* );
+    void slotDeleteStencilSet( DragBarButton*,TQWidget*,KivioStackBar* );
     void setAllStackBarsShown(bool shown);
   
   protected slots:
@@ -70,11 +71,11 @@ class StencilBarDockManager : public QWidget
   private:
     KivioDoc *m_pDoc;
     DragBarButton* dragButton;
-    QWidget* dragWidget;
+    TQWidget* dragWidget;
     KoToolDockMoveManager* moveManager;
-    QPtrList<KivioStackBar> m_pBars;
-    QSplitter* split1;
-    QSplitter* split2;
+    TQPtrList<KivioStackBar> m_pBars;
+    TQSplitter* split1;
+    TQSplitter* split2;
     KivioView* m_pView;
   
     BarPos dragPos;
@@ -86,9 +87,10 @@ class StencilBarDockManager : public QWidget
  * The move manager handles moving tooldocks or other widgets that it
  * can manage, such as the Kivio stencil bar.
  */
-class KoToolDockMoveManager: public QObject
+class KoToolDockMoveManager: public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
 
@@ -97,23 +99,23 @@ class KoToolDockMoveManager: public QObject
 
     bool isWorking() const { return working; }
 
-    void doXResize( QWidget*, bool mirror );
-    void doYResize( QWidget*, bool mirror );
-    void doXYResize( QWidget*, bool _mirrorX, bool _mirrorY );
+    void doXResize( TQWidget*, bool mirror );
+    void doYResize( TQWidget*, bool mirror );
+    void doXYResize( TQWidget*, bool _mirrorX, bool _mirrorY );
 
-    void doMove( QWidget* );
+    void doMove( TQWidget* );
     void movePause( bool horizontal = true, bool vertical = true );
     void moveContinue();
 
-    void setGeometry( const QRect& r );
+    void setGeometry( const TQRect& r );
     void setGeometry(int x, int y, int w, int h);
 
-    QRect geometry();
+    TQRect tqgeometry();
 
-    void resize( const QSize& s ) { setGeometry(xp, yp, s.width(), s.height()); }
+    void resize( const TQSize& s ) { setGeometry(xp, yp, s.width(), s.height()); }
     void resize(int rw, int rh) { setGeometry(xp, yp, rw, rh); }
     void move( int rx, int ry) { setGeometry(rx, ry, w, h); }
-    void move( const QPoint& p ) {setGeometry(p.x(), p.y(), w, h); }
+    void move( const TQPoint& p ) {setGeometry(p.x(), p.y(), w, h); }
 
     int x()const { return xp; }
     int y() const { return yp; }
@@ -124,7 +126,7 @@ class KoToolDockMoveManager: public QObject
     bool isYMirror() const{ return mirrorY; }
 
     void stop ();
-    QWidget* getWidget()const{ return widget; }
+    TQWidget* getWidget()const{ return widget; }
 
   signals:
 
@@ -135,8 +137,8 @@ class KoToolDockMoveManager: public QObject
 
   protected:
 
-    void doResize( QWidget* );
-    void setWidget( QWidget* );
+    void doResize( TQWidget* );
+    void setWidget( TQWidget* );
     void drawRectangle (int x, int y, int w, int h);
     void paintProcess( bool onlyDeelete = true, int _x = 0, int _y = 0, int _w = 0, int _h = 0 );
     bool check(int& x, int& y, int& w, int& h, bool change = false);
@@ -156,16 +158,16 @@ class KoToolDockMoveManager: public QObject
     bool noLast;
     bool working;
 
-    QSize maxSize;
-    QSize minSize;
-    QWidget* widget;
-    QTimer* timer;
+    TQSize maxSize;
+    TQSize minSize;
+    TQWidget* widget;
+    TQTimer* timer;
 
     int rx, ry, sx, sy;
     int offX, offY;
 
     /* X-stuff */
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
     Window root;
     GC rootgc;
     int scr;
@@ -178,8 +180,8 @@ class KoToolDockMoveManager: public QObject
     bool yOnly;
 
     bool isDoMove;
-    QRect rr;
-    QPoint p;
+    TQRect rr;
+    TQPoint p;
 };
 
 #endif