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

6 files changed, 87 insertions, 84 deletions

diff --git a/kivio/plugins/kivioconnectortool/plugin.cpp b/kivio/plugins/kivioconnectortool/plugin.cpp
index 2b4c6e41..848579c9 100644
--- a/kivio/plugins/kivioconnectortool/plugin.cpp
+++ b/kivio/plugins/kivioconnectortool/plugin.cpp
@@ -31,8 +31,8 @@ K_EXPORT_COMPONENT_FACTORY( libkivioconnectortool, ConnectorToolFactory )
 
 KInstance* ConnectorToolFactory::s_global = 0;
 
-ConnectorToolFactory::ConnectorToolFactory( QObject* parent, const char* name )
-: KLibFactory( parent, name )
+ConnectorToolFactory::ConnectorToolFactory( TQObject* tqparent, const char* name )
+: KLibFactory( tqparent, name )
 {
   s_global = new KInstance("kivio");
 }
@@ -42,12 +42,12 @@ ConnectorToolFactory::~ConnectorToolFactory()
   delete s_global;
 }
 
-QObject* ConnectorToolFactory::createObject( QObject* parent, const char*, const char*, const QStringList& )
+TQObject* ConnectorToolFactory::createObject( TQObject* tqparent, const char*, const char*, const TQStringList& )
 {
-  if ( !parent->inherits("KivioView") )
+  if ( !tqparent->inherits("KivioView") )
     return 0;
 
-  QObject *obj = new ConnectorTool( (KivioView*)parent );
+  TQObject *obj = new ConnectorTool( (KivioView*)tqparent );
   return obj;
 }
 
diff --git a/kivio/plugins/kivioconnectortool/plugin.h b/kivio/plugins/kivioconnectortool/plugin.h
index 0fbb5a9a..e8d9803b 100644
--- a/kivio/plugins/kivioconnectortool/plugin.h
+++ b/kivio/plugins/kivioconnectortool/plugin.h
@@ -19,8 +19,8 @@
 #ifndef CONNECTOR_PLUGIN_H
 #define CONNECTOR_PLUGIN_H
 
-#include <qstringlist.h>
-#include <qobject.h>
+#include <tqstringlist.h>
+#include <tqobject.h>
 
 #include <klibloader.h>
 
@@ -28,12 +28,13 @@ class KInstance;
 
 class ConnectorToolFactory : public KLibFactory
 { Q_OBJECT
+  TQ_OBJECT
 public:
-  ConnectorToolFactory( QObject* parent = 0, const char* name = 0 );
+  ConnectorToolFactory( TQObject* tqparent = 0, const char* name = 0 );
   ~ConnectorToolFactory();
 
-  virtual QObject* createObject( QObject* parent = 0, const char* name = 0,
-                           const char* classname = "QObject", const QStringList &args = QStringList() );
+  virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0,
+                           const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
   static KInstance* global();
 
diff --git a/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.cpp b/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.cpp
index 233c7ab8..199e78d6 100644
--- a/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.cpp
+++ b/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.cpp
@@ -33,23 +33,23 @@
 #include "kivio_text_style.h"
 #include "tkmath.h"
 
-#include <qcolor.h>
-#include <qpixmap.h>
+#include <tqcolor.h>
+#include <tqpixmap.h>
 #include <kdebug.h>
 #include <KoZoomHandler.h>
 
 #include "straight_connector.xpm"
 
 
-static QPixmap *pIcon = NULL;
+static TQPixmap *pIcon = NULL;
 
 static KivioStencilSpawnerInfo sinfo = KivioStencilSpawnerInfo("Dave Marotti", "Straight Connector", "Dave Marotti - Straight Connector", "Basic Straight Connector", "0.1", "http://localhost/", "", "off");
 
 #include <kgenericfactory.h>
 K_EXPORT_COMPONENT_FACTORY( straight_connector, KGenericFactory<KivioConnectorFactory>( "KivioConnectorFactory" ) )
 
-KivioConnectorFactory::KivioConnectorFactory(QObject *parent, const char* name, const QStringList& args) :
-	KivioStencilFactory(parent, name, args)
+KivioConnectorFactory::KivioConnectorFactory(TQObject *tqparent, const char* name, const TQStringList& args) :
+	KivioStencilFactory(tqparent, name, args)
 {
 	kdDebug(43000) << "new straight line connector factory: " << endl;
 }
@@ -59,18 +59,18 @@ KivioStencil *KivioConnectorFactory::NewStencil()
     return new KivioStraightConnector();
 }
 
-KivioStencil *KivioConnectorFactory::NewStencil(const QString&)
+KivioStencil *KivioConnectorFactory::NewStencil(const TQString&)
 {
     return new KivioStraightConnector();
 }
 
 //FIXME: Is this a memory leak?
-QPixmap *KivioConnectorFactory::GetIcon()
+TQPixmap *KivioConnectorFactory::GetIcon()
 {
     if( pIcon )
         return pIcon;
 
-    pIcon = new QPixmap( (const char **)straight_connector_xpm );
+    pIcon = new TQPixmap( (const char **)straight_connector_xpm );
     return pIcon;
 }
 
@@ -299,17 +299,17 @@ void KivioStraightConnector::paintOutline( KivioIntraStencilData *pData )
   drawText(pData);
 }
 
-bool KivioStraightConnector::saveCustom( QDomElement &e, QDomDocument &doc )
+bool KivioStraightConnector::saveCustom( TQDomElement &e, TQDomDocument &doc )
 {
    e.appendChild( saveArrowHeads(doc) );
 
    return true;
 }
 
-bool KivioStraightConnector::loadCustom( const QDomElement &e )
+bool KivioStraightConnector::loadCustom( const TQDomElement &e )
 {
-   QDomNode node;
-   QString name;
+   TQDomNode node;
+   TQString name;
 
    node = e.firstChild();
    while( !node.isNull() )
@@ -328,9 +328,9 @@ bool KivioStraightConnector::loadCustom( const QDomElement &e )
    return true;
 }
 
-QDomElement KivioStraightConnector::saveArrowHeads( QDomDocument &doc )
+TQDomElement KivioStraightConnector::saveArrowHeads( TQDomDocument &doc )
 {
-    QDomElement e = doc.createElement("KivioArrowHeads");
+    TQDomElement e = doc.createElement("KivioArrowHeads");
 
     e.appendChild( m_startAH->saveXML(doc) );
     e.appendChild( m_endAH->saveXML(doc) );
@@ -338,11 +338,11 @@ QDomElement KivioStraightConnector::saveArrowHeads( QDomDocument &doc )
     return e;
 }
 
-bool KivioStraightConnector::loadArrowHeads( const QDomElement &e )
+bool KivioStraightConnector::loadArrowHeads( const TQDomElement &e )
 {
-    QDomNode node;
-    QString nodeName;
-    QDomElement arrowE;
+    TQDomNode node;
+    TQString nodeName;
+    TQDomElement arrowE;
     bool first=true;
 
     node = e.firstChild();
diff --git a/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.h b/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.h
index 9cc602a5..e0ea7476 100644
--- a/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.h
+++ b/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.h
@@ -30,8 +30,8 @@
 
 class KivioPage;
 
-#include <qcolor.h>
-#include <qdom.h>
+#include <tqcolor.h>
+#include <tqdom.h>
 
 #include "kivio_1d_stencil.h"
 
@@ -42,8 +42,8 @@ class KivioStraightConnector : public Kivio1DStencil
     KivioArrowHead *m_startAH;
     KivioArrowHead *m_endAH;
 
-    bool loadArrowHeads( const QDomElement & );
-    QDomElement saveArrowHeads( QDomDocument & );
+    bool loadArrowHeads( const TQDomElement & );
+    TQDomElement saveArrowHeads( TQDomDocument & );
 
   public:
     KivioStraightConnector();
@@ -59,8 +59,8 @@ class KivioStraightConnector : public Kivio1DStencil
     virtual void paint( KivioIntraStencilData * );
     virtual void paintOutline( KivioIntraStencilData * );
 
-    virtual bool loadCustom( const QDomElement & );
-    virtual bool saveCustom( QDomElement &, QDomDocument & );
+    virtual bool loadCustom( const TQDomElement & );
+    virtual bool saveCustom( TQDomElement &, TQDomDocument & );
 
 
     virtual void setStartAHType( int i )        { m_startAH->setType(i); }
@@ -83,11 +83,12 @@ class KivioStraightConnector : public Kivio1DStencil
 class KIVIOPLUGINS_EXPORT KivioConnectorFactory : public KivioStencilFactory
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KivioConnectorFactory(QObject *parent=0, const char* name=0, const QStringList& args = QStringList());
-    KivioStencil *NewStencil(const QString& name);
+    KivioConnectorFactory(TQObject *tqparent=0, const char* name=0, const TQStringList& args = TQStringList());
+    KivioStencil *NewStencil(const TQString& name);
     KivioStencil *NewStencil();
-    QPixmap *GetIcon();
+    TQPixmap *GetIcon();
     KivioStencilSpawnerInfo *GetSpawnerInfo();
 };
 
diff --git a/kivio/plugins/kivioconnectortool/tool_connector.cpp b/kivio/plugins/kivioconnectortool/tool_connector.cpp
index 87ec4729..43596240 100644
--- a/kivio/plugins/kivioconnectortool/tool_connector.cpp
+++ b/kivio/plugins/kivioconnectortool/tool_connector.cpp
@@ -19,7 +19,7 @@
  */
 #include "tool_connector.h"
 
-#include <qcursor.h>
+#include <tqcursor.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
@@ -47,20 +47,20 @@
 #include "polylineconnectorspawner.h"
 #include "mousetoolaction.h"
 
-ConnectorTool::ConnectorTool( KivioView* parent ) : Kivio::MouseTool(parent, "Connector Mouse Tool")
+ConnectorTool::ConnectorTool( KivioView* tqparent ) : Kivio::MouseTool(tqparent, "Connector Mouse Tool")
 {
   m_connectorAction = new Kivio::MouseToolAction(i18n("Straight Connector"), "kivio_connector", 0,
     actionCollection(), "connector");
-  connect(m_connectorAction, SIGNAL(toggled(bool)), this, SLOT(setActivated(bool)));
-  connect(m_connectorAction, SIGNAL(activated()), this, SLOT(activateStraight()));
-  connect(m_connectorAction, SIGNAL(doubleClicked()), this, SLOT(makePermanent()));
+  connect(m_connectorAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActivated(bool)));
+  connect(m_connectorAction, TQT_SIGNAL(activated()), this, TQT_SLOT(activateStraight()));
+  connect(m_connectorAction, TQT_SIGNAL(doubleClicked()), this, TQT_SLOT(makePermanent()));
   m_connectorAction->setExclusiveGroup("ConnectorTool");
 
   m_polyLineAction = new Kivio::MouseToolAction(i18n("Polyline Connector"), "kivio_connector", 0,
     actionCollection(), "polyLineConnector");
-  connect(m_polyLineAction, SIGNAL(toggled(bool)), this, SLOT(setActivated(bool)));
-  connect(m_polyLineAction, SIGNAL(activated()), this, SLOT(activatePolyline()));
-  connect(m_connectorAction, SIGNAL(doubleClicked()), this, SLOT(makePermanent()));
+  connect(m_polyLineAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActivated(bool)));
+  connect(m_polyLineAction, TQT_SIGNAL(activated()), this, TQT_SLOT(activatePolyline()));
+  connect(m_connectorAction, TQT_SIGNAL(doubleClicked()), this, TQT_SLOT(makePermanent()));
   m_polyLineAction->setExclusiveGroup("ConnectorTool");
 
   m_permanent = false;
@@ -69,8 +69,8 @@ ConnectorTool::ConnectorTool( KivioView* parent ) : Kivio::MouseTool(parent, "Co
   m_mode = stmNone;
   m_pDragData = 0;
 
-  m_pConnectorCursor1 = new QCursor(BarIcon("kivio_connector_cursor1",KivioFactory::global()),2,2);
-  m_pConnectorCursor2 = new QCursor(BarIcon("kivio_connector_cursor2",KivioFactory::global()),2,2);
+  m_pConnectorCursor1 = new TQCursor(BarIcon("kivio_connector_cursor1",KivioFactory::global()),2,2);
+  m_pConnectorCursor2 = new TQCursor(BarIcon("kivio_connector_cursor2",KivioFactory::global()),2,2);
 }
 
 ConnectorTool::~ConnectorTool()
@@ -88,22 +88,22 @@ ConnectorTool::~ConnectorTool()
  * @param e The event to be identified and processed
  *
  */
-bool ConnectorTool::processEvent(QEvent* e)
+bool ConnectorTool::processEvent(TQEvent* e)
 {
   switch (e->type())
   {
-  case QEvent::MouseButtonPress:
-    mousePress( static_cast<QMouseEvent*>(e) );
+  case TQEvent::MouseButtonPress:
+    mousePress( TQT_TQMOUSEEVENT(e) );
     return true;
     break;
 
-  case QEvent::MouseButtonRelease:
-    mouseRelease( static_cast<QMouseEvent*>(e) );
+  case TQEvent::MouseButtonRelease:
+    mouseRelease( TQT_TQMOUSEEVENT(e) );
     return true;
     break;
 
-  case QEvent::MouseMove:
-    mouseMove( static_cast<QMouseEvent*>(e) );
+  case TQEvent::MouseMove:
+    mouseMove( TQT_TQMOUSEEVENT(e) );
     return true;
     break;
 
@@ -122,7 +122,7 @@ void ConnectorTool::setActivated(bool a)
     m_pStencil = 0;
     m_pDragData = 0;
     view()->canvasWidget()->setShowConnectorTargets(true);
-    view()->canvasWidget()->repaint();
+    view()->canvasWidget()->tqrepaint();
     emit activated(this);
   } else {
     if(m_pStencil && (m_mode == stmDrawRubber) && (m_type == PolyLineConnector)) {
@@ -138,7 +138,7 @@ void ConnectorTool::setActivated(bool a)
         polyconnector = 0;
       }
 
-      view()->canvasWidget()->guideLines().repaintAfterSnapping();
+      view()->canvasWidget()->guideLines().tqrepaintAfterSnapping();
     }
 
     m_pStencil = 0;
@@ -150,11 +150,11 @@ void ConnectorTool::setActivated(bool a)
     m_permanent = false;
     view()->setStatusBarInfo("");
     view()->canvasWidget()->setShowConnectorTargets(false);
-    view()->canvasWidget()->repaint();
+    view()->canvasWidget()->tqrepaint();
   }
 }
 
-void ConnectorTool::connector(QRect)
+void ConnectorTool::connector(TQRect)
 {
   if (!m_pStencil)
     return;
@@ -169,9 +169,9 @@ void ConnectorTool::connector(QRect)
   doc->updateView(page);
 }
 
-void ConnectorTool::mousePress( QMouseEvent *e )
+void ConnectorTool::mousePress( TQMouseEvent *e )
 {
-  if(e->button() == LeftButton) {
+  if(e->button() == Qt::LeftButton) {
     bool ok = true;
     if(!m_pStencil || (m_type == StraightConnector)) {
       ok = startRubberBanding(e);
@@ -200,7 +200,7 @@ void ConnectorTool::mousePress( QMouseEvent *e )
     } else {
       m_mode = stmNone;
     }
-  } else if(e->button() == RightButton) {
+  } else if(e->button() == Qt::RightButton) {
     if(m_type == PolyLineConnector) {
       if(m_mode == stmDrawRubber) {
         endRubberBanding(e);
@@ -216,12 +216,12 @@ void ConnectorTool::mousePress( QMouseEvent *e )
 /**
  * Tests if we should start rubber banding (always returns true).
  */
-bool ConnectorTool::startRubberBanding( QMouseEvent *e )
+bool ConnectorTool::startRubberBanding( TQMouseEvent *e )
 {
   KivioCanvas* canvas = view()->canvasWidget();
   KivioDoc* doc = view()->doc();
   KivioPage* pPage = canvas->activePage();
-  QString spawnerId;
+  TQString spawnerId;
   
   if(m_type == StraightConnector) {
     spawnerId = "Dave Marotti - Straight Connector";
@@ -278,12 +278,12 @@ bool ConnectorTool::startRubberBanding( QMouseEvent *e )
 
   m_pStencil->customDrag(m_pDragData);
 
-  canvas->repaint();
+  canvas->tqrepaint();
   canvas->setCursor(*m_pConnectorCursor2);
   return true;
 }
 
-void ConnectorTool::mouseMove( QMouseEvent * e )
+void ConnectorTool::mouseMove( TQMouseEvent * e )
 {
   switch( m_mode )
   {
@@ -296,7 +296,7 @@ void ConnectorTool::mouseMove( QMouseEvent * e )
   }
 }
 
-void ConnectorTool::continueRubberBanding( QMouseEvent *e )
+void ConnectorTool::continueRubberBanding( TQMouseEvent *e )
 {
   KivioCanvas* canvas = view()->canvasWidget();
   KivioPage* pPage = view()->activePage();
@@ -322,10 +322,10 @@ void ConnectorTool::continueRubberBanding( QMouseEvent *e )
 
   m_pStencil->customDrag(m_pDragData);
   m_pStencil->updateGeometry();
-  canvas->repaint();
+  canvas->tqrepaint();
 }
 
-void ConnectorTool::mouseRelease( QMouseEvent *e )
+void ConnectorTool::mouseRelease( TQMouseEvent *e )
 {
   if(m_type == StraightConnector) {
     switch( m_mode )
@@ -340,12 +340,12 @@ void ConnectorTool::mouseRelease( QMouseEvent *e )
   }
 }
 
-void ConnectorTool::endRubberBanding(QMouseEvent *)
+void ConnectorTool::endRubberBanding(TQMouseEvent *)
 {
   connector(view()->canvasWidget()->rect());
   m_pStencil = 0;
   m_mode = stmNone;
-  view()->canvasWidget()->guideLines().repaintAfterSnapping();
+  view()->canvasWidget()->guideLines().tqrepaintAfterSnapping();
 
   if(!m_permanent) {
     view()->pluginManager()->activateDefaultTool();
diff --git a/kivio/plugins/kivioconnectortool/tool_connector.h b/kivio/plugins/kivioconnectortool/tool_connector.h
index d0bb8b01..7dd1462b 100644
--- a/kivio/plugins/kivioconnectortool/tool_connector.h
+++ b/kivio/plugins/kivioconnectortool/tool_connector.h
@@ -23,8 +23,8 @@
 #include "kivio_mousetool.h"
 #include <KoPoint.h>
 
-class QMouseEvent;
-class QCursor;
+class TQMouseEvent;
+class TQCursor;
 
 namespace Kivio {
   class MouseToolAction;
@@ -38,13 +38,14 @@ class KivioCustomDragData;
 class ConnectorTool : public Kivio::MouseTool
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    ConnectorTool( KivioView* parent );
+    ConnectorTool( KivioView* tqparent );
     ~ConnectorTool();
 
-    virtual bool processEvent(QEvent* e);
+    virtual bool processEvent(TQEvent* e);
 
-    void connector(QRect);
+    void connector(TQRect);
 
   public slots:
     void setActivated(bool a);
@@ -59,15 +60,15 @@ class ConnectorTool : public Kivio::MouseTool
     void operationDone();
 
   protected:
-    void mousePress(QMouseEvent *);
-    void mouseMove(QMouseEvent *);
-    void mouseRelease(QMouseEvent *);
+    void mousePress(TQMouseEvent *);
+    void mouseMove(TQMouseEvent *);
+    void mouseRelease(TQMouseEvent *);
 
-    bool startRubberBanding(QMouseEvent*);
-    void continueRubberBanding(QMouseEvent *);
-    void endRubberBanding(QMouseEvent *);
+    bool startRubberBanding(TQMouseEvent*);
+    void continueRubberBanding(TQMouseEvent *);
+    void endRubberBanding(TQMouseEvent *);
 
-    QPoint m_startPoint, m_releasePoint;
+    TQPoint m_startPoint, m_releasePoint;
 
     // Connector Tool Mode
     enum
@@ -84,8 +85,8 @@ class ConnectorTool : public Kivio::MouseTool
   private:
     int m_mode; // Flag to indicate that we are drawing a rubber band
     int m_type; // Type of connector
-    QCursor* m_pConnectorCursor1;
-    QCursor* m_pConnectorCursor2;
+    TQCursor* m_pConnectorCursor1;
+    TQCursor* m_pConnectorCursor2;
     Kivio1DStencil* m_pStencil;
     KoPoint startPoint;
     KivioCustomDragData* m_pDragData;