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

diff --git a/kivio/plugins/kiviosmlconnector/tool_connector.cpp b/kivio/plugins/kiviosmlconnector/tool_connector.cpp
index ded38f13..4578f0a7 100644
--- a/kivio/plugins/kiviosmlconnector/tool_connector.cpp
+++ b/kivio/plugins/kiviosmlconnector/tool_connector.cpp
@@ -18,7 +18,7 @@
  */
 #include "tool_connector.h"
 
-#include <qcursor.h>
+#include <tqcursor.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
@@ -46,12 +46,12 @@ SMLConnector::SMLConnector( KivioView* view )
 {
   m_connectorAction = new KToggleAction(i18n("Polyline Connector"), "", 0,
     actionCollection(), "sml_connector");
-  connect(m_connectorAction, SIGNAL(toggled(bool)), this, SLOT(setActivated(bool)));
+  connect(m_connectorAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActivated(bool)));
 
   m_mode = stmNone;
 
-  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);
 }
 
 SMLConnector::~SMLConnector()
@@ -67,22 +67,22 @@ SMLConnector::~SMLConnector()
  * @param e The event to be identified and processed
  *
  */
-bool SMLConnector::processEvent( QEvent* e )
+bool SMLConnector::processEvent( TQEvent* e )
 {
     switch (e->type())
     {
-    case QEvent::MouseButtonPress:
-        mousePress( (QMouseEvent*)e );
+    case TQEvent::MouseButtonPress:
+        mousePress( (TQMouseEvent*)e );
         return true;
         break;
 
-    case QEvent::MouseButtonRelease:
-        mouseRelease( (QMouseEvent*)e );
+    case TQEvent::MouseButtonRelease:
+        mouseRelease( (TQMouseEvent*)e );
         return true;
         break;
 
-    case QEvent::MouseMove:
-        mouseMove( (QMouseEvent*)e );
+    case TQEvent::MouseMove:
+        mouseMove( (TQMouseEvent*)e );
         return true;
         break;
 
@@ -111,7 +111,7 @@ void SMLConnector::setActivated(bool a)
   }
 }
 
-void SMLConnector::connector(QRect)
+void SMLConnector::connector(TQRect)
 {
     if (!m_pStencil)
       return;
@@ -135,7 +135,7 @@ void SMLConnector::connector(QRect)
     doc->updateView(page);
 }
 
-void SMLConnector::mousePress( QMouseEvent *e )
+void SMLConnector::mousePress( TQMouseEvent *e )
 {
   if(e->button() == RightButton)
   {
@@ -151,7 +151,7 @@ void SMLConnector::mousePress( QMouseEvent *e )
 /**
  * Tests if we should start rubber banding (always returns true).
  */
-bool SMLConnector::startRubberBanding( QMouseEvent *e )
+bool SMLConnector::startRubberBanding( TQMouseEvent *e )
 {
   KivioDoc* doc = view()->doc();
   KivioPage* pPage = view()->activePage();
@@ -190,12 +190,12 @@ bool SMLConnector::startRubberBanding( QMouseEvent *e )
   m_pStencil->customDrag(m_pDragData);
 
 
-  canvas->repaint();
+  canvas->tqrepaint();
   canvas->setCursor(*m_pConnectorCursor2);
   return true;
 }
 
-void SMLConnector::mouseMove( QMouseEvent * e )
+void SMLConnector::mouseMove( TQMouseEvent * e )
 {
     switch( m_mode )
     {
@@ -208,7 +208,7 @@ void SMLConnector::mouseMove( QMouseEvent * e )
     }
 }
 
-void SMLConnector::continueRubberBanding( QMouseEvent *e )
+void SMLConnector::continueRubberBanding( TQMouseEvent *e )
 {
   KivioCanvas* canvas = view()->canvasWidget();
   KoPoint endPoint = canvas->mapFromScreen( e->pos() );
@@ -223,10 +223,10 @@ void SMLConnector::continueRubberBanding( QMouseEvent *e )
   m_pStencil->customDrag(m_pDragData);
 
   m_pStencil->updateGeometry();
-  canvas->repaint();
+  canvas->tqrepaint();
 }
 
-void SMLConnector::mouseRelease( QMouseEvent *e )
+void SMLConnector::mouseRelease( TQMouseEvent *e )
 {
   switch( m_mode )
   {
@@ -239,7 +239,7 @@ void SMLConnector::mouseRelease( QMouseEvent *e )
   m_mode = stmNone;
 }
 
-void SMLConnector::endRubberBanding(QMouseEvent *)
+void SMLConnector::endRubberBanding(TQMouseEvent *)
 {
   connector(view()->canvasWidget()->rect());
   m_pStencil = 0;