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

306 files changed, 4340 insertions, 4303 deletions

diff --git a/kivio/kiviopart/KIvioDocIface.h b/kivio/kiviopart/KIvioDocIface.h
index 800a28e8..f43b35c4 100644
--- a/kivio/kiviopart/KIvioDocIface.h
+++ b/kivio/kiviopart/KIvioDocIface.h
@@ -23,7 +23,7 @@
 #include <KoDocumentIface.h>
 #include <dcopref.h>
 
-#include <qstring.h>
+#include <tqstring.h>
 
 class KivioDoc;
 
diff --git a/kivio/kiviopart/KIvioLayerIface.cc b/kivio/kiviopart/KIvioLayerIface.cc
index 9ea29177..c2e667af 100644
--- a/kivio/kiviopart/KIvioLayerIface.cc
+++ b/kivio/kiviopart/KIvioLayerIface.cc
@@ -49,12 +49,12 @@ void KIvioLayerIface::setConnectable( bool f )
     m_layer->setConnectable( f );
 }
 
-QString KIvioLayerIface::name() const
+TQString KIvioLayerIface::name() const
 {
     return m_layer->name();
 }
 
-void KIvioLayerIface::setName( const QString &n )
+void KIvioLayerIface::setName( const TQString &n )
 {
     m_layer->setName( n );
 }
diff --git a/kivio/kiviopart/KIvioLayerIface.h b/kivio/kiviopart/KIvioLayerIface.h
index e4349d80..92d45d53 100644
--- a/kivio/kiviopart/KIvioLayerIface.h
+++ b/kivio/kiviopart/KIvioLayerIface.h
@@ -22,7 +22,7 @@
 
 #include <dcopobject.h>
 #include <dcopref.h>
-#include <qstring.h>
+#include <tqstring.h>
 
 class KivioLayer;
 
@@ -39,8 +39,8 @@ k_dcop:
     bool connectable();
     void setConnectable( bool f );
 
-    QString name() const;
-    void setName( const QString &n );
+    TQString name() const;
+    void setName( const TQString &n );
 
 private:
     KivioLayer *m_layer;
diff --git a/kivio/kiviopart/KIvioMapIface.cc b/kivio/kiviopart/KIvioMapIface.cc
index cd056f2b..2caea757 100644
--- a/kivio/kiviopart/KIvioMapIface.cc
+++ b/kivio/kiviopart/KIvioMapIface.cc
@@ -33,7 +33,7 @@ KIvioMapIface::KIvioMapIface( KivioMap* map )
     m_map = map;
 }
 
-DCOPRef KIvioMapIface::page( const QString& name )
+DCOPRef KIvioMapIface::page( const TQString& name )
 {
     KivioPage* t = m_map->findPage( name );
     if ( !t )
@@ -51,7 +51,7 @@ DCOPRef KIvioMapIface::pageByIndex( int index )
         return DCOPRef();
     }
 
-    kdDebug(43000) << "+++++++ Returning page " << t->QObject::name() << endl;
+    kdDebug(43000) << "+++++++ Returning page " << t->TQObject::name() << endl;
 
     return DCOPRef( kapp->dcopClient()->appId(), t->dcopObject()->objId() );
 }
@@ -61,31 +61,31 @@ int KIvioMapIface::pageCount() const
     return m_map->count();
 }
 
-QStringList KIvioMapIface::pageNames() const
+TQStringList KIvioMapIface::pageNames() const
 {
-    QStringList names;
+    TQStringList names;
 
-    QPtrList<KivioPage>& lst = m_map->pageList();
-    QPtrListIterator<KivioPage> it( lst );
+    TQPtrList<KivioPage>& lst = m_map->pageList();
+    TQPtrListIterator<KivioPage> it( lst );
     for( ; it.current(); ++it )
         names.append( it.current()->name() );
 
     return names;
 }
 
-QValueList<DCOPRef> KIvioMapIface::pages()
+TQValueList<DCOPRef> KIvioMapIface::pages()
 {
-    QValueList<DCOPRef> t;
+    TQValueList<DCOPRef> t;
 
-    QPtrList<KivioPage>& lst = m_map->pageList();
-    QPtrListIterator<KivioPage> it( lst );
+    TQPtrList<KivioPage>& lst = m_map->pageList();
+    TQPtrListIterator<KivioPage> it( lst );
     for( ; it.current(); ++it )
         t.append( DCOPRef( kapp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
 
     return t;
 }
 
-DCOPRef KIvioMapIface::insertPage( const QString& name )
+DCOPRef KIvioMapIface::insertPage( const TQString& name )
 {
     if ( m_map->findPage( name ) )
         return page( name );
@@ -97,8 +97,8 @@ DCOPRef KIvioMapIface::insertPage( const QString& name )
     return page( name );
 }
 
-bool KIvioMapIface::processDynamic(const QCString &fun, const QByteArray &/*data*/,
-                                     QCString& replyType, QByteArray &replyData)
+bool KIvioMapIface::processDynamic(const TQCString &fun, const TQByteArray &/*data*/,
+                                     TQCString& replyType, TQByteArray &replyData)
 {
     // Does the name follow the pattern "foobar()" ?
     uint len = fun.length();
@@ -113,7 +113,7 @@ bool KIvioMapIface::processDynamic(const QCString &fun, const QByteArray &/*data
         return false;
 
     replyType = "DCOPRef";
-    QDataStream out( replyData, IO_WriteOnly );
+    TQDataStream out( replyData, IO_WriteOnly );
     out << DCOPRef( kapp->dcopClient()->appId(), t->dcopObject()->objId() );
     return true;
 }
diff --git a/kivio/kiviopart/KIvioMapIface.h b/kivio/kiviopart/KIvioMapIface.h
index ab2e655f..d7b77168 100644
--- a/kivio/kiviopart/KIvioMapIface.h
+++ b/kivio/kiviopart/KIvioMapIface.h
@@ -23,8 +23,8 @@
 #include <dcopobject.h>
 #include <dcopref.h>
 
-#include <qvaluelist.h>
-#include <qstringlist.h>
+#include <tqvaluelist.h>
+#include <tqstringlist.h>
 
 class KivioMap;
 
@@ -34,16 +34,16 @@ class KIvioMapIface : virtual public DCOPObject
 public:
     KIvioMapIface( KivioMap* );
 
-    virtual bool processDynamic(const QCString &fun, const QByteArray &data,
-				QCString& replyType, QByteArray &replyData);
+    virtual bool processDynamic(const TQCString &fun, const TQByteArray &data,
+				TQCString& replyType, TQByteArray &replyData);
 
 k_dcop:
-    virtual DCOPRef page( const QString& name );
+    virtual DCOPRef page( const TQString& name );
     virtual DCOPRef pageByIndex( int index );
     virtual int pageCount() const;
-    virtual QStringList pageNames() const;
-    virtual QValueList<DCOPRef> pages();
-    virtual DCOPRef insertPage( const QString& name );
+    virtual TQStringList pageNames() const;
+    virtual TQValueList<DCOPRef> pages();
+    virtual DCOPRef insertPage( const TQString& name );
 
 private:
     KivioMap* m_map;
diff --git a/kivio/kiviopart/KIvioPageIface.cc b/kivio/kiviopart/KIvioPageIface.cc
index 04bf448c..c85e2671 100644
--- a/kivio/kiviopart/KIvioPageIface.cc
+++ b/kivio/kiviopart/KIvioPageIface.cc
@@ -51,7 +51,7 @@ void KIvioPageIface::ungroupSelectedStencils()
 }
 
 
-QString KIvioPageIface::pageName()const
+TQString KIvioPageIface::pageName()const
 {
     return m_page->pageName();
 }
diff --git a/kivio/kiviopart/KIvioPageIface.h b/kivio/kiviopart/KIvioPageIface.h
index ede35953..63ffbb21 100644
--- a/kivio/kiviopart/KIvioPageIface.h
+++ b/kivio/kiviopart/KIvioPageIface.h
@@ -22,7 +22,7 @@
 
 #include <dcopobject.h>
 #include <dcopref.h>
-#include <qstring.h>
+#include <tqstring.h>
 
 class KivioPage;
 
@@ -40,7 +40,7 @@ k_dcop:
     void deleteSelectedStencils();
     void groupSelectedStencils();
     void ungroupSelectedStencils();
-    QString pageName()const;
+    TQString pageName()const;
     void copy();
     void cut();
     void paste();
diff --git a/kivio/kiviopart/KIvioStencilIface.cc b/kivio/kiviopart/KIvioStencilIface.cc
index 9b91bcf6..61c5542e 100644
--- a/kivio/kiviopart/KIvioStencilIface.cc
+++ b/kivio/kiviopart/KIvioStencilIface.cc
@@ -60,9 +60,9 @@ void  KivioStencilIface::setH( double /*f*/ )
 
 }
 
-QRect  KivioStencilIface::rect()
+TQRect  KivioStencilIface::rect()
 {
-  return QRect();
+  return TQRect();
 }
 
 void  KivioStencilIface::setPosition( double /*f1*/, double /*f2*/ )
@@ -75,24 +75,24 @@ void  KivioStencilIface::setDimensions( double /*f1*/, double /*f2*/ )
 
 }
 
-QColor  KivioStencilIface::fgColor()
+TQColor  KivioStencilIface::fgColor()
 {
-  return QColor();
+  return TQColor();
 }
 
-void  KivioStencilIface::setFGColor( QColor )
+void  KivioStencilIface::setFGColor( TQColor )
 {
 
 }
 
-void  KivioStencilIface::setBGColor( QColor )
+void  KivioStencilIface::setBGColor( TQColor )
 {
 
 }
 
-QColor  KivioStencilIface::bgColor()
+TQColor  KivioStencilIface::bgColor()
 {
-  return QColor();
+  return TQColor();
 }
 
 void  KivioStencilIface::setLineWidth( double )
@@ -105,22 +105,22 @@ double  KivioStencilIface::lineWidth()
 }
 
 // FOnt stuff
-QColor  KivioStencilIface::textColor()
+TQColor  KivioStencilIface::textColor()
 {
-  return QColor();
+  return TQColor();
 }
 
-void  KivioStencilIface::setTextColor( QColor )
+void  KivioStencilIface::setTextColor( TQColor )
 {
 
 }
 
-QFont  KivioStencilIface::textFont()
+TQFont  KivioStencilIface::textFont()
 {
-  return QFont();
+  return TQFont();
 }
 
-void  KivioStencilIface::setTextFont( const QFont & )
+void  KivioStencilIface::setTextFont( const TQFont & )
 {
 
 }
@@ -145,14 +145,14 @@ void  KivioStencilIface::setVTextAlign(int)
 
 }
 
-void  KivioStencilIface::setText( const QString & )
+void  KivioStencilIface::setText( const TQString & )
 {
 
 }
 
-QString  KivioStencilIface::text()
+TQString  KivioStencilIface::text()
 {
-  return QString::null;
+  return TQString();
 }
 
 bool  KivioStencilIface::isSelected()
diff --git a/kivio/kiviopart/KIvioStencilIface.h b/kivio/kiviopart/KIvioStencilIface.h
index c9b772f7..de53f7f5 100644
--- a/kivio/kiviopart/KIvioStencilIface.h
+++ b/kivio/kiviopart/KIvioStencilIface.h
@@ -22,10 +22,10 @@
 
 #include <dcopref.h>
 #include <dcopobject.h>
-#include <qstring.h>
-#include <qfont.h>
-#include <qcolor.h>
-#include <qrect.h>
+#include <tqstring.h>
+#include <tqfont.h>
+#include <tqcolor.h>
+#include <tqrect.h>
 
 class KivioStencil;
 
@@ -54,26 +54,26 @@ k_dcop:
 	virtual double h();
 	virtual void setH( double f );
 
-	virtual QRect rect();
+	virtual TQRect rect();
 
 	virtual void setPosition( double f1, double f2 );
 	virtual void setDimensions( double f1, double f2 );
 
-	virtual QColor fgColor();
-	virtual void setFGColor( QColor );
+	virtual TQColor fgColor();
+	virtual void setFGColor( TQColor );
 
-	virtual void setBGColor( QColor );
-	virtual QColor bgColor();
+	virtual void setBGColor( TQColor );
+	virtual TQColor bgColor();
 
 	virtual void setLineWidth( double );
 	virtual double lineWidth();
 
 	// FOnt stuff
-	virtual QColor textColor();
-	virtual void setTextColor( QColor );
+	virtual TQColor textColor();
+	virtual void setTextColor( TQColor );
 
-	virtual QFont textFont();
-	virtual void setTextFont( const QFont & );
+	virtual TQFont textFont();
+	virtual void setTextFont( const TQFont & );
 
 	virtual int hTextAlign();
 	virtual int vTextAlign();
@@ -81,8 +81,8 @@ k_dcop:
 	virtual void setHTextAlign(int);
 	virtual void setVTextAlign(int);
 
-	virtual void setText( const QString & );
-	virtual QString text();
+	virtual void setText( const TQString & );
+	virtual TQString text();
 
 	virtual bool isSelected();
 	virtual void select();
diff --git a/kivio/kiviopart/KIvioViewIface.cc b/kivio/kiviopart/KIvioViewIface.cc
index ee4da300..f8d7477c 100644
--- a/kivio/kiviopart/KIvioViewIface.cc
+++ b/kivio/kiviopart/KIvioViewIface.cc
@@ -165,12 +165,12 @@ void KIvioViewIface::alignStencilsDlg()
     view->alignStencilsDlg();
 }
 
-QColor KIvioViewIface::foreGroundColor()const
+TQColor KIvioViewIface::foreGroundColor()const
 {
     return view->fgColor();
 }
 
-QColor KIvioViewIface::backGroundColor()const
+TQColor KIvioViewIface::backGroundColor()const
 {
     return view->bgColor();
 }
diff --git a/kivio/kiviopart/KIvioViewIface.h b/kivio/kiviopart/KIvioViewIface.h
index 2bed9ca1..16682595 100644
--- a/kivio/kiviopart/KIvioViewIface.h
+++ b/kivio/kiviopart/KIvioViewIface.h
@@ -22,8 +22,8 @@
 
 #include <KoViewIface.h>
 
-#include <qstring.h>
-#include <qcolor.h>
+#include <tqstring.h>
+#include <tqcolor.h>
 class KivioView;
 
 class KIvioViewIface : public KoViewIface
@@ -69,8 +69,8 @@ k_dcop:
     virtual void unselectAllStencils();
 
     virtual double lineWidth()const;
-    QColor foreGroundColor()const;
-    QColor backGroundColor()const;
+    TQColor foreGroundColor()const;
+    TQColor backGroundColor()const;
 private:
     KivioView *view;
 
diff --git a/kivio/kiviopart/addstenciltool.cpp b/kivio/kiviopart/addstenciltool.cpp
index 01f87e4f..e195af69 100644
--- a/kivio/kiviopart/addstenciltool.cpp
+++ b/kivio/kiviopart/addstenciltool.cpp
@@ -18,8 +18,8 @@
  */
 #include "addstenciltool.h"
 
-#include <qevent.h>
-#include <qcursor.h>
+#include <tqevent.h>
+#include <tqcursor.h>
 
 #include "kdebug.h"
 
@@ -32,8 +32,8 @@
 
 namespace Kivio {
 
-AddStencilTool::AddStencilTool(KivioView* parent)
- : MouseTool(parent, "Add Stencil Mouse Tool")
+AddStencilTool::AddStencilTool(KivioView* tqparent)
+ : MouseTool(tqparent, "Add Stencil Mouse Tool")
 {
   m_leftMouseButtonPressed = false;
   m_stencil = 0;
@@ -46,14 +46,14 @@ AddStencilTool::~AddStencilTool()
   m_stencil = 0;
 }
 
-bool AddStencilTool::processEvent(QEvent* e)
+bool AddStencilTool::processEvent(TQEvent* e)
 {
   switch(e->type()) {
-    case QEvent::MouseButtonPress:
+    case TQEvent::MouseButtonPress:
     {
-      QMouseEvent* me = static_cast<QMouseEvent*>(e);
+      TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
 
-      if(me->button() == LeftButton) {
+      if(me->button() == Qt::LeftButton) {
         m_leftMouseButtonPressed = true;
         createStencil(me->pos());
         return true;
@@ -61,11 +61,11 @@ bool AddStencilTool::processEvent(QEvent* e)
 
       break;
     }
-    case QEvent::MouseButtonRelease:
+    case TQEvent::MouseButtonRelease:
     {
-      QMouseEvent* me = static_cast<QMouseEvent*>(e);
+      TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
 
-      if(m_leftMouseButtonPressed && (me->button() == LeftButton)) {
+      if(m_leftMouseButtonPressed && (me->button() == Qt::LeftButton)) {
         m_leftMouseButtonPressed = false;
         endOperation(me->pos());
         return true;
@@ -73,9 +73,9 @@ bool AddStencilTool::processEvent(QEvent* e)
 
       break;
     }
-    case QEvent::MouseMove:
+    case TQEvent::MouseMove:
     {
-      QMouseEvent* me = static_cast<QMouseEvent*>(e);
+      TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
 
       if(m_leftMouseButtonPressed) {
         resize(me->pos());
@@ -95,7 +95,7 @@ void AddStencilTool::setActivated(bool a)
 {
   if(a) {
     m_leftMouseButtonPressed = false;
-    view()->canvasWidget()->setCursor(Qt::CrossCursor);
+    view()->canvasWidget()->setCursor(TQt::CrossCursor);
     emit activated(this);
   } else {
     view()->canvasWidget()->unsetCursor();
@@ -111,7 +111,7 @@ void AddStencilTool::activateNewStencil(KivioStencilSpawner* spawner)
   setActivated(true);
 }
 
-void AddStencilTool::createStencil(const QPoint& position)
+void AddStencilTool::createStencil(const TQPoint& position)
 {
   if(!m_spawner) {
     return;
@@ -135,7 +135,7 @@ void AddStencilTool::createStencil(const QPoint& position)
   view()->canvasWidget()->drawStencilXOR(m_stencil);
 }
 
-void AddStencilTool::endOperation(const QPoint& position)
+void AddStencilTool::endOperation(const TQPoint& position)
 {
   if(!m_stencil) {
     return;
@@ -161,7 +161,7 @@ void AddStencilTool::endOperation(const QPoint& position)
   view()->pluginManager()->activateDefaultTool();
 }
 
-void AddStencilTool::resize(const QPoint& position)
+void AddStencilTool::resize(const TQPoint& position)
 {
   KoPoint endPoint = view()->canvasWidget()->mapFromScreen(position);
   endPoint = view()->canvasWidget()->snapToGridAndGuides(endPoint);
diff --git a/kivio/kiviopart/addstenciltool.h b/kivio/kiviopart/addstenciltool.h
index ad805163..29164686 100644
--- a/kivio/kiviopart/addstenciltool.h
+++ b/kivio/kiviopart/addstenciltool.h
@@ -34,20 +34,21 @@ namespace Kivio {
 class AddStencilTool : public MouseTool
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    AddStencilTool(KivioView* parent);
+    AddStencilTool(KivioView* tqparent);
     ~AddStencilTool();
 
-    virtual bool processEvent(QEvent* e);
+    virtual bool processEvent(TQEvent* e);
 
   public slots:
     void setActivated(bool a);
     void activateNewStencil(KivioStencilSpawner* spawner);
 
   protected:
-    void createStencil(const QPoint& position);
-    void endOperation(const QPoint& position);
-    void resize(const QPoint& position);
+    void createStencil(const TQPoint& position);
+    void endOperation(const TQPoint& position);
+    void resize(const TQPoint& position);
 
   private:
     bool m_leftMouseButtonPressed;
diff --git a/kivio/kiviopart/config/kivio.kcfg b/kivio/kiviopart/config/kivio.kcfg
index 94c73ca4..8eea04b3 100644
--- a/kivio/kiviopart/config/kivio.kcfg
+++ b/kivio/kiviopart/config/kivio.kcfg
@@ -8,8 +8,8 @@
   <include>KoGlobal.h</include>
   <include>kglobal.h</include>
   <include>klocale.h</include>
-  <include>qfont.h</include>
-  <include>qcolor.h</include>
+  <include>tqfont.h</include>
+  <include>tqcolor.h</include>
   <kcfgfile name="kiviorc"/>
   <group name="DefaultPageLayout">
     <entry name="Format" type="String">
diff --git a/kivio/kiviopart/config/kivio_config.cpp b/kivio/kiviopart/config/kivio_config.cpp
index 74e8572b..6428c1fd 100644
--- a/kivio/kiviopart/config/kivio_config.cpp
+++ b/kivio/kiviopart/config/kivio_config.cpp
@@ -28,30 +28,30 @@ namespace Kivio {
 
   KoPageLayout Config::defaultPageLayout()
   {
-    KoPageLayout layout;
+    KoPageLayout tqlayout;
     
-    layout.format = KoPageFormat::formatFromString(Settings::format());
-    layout.orientation = Kivio::orientationFromString(Settings::orientation());
-    layout.ptTop = Settings::borderTop();
-    layout.ptBottom = Settings::borderBottom();
-    layout.ptLeft = Settings::borderLeft();
-    layout.ptRight = Settings::borderRight();
-    layout.ptWidth = Settings::width();
-    layout.ptHeight = Settings::height();
+    tqlayout.format = KoPageFormat::formatFromString(Settings::format());
+    tqlayout.orientation = Kivio::orientationFromString(Settings::orientation());
+    tqlayout.ptTop = Settings::borderTop();
+    tqlayout.ptBottom = Settings::borderBottom();
+    tqlayout.ptLeft = Settings::borderLeft();
+    tqlayout.ptRight = Settings::borderRight();
+    tqlayout.ptWidth = Settings::width();
+    tqlayout.ptHeight = Settings::height();
     
-    return layout;
+    return tqlayout;
   }
   
-  void Config::setDefaultPageLayout(const KoPageLayout& layout)
+  void Config::setDefaultPageLayout(const KoPageLayout& tqlayout)
   {
-    Settings::setFormat(KoPageFormat::formatString(layout.format));
-    Settings::setOrientation(Kivio::orientationString(layout.orientation));
-    Settings::setBorderTop(layout.ptTop);
-    Settings::setBorderBottom(layout.ptBottom);
-    Settings::setBorderLeft(layout.ptLeft);
-    Settings::setBorderRight(layout.ptRight);
-    Settings::setWidth(layout.ptWidth);
-    Settings::setHeight(layout.ptHeight);
+    Settings::setFormat(KoPageFormat::formatString(tqlayout.format));
+    Settings::setOrientation(Kivio::orientationString(tqlayout.orientation));
+    Settings::setBorderTop(tqlayout.ptTop);
+    Settings::setBorderBottom(tqlayout.ptBottom);
+    Settings::setBorderLeft(tqlayout.ptLeft);
+    Settings::setBorderRight(tqlayout.ptRight);
+    Settings::setWidth(tqlayout.ptWidth);
+    Settings::setHeight(tqlayout.ptHeight);
   }
 
   void Config::setGrid(const KivioGridData& /*grid*/)
diff --git a/kivio/kiviopart/config/kivio_config.h b/kivio/kiviopart/config/kivio_config.h
index 651ec121..b4df785a 100644
--- a/kivio/kiviopart/config/kivio_config.h
+++ b/kivio/kiviopart/config/kivio_config.h
@@ -34,12 +34,12 @@ namespace Kivio {
   {
     public:
       /**
-      * Set the default page layout
+      * Set the default page tqlayout
       */
-      static void setDefaultPageLayout(const KoPageLayout& layout);
+      static void setDefaultPageLayout(const KoPageLayout& tqlayout);
 
       /**
-      * Get the default page layout
+      * Get the default page tqlayout
       */
       static KoPageLayout defaultPageLayout();
 
diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp
index 162f076f..0b78a70c 100644
--- a/kivio/kiviopart/kivio_canvas.cpp
+++ b/kivio/kiviopart/kivio_canvas.cpp
@@ -47,16 +47,16 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include <qlabel.h>
-#include <qpixmap.h>
-#include <qscrollbar.h>
-#include <qtimer.h>
-#include <qsize.h>
+#include <tqlabel.h>
+#include <tqpixmap.h>
+#include <tqscrollbar.h>
+#include <tqtimer.h>
+#include <tqsize.h>
 
 using namespace Kivio;
 
-KivioCanvas::KivioCanvas( QWidget *par, KivioView* view, KivioDoc* doc, QScrollBar* vs, QScrollBar* hs)
-: QWidget(par, "KivioCanvas", WResizeNoErase | WRepaintNoErase),
+KivioCanvas::KivioCanvas( TQWidget *par, KivioView* view, KivioDoc* doc, TQScrollBar* vs, TQScrollBar* hs)
+: TQWidget(par, "KivioCanvas", WResizeNoErase | WRepaintNoErase),
   m_pView(view),
   m_pDoc(doc),
   m_pVertScrollBar(vs),
@@ -66,7 +66,7 @@ KivioCanvas::KivioCanvas( QWidget *par, KivioView* view, KivioDoc* doc, QScrollB
   setBackgroundMode(NoBackground);
   setAcceptDrops(true);
   setMouseTracking(true);
-  setFocusPolicy(StrongFocus);
+  setFocusPolicy(TQ_StrongFocus);
   setFocus();
 
   m_showConnectorTargets = false;
@@ -79,8 +79,8 @@ KivioCanvas::KivioCanvas( QWidget *par, KivioView* view, KivioDoc* doc, QScrollB
   m_pVertScrollBar->setPageStep(10);
   m_pHorzScrollBar->setPageStep(10);
 
-  connect(m_pVertScrollBar, SIGNAL(valueChanged(int)), SLOT(scrollV(int)));
-  connect( m_pHorzScrollBar, SIGNAL(valueChanged(int)), SLOT(scrollH(int)));
+  connect(m_pVertScrollBar, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrollV(int)));
+  connect( m_pHorzScrollBar, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrollH(int)));
 
   m_iXOffset = 0;
   m_iYOffset = 0;
@@ -93,14 +93,14 @@ KivioCanvas::KivioCanvas( QWidget *par, KivioView* view, KivioDoc* doc, QScrollB
 
   m_pasteMoving = false;
 
-  m_buffer = new QPixmap();
+  m_buffer = new TQPixmap();
 
   m_pDragStencil = 0L;
   unclippedSpawnerPainter = 0L;
   unclippedPainter = 0L;
 
-  m_borderTimer = new QTimer(this);
-  connect(m_borderTimer,SIGNAL(timeout()),SLOT(borderTimerTimeout()));
+  m_borderTimer = new TQTimer(this);
+  connect(m_borderTimer,TQT_SIGNAL(timeout()),TQT_SLOT(borderTimerTimeout()));
 }
 
 KivioCanvas::~KivioCanvas()
@@ -110,7 +110,7 @@ KivioCanvas::~KivioCanvas()
   delete unclippedPainter;
 }
 
-KivioPage* KivioCanvas::findPage( const QString& _name )
+KivioPage* KivioCanvas::findPage( const TQString& _name )
 {
   return m_pDoc->map()->findPage( _name );
 }
@@ -169,7 +169,7 @@ void KivioCanvas::scrollDy( int dy )
   m_pVertScrollBar->setValue(value);
 }
 
-void KivioCanvas::resizeEvent( QResizeEvent* )
+void KivioCanvas::resizeEvent( TQResizeEvent* )
 {
   m_buffer->resize(size());
   updateScrollBars();
@@ -177,7 +177,7 @@ void KivioCanvas::resizeEvent( QResizeEvent* )
   emit visibleAreaChanged();
 }
 
-void KivioCanvas::wheelEvent( QWheelEvent* ev )
+void KivioCanvas::wheelEvent( TQWheelEvent* ev )
 {
   ev->accept();
   
@@ -207,7 +207,7 @@ void KivioCanvas::setUpdatesEnabled( bool isUpdate )
 {
   static int i = 0;
 
-  QWidget::setUpdatesEnabled(isUpdate);
+  TQWidget::setUpdatesEnabled(isUpdate);
   if (isUpdate) {
     --i;
     if (i == 0) {
@@ -224,18 +224,18 @@ void KivioCanvas::setUpdatesEnabled( bool isUpdate )
   }
 }
 
-void KivioCanvas::zoomIn(const QPoint &p)
+void KivioCanvas::zoomIn(const TQPoint &p)
 {
   setUpdatesEnabled(false);
   KoPoint p0 = mapFromScreen(p);
   m_pView->viewZoom(m_pView->zoomHandler()->zoom() + 25);
-  QPoint p1 = mapToScreen(p0);
+  TQPoint p1 = mapToScreen(p0);
   scrollDx(-p1.x()+p.x());
   scrollDy(-p1.y()+p.y());
   setUpdatesEnabled(true);
 }
 
-void KivioCanvas::zoomOut(const QPoint &p)
+void KivioCanvas::zoomOut(const TQPoint &p)
 {
   setUpdatesEnabled(false);
   KoPoint p0 = mapFromScreen(p);
@@ -243,29 +243,29 @@ void KivioCanvas::zoomOut(const QPoint &p)
 
   if(newZoom > 0) {
     m_pView->viewZoom(newZoom);
-    QPoint p1 = mapToScreen(p0);
+    TQPoint p1 = mapToScreen(p0);
     scrollDx(-p1.x()+p.x());
     scrollDy(-p1.y()+p.y());
   }
   setUpdatesEnabled(true);
 }
 
-void KivioCanvas::paintEvent( QPaintEvent* ev )
+void KivioCanvas::paintEvent( TQPaintEvent* ev )
 {
   if ( m_pDoc->isLoading() || !activePage() )
     return;
 
   KivioPage* page = activePage();
 
-  QPainter painter;
+  TQPainter painter;
   painter.begin(m_buffer);
 
   KoPageLayout pl = page->paperLayout();
   int pw = m_pView->zoomHandler()->zoomItX(pl.ptWidth);
   int ph = m_pView->zoomHandler()->zoomItY(pl.ptHeight);
-  QRect fillRect(0, 0, pw, ph);
-  QRect paintRect = ev->rect();
-  QRegion grayRegion(paintRect);
+  TQRect fillRect(0, 0, pw, ph);
+  TQRect paintRect = ev->rect();
+  TQRegion grayRegion(paintRect);
   grayRegion.translate(m_iXOffset - m_pageOffsetX, m_iYOffset - m_pageOffsetY);
   grayRegion -= fillRect;
   grayRegion.translate(-m_iXOffset + m_pageOffsetX, -m_iYOffset + m_pageOffsetY);
@@ -273,9 +273,9 @@ void KivioCanvas::paintEvent( QPaintEvent* ev )
   // This code comes from KPresenter's kprcanvas.cpp
   // Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
   painter.save();
-  painter.setClipRegion(grayRegion, QPainter::CoordPainter);
-  painter.setPen(Qt::NoPen);
-  painter.fillRect(grayRegion.boundingRect(), KApplication::palette().active().brush(QColorGroup::Mid));
+  painter.setClipRegion(grayRegion, TQPainter::CoordPainter);
+  painter.setPen(TQt::NoPen);
+  painter.fillRect(grayRegion.boundingRect(), KApplication::tqpalette().active().brush(TQColorGroup::Mid));
   painter.restore();
   // end of copy...
 
@@ -286,14 +286,14 @@ void KivioCanvas::paintEvent( QPaintEvent* ev )
   if(m_pDoc->grid().isShow) {
     KoPoint topLeft(0, 0);
     KoPoint bottomRight(pl.ptWidth, pl.ptHeight);
-    QPoint zoomedTL = m_pView->zoomHandler()->zoomPoint(topLeft);
-    QPoint zoomedBR = m_pView->zoomHandler()->zoomPoint(bottomRight);
+    TQPoint zoomedTL = m_pView->zoomHandler()->zoomPoint(topLeft);
+    TQPoint zoomedBR = m_pView->zoomHandler()->zoomPoint(bottomRight);
 
     KoSize freq = m_pDoc->grid().freq;
 
     painter.setPen(m_pDoc->grid().color);
 
-    double x = qRound(topLeft.x() / freq.width()) * freq.width();
+    double x = tqRound(topLeft.x() / freq.width()) * freq.width();
     int zoomed = 0;
 
     while(x <= bottomRight.x()) {
@@ -302,7 +302,7 @@ void KivioCanvas::paintEvent( QPaintEvent* ev )
       x += freq.width();
     }
 
-    double y = qRound(topLeft.y() / freq.height()) * freq.height();
+    double y = tqRound(topLeft.y() / freq.height()) * freq.height();
 
     while(y <= bottomRight.y()) {
       zoomed = m_pView->zoomHandler()->zoomItY(y);
@@ -318,7 +318,7 @@ void KivioCanvas::paintEvent( QPaintEvent* ev )
     int mb = m_pView->zoomHandler()->zoomItY(pl.ptBottom);
 
     painter.save();
-    painter.setPen(QPen("#C7C7C7",1,SolidLine));
+    painter.setPen(TQPen("#C7C7C7",1,SolidLine));
     painter.drawRect(ml,mt,pw-ml-mr,ph-mt-mb);
     painter.restore();
   }
@@ -331,9 +331,9 @@ void KivioCanvas::paintEvent( QPaintEvent* ev )
 
   // Draw content
   KivioScreenPainter kpainter;
-  kpainter.start(m_buffer);
+  kpainter.start(TQT_TQPAINTDEVICE(m_buffer));
   kpainter.translateBy(-m_iXOffset + m_pageOffsetX, -m_iYOffset + m_pageOffsetY);
-  m_pDoc->paintContent(kpainter, paintRect, false, page, QPoint(0, 0), m_pView->zoomHandler(), showConnectorTargets(), true);
+  m_pDoc->paintContent(kpainter, paintRect, false, page, TQPoint(0, 0), m_pView->zoomHandler(), showConnectorTargets(), true);
   kpainter.stop();
 
   if(m_pView->isShowGuides()) {
@@ -356,8 +356,8 @@ void KivioCanvas::updateScrollBars()
   int pw = m_pView->zoomHandler()->zoomItX(pl.ptWidth);
   int ph = m_pView->zoomHandler()->zoomItY(pl.ptHeight);
 
-  m_pScrollX = QMAX(pw - width(), 0);
-  m_pScrollY = QMAX(ph - height(), 0);
+  m_pScrollX = TQMAX(pw - width(), 0);
+  m_pScrollY = TQMAX(ph - height(), 0);
 
   m_pHorzScrollBar->setRange(0, m_pScrollX);
   if ( m_pHorzScrollBar->value() > m_pHorzScrollBar->maxValue() ||
@@ -389,14 +389,14 @@ void KivioCanvas::updateScrollBars()
   }
 }
 
-QSize KivioCanvas::actualSize() const
+TQSize KivioCanvas::actualSize() const
 {
-  return QSize(m_pScrollX, m_pScrollY);
+  return TQSize(m_pScrollX, m_pScrollY);
 }
 
-bool KivioCanvas::event( QEvent* e )
+bool KivioCanvas::event( TQEvent* e )
 {
-  bool f = QWidget::event(e);
+  bool f = TQWidget::event(e);
 
   if (m_pView->pluginManager() && delegateThisEvent) {
     f = m_pView->pluginManager()->delegateEvent(e);
@@ -406,16 +406,16 @@ bool KivioCanvas::event( QEvent* e )
   return f;
 }
 
-void KivioCanvas::enterEvent( QEvent* )
+void KivioCanvas::enterEvent( TQEvent* )
 {
 }
 
-void KivioCanvas::leaveEvent( QEvent* )
+void KivioCanvas::leaveEvent( TQEvent* )
 {
   m_pView->setMousePos(-1, -1);
 }
 
-void KivioCanvas::mousePressEvent(QMouseEvent* e)
+void KivioCanvas::mousePressEvent(TQMouseEvent* e)
 {
     if(!m_pDoc->isReadWrite())
         return;
@@ -435,7 +435,7 @@ void KivioCanvas::mousePressEvent(QMouseEvent* e)
     }
 }
 
-void KivioCanvas::mouseReleaseEvent(QMouseEvent* e)
+void KivioCanvas::mouseReleaseEvent(TQMouseEvent* e)
 {
   if(!m_pDoc->isReadWrite())
     return;
@@ -450,7 +450,7 @@ void KivioCanvas::mouseReleaseEvent(QMouseEvent* e)
   }
 }
 
-void KivioCanvas::mouseMoveEvent(QMouseEvent* e)
+void KivioCanvas::mouseMoveEvent(TQMouseEvent* e)
 {
   if(!m_pDoc->isReadWrite())
     return;
@@ -469,9 +469,9 @@ void KivioCanvas::mouseMoveEvent(QMouseEvent* e)
   view()->setMousePos(lastPoint.x(), lastPoint.y());
 }
 
-QPoint KivioCanvas::mapToScreen(const KoPoint& pos)
+TQPoint KivioCanvas::mapToScreen(const KoPoint& pos)
 {
-  QPoint p;
+  TQPoint p;
   int x = m_pView->zoomHandler()->zoomItX(pos.x());
   int y = m_pView->zoomHandler()->zoomItY(pos.y());
 
@@ -481,7 +481,7 @@ QPoint KivioCanvas::mapToScreen(const KoPoint& pos)
   return p;
 }
 
-KoPoint KivioCanvas::mapFromScreen( const QPoint & pos )
+KoPoint KivioCanvas::mapFromScreen( const TQPoint & pos )
 {
   int x = pos.x() + m_iXOffset - m_pageOffsetX;
   int y = pos.y() + m_iYOffset - m_pageOffsetY;
@@ -492,24 +492,24 @@ KoPoint KivioCanvas::mapFromScreen( const QPoint & pos )
   return p;
 }
 
-void KivioCanvas::startRectDraw( const QPoint &p, RectType )
+void KivioCanvas::startRectDraw( const TQPoint &p, RectType )
 {
-  currRect = QRect( 0, 0, -1, -1 );
+  currRect = TQRect( 0, 0, -1, -1 );
 
-  QPoint pos( p );
+  TQPoint pos( p );
   oldRectValid = false;
   beginUnclippedPainter();
   rectAnchor = pos;
-  currRect = QRect( rectAnchor, QPoint(0,0) );
+  currRect = TQRect( rectAnchor, TQPoint(0,0) );
 
   m_borderTimer->start(100);
 }
 
-void KivioCanvas::continueRectDraw( const QPoint &p, RectType )
+void KivioCanvas::continueRectDraw( const TQPoint &p, RectType )
 {
-  QPoint pos = p;
-  QPoint p2 = pos;
-  QRect r( rectAnchor, p2 );
+  TQPoint pos = p;
+  TQPoint p2 = pos;
+  TQRect r( rectAnchor, p2 );
   r = r.normalize();
 
   if ( oldRectValid )
@@ -544,9 +544,9 @@ void KivioCanvas::endRectDraw()
  * This will allocate a new KivioStencil for drawing with and
  * set some class variables used during redraws.
  */
-void KivioCanvas::startSpawnerDragDraw( const QPoint &p )
+void KivioCanvas::startSpawnerDragDraw( const TQPoint &p )
 {
-  currRect = QRect( 0, 0, -1, -1 );
+  currRect = TQRect( 0, 0, -1, -1 );
 
   KivioStencilSpawner *pSpawner = KivioIconView::curDragSpawner();
   if( !pSpawner )
@@ -593,7 +593,7 @@ void KivioCanvas::startSpawnerDragDraw( const QPoint &p )
 /**
  * Undraws the old stencil outline, draws the new one
  */
-void KivioCanvas::continueSpawnerDragDraw( const QPoint &p )
+void KivioCanvas::continueSpawnerDragDraw( const TQPoint &p )
 {
   bool snappedX, snappedY;
 
@@ -706,7 +706,7 @@ void KivioCanvas::beginUnclippedSpawnerPainter()
     unclippedSpawnerPainter = new KivioScreenPainter();
 
     // Tell it to start (allocates a Qpainter object)
-    unclippedSpawnerPainter->start(this);
+    unclippedSpawnerPainter->start(TQT_TQPAINTDEVICE(this));
 
     // Uhhhhh??
     if( !unclipped )
@@ -715,7 +715,7 @@ void KivioCanvas::beginUnclippedSpawnerPainter()
 
     // Make sure it's doing NOT drawing.
     unclippedSpawnerPainter->painter()->setRasterOp( NotROP );
-    unclippedSpawnerPainter->painter()->setPen( QColor(0,0,250) );
+    unclippedSpawnerPainter->painter()->setPen( TQColor(0,0,250) );
 
 }
 
@@ -739,14 +739,14 @@ void KivioCanvas::beginUnclippedPainter()
     bool unclipped = testWFlags( WPaintUnclipped );
 
     setWFlags( WPaintUnclipped );
-    unclippedPainter = new QPainter;
+    unclippedPainter = new TQPainter;
     unclippedPainter->begin( this );
 
     if ( !unclipped )
         clearWFlags( WPaintUnclipped );
 
     unclippedPainter->setRasterOp( NotROP );
-    unclippedPainter->setPen( QPen(blue,1,DotLine) );
+    unclippedPainter->setPen( TQPen(blue,1,DotLine) );
 }
 
 void KivioCanvas::endUnclippedPainter()
@@ -761,12 +761,12 @@ void KivioCanvas::endUnclippedPainter()
 
 void KivioCanvas::borderTimerTimeout()
 {
-  QPoint p = mapFromGlobal(QCursor::pos());
+  TQPoint p = mapFromGlobal(TQCursor::pos());
   int dx = 0;
   int dy = 0;
   int d = 10;
 
-  QRect r(currRect);
+  TQRect r(currRect);
   int vpos = m_pVertScrollBar->value();
   int vmax = m_pVertScrollBar->maxValue();
   int vmin = m_pVertScrollBar->minValue();
@@ -776,25 +776,25 @@ void KivioCanvas::borderTimerTimeout()
   int hmin = m_pHorzScrollBar->minValue();
 
   if ( p.x() < 0 && hpos > hmin ) {
-    dx = QMIN(d,hpos-hmin);
+    dx = TQMIN(d,hpos-hmin);
     r.setRight(r.right()+dx);
     rectAnchor.setX(rectAnchor.x()+dx);
   }
 
   if ( p.y() < 0 && vpos > vmin ) {
-    dy = QMIN(d,vpos-vmin);
+    dy = TQMIN(d,vpos-vmin);
     r.setBottom(r.bottom()+dy);
     rectAnchor.setY(rectAnchor.y()+dy);
   }
 
   if ( p.x() > width() && hpos < hmax ) {
-    dx = -QMIN(d,hmax-hpos);
+    dx = -TQMIN(d,hmax-hpos);
     r.setLeft(r.left()+dx);
     rectAnchor.setX(rectAnchor.x()+dx);
   }
 
   if ( p.y() > height() && vpos < vmax  ) {
-    dy = -QMIN(d,vmax-vpos);
+    dy = -TQMIN(d,vmax-vpos);
     r.setTop(r.top()+dy);
     rectAnchor.setY(rectAnchor.y()+dy);
   }
@@ -819,7 +819,7 @@ void KivioCanvas::borderTimerTimeout()
  * allocate a new drawing object and set some class variables for future
  * drawing.
  */
-void KivioCanvas::dragEnterEvent( QDragEnterEvent *e )
+void KivioCanvas::dragEnterEvent( TQDragEnterEvent *e )
 {
     if( e->provides("kivio/stencilSpawner") )
     {
@@ -841,7 +841,7 @@ void KivioCanvas::dragEnterEvent( QDragEnterEvent *e )
  * are currently the only type of mime-types accepted.  If so, it accepts the
  * event, and then tells the drawing object to update itself with a new position.
  */
-void KivioCanvas::dragMoveEvent( QDragMoveEvent *e )
+void KivioCanvas::dragMoveEvent( TQDragMoveEvent *e )
 {
     // Does it speak our language?
     if( e->provides("kivio/stencilSpawner") )
@@ -862,7 +862,7 @@ void KivioCanvas::dragMoveEvent( QDragMoveEvent *e )
  * to the active page of the document (which actually adds it to the active layer
  * of the active page).
  */
-void KivioCanvas::dropEvent( QDropEvent *e )
+void KivioCanvas::dropEvent( TQDropEvent *e )
 {
     // Terminate the drawing object
     endSpawnerDragDraw();
@@ -873,7 +873,7 @@ void KivioCanvas::dropEvent( QDropEvent *e )
     if( !pSpawner )
         return;
         
-    QPoint pos = e->pos();
+    TQPoint pos = e->pos();
     KoPoint pagePoint = snapToGrid(mapFromScreen( pos ));
     view()->addStencilFromSpawner(pSpawner, pagePoint.x(), pagePoint.y());
 
@@ -889,7 +889,7 @@ void KivioCanvas::dropEvent( QDropEvent *e )
  * This will call endSpawnerDragDraw() which terminates the drawing
  * object and ends interaction with the drag.
  */
-void KivioCanvas::dragLeaveEvent( QDragLeaveEvent * )
+void KivioCanvas::dragLeaveEvent( TQDragLeaveEvent * )
 {
     endSpawnerDragDraw();
 }
@@ -944,7 +944,7 @@ void KivioCanvas::drawStencilXOR( KivioStencil *pStencil )
     unclippedSpawnerPainter->painter()->restore();
 }
 
-void KivioCanvas::keyPressEvent( QKeyEvent *e )
+void KivioCanvas::keyPressEvent( TQKeyEvent *e )
 {
   if(view()->isShowGuides() && m_guides.keyPressEvent(e)) {
     return;
@@ -981,11 +981,11 @@ KoPoint KivioCanvas::snapToGrid(const KoPoint& point)
   KoSize dist = m_pDoc->grid().snap;
   KoSize freq = m_pDoc->grid().freq;
 
-  double dx = qRound(p.x() / freq.width());
-  double dy = qRound(p.y() / freq.height());
+  double dx = tqRound(p.x() / freq.width());
+  double dy = tqRound(p.y() / freq.height());
 
-  double distx = QABS(p.x() - (freq.width() * dx));
-  double disty = QABS(p.y() - (freq.height() * dy));
+  double distx = TQABS(p.x() - (freq.width() * dx));
+  double disty = TQABS(p.y() - (freq.height() * dy));
 
   if(distx < dist.width()) {
     p.setX(freq.width() * dx);
@@ -1006,7 +1006,7 @@ KoPoint KivioCanvas::snapToGuides(const KoPoint& point, bool &snappedX, bool &sn
 
   if (m_pView->isSnapGuides())
   {
-    KoGuides::SnapStatus status = KoGuides::SNAP_NONE;
+    KoGuides::SnaptqStatus status = KoGuides::SNAP_NONE;
     KoPoint diff;
     m_guides.snapToGuideLines(p, 4, status, diff);
     p += diff;
@@ -1018,7 +1018,7 @@ KoPoint KivioCanvas::snapToGuides(const KoPoint& point, bool &snappedX, bool &sn
       snappedX = true;
     }
 
-    m_guides.repaintSnapping(p, status);
+    m_guides.tqrepaintSnapping(p, status);
   }
 
   return p;
@@ -1030,8 +1030,8 @@ void KivioCanvas::setViewCenterPoint(const KoPoint &p)
 
   KoRect va = visibleArea();
 
-  double x = QMAX(0.0, p.x() - (va.width() / 2.0));
-  double y = QMAX(0.0, p.y() - (va.height() / 2.0));
+  double x = TQMAX(0.0, p.x() - (va.width() / 2.0));
+  double y = TQMAX(0.0, p.y() - (va.height() / 2.0));
 
   m_pVertScrollBar->setValue(m_pView->zoomHandler()->zoomItY(y));
   m_pHorzScrollBar->setValue(m_pView->zoomHandler()->zoomItX(x));
@@ -1041,8 +1041,8 @@ void KivioCanvas::setViewCenterPoint(const KoPoint &p)
 
 KoRect KivioCanvas::visibleArea()
 {
-  KoPoint p0 = mapFromScreen(QPoint(0,0));
-  KoPoint p1 = mapFromScreen(QPoint(width()-1,height()-1));
+  KoPoint p0 = mapFromScreen(TQPoint(0,0));
+  KoPoint p1 = mapFromScreen(TQPoint(width()-1,height()-1));
 
   return KoRect(p0.x(), p0.y(), p1.x() - p0.x(), p1.y() - p0.y());
 }
@@ -1059,9 +1059,9 @@ void KivioCanvas::setVisibleArea(KoRect r, int margin)
 
   float zw = cw / (float)zoom.zoomItX(r.width());
   float zh = ch / (float)zoom.zoomItY(r.height());
-  float z = QMIN(zw, zh);
+  float z = TQMIN(zw, zh);
 
-  m_pView->viewZoom(qRound(z * 100));
+  m_pView->viewZoom(tqRound(z * 100));
 
   KoPoint c = r.center();
 
@@ -1079,7 +1079,7 @@ void KivioCanvas::setVisibleAreaByWidth(KoRect r, int margin)
   float cw = width() - 2*margin;
   float z = cw / (float)zoom.zoomItX(r.width());
 
-  m_pView->viewZoom(qRound(z * 100));
+  m_pView->viewZoom(tqRound(z * 100));
 
   KoPoint c = r.center();
 
@@ -1097,7 +1097,7 @@ void KivioCanvas::setVisibleAreaByHeight(KoRect r, int margin)
   float ch = height() - 2*margin;
   float z = ch / (float)zoom.zoomItY(r.height());
 
-  m_pView->viewZoom(qRound(z * 100));
+  m_pView->viewZoom(tqRound(z * 100));
 
   KoPoint c = r.center();
 
@@ -1115,7 +1115,7 @@ void KivioCanvas::startPasteMoving()
   beginUnclippedSpawnerPainter();
   drawSelectedStencilsXOR();
 
-  // Build the list of old geometry
+  // Build the list of old tqgeometry
   KoRect *pData;
   m_lstOldGeometry.clear();
   KivioStencil* pStencil = activePage()->selectedStencils()->first();
@@ -1134,7 +1134,7 @@ void KivioCanvas::startPasteMoving()
   setEnabled(true);
 }
 
-void KivioCanvas::continuePasteMoving(const QPoint &pos)
+void KivioCanvas::continuePasteMoving(const TQPoint &pos)
 {
   KoPoint pagePoint = mapFromScreen( pos );
 
@@ -1245,20 +1245,20 @@ void KivioCanvas::endPasteMoving()
 
   endUnclippedSpawnerPainter();
 
-  // Clear the list of old geometry
+  // Clear the list of old tqgeometry
   m_lstOldGeometry.clear();
   m_pasteMoving = false;
 }
 
 void KivioCanvas::updateAutoGuideLines()
 {
-  QValueList<double> hGuideLines;
-  QValueList<double> vGuideLines;
-  QPtrList<KivioLayer> layerList = *(activePage()->layers());
-  QPtrListIterator<KivioLayer> layerIt(layerList);
+  TQValueList<double> hGuideLines;
+  TQValueList<double> vGuideLines;
+  TQPtrList<KivioLayer> layerList = *(activePage()->layers());
+  TQPtrListIterator<KivioLayer> layerIt(layerList);
   KivioLayer* layer = 0;
-  QPtrList<KivioStencil> stencilList;
-  QPtrListIterator<KivioStencil> stencilIt(stencilList);
+  TQPtrList<KivioStencil> stencilList;
+  TQPtrListIterator<KivioStencil> stencilIt(stencilList);
   KivioStencil* stencil = 0;
 
   while((layer = layerIt.current()) != 0) {
diff --git a/kivio/kiviopart/kivio_canvas.h b/kivio/kiviopart/kivio_canvas.h
index 92fbd632..eb03a3ae 100644
--- a/kivio/kiviopart/kivio_canvas.h
+++ b/kivio/kiviopart/kivio_canvas.h
@@ -19,14 +19,14 @@
 #ifndef __kivio_canvas_h__
 #define __kivio_canvas_h__
 
-#include <qpainter.h>
-#include <qbitmap.h>
-#include <qlineedit.h>
-#include <qwidget.h>
-#include <qpoint.h>
-#include <qrect.h>
-#include <qstring.h>
-#include <qptrlist.h>
+#include <tqpainter.h>
+#include <tqbitmap.h>
+#include <tqlineedit.h>
+#include <tqwidget.h>
+#include <tqpoint.h>
+#include <tqrect.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
 
 #include <KoQueryTrader.h>
 #include <KoPoint.h>
@@ -45,11 +45,11 @@ class KivioGuideLineData;
 class KivioScreenPainter;
 class KivioStencil;
 
-class QPainter;
-class QLabel;
-class QPixmap;
-class QScrollBar;
-class QTimer;
+class TQPainter;
+class TQLabel;
+class TQPixmap;
+class TQScrollBar;
+class TQTimer;
 
 class KoSize;
 class KoRect;
@@ -57,12 +57,13 @@ class KoRect;
 #define YBORDER_WIDTH 50
 #define XBORDER_HEIGHT 20
 
-class KIVIO_EXPORT KivioCanvas : public QWidget
+class KIVIO_EXPORT KivioCanvas : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class KivioView;
   public:
-    KivioCanvas( QWidget*, KivioView*, KivioDoc*, QScrollBar*, QScrollBar* );
+    KivioCanvas( TQWidget*, KivioView*, KivioDoc*, TQScrollBar*, TQScrollBar* );
     ~KivioCanvas();
 
     int xOffset() const { return m_iXOffset; }
@@ -70,23 +71,23 @@ class KIVIO_EXPORT KivioCanvas : public QWidget
 
     const KivioPage* activePage() const;
     KivioPage* activePage();
-    KivioPage* findPage( const QString& _name );
+    KivioPage* findPage( const TQString& _name );
 
     KivioView* view()const  { return m_pView; }
     KivioDoc* doc()const { return m_pDoc; }
 
-    QSize actualSize() const;
+    TQSize actualSize() const;
 
-    virtual bool event(QEvent*);
+    virtual bool event(TQEvent*);
 
     enum RectType { Insert, Rubber };
-    void startRectDraw( const QPoint &p, RectType t );
-    void continueRectDraw( const QPoint &p, RectType t );
+    void startRectDraw( const TQPoint &p, RectType t );
+    void continueRectDraw( const TQPoint &p, RectType t );
     void endRectDraw();
-    QRect rect()const { return currRect; }
+    TQRect rect()const { return currRect; }
 
-    void startSpawnerDragDraw( const QPoint &p );
-    void continueSpawnerDragDraw( const QPoint &p );
+    void startSpawnerDragDraw( const TQPoint &p );
+    void continueSpawnerDragDraw( const TQPoint &p );
     void endSpawnerDragDraw();
 
     void drawSelectedStencilsXOR();
@@ -96,8 +97,8 @@ class KIVIO_EXPORT KivioCanvas : public QWidget
     KoPoint snapToGuides(const KoPoint&, bool &, bool &);
     KoPoint snapToGridAndGuides(const KoPoint&);
 
-    KoPoint mapFromScreen(const QPoint&);
-    QPoint mapToScreen(const KoPoint&);
+    KoPoint mapFromScreen(const TQPoint&);
+    TQPoint mapToScreen(const KoPoint&);
 
     void beginUnclippedSpawnerPainter();
     void endUnclippedSpawnerPainter();
@@ -123,8 +124,8 @@ class KIVIO_EXPORT KivioCanvas : public QWidget
   public slots:
     virtual void setUpdatesEnabled(bool);
 
-    void zoomIn(const QPoint&);
-    void zoomOut(const QPoint&);
+    void zoomIn(const TQPoint&);
+    void zoomOut(const TQPoint&);
 
     void scrollDx(int dx);
     void scrollDy(int dy);
@@ -139,30 +140,30 @@ class KIVIO_EXPORT KivioCanvas : public QWidget
     void updateAutoGuideLines();
 
   protected:
-    virtual void mousePressEvent( QMouseEvent* );
-    virtual void mouseReleaseEvent( QMouseEvent* );
-    virtual void mouseMoveEvent( QMouseEvent* );
+    virtual void mousePressEvent( TQMouseEvent* );
+    virtual void mouseReleaseEvent( TQMouseEvent* );
+    virtual void mouseMoveEvent( TQMouseEvent* );
 
-    virtual void enterEvent( QEvent* );
-    virtual void leaveEvent( QEvent* );
+    virtual void enterEvent( TQEvent* );
+    virtual void leaveEvent( TQEvent* );
 
-    virtual void resizeEvent( QResizeEvent* );
-    virtual void paintEvent( QPaintEvent* );
-    virtual void wheelEvent( QWheelEvent* );
+    virtual void resizeEvent( TQResizeEvent* );
+    virtual void paintEvent( TQPaintEvent* );
+    virtual void wheelEvent( TQWheelEvent* );
 
-    virtual void dragEnterEvent( QDragEnterEvent * );
-    virtual void dragMoveEvent( QDragMoveEvent * );
-    virtual void dragLeaveEvent( QDragLeaveEvent * );
-    virtual void dropEvent( QDropEvent * );
+    virtual void dragEnterEvent( TQDragEnterEvent * );
+    virtual void dragMoveEvent( TQDragMoveEvent * );
+    virtual void dragLeaveEvent( TQDragLeaveEvent * );
+    virtual void dropEvent( TQDropEvent * );
 
-    virtual void keyPressEvent( QKeyEvent * );
+    virtual void keyPressEvent( TQKeyEvent * );
 
     void beginUnclippedPainter();
     void endUnclippedPainter();
 
     void paintSelectedXOR();
 
-    void continuePasteMoving(const QPoint &pos);
+    void continuePasteMoving(const TQPoint &pos);
     void endPasteMoving();
 
   protected slots:
@@ -172,35 +173,35 @@ class KIVIO_EXPORT KivioCanvas : public QWidget
     KivioView* m_pView;
     KivioDoc* m_pDoc;
 
-    QScrollBar* m_pVertScrollBar;
-    QScrollBar* m_pHorzScrollBar;
+    TQScrollBar* m_pVertScrollBar;
+    TQScrollBar* m_pHorzScrollBar;
 
     int m_iXOffset;
     int m_iYOffset;
 
-    QPixmap* m_buffer;
+    TQPixmap* m_buffer;
 
     int m_pScrollX;
     int m_pScrollY;
-    QPointArray gridLines;
+    TQPointArray gridLines;
 
     bool oldRectValid;
-    QRect currRect;
-    QPoint rectAnchor;
-    QPainter* unclippedPainter;
-    QPoint sizePreviewPos;
+    TQRect currRect;
+    TQPoint rectAnchor;
+    TQPainter* unclippedPainter;
+    TQPoint sizePreviewPos;
 
     KivioScreenPainter* unclippedSpawnerPainter;
     KivioIntraStencilData m_dragStencilData;
     KivioStencil* m_pDragStencil;
 
-    QTimer* m_borderTimer;
+    TQTimer* m_borderTimer;
 
     bool delegateThisEvent;
-    QPoint lastPoint;
+    TQPoint lastPoint;
 
     bool m_pasteMoving;
-    QPtrList<KoRect> m_lstOldGeometry;
+    TQPtrList<KoRect> m_lstOldGeometry;
     KoPoint m_origPoint;
 
     KoGuides m_guides;
diff --git a/kivio/kiviopart/kivio_command.cc b/kivio/kiviopart/kivio_command.cc
index 0598653a..4633a60f 100644
--- a/kivio/kiviopart/kivio_command.cc
+++ b/kivio/kiviopart/kivio_command.cc
@@ -25,7 +25,7 @@
 #include "kivio_layer.h"
 #include "kivio_group_stencil.h"
 
-KivioChangePageNameCommand::KivioChangePageNameCommand(const QString &_name,  const QString & _oldPageName, const QString & _newPageName, KivioPage *_page)
+KivioChangePageNameCommand::KivioChangePageNameCommand(const TQString &_name,  const TQString & _oldPageName, const TQString & _newPageName, KivioPage *_page)
     : KNamedCommand( _name ),
       oldPageName(_oldPageName ),
       newPageName(_newPageName ),
@@ -49,7 +49,7 @@ void KivioChangePageNameCommand::unexecute()
 }
 
 
-KivioHidePageCommand::KivioHidePageCommand(const QString &_name, KivioPage *_page)
+KivioHidePageCommand::KivioHidePageCommand(const TQString &_name, KivioPage *_page)
     : KNamedCommand( _name ),
       m_page( _page )
 {
@@ -69,13 +69,13 @@ void KivioHidePageCommand::unexecute()
     m_page->setHidePage( false );
 }
 
-KivioShowPageCommand::KivioShowPageCommand( const QString &_name, KivioPage *_page)
+KivioShowPageCommand::KivioShowPageCommand( const TQString &_name, KivioPage *_page)
     : KivioHidePageCommand( _name, _page)
 {
 }
 
 
-KivioAddPageCommand::KivioAddPageCommand(const QString &_name, KivioPage *_page)
+KivioAddPageCommand::KivioAddPageCommand(const TQString &_name, KivioPage *_page)
     : KNamedCommand( _name ),
       m_page( _page )
 {
@@ -97,7 +97,7 @@ void KivioAddPageCommand::unexecute()
     m_page->doc()->takePage( m_page );
 }
 
-KivioRemovePageCommand::KivioRemovePageCommand(const QString &_name, KivioPage *_page)
+KivioRemovePageCommand::KivioRemovePageCommand(const TQString &_name, KivioPage *_page)
     : KNamedCommand( _name ),
       m_page( _page )
 {
@@ -120,7 +120,7 @@ void KivioRemovePageCommand::unexecute()
 
 }
 
-KivioAddStencilCommand::KivioAddStencilCommand(const QString &_name, KivioPage *_page,  KivioLayer * _layer, KivioStencil *_stencil )
+KivioAddStencilCommand::KivioAddStencilCommand(const TQString &_name, KivioPage *_page,  KivioLayer * _layer, KivioStencil *_stencil )
     : KNamedCommand( _name ),
       m_page( _page ),
       m_layer( _layer),
@@ -149,13 +149,13 @@ void KivioAddStencilCommand::unexecute()
     m_page->doc()->slotSelectionChanged();
 }
 
-KivioRemoveStencilCommand::KivioRemoveStencilCommand(const QString &_name, KivioPage *_page,  KivioLayer * _layer, KivioStencil *_stencil )
+KivioRemoveStencilCommand::KivioRemoveStencilCommand(const TQString &_name, KivioPage *_page,  KivioLayer * _layer, KivioStencil *_stencil )
     : KivioAddStencilCommand(_name, _page, _layer, _stencil )
 {
 }
 
-KivioChangeStencilTextCommand::KivioChangeStencilTextCommand(const QString& _name, KivioStencil* _stencil,
-    const QString& _oldText, const QString& _newText, KivioPage* _page, const QString& textBoxName)
+KivioChangeStencilTextCommand::KivioChangeStencilTextCommand(const TQString& _name, KivioStencil* _stencil,
+    const TQString& _oldText, const TQString& _newText, KivioPage* _page, const TQString& textBoxName)
     : KNamedCommand( _name ),
       m_stencil(_stencil),
       oldText(_oldText),
@@ -192,7 +192,7 @@ void KivioChangeStencilTextCommand::unexecute()
 }
 
 
-KivioAddLayerCommand::KivioAddLayerCommand( const QString &_name, KivioPage *_page, KivioLayer * _layer, int _pos )
+KivioAddLayerCommand::KivioAddLayerCommand( const TQString &_name, KivioPage *_page, KivioLayer * _layer, int _pos )
     :KNamedCommand( _name ),
      m_page( _page ),
      m_layer( _layer),
@@ -220,12 +220,12 @@ void KivioAddLayerCommand::unexecute()
 }
 
 
-KivioRemoveLayerCommand::KivioRemoveLayerCommand( const QString &_name, KivioPage *_page, KivioLayer * _layer, int _pos )
+KivioRemoveLayerCommand::KivioRemoveLayerCommand( const TQString &_name, KivioPage *_page, KivioLayer * _layer, int _pos )
     :KivioAddLayerCommand( _name, _page, _layer, _pos )
 {
 }
 
-KivioRenameLayerCommand::KivioRenameLayerCommand( const QString &_name, KivioLayer * _layer, const QString & _oldName, const QString & _newName)
+KivioRenameLayerCommand::KivioRenameLayerCommand( const TQString &_name, KivioLayer * _layer, const TQString & _oldName, const TQString & _newName)
     :KNamedCommand( _name ),
      m_layer( _layer ),
      oldName( _oldName),
@@ -249,7 +249,7 @@ void KivioRenameLayerCommand::unexecute()
     m_layer->page()->doc()->resetLayerPanel();
 }
 
-KivioResizeStencilCommand::KivioResizeStencilCommand( const QString &_name, KivioStencil *_stencil, KoRect _initSize, KoRect _endSize, KivioPage *_page)
+KivioResizeStencilCommand::KivioResizeStencilCommand( const TQString &_name, KivioStencil *_stencil, KoRect _initSize, KoRect _endSize, KivioPage *_page)
     :KNamedCommand( _name ),
      m_stencil( _stencil),
      initSize( _initSize),
@@ -277,7 +277,7 @@ void KivioResizeStencilCommand::unexecute()
 }
 
 
-KivioMoveStencilCommand::KivioMoveStencilCommand( const QString &_name, KivioStencil *_stencil, KoRect _initSize, KoRect _endSize, KivioPage *_page)
+KivioMoveStencilCommand::KivioMoveStencilCommand( const TQString &_name, KivioStencil *_stencil, KoRect _initSize, KoRect _endSize, KivioPage *_page)
     :KNamedCommand( _name ),
      m_stencil( _stencil),
      initSize( _initSize),
@@ -304,7 +304,7 @@ void KivioMoveStencilCommand::unexecute()
     m_page->doc()->updateView(m_page);
 }
 
-KivioChangeLayoutCommand::KivioChangeLayoutCommand( const QString &_name, KivioPage *_page, KoPageLayout _oldLayout, KoPageLayout _newLayout)
+KivioChangeLayoutCommand::KivioChangeLayoutCommand( const TQString &_name, KivioPage *_page, KoPageLayout _oldLayout, KoPageLayout _newLayout)
     :KNamedCommand( _name),
      m_page(_page),
      oldLayout( _oldLayout),
@@ -326,8 +326,8 @@ void KivioChangeLayoutCommand::unexecute()
     m_page->setPaperLayout(oldLayout);
 }
 
-KivioChangeStencilHAlignmentCommand::KivioChangeStencilHAlignmentCommand(const QString& _name, KivioPage* _page,
-    KivioStencil* _stencil, int _oldAlign, int _newAlign, const QString& textBoxName)
+KivioChangeStencilHAlignmentCommand::KivioChangeStencilHAlignmentCommand(const TQString& _name, KivioPage* _page,
+    KivioStencil* _stencil, int _oldAlign, int _newAlign, const TQString& textBoxName)
     : KNamedCommand(_name),
      m_page(_page),
      m_stencil(_stencil),
@@ -365,8 +365,8 @@ void KivioChangeStencilHAlignmentCommand::unexecute()
   m_page->doc()->slotSelectionChanged();
 }
 
-KivioChangeStencilVAlignmentCommand::KivioChangeStencilVAlignmentCommand(const QString& _name, KivioPage* _page,
-    KivioStencil* _stencil, int _oldAlign, int _newAlign, const QString& textBoxName)
+KivioChangeStencilVAlignmentCommand::KivioChangeStencilVAlignmentCommand(const TQString& _name, KivioPage* _page,
+    KivioStencil* _stencil, int _oldAlign, int _newAlign, const TQString& textBoxName)
     : KNamedCommand(_name),
      m_page(_page),
      m_stencil(_stencil),
@@ -405,8 +405,8 @@ void KivioChangeStencilVAlignmentCommand::unexecute()
 }
 
 
-KivioChangeStencilFontCommand::KivioChangeStencilFontCommand(const QString& _name, KivioPage* _page,
-    KivioStencil* _stencil, const QFont& _oldFont, const QFont& _newFont, const QString& textBoxName)
+KivioChangeStencilFontCommand::KivioChangeStencilFontCommand(const TQString& _name, KivioPage* _page,
+    KivioStencil* _stencil, const TQFont& _oldFont, const TQFont& _newFont, const TQString& textBoxName)
     : KNamedCommand(_name),
      m_page(_page),
      m_stencil( _stencil),
@@ -444,8 +444,8 @@ void KivioChangeStencilFontCommand::unexecute()
   m_page->doc()->slotSelectionChanged();
 }
 
-KivioChangeStencilColorCommand::KivioChangeStencilColorCommand(const QString& _name, KivioPage* _page,
-    KivioStencil* _stencil, const QColor& _oldColor,  const QColor& _newColor, ColorType _type, const QString& textBoxName)
+KivioChangeStencilColorCommand::KivioChangeStencilColorCommand(const TQString& _name, KivioPage* _page,
+    KivioStencil* _stencil, const TQColor& _oldColor,  const TQColor& _newColor, ColorType _type, const TQString& textBoxName)
     : KNamedCommand(_name),
      m_page(_page),
      m_stencil(_stencil),
@@ -505,7 +505,7 @@ void KivioChangeStencilColorCommand::unexecute()
 }
 
 
-KivioChangeLineWidthCommand::KivioChangeLineWidthCommand( const QString &_name,
+KivioChangeLineWidthCommand::KivioChangeLineWidthCommand( const TQString &_name,
     KivioPage *_page, KivioStencil * _stencil, double _oldValue, double _newValue)
     :KNamedCommand( _name),
     m_page(_page),
@@ -533,7 +533,7 @@ void KivioChangeLineWidthCommand::unexecute()
     m_page->doc()->slotSelectionChanged();
 }
 
-KivioChangeRotationCommand::KivioChangeRotationCommand( const QString &_name,
+KivioChangeRotationCommand::KivioChangeRotationCommand( const TQString &_name,
     KivioPage *_page, KivioStencil * _stencil, int _oldValue, int _newValue)
     :KNamedCommand( _name),
     m_page(_page),
@@ -562,7 +562,7 @@ void KivioChangeRotationCommand::unexecute()
 }
 
 
-KivioChangeLineStyleCommand::KivioChangeLineStyleCommand( const QString &_name,
+KivioChangeLineStyleCommand::KivioChangeLineStyleCommand( const TQString &_name,
     KivioPage *_page, KivioStencil * _stencil, int _oldValue, int _newValue)
     :KNamedCommand( _name),
     m_page(_page),
@@ -590,7 +590,7 @@ void KivioChangeLineStyleCommand::unexecute()
     m_page->doc()->slotSelectionChanged();
 }
 
-KivioChangeBeginEndArrowCommand::KivioChangeBeginEndArrowCommand( const QString &_name, KivioPage *_page, KivioStencil * _stencil, int _oldArrow,  int _newArrow, bool _beginArrow)
+KivioChangeBeginEndArrowCommand::KivioChangeBeginEndArrowCommand( const TQString &_name, KivioPage *_page, KivioStencil * _stencil, int _oldArrow,  int _newArrow, bool _beginArrow)
     :KNamedCommand( _name),
      m_page(_page),
      m_stencil( _stencil ),
@@ -625,7 +625,7 @@ void KivioChangeBeginEndArrowCommand::unexecute()
 }
 
 
-KivioChangeBeginEndSizeArrowCommand::KivioChangeBeginEndSizeArrowCommand( const QString &_name, KivioPage *_page, KivioStencil * _stencil, float _oldH,float _oldW, float _newH,float _newW, bool _beginArrow)
+KivioChangeBeginEndSizeArrowCommand::KivioChangeBeginEndSizeArrowCommand( const TQString &_name, KivioPage *_page, KivioStencil * _stencil, float _oldH,float _oldW, float _newH,float _newW, bool _beginArrow)
     :KNamedCommand( _name),
      m_page(_page),
      m_stencil( _stencil ),
@@ -673,7 +673,7 @@ void KivioChangeBeginEndSizeArrowCommand::unexecute()
     m_page->doc()->slotSelectionChanged();
 }
 
-KivioChangeStencilProtectCommand::KivioChangeStencilProtectCommand( const QString &_name, KivioPage *_page, KivioStencil * _stencil, bool _state, KVP_TYPE _type)
+KivioChangeStencilProtectCommand::KivioChangeStencilProtectCommand( const TQString &_name, KivioPage *_page, KivioStencil * _stencil, bool _state, KVP_TYPE _type)
     :KNamedCommand( _name),
      m_page(_page),
      m_stencil( _stencil ),
@@ -722,7 +722,7 @@ void KivioChangeStencilProtectCommand::changeValue( bool b )
     m_page->doc()->updateView(m_page);
 }
 
-KivioAddConnectorTargetCommand::KivioAddConnectorTargetCommand(const QString& name, KivioPage* page,
+KivioAddConnectorTargetCommand::KivioAddConnectorTargetCommand(const TQString& name, KivioPage* page,
     KivioStencil* stencil, const KoPoint& targetPoint) : KNamedCommand(name)
 {
   m_page = page;
@@ -742,7 +742,7 @@ void KivioAddConnectorTargetCommand::unexecute()
 }
 
 
-KivioCustomDragCommand::KivioCustomDragCommand(const QString& name, KivioPage* page, KivioStencil* stencil,
+KivioCustomDragCommand::KivioCustomDragCommand(const TQString& name, KivioPage* page, KivioStencil* stencil,
                                                int customID, const KoPoint& originalPoint, const KoPoint& newPoint)
   : KNamedCommand(name)
 {
@@ -766,7 +766,7 @@ void KivioCustomDragCommand::unexecute()
 }
 
 
-KivioGroupCommand::KivioGroupCommand(const QString& name, KivioPage* page, KivioLayer* layer,
+KivioGroupCommand::KivioGroupCommand(const TQString& name, KivioPage* page, KivioLayer* layer,
                                      KivioGroupStencil* group)
   : KNamedCommand(name)
 {
@@ -777,8 +777,8 @@ KivioGroupCommand::KivioGroupCommand(const QString& name, KivioPage* page, Kivio
 
 void KivioGroupCommand::execute()
 {
-  QPtrList<KivioStencil>* list = m_groupStencil->groupList();
-  QPtrListIterator<KivioStencil> it(*list);
+  TQPtrList<KivioStencil>* list = m_groupStencil->groupList();
+  TQPtrListIterator<KivioStencil> it(*list);
   KivioStencil* stencil = 0;
 
   for(; (stencil = it.current()) != 0; ++it) {
@@ -792,8 +792,8 @@ void KivioGroupCommand::execute()
 
 void KivioGroupCommand::unexecute()
 {
-  QPtrList<KivioStencil>* list = m_groupStencil->groupList();
-  QPtrListIterator<KivioStencil> it(*list);
+  TQPtrList<KivioStencil>* list = m_groupStencil->groupList();
+  TQPtrListIterator<KivioStencil> it(*list);
   KivioStencil* stencil = 0;
 
   for(; (stencil = it.current()) != 0; ++it) {
diff --git a/kivio/kiviopart/kivio_command.h b/kivio/kiviopart/kivio_command.h
index 5a98bf2b..af08a2e3 100644
--- a/kivio/kiviopart/kivio_command.h
+++ b/kivio/kiviopart/kivio_command.h
@@ -21,9 +21,9 @@
 #define kiviocommand_h
 
 #include <kcommand.h>
-#include <qfont.h>
-#include <qcolor.h>
-#include <qvaluelist.h>
+#include <tqfont.h>
+#include <tqcolor.h>
+#include <tqvaluelist.h>
 #include <KoRect.h>
 #include <KoPageLayout.h>
 #include <koffice_export.h>
@@ -36,22 +36,22 @@ struct KoPageLayout;
 class KivioChangePageNameCommand : public KNamedCommand
 {
 public:
-    KivioChangePageNameCommand( const QString &_name,  const QString & _oldPageName, const QString & _newPageName, KivioPage *_page );
+    KivioChangePageNameCommand( const TQString &_name,  const TQString & _oldPageName, const TQString & _newPageName, KivioPage *_page );
     ~KivioChangePageNameCommand();
 
     virtual void execute();
     virtual void unexecute();
 
 protected:
-    QString oldPageName;
-    QString newPageName;
+    TQString oldPageName;
+    TQString newPageName;
     KivioPage * m_page;
 };
 
 class KivioHidePageCommand : public KNamedCommand
 {
 public:
-    KivioHidePageCommand( const QString &_name, KivioPage *_page );
+    KivioHidePageCommand( const TQString &_name, KivioPage *_page );
     ~KivioHidePageCommand();
 
     virtual void execute();
@@ -64,7 +64,7 @@ protected:
 class KivioShowPageCommand : public KivioHidePageCommand
 {
 public:
-    KivioShowPageCommand( const QString &_name, KivioPage *_page );
+    KivioShowPageCommand( const TQString &_name, KivioPage *_page );
     ~KivioShowPageCommand() {}
 
     void execute() { KivioHidePageCommand::unexecute(); }
@@ -74,7 +74,7 @@ public:
 class KivioAddPageCommand : public KNamedCommand
 {
 public:
-    KivioAddPageCommand( const QString &_name, KivioPage *_page );
+    KivioAddPageCommand( const TQString &_name, KivioPage *_page );
     ~KivioAddPageCommand();
 
     virtual void execute();
@@ -87,7 +87,7 @@ protected:
 class KivioRemovePageCommand : public KNamedCommand
 {
 public:
-    KivioRemovePageCommand( const QString &_name, KivioPage *_page );
+    KivioRemovePageCommand( const TQString &_name, KivioPage *_page );
     ~KivioRemovePageCommand();
 
     virtual void execute();
@@ -100,7 +100,7 @@ protected:
 class KivioAddStencilCommand : public KNamedCommand
 {
 public:
-    KivioAddStencilCommand( const QString &_name, KivioPage *_page,  KivioLayer * _layer, KivioStencil *_stencil  );
+    KivioAddStencilCommand( const TQString &_name, KivioPage *_page,  KivioLayer * _layer, KivioStencil *_stencil  );
     ~KivioAddStencilCommand();
 
     virtual void execute();
@@ -116,7 +116,7 @@ protected:
 class KivioRemoveStencilCommand : public KivioAddStencilCommand
 {
 public:
-    KivioRemoveStencilCommand(const QString &_name, KivioPage *_page,  KivioLayer * _layer, KivioStencil *_stencil );
+    KivioRemoveStencilCommand(const TQString &_name, KivioPage *_page,  KivioLayer * _layer, KivioStencil *_stencil );
     ~KivioRemoveStencilCommand() {}
 
     void execute() { KivioAddStencilCommand::unexecute(); }
@@ -126,22 +126,22 @@ public:
 class KIVIO_EXPORT KivioChangeStencilTextCommand : public KNamedCommand
 {
 public:
-  KivioChangeStencilTextCommand( const QString &_name, KivioStencil *_stencil, const QString & _oldText, const QString & _newText, KivioPage *_page, const QString& textBoxName = QString::null);
+  KivioChangeStencilTextCommand( const TQString &_name, KivioStencil *_stencil, const TQString & _oldText, const TQString & _newText, KivioPage *_page, const TQString& textBoxName = TQString());
     ~KivioChangeStencilTextCommand();
     virtual void execute();
     virtual void unexecute();
 protected:
     KivioStencil *m_stencil;
-    QString oldText;
-    QString newText;
+    TQString oldText;
+    TQString newText;
     KivioPage *m_page;
-    QString m_textBoxName;
+    TQString m_textBoxName;
 };
 
 class KivioAddLayerCommand : public KNamedCommand
 {
 public:
-    KivioAddLayerCommand( const QString &_name, KivioPage *_page, KivioLayer * _layer,int _pos );
+    KivioAddLayerCommand( const TQString &_name, KivioPage *_page, KivioLayer * _layer,int _pos );
     ~KivioAddLayerCommand();
 
     virtual void execute();
@@ -156,7 +156,7 @@ protected:
 class KivioRemoveLayerCommand : public KivioAddLayerCommand
 {
 public:
-    KivioRemoveLayerCommand( const QString &_name, KivioPage *_page, KivioLayer * _layer, int _pos );
+    KivioRemoveLayerCommand( const TQString &_name, KivioPage *_page, KivioLayer * _layer, int _pos );
     ~KivioRemoveLayerCommand() {}
 
     void execute() { KivioAddLayerCommand::unexecute(); }
@@ -166,22 +166,22 @@ public:
 class KivioRenameLayerCommand : public KNamedCommand
 {
 public:
-    KivioRenameLayerCommand( const QString &_name, KivioLayer * _layer, const QString & _oldName, const QString & _newName);
+    KivioRenameLayerCommand( const TQString &_name, KivioLayer * _layer, const TQString & _oldName, const TQString & _newName);
     ~KivioRenameLayerCommand();
     virtual void execute();
     virtual void unexecute();
 
 protected:
     KivioLayer *m_layer;
-    QString oldName;
-    QString newName;
+    TQString oldName;
+    TQString newName;
 
 };
 
 class KIVIO_EXPORT  KivioResizeStencilCommand : public KNamedCommand
 {
 public:
-    KivioResizeStencilCommand(const QString &_name, KivioStencil *_stencil, KoRect _initSize, KoRect _endSize, KivioPage *_page );
+    KivioResizeStencilCommand(const TQString &_name, KivioStencil *_stencil, KoRect _initSize, KoRect _endSize, KivioPage *_page );
     ~KivioResizeStencilCommand();
 
     virtual void execute();
@@ -197,7 +197,7 @@ protected:
 class KIVIO_EXPORT KivioMoveStencilCommand : public KNamedCommand
 {
 public:
-    KivioMoveStencilCommand(const QString &_name, KivioStencil *_stencil, KoRect _initSize, KoRect _endSize, KivioPage *_page );
+    KivioMoveStencilCommand(const TQString &_name, KivioStencil *_stencil, KoRect _initSize, KoRect _endSize, KivioPage *_page );
     ~KivioMoveStencilCommand();
 
     virtual void execute();
@@ -213,7 +213,7 @@ protected:
 class KivioChangeLayoutCommand : public KNamedCommand
 {
 public:
-    KivioChangeLayoutCommand(const QString &_name, KivioPage *_page, KoPageLayout _oldLayout, KoPageLayout _newLayout);
+    KivioChangeLayoutCommand(const TQString &_name, KivioPage *_page, KoPageLayout _oldLayout, KoPageLayout _newLayout);
     ~KivioChangeLayoutCommand();
 
     virtual void execute();
@@ -229,8 +229,8 @@ protected:
 class KivioChangeStencilHAlignmentCommand : public KNamedCommand
 {
   public:
-    KivioChangeStencilHAlignmentCommand(const QString& _name, KivioPage* _page, KivioStencil* _stencil,
-                                        int _oldAlign, int _newAlign, const QString& textBoxName = QString::null);
+    KivioChangeStencilHAlignmentCommand(const TQString& _name, KivioPage* _page, KivioStencil* _stencil,
+                                        int _oldAlign, int _newAlign, const TQString& textBoxName = TQString());
     ~KivioChangeStencilHAlignmentCommand();
 
     virtual void execute();
@@ -241,14 +241,14 @@ class KivioChangeStencilHAlignmentCommand : public KNamedCommand
     KivioStencil *m_stencil;
     int oldAlign;
     int newAlign;
-    QString m_textBoxName;
+    TQString m_textBoxName;
 };
 
 class KivioChangeStencilVAlignmentCommand : public KNamedCommand
 {
   public:
-    KivioChangeStencilVAlignmentCommand(const QString& _name, KivioPage* _page, KivioStencil* _stencil,
-                                        int _oldAlign, int _newAlign, const QString& textBoxName = QString::null);
+    KivioChangeStencilVAlignmentCommand(const TQString& _name, KivioPage* _page, KivioStencil* _stencil,
+                                        int _oldAlign, int _newAlign, const TQString& textBoxName = TQString());
     ~KivioChangeStencilVAlignmentCommand();
 
     virtual void execute();
@@ -259,16 +259,16 @@ class KivioChangeStencilVAlignmentCommand : public KNamedCommand
     KivioStencil *m_stencil;
     int oldAlign;
     int newAlign;
-    QString m_textBoxName;
+    TQString m_textBoxName;
 };
 
 
 class KivioChangeStencilFontCommand : public KNamedCommand
 {
   public:
-    KivioChangeStencilFontCommand(const QString& _name, KivioPage* _page, KivioStencil* _stencil,
-                                  const QFont& _oldFont,  const QFont& _newFont,
-                                  const QString& textBoxName = QString::null);
+    KivioChangeStencilFontCommand(const TQString& _name, KivioPage* _page, KivioStencil* _stencil,
+                                  const TQFont& _oldFont,  const TQFont& _newFont,
+                                  const TQString& textBoxName = TQString());
     ~KivioChangeStencilFontCommand();
 
     virtual void execute();
@@ -277,18 +277,18 @@ class KivioChangeStencilFontCommand : public KNamedCommand
   protected:
     KivioPage *m_page;
     KivioStencil *m_stencil;
-    QFont oldFont;
-    QFont newFont;
-    QString m_textBoxName;
+    TQFont oldFont;
+    TQFont newFont;
+    TQString m_textBoxName;
 };
 
 class KivioChangeStencilColorCommand : public KNamedCommand
 {
   public:
     enum ColorType { CT_TEXTCOLOR, CT_FGCOLOR, CT_BGCOLOR };
-    KivioChangeStencilColorCommand(const QString& _name, KivioPage* _page, KivioStencil*  _stencil,
-                                   const QColor& _oldColor,  const QColor& _newColor, ColorType _type,
-                                   const QString& textBoxName = QString::null);
+    KivioChangeStencilColorCommand(const TQString& _name, KivioPage* _page, KivioStencil*  _stencil,
+                                   const TQColor& _oldColor,  const TQColor& _newColor, ColorType _type,
+                                   const TQString& textBoxName = TQString());
     ~KivioChangeStencilColorCommand();
 
     virtual void execute();
@@ -297,16 +297,16 @@ class KivioChangeStencilColorCommand : public KNamedCommand
   protected:
     KivioPage *m_page;
     KivioStencil *m_stencil;
-    QColor oldColor;
-    QColor newColor;
+    TQColor oldColor;
+    TQColor newColor;
     ColorType type;
-    QString m_textBoxName;
+    TQString m_textBoxName;
 };
 
 class KivioChangeRotationCommand : public KNamedCommand
 {
 public:
-    KivioChangeRotationCommand( const QString &_name, KivioPage *_page, KivioStencil * _stencil, int _oldValue,  int _newValue);
+    KivioChangeRotationCommand( const TQString &_name, KivioPage *_page, KivioStencil * _stencil, int _oldValue,  int _newValue);
     ~KivioChangeRotationCommand();
 
     virtual void execute();
@@ -322,7 +322,7 @@ protected:
 class KivioChangeLineStyleCommand : public KNamedCommand
 {
 public:
-    KivioChangeLineStyleCommand( const QString &_name, KivioPage *_page, KivioStencil * _stencil, int _oldValue,  int _newValue);
+    KivioChangeLineStyleCommand( const TQString &_name, KivioPage *_page, KivioStencil * _stencil, int _oldValue,  int _newValue);
     ~KivioChangeLineStyleCommand();
 
     virtual void execute();
@@ -339,7 +339,7 @@ protected:
 class KivioChangeLineWidthCommand : public KNamedCommand
 {
 public:
-    KivioChangeLineWidthCommand( const QString &_name, KivioPage *_page, KivioStencil * _stencil, double _oldValue,  double _newValue);
+    KivioChangeLineWidthCommand( const TQString &_name, KivioPage *_page, KivioStencil * _stencil, double _oldValue,  double _newValue);
     ~KivioChangeLineWidthCommand();
 
     virtual void execute();
@@ -355,7 +355,7 @@ protected:
 class KivioChangeBeginEndArrowCommand : public KNamedCommand
 {
 public:
-    KivioChangeBeginEndArrowCommand( const QString &_name, KivioPage *_page, KivioStencil * _stencil, int _oldArrow,  int _newArrow, bool _beginArrow);
+    KivioChangeBeginEndArrowCommand( const TQString &_name, KivioPage *_page, KivioStencil * _stencil, int _oldArrow,  int _newArrow, bool _beginArrow);
 
     ~KivioChangeBeginEndArrowCommand();
 
@@ -373,7 +373,7 @@ protected:
 class KivioChangeBeginEndSizeArrowCommand : public KNamedCommand
 {
 public:
-    KivioChangeBeginEndSizeArrowCommand( const QString &_name, KivioPage *_page, KivioStencil * _stencil, float _oldH,float _oldW, float _newH,float _newW, bool _beginArrow);
+    KivioChangeBeginEndSizeArrowCommand( const TQString &_name, KivioPage *_page, KivioStencil * _stencil, float _oldH,float _oldW, float _newH,float _newW, bool _beginArrow);
 
     ~KivioChangeBeginEndSizeArrowCommand();
 
@@ -395,7 +395,7 @@ class KivioChangeStencilProtectCommand : public KNamedCommand
 {
 public:
     enum KVP_TYPE {KV_POSX, KV_POSY,KV_WIDTH, KV_HEIGHT, KV_ASPECT, KV_DELETE};
-    KivioChangeStencilProtectCommand( const QString &_name, KivioPage *_page, KivioStencil * _stencil, bool _state, KVP_TYPE _type);
+    KivioChangeStencilProtectCommand( const TQString &_name, KivioPage *_page, KivioStencil * _stencil, bool _state, KVP_TYPE _type);
 
     ~KivioChangeStencilProtectCommand(){};
 
@@ -413,7 +413,7 @@ protected:
 class KivioAddConnectorTargetCommand : public KNamedCommand
 {
   public:
-    KivioAddConnectorTargetCommand(const QString& name, KivioPage* page,
+    KivioAddConnectorTargetCommand(const TQString& name, KivioPage* page,
                                    KivioStencil* stencil, const KoPoint& targetPoint);
 
     virtual void execute();
@@ -428,7 +428,7 @@ class KivioAddConnectorTargetCommand : public KNamedCommand
 class KivioCustomDragCommand : public KNamedCommand
 {
   public:
-    KivioCustomDragCommand(const QString& name, KivioPage* page, KivioStencil* stencil,
+    KivioCustomDragCommand(const TQString& name, KivioPage* page, KivioStencil* stencil,
                            int customID, const KoPoint& originalPoint, const KoPoint& newPoint);
 
     virtual void execute();
@@ -446,7 +446,7 @@ class KivioCustomDragCommand : public KNamedCommand
 class KivioGroupCommand : public KNamedCommand
 {
   public:
-    KivioGroupCommand(const QString& name, KivioPage* page, KivioLayer* layer, KivioGroupStencil* group);
+    KivioGroupCommand(const TQString& name, KivioPage* page, KivioLayer* layer, KivioGroupStencil* group);
 
     virtual void execute();
     virtual void unexecute();
@@ -461,7 +461,7 @@ class KivioGroupCommand : public KNamedCommand
 class KivioUnGroupCommand : public KivioGroupCommand
 {
   public:
-    KivioUnGroupCommand(const QString& name, KivioPage* page, KivioLayer* layer, KivioGroupStencil* group)
+    KivioUnGroupCommand(const TQString& name, KivioPage* page, KivioLayer* layer, KivioGroupStencil* group)
       : KivioGroupCommand(name, page, layer, group)
     {}
 
diff --git a/kivio/kiviopart/kivio_dlg_pageshow.cpp b/kivio/kiviopart/kivio_dlg_pageshow.cpp
index 73f075b0..5c9addb6 100644
--- a/kivio/kiviopart/kivio_dlg_pageshow.cpp
+++ b/kivio/kiviopart/kivio_dlg_pageshow.cpp
@@ -25,47 +25,47 @@
 #include "kivio_map.h"
 #include <kapplication.h>
 #include <klocale.h>
-#include <qstringlist.h>
-#include <qlayout.h>
+#include <tqstringlist.h>
+#include <tqlayout.h>
 #include <kbuttonbox.h>
-#include <qstrlist.h>
-#include <qptrlist.h>
+#include <tqstrlist.h>
+#include <tqptrlist.h>
 #include <kdebug.h>
 #include <KoTabBar.h>
 
-KivioPageShow::KivioPageShow( KivioView* parent, const char* name )
-: KDialogBase( parent, name, true, i18n("Show Page"), Ok|Cancel, Ok )
+KivioPageShow::KivioPageShow( KivioView* tqparent, const char* name )
+: KDialogBase( tqparent, name, true, i18n("Show Page"), Ok|Cancel, Ok )
 {
-  m_pView = parent;
+  m_pView = tqparent;
 
-  QWidget* view = new QWidget(this);
+  TQWidget* view = new TQWidget(this);
   setMainWidget(view);
 
-  QVBoxLayout *lay1 = new QVBoxLayout( view );
+  TQVBoxLayout *lay1 = new TQVBoxLayout( view );
   lay1->setMargin( KDialog::marginHint() );
   lay1->setSpacing( KDialog::spacingHint() );
 
-  QLabel *label = new QLabel( i18n("Select hidden page to show:"), view );
+  TQLabel *label = new TQLabel( i18n("Select hidden page to show:"), view );
   lay1->addWidget( label );
 
-  list = new QListBox(view);
+  list = new TQListBox(view);
   lay1->addWidget( list );
 
-  QStringList tabsList = m_pView->doc()->map()->hiddenPages();
+  TQStringList tabsList = m_pView->doc()->map()->hiddenPages();
   list->insertStringList(tabsList);
 
-  connect( list, SIGNAL(doubleClicked(QListBoxItem *)), this, SLOT(slotDoubleClicked(QListBoxItem *)));
+  connect( list, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), this, TQT_SLOT(slotDoubleClicked(TQListBoxItem *)));
   resize( 200, 150 );
 }
 
-void KivioPageShow::slotDoubleClicked(QListBoxItem *)
+void KivioPageShow::slotDoubleClicked(TQListBoxItem *)
 {
   slotOk();
 }
 
 void KivioPageShow::slotOk()
 {
-  QString text;
+  TQString text;
   if (list->currentItem()!=-1) {
     text=list->text(list->currentItem());
     //m_pView->tabBar()->showPage(text);
diff --git a/kivio/kiviopart/kivio_dlg_pageshow.h b/kivio/kiviopart/kivio_dlg_pageshow.h
index 6820dfe3..496f4f43 100644
--- a/kivio/kiviopart/kivio_dlg_pageshow.h
+++ b/kivio/kiviopart/kivio_dlg_pageshow.h
@@ -19,10 +19,10 @@
 #ifndef __kivio_dlg_pageshow__
 #define __kivio_dlg_pageshow__
 
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qlistbox.h>
-#include <qlabel.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqlistbox.h>
+#include <tqlabel.h>
 
 #include <kdialogbase.h>
 
@@ -30,16 +30,17 @@ class KivioView;
 
 class KivioPageShow: public KDialogBase
 { Q_OBJECT
+  TQ_OBJECT
 public:
-  KivioPageShow( KivioView* parent, const char* name );
+  KivioPageShow( KivioView* tqparent, const char* name );
 
 public slots:
   void slotOk();
-  void slotDoubleClicked(QListBoxItem *);
+  void slotDoubleClicked(TQListBoxItem *);
 
 protected:
   KivioView* m_pView;
-  QListBox * list;
+  TQListBox * list;
 };
 
 #endif
diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp
index aa7724d1..cf0327ab 100644
--- a/kivio/kiviopart/kivio_doc.cpp
+++ b/kivio/kiviopart/kivio_doc.cpp
@@ -16,11 +16,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#include <qdom.h>
-#include <qtextstream.h>
-#include <qbuffer.h>
-#include <qtabwidget.h>
-#include <qpaintdevicemetrics.h>
+#include <tqdom.h>
+#include <tqtextstream.h>
+#include <tqbuffer.h>
+#include <tqtabwidget.h>
+#include <tqpaintdevicemetrics.h>
 
 #include "kivio_doc.h"
 #include "kivio_page.h"
@@ -51,20 +51,20 @@
 #include <kurl.h>
 #include <kapplication.h>
 #include <assert.h>
-#include <qdatetime.h>
+#include <tqdatetime.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <pwd.h>
-#include <qdir.h>
-#include <qfileinfo.h>
-#include <qfile.h>
-#include <qpixmap.h>
+#include <tqdir.h>
+#include <tqfileinfo.h>
+#include <tqfile.h>
+#include <tqpixmap.h>
 
-#include <qpainter.h>
-#include <qpen.h>
-#include <qfont.h>
-#include <qvaluelist.h>
+#include <tqpainter.h>
+#include <tqpen.h>
+#include <tqfont.h>
+#include <tqvaluelist.h>
 
 
 #include <kstandarddirs.h>
@@ -96,19 +96,19 @@
  *
  *****************************************************************************/
 
-QPtrList<KivioDoc>* KivioDoc::s_docs = 0;
+TQPtrList<KivioDoc>* KivioDoc::s_docs = 0;
 int KivioDoc::s_docId = 0;
 
-KivioDoc::KivioDoc( QWidget *parentWidget, const char* widgetName, QObject* parent, const char* name, bool singleViewMode )
-: KoDocument( parentWidget, widgetName, parent, name, singleViewMode )
+KivioDoc::KivioDoc( TQWidget *tqparentWidget, const char* widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
+: KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode )
 {
   dcop = 0;
   if (!s_docs)
-    s_docs = new QPtrList<KivioDoc>;
+    s_docs = new TQPtrList<KivioDoc>;
 
   s_docs->append(this);
 
-  m_pLstSpawnerSets = new QPtrList<KivioStencilSpawnerSet>;
+  m_pLstSpawnerSets = new TQPtrList<KivioStencilSpawnerSet>;
   m_pLstSpawnerSets->setAutoDelete(true);
   m_loadTimer = 0;
   m_currentFile = 0;
@@ -118,8 +118,8 @@ KivioDoc::KivioDoc( QWidget *parentWidget, const char* widgetName, QObject* pare
 
   if ( !name )
   {
-    QString tmp( "Document%1" );	//lukas: FIXME
-    tmp = tmp.arg( s_docId++ );
+    TQString tmp( "Document%1" );	//lukas: FIXME
+    tmp = tmp.tqarg( s_docId++ );
     setName( tmp.latin1() );
   }
 
@@ -130,9 +130,9 @@ KivioDoc::KivioDoc( QWidget *parentWidget, const char* widgetName, QObject* pare
   // Load autoLoadStencils in internal StencilSpawnerSet
   m_pInternalSet = new KivioStencilSpawnerSet("Kivio_Internal");
   m_pInternalSet->setId("Kivio - Internal - Do Not Touch");
-  QStringList list = instance()->dirs()->findAllResources("data",instance()->instanceName()+"/autoloadStencils/*",true,false);
-  QStringList::ConstIterator pIt = list.begin();
-  QStringList::ConstIterator pEnd = list.end();
+  TQStringList list = instance()->dirs()->findAllResources("data",instance()->instanceName()+"/autoloadStencils/*",true,false);
+  TQStringList::ConstIterator pIt = list.begin();
+  TQStringList::ConstIterator pEnd = list.end();
 
   for (; pIt != pEnd; ++pIt )
   {
@@ -146,8 +146,8 @@ KivioDoc::KivioDoc( QWidget *parentWidget, const char* widgetName, QObject* pare
 
   //laurent: Why don't use menu history for undo/redo command ? sync with other koffice application
   m_commandHistory = new KoCommandHistory( actionCollection(),  /*false*/true  ) ;
-  connect( m_commandHistory, SIGNAL( documentRestored() ), this, SLOT( slotDocumentRestored() ) );
-  connect( m_commandHistory, SIGNAL( commandExecuted() ), this, SLOT( slotCommandExecuted() ) );
+  connect( m_commandHistory, TQT_SIGNAL( documentRestored() ), this, TQT_SLOT( slotDocumentRestored() ) );
+  connect( m_commandHistory, TQT_SIGNAL( commandExecuted() ), this, TQT_SLOT( slotCommandExecuted() ) );
 
 
   if ( name )
@@ -163,16 +163,16 @@ DCOPObject* KivioDoc::dcopObject()
   return dcop;
 }
 
-QPtrList<KivioDoc>& KivioDoc::documents()
+TQPtrList<KivioDoc>& KivioDoc::documents()
 {
   if ( s_docs == 0 ) {
-    s_docs = new QPtrList<KivioDoc>;
+    s_docs = new TQPtrList<KivioDoc>;
   }
 
   return *s_docs;
 }
 
-bool KivioDoc::initDoc(InitDocFlags flags, QWidget* parentWidget)
+bool KivioDoc::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
 {
   KivioPage *t = createPage();
   m_pMap->addPage( t );
@@ -184,7 +184,7 @@ bool KivioDoc::initDoc(InitDocFlags flags, QWidget* parentWidget)
     return true;
   }
 
-  QString f;
+  TQString f;
   KoTemplateChooseDia::ReturnType ret;
   KoTemplateChooseDia::DialogType dlgtype;
 
@@ -196,7 +196,7 @@ bool KivioDoc::initDoc(InitDocFlags flags, QWidget* parentWidget)
   }
 
   ret = KoTemplateChooseDia::choose( KivioFactory::global(), f,
-                                     dlgtype, "kivio_template", parentWidget );
+                                     dlgtype, "kivio_template", tqparentWidget );
 
   if( ret == KoTemplateChooseDia::File ) {
     KURL url(f);
@@ -204,8 +204,8 @@ bool KivioDoc::initDoc(InitDocFlags flags, QWidget* parentWidget)
     m_docOpened = ok; // Used to for a hack that make kivio not crash if you cancel startup dialog.
     return ok;
   } else if ( ret == KoTemplateChooseDia::Template ) {
-    QFileInfo fileInfo( f );
-    QString fileName( fileInfo.dirPath(true) + "/" + fileInfo.baseName() + ".kft" );
+    TQFileInfo fileInfo( f );
+    TQString fileName( fileInfo.dirPath(true) + "/" + fileInfo.baseName() + ".kft" );
     resetURL();
     bool ok = loadNativeFormat( fileName );
     if ( !ok )
@@ -222,7 +222,7 @@ bool KivioDoc::initDoc(InitDocFlags flags, QWidget* parentWidget)
   }
 }
 
-void KivioDoc::openExistingFile( const QString& file )
+void KivioDoc::openExistingFile( const TQString& file )
 {
   KivioPage* t = createPage();
   m_pMap->addPage(t);
@@ -230,7 +230,7 @@ void KivioDoc::openExistingFile( const QString& file )
   KoDocument::openExistingFile(file);
 }
 
-void KivioDoc::openTemplate( const QString& file )
+void KivioDoc::openTemplate( const TQString& file )
 {
   KivioPage* t = createPage();
   m_pMap->addPage(t);
@@ -245,27 +245,27 @@ void KivioDoc::initEmpty()
   KoDocument::initEmpty();
 }
 
-KoView* KivioDoc::createViewInstance( QWidget* parent, const char* name )
+KoView* KivioDoc::createViewInstance( TQWidget* tqparent, const char* name )
 {
   if (!name) {
     name = "View";
   }
 
-  return new KivioView( parent, name, this );
+  return new KivioView( tqparent, name, this );
 }
 
-QDomDocument KivioDoc::saveXML()
+TQDomDocument KivioDoc::saveXML()
 {
-  QDomDocument doc( "kiviodoc" );
+  TQDomDocument doc( "kiviodoc" );
   doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
-  QDomElement kivio = doc.createElement( "kiviosheet" );
+  TQDomElement kivio = doc.createElement( "kiviosheet" );
   kivio.setAttribute( "editor", "Kivio" );
   kivio.setAttribute( "mime", MIME_TYPE );
 
   kivio.setAttribute( "units", unitName() );
   gridData.save(kivio,"grid");
 
-  QDomElement viewItemsElement = doc.createElement("ViewItems");
+  TQDomElement viewItemsElement = doc.createElement("ViewItems");
   kivio.appendChild(viewItemsElement);
 
   doc.appendChild(kivio);
@@ -292,7 +292,7 @@ QDomDocument KivioDoc::saveXML()
   }
 
 
-  QDomElement e = m_pMap->save(doc);
+  TQDomElement e = m_pMap->save(doc);
   kivio.appendChild(e);
 
   setModified(false);
@@ -305,9 +305,9 @@ bool KivioDoc::saveOasis(KoStore* store, KoXmlWriter* manifestWriter)
     KoGenStyles styles;
 
     KoGenStyle pageLayout = Kivio::Config::defaultPageLayout().saveOasis();
-    QString layoutName = styles.lookup(pageLayout, "PL");
+    TQString tqlayoutName = styles.lookup(pageLayout, "PL");
     KoGenStyle masterPage(KoGenStyle::STYLE_MASTER);
-    masterPage.addAttribute("style:page-layout-name", layoutName);
+    masterPage.addAttribute("style:page-tqlayout-name", tqlayoutName);
     styles.lookup(masterPage, "Standard", false);
 
     if(!store->open("content.xml")) {
@@ -341,11 +341,11 @@ bool KivioDoc::saveOasis(KoStore* store, KoXmlWriter* manifestWriter)
 
     styleWriter->startElement("office:automatic-styles");
 
-    QValueList<KoGenStyles::NamedStyle> styleList = styles.styles(KoGenStyle::STYLE_PAGELAYOUT);
-    QValueList<KoGenStyles::NamedStyle>::const_iterator it = styleList.begin();
+    TQValueList<KoGenStyles::NamedStyle> styleList = styles.styles(KoGenStyle::STYLE_PAGELAYOUT);
+    TQValueList<KoGenStyles::NamedStyle>::const_iterator it = styleList.begin();
 
     for ( ; it != styleList.end(); ++it) {
-        (*it).style->writeStyle(styleWriter, styles, "style:page-layout", (*it).name, "style:page-layout-properties");
+        (*it).style->writeStyle(styleWriter, styles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties");
     }
 
     styleList = styles.styles(Kivio::STYLE_PAGE);
@@ -411,13 +411,13 @@ void KivioDoc::saveOasisSettings( KoXmlWriter &/*settingsWriter*/ )
     //todo
 }
 
-bool KivioDoc::loadOasis( const QDomDocument& doc, KoOasisStyles& oasisStyles, const QDomDocument& settings, KoStore* )
+bool KivioDoc::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles, const TQDomDocument& settings, KoStore* )
 {
   kdDebug(43000) << "Start loading OASIS document..." << endl;
   m_bLoading = true;
 
-  QDomElement contents = doc.documentElement();
-  QDomElement body(KoDom::namedItemNS( contents, KoXmlNS::office, "body"));
+  TQDomElement contents = doc.documentElement();
+  TQDomElement body(KoDom::namedItemNS( contents, KoXmlNS::office, "body"));
 
   if(body.isNull()) {
     kdDebug(43000) << "No office:body found!" << endl;
@@ -435,8 +435,8 @@ bool KivioDoc::loadOasis( const QDomDocument& doc, KoOasisStyles& oasisStyles, c
     return false;
   }
 
-  QDomNode node = body.firstChild();
-  QString localName;
+  TQDomNode node = body.firstChild();
+  TQString localName;
   m_pMap->clear();
 
   // TODO: port to forEachElement
@@ -463,7 +463,7 @@ bool KivioDoc::loadOasis( const QDomDocument& doc, KoOasisStyles& oasisStyles, c
 }
 
 
-void KivioDoc::loadOasisSettings( const QDomDocument&settingsDoc )
+void KivioDoc::loadOasisSettings( const TQDomDocument&settingsDoc )
 {
     if ( settingsDoc.isNull() )
         return ; //not a error some file doesn't have settings.xml
@@ -476,7 +476,7 @@ void KivioDoc::loadOasisSettings( const QDomDocument&settingsDoc )
     }
 }
 
-bool KivioDoc::loadXML( QIODevice *, const QDomDocument& doc )
+bool KivioDoc::loadXML( TQIODevice *, const TQDomDocument& doc )
 {
   m_bLoading = true;
 
@@ -485,7 +485,7 @@ bool KivioDoc::loadXML( QIODevice *, const QDomDocument& doc )
     return false;
   }
 
-  QDomElement kivio = doc.documentElement();
+  TQDomElement kivio = doc.documentElement();
   if ( kivio.attribute( "mime" ) != "application/x-kivio" &&
     kivio.attribute( "mime" ) != "application/vnd.kde.kivio" )
   {
@@ -494,10 +494,10 @@ bool KivioDoc::loadXML( QIODevice *, const QDomDocument& doc )
     return false;
   }
 
-  QDomNode node = kivio.firstChild();
+  TQDomNode node = kivio.firstChild();
   while( !node.isNull() )
   {
-    QString name = node.nodeName();
+    TQString name = node.nodeName();
     if( name == "KivioMap" )
     {
         if( !m_pMap->loadXML( node.toElement() ) )
@@ -508,7 +508,7 @@ bool KivioDoc::loadXML( QIODevice *, const QDomDocument& doc )
     }
     else if( name == "KivioStencilSpawnerSet" )
     {
-        QString id = XmlReadString( node.toElement(), "id", "" );
+        TQString id = XmlReadString( node.toElement(), "id", "" );
         bool hidden = (XmlReadString(node.toElement(), "hidden", "false") == "true");
 
         if( id.isEmpty() )
@@ -532,7 +532,7 @@ bool KivioDoc::loadXML( QIODevice *, const QDomDocument& doc )
     node = node.nextSibling();
   }
 
-  QString us = kivio.attribute("units", Kivio::Config::unit());
+  TQString us = kivio.attribute("units", Kivio::Config::unit());
   bool isInt = false;
   int u = us.toInt(&isInt);
 
@@ -550,26 +550,26 @@ bool KivioDoc::loadXML( QIODevice *, const QDomDocument& doc )
   return true;
 }
 
-bool KivioDoc::loadStencilSpawnerSet(const QString &id, bool hidden)
+bool KivioDoc::loadStencilSpawnerSet(const TQString &id, bool hidden)
 {
   KStandardDirs *dirs = KGlobal::dirs();
-  QStringList dirList = dirs->findDirs("data", "kivio/stencils");
-  QString rootDir;
+  TQStringList dirList = dirs->findDirs("data", "kivio/stencils");
+  TQString rootDir;
 
   // Iterate through all data directories
-  for( QStringList::Iterator it = dirList.begin(); it != dirList.end(); ++it )
+  for( TQStringList::Iterator it = dirList.begin(); it != dirList.end(); ++it )
   {
     rootDir = (*it);
 
     // Within each data directory, iterate through all directories looking
     // for a filename (dir) that matches the parameter
-    QDir d(rootDir);
-    d.setFilter( QDir::Dirs );
-    d.setSorting( QDir::Name );
+    TQDir d(rootDir);
+    d.setFilter( TQDir::Dirs );
+    d.setSorting( TQDir::Name );
 
-    const QFileInfoList *list = d.entryInfoList();
-    QFileInfoListIterator listIT( *list );
-    QFileInfo *fi;
+    const TQFileInfoList *list = d.entryInfoList();
+    TQFileInfoListIterator listIT( *list );
+    TQFileInfo *fi;
 
     // Loop through the outer directories (like BasicFlowcharting)
     while( (fi=listIT.current()) )
@@ -577,13 +577,13 @@ bool KivioDoc::loadStencilSpawnerSet(const QString &id, bool hidden)
       if( fi->fileName() != "." &&
           fi->fileName() != ".." )
       {
-        QDir innerD(fi->absFilePath() );
-        innerD.setFilter( QDir::Dirs );
-        innerD.setSorting( QDir::Name );
+        TQDir innerD(fi->absFilePath() );
+        innerD.setFilter( TQDir::Dirs );
+        innerD.setSorting( TQDir::Name );
 
-        const QFileInfoList *innerList = innerD.entryInfoList();
-        QFileInfoListIterator innerIT( *innerList );
-        QFileInfo *innerFI;
+        const TQFileInfoList *innerList = innerD.entryInfoList();
+        TQFileInfoListIterator innerIT( *innerList );
+        TQFileInfo *innerFI;
 
         // Loop through the inner directories (like FlowChartingShapes1)
         while( (innerFI = innerIT.current()) )
@@ -592,7 +592,7 @@ bool KivioDoc::loadStencilSpawnerSet(const QString &id, bool hidden)
               innerFI->fileName() != "." )
           {
             // Compare the descriptions
-            QString foundId;
+            TQString foundId;
 
             // TODO: use ID system here for loading
             foundId = KivioStencilSpawnerSet::readId(innerFI->absFilePath());
@@ -626,8 +626,8 @@ bool KivioDoc::completeLoading( KoStore* )
 
 KivioPage* KivioDoc::createPage()
 {
-  QString s( i18n("Page%1") );
-  s = s.arg( m_iPageId++ );
+  TQString s( i18n("Page%1") );
+  s = s.tqarg( m_iPageId++ );
 
   KivioPage* t = new KivioPage(m_pMap, s);
   t->setPageName(s,true);
@@ -644,20 +644,20 @@ void KivioDoc::addPage( KivioPage* page )
 
 void KivioDoc::insertPage( KivioPage * page )
 {
-    QPtrListIterator<KoView> it( views() );
+    TQPtrListIterator<KoView> it( views() );
     for (; it.current(); ++it )
 	((KivioView*)it.current())->insertPage( page );
 }
 
 void KivioDoc::takePage( KivioPage * page )
 {
-    QPtrListIterator<KoView> it( views() );
+    TQPtrListIterator<KoView> it( views() );
     for (; it.current(); ++it )
 	((KivioView*)it.current())->removePage( page );
 }
 
 
-void KivioDoc::paintContent( QPainter& painter, const QRect& rect, bool transparent, double /*zoomX*/, double /*zoomY*/ )
+void KivioDoc::paintContent( TQPainter& painter, const TQRect& rect, bool transparent, double /*zoomX*/, double /*zoomY*/ )
 {
   KivioPage* page = m_pMap->firstPage();
   if ( !page )
@@ -670,18 +670,18 @@ void KivioDoc::paintContent( QPainter& painter, const QRect& rect, bool transpar
 
   float zw = (float) rect.width() / (float)zoom.zoomItX(r.width());
   float zh = (float) rect.height() / (float)zoom.zoomItY(r.height());
-  float z = QMIN(zw, zh);
+  float z = TQMIN(zw, zh);
   //kdDebug(43000) << "paintContent: w = " << rect.width() << " h = " << rect.height() << endl;
 
-  zoom.setZoomAndResolution(qRound(z * 100), KoGlobal::dpiX(),
+  zoom.setZoomAndResolution(tqRound(z * 100), KoGlobal::dpiX(),
     KoGlobal::dpiY());
   KivioScreenPainter ksp(&painter);
   ksp.painter()->translate( - zoom.zoomItX(r.x()), - zoom.zoomItY(r.y()) );
-  paintContent(ksp,rect,transparent,page, QPoint(zoom.zoomItX(r.x()), zoom.zoomItY(r.y())), &zoom, false, false);
-  ksp.setPainter(0L); // Important! Don't delete the QPainter!!!
+  paintContent(ksp,rect,transparent,page, TQPoint(zoom.zoomItX(r.x()), zoom.zoomItY(r.y())), &zoom, false, false);
+  ksp.setPainter(0L); // Important! Don't delete the TQPainter!!!
 }
 
-void KivioDoc::paintContent( KivioPainter& painter, const QRect& rect, bool transparent, KivioPage* page, QPoint p0, KoZoomHandler* zoom, bool drawConnectorTargets, bool drawSelection )
+void KivioDoc::paintContent( KivioPainter& painter, const TQRect& rect, bool transparent, KivioPage* page, TQPoint p0, KoZoomHandler* zoom, bool drawConnectorTargets, bool drawSelection )
 {
   if ( isLoading() )
     return;
@@ -692,7 +692,7 @@ void KivioDoc::paintContent( KivioPainter& painter, const QRect& rect, bool tran
 void KivioDoc::printContent( KPrinter &prn )
 {
   KivioScreenPainter p;
-  QValueList<int> pages = prn.pageList();
+  TQValueList<int> pages = prn.pageList();
   KivioPage *pPage;
 
   // ### HACK: disable zooming-when-printing if embedded parts are used.
@@ -704,11 +704,11 @@ void KivioDoc::printContent( KPrinter &prn )
 
   p.start(&prn);
 
-  QPaintDeviceMetrics metrics( &prn );
+  TQPaintDeviceMetrics metrics( &prn );
   p.painter()->scale( (double)metrics.logicalDpiX() / (double)dpiX,
     (double)metrics.logicalDpiY() / (double)dpiY );
 
-  QValueList<int>::iterator it;
+  TQValueList<int>::iterator it;
 
   for(it = pages.begin(); it != pages.end(); ++it) {
     pPage = m_pMap->pageList().at((*it)-1);
@@ -723,7 +723,7 @@ void KivioDoc::printContent( KPrinter &prn )
 }
 
 // TODO: Fix for id system
-KivioStencilSpawnerSet* KivioDoc::findSpawnerSet(const QString& dirName, const QString& id)
+KivioStencilSpawnerSet* KivioDoc::findSpawnerSet(const TQString& dirName, const TQString& id)
 {
     KivioStencilSpawnerSet *pSet = m_pLstSpawnerSets->first();
     while(pSet)
@@ -739,9 +739,9 @@ KivioStencilSpawnerSet* KivioDoc::findSpawnerSet(const QString& dirName, const Q
     return 0;
 }
 
-void KivioDoc::addSpawnerSet( const QString &dirName )
+void KivioDoc::addSpawnerSet( const TQString &dirName )
 {
-  QString id = KivioStencilSpawnerSet::readId( dirName );
+  TQString id = KivioStencilSpawnerSet::readId( dirName );
   KivioStencilSpawnerSet* set = findSpawnerSet(dirName, id);
 
   if(set)
@@ -769,8 +769,8 @@ void KivioDoc::addSpawnerSet( const QString &dirName )
   m_stencilSetLoadQueue.append(set);
 
   if(!m_loadTimer) {
-    m_loadTimer = new QTimer(this);
-    connect(m_loadTimer, SIGNAL(timeout()), this, SLOT(loadStencil()));
+    m_loadTimer = new TQTimer(this);
+    connect(m_loadTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(loadStencil()));
   }
 
   if(!m_loadTimer->isActive()) {
@@ -779,7 +779,7 @@ void KivioDoc::addSpawnerSet( const QString &dirName )
   }
 }
 
-void KivioDoc::addSpawnerSetDuringLoad(const QString& dirName, bool hidden)
+void KivioDoc::addSpawnerSetDuringLoad(const TQString& dirName, bool hidden)
 {
   KivioStencilSpawnerSet *set;
 
@@ -793,11 +793,11 @@ void KivioDoc::addSpawnerSetDuringLoad(const QString& dirName, bool hidden)
     return;
   }
 
-  QStringList::iterator it;
-  QStringList files = set->files();
+  TQStringList::iterator it;
+  TQStringList files = set->files();
 
   for(it = files.begin(); it != files.end(); ++it) {
-    QString fileName = set->dir() + "/" + (*it);
+    TQString fileName = set->dir() + "/" + (*it);
     set->loadFile(fileName);
   }
 
@@ -845,7 +845,7 @@ bool KivioDoc::removeSpawnerSet( KivioStencilSpawnerSet *pSet )
  * Iterates through all spawner objects in the stencil set checking if
  * they exist in any of the pages.
  */
-void KivioDoc::slotDeleteStencilSet( DragBarButton *pBtn, QWidget *w, KivioStackBar *pBar )
+void KivioDoc::slotDeleteStencilSet( DragBarButton *pBtn, TQWidget *w, KivioStackBar *pBar )
 {
   KivioIconView* pIconView = static_cast<KivioIconView*>(w);
   KivioStencilSpawnerSet* pSet = pIconView->spawnerSet();
@@ -922,30 +922,30 @@ void KivioDoc::slotSelectionChanged()
     emit sig_selectionChanged();
 }
 
-KivioStencilSpawner* KivioDoc::findStencilSpawner( const QString& setId, const QString& stencilId )
+KivioStencilSpawner* KivioDoc::findStencilSpawner( const TQString& setId, const TQString& stencilId )
 {
     KivioStencilSpawnerSet *pSpawnerSet = m_pLstSpawnerSets->first();
     while( pSpawnerSet )
     {
-        if( pSpawnerSet->id() == setId && pSpawnerSet->find(stencilId) )
+        if( pSpawnerSet->id() == setId && pSpawnerSet->tqfind(stencilId) )
         {
-            return pSpawnerSet->find(stencilId);
-	    // return pSpawnerSet->find(name)
+            return pSpawnerSet->tqfind(stencilId);
+	    // return pSpawnerSet->tqfind(name)
         }
         pSpawnerSet = m_pLstSpawnerSets->next();
     }
 
-    if( m_pInternalSet->id() == setId && m_pInternalSet->find(stencilId) )
+    if( m_pInternalSet->id() == setId && m_pInternalSet->tqfind(stencilId) )
     {
-        return m_pInternalSet->find(stencilId);
+        return m_pInternalSet->tqfind(stencilId);
     }
 
     return NULL;
 }
 
-KivioStencilSpawner* KivioDoc::findInternalStencilSpawner( const QString& stencilId )
+KivioStencilSpawner* KivioDoc::findInternalStencilSpawner( const TQString& stencilId )
 {
-    return m_pInternalSet->find(stencilId);
+    return m_pInternalSet->tqfind(stencilId);
 }
 
 void KivioDoc::addInternalStencilSpawner(KivioStencilSpawner* spawner)
@@ -960,14 +960,14 @@ void KivioDoc::updateView(KivioPage* page)
 
 void KivioDoc::updateButton()
 {
-    QPtrListIterator<KoView> it( views() );
+    TQPtrListIterator<KoView> it( views() );
     for (; it.current(); ++it )
 	((KivioView*)it.current())->updateButton();
 }
 
 void KivioDoc::resetLayerPanel()
 {
-    QPtrListIterator<KoView> it( views() );
+    TQPtrListIterator<KoView> it( views() );
     for (; it.current(); ++it )
 	((KivioView*)it.current())->resetLayerPanel();
 }
@@ -1002,7 +1002,7 @@ void KivioDoc::slotCommandExecuted()
 
 void KivioDoc::updateProtectPanelCheckBox()
 {
-    QPtrListIterator<KoView> it( views() );
+    TQPtrListIterator<KoView> it( views() );
     for (; it.current(); ++it )
       ((KivioView*)it.current())->updateProtectPanelCheckBox();
 }
@@ -1010,10 +1010,10 @@ void KivioDoc::updateProtectPanelCheckBox()
 void KivioDoc::loadStencil()
 {
   KivioStencilSpawnerSet* set = m_stencilSetLoadQueue.first();
-  QString fileName = set->dir() + "/" + set->files()[m_currentFile];
+  TQString fileName = set->dir() + "/" + set->files()[m_currentFile];
   set->loadFile(fileName);
   m_currentFile++;
-  emit progress(qRound(((float)m_currentFile / (float)set->files().count()) * 100.0));
+  emit progress(tqRound(((float)m_currentFile / (float)set->files().count()) * 100.0));
 
   if(m_currentFile >= set->files().count()) {
     m_pLstSpawnerSets->append(set);
@@ -1038,13 +1038,13 @@ void KivioDoc::loadStencil()
 
 void KivioDoc::updateGuideLines(KoView* sender)
 {
-  QValueList<double> hGuideLines;
-  QValueList<double> vGuideLines;
+  TQValueList<double> hGuideLines;
+  TQValueList<double> vGuideLines;
   KivioView* view = static_cast<KivioView*>(sender);
   view->canvasWidget()->guideLines().getGuideLines(hGuideLines, vGuideLines);
   view->activePage()->setGuideLines(hGuideLines, vGuideLines);
 
-  QPtrListIterator<KoView> it(views());
+  TQPtrListIterator<KoView> it(views());
   KivioView* itView = 0;
 
   for (; it.current(); ++it ) {
@@ -1057,9 +1057,9 @@ void KivioDoc::updateGuideLines(KoView* sender)
 
 void KivioDoc::updateGuideLines(KivioPage* page)
 {
-  QValueList<double> hGuideLines = page->horizontalGuideLines();
-  QValueList<double> vGuideLines = page->verticalGuideLines();
-  QPtrListIterator<KoView> it(views());
+  TQValueList<double> hGuideLines = page->horizontalGuideLines();
+  TQValueList<double> vGuideLines = page->verticalGuideLines();
+  TQPtrListIterator<KoView> it(views());
   KivioView* itView = 0;
 
   for (; it.current(); ++it ) {
diff --git a/kivio/kiviopart/kivio_doc.h b/kivio/kiviopart/kivio_doc.h
index 46288bf1..441e8376 100644
--- a/kivio/kiviopart/kivio_doc.h
+++ b/kivio/kiviopart/kivio_doc.h
@@ -21,8 +21,8 @@
 
 #include "kivio_grid_data.h"
 
-#include <qptrlist.h>
-#include <qobject.h>
+#include <tqptrlist.h>
+#include <tqobject.h>
 
 #include <KoDocument.h>
 #include <KoMainWindow.h>
@@ -48,15 +48,15 @@ namespace Kivio {
 }
 
 class KoStore;
-class QDomDocument;
+class TQDomDocument;
 class DCOPObject;
 class KoCommandHistory;
 
-class QPainter;
+class TQPainter;
 class KPrinter;
 class KCommand;
 class KoZoomHandler;
-class QFont;
+class TQFont;
 
 #define MIME_TYPE "application/x-kivio"
 
@@ -65,22 +65,23 @@ using namespace Kivio;
 class KIVIO_EXPORT KivioDoc : public KoDocument
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class KivioPage;
   public:
-    KivioDoc( QWidget *parentWidget = 0, const char* widgetName = 0, QObject* parent = 0, const char* name = 0, bool singleViewMode = false );
+    KivioDoc( TQWidget *tqparentWidget = 0, const char* widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
     ~KivioDoc();
 
     virtual DCOPObject* dcopObject();
 
-    virtual QDomDocument saveXML();
+    virtual TQDomDocument saveXML();
     virtual bool saveOasis(KoStore* store, KoXmlWriter* manifestWriter);
 
-    virtual bool loadXML( QIODevice *, const QDomDocument& doc );
-    virtual bool loadOasis( const QDomDocument& doc, KoOasisStyles& oasisStyles, const QDomDocument& settings, KoStore* );
+    virtual bool loadXML( TQIODevice *, const TQDomDocument& doc );
+    virtual bool loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles, const TQDomDocument& settings, KoStore* );
 
-    virtual bool initDoc(InitDocFlags flags, QWidget* parentWidget=0);
+    virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
 
-    virtual QCString mimeType() const { return MIME_TYPE; }
+    virtual TQCString mimeType() const { return MIME_TYPE; }
 
     /**
     * @return a pointer to a new KivioPage. The KivioPage is not added to the map nor added to the GUI.
@@ -100,14 +101,14 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
     * Adds a KivioStencilSpawnerSet to the list of spawner sets and make it active.
     *
     */
-    void addSpawnerSet( const QString& );
-    void addSpawnerSetDuringLoad(const QString& dirName, bool hidden);
+    void addSpawnerSet( const TQString& );
+    void addSpawnerSetDuringLoad(const TQString& dirName, bool hidden);
     bool removeSpawnerSet( KivioStencilSpawnerSet * );
 
-    QPtrList<KivioStencilSpawnerSet> *spawnerSets()const { return m_pLstSpawnerSets; }
+    TQPtrList<KivioStencilSpawnerSet> *spawnerSets()const { return m_pLstSpawnerSets; }
 
-    KivioStencilSpawner *findStencilSpawner( const QString& setId, const QString& stencilId );
-    KivioStencilSpawner *findInternalStencilSpawner( const QString& title );
+    KivioStencilSpawner *findStencilSpawner( const TQString& setId, const TQString& stencilId );
+    KivioStencilSpawner *findInternalStencilSpawner( const TQString& title );
 
     void addInternalStencilSpawner(KivioStencilSpawner* spawner);
     KivioStencilSpawnerSet* internalSpawnerSet() { return m_pInternalSet; }
@@ -119,13 +120,13 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
     */
     bool isLoading()const { return m_bLoading; }
 
-    virtual void paintContent( QPainter& painter, const QRect& rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 );
-    void paintContent(KivioPainter& painter, const QRect& rect, bool transparent, KivioPage* page,
-                      QPoint, KoZoomHandler*, bool, bool);
+    virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 );
+    void paintContent(KivioPainter& painter, const TQRect& rect, bool transparent, KivioPage* page,
+                      TQPoint, KoZoomHandler*, bool, bool);
 
     void printContent( KPrinter& prn );
 
-    static QPtrList<KivioDoc>& documents();
+    static TQPtrList<KivioDoc>& documents();
 
     KivioGridData grid() { return Kivio::Config::grid(); }
 
@@ -143,15 +144,15 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
     void resetLayerPanel();
     void updateProtectPanelCheckBox();
 
-    QFont defaultFont() const { return m_font; }
+    TQFont defaultFont() const { return m_font; }
 
   public slots:
     void updateView(KivioPage*);
 
-    void slotDeleteStencilSet( DragBarButton *, QWidget *, KivioStackBar * );
+    void slotDeleteStencilSet( DragBarButton *, TQWidget *, KivioStackBar * );
     void slotSelectionChanged();
 
-    void setDefaultFont(const QFont& f) { m_font = f; }
+    void setDefaultFont(const TQFont& f) { m_font = f; }
 
     void updateGuideLines(KoView* sender);
     void updateGuideLines(KivioPage* page);
@@ -163,16 +164,16 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
     void slotCommandExecuted();
     void loadStencil();
 
-    virtual void openExistingFile( const QString& file );
-    virtual void openTemplate( const QString& file );
+    virtual void openExistingFile( const TQString& file );
+    virtual void openTemplate( const TQString& file );
 
   signals:
     void sig_selectionChanged();
     void sig_addPage(KivioPage*);
     void sig_addSpawnerSet( KivioStencilSpawnerSet * );
     void sig_updateView(KivioPage*);
-    void sig_pageNameChanged(KivioPage*, const QString&);
-    void sig_deleteStencilSet( DragBarButton*, QWidget *, KivioStackBar * );
+    void sig_pageNameChanged(KivioPage*, const TQString&);
+    void sig_deleteStencilSet( DragBarButton*, TQWidget *, KivioStackBar * );
     void sig_updateGrid();
 
     void initProgress();
@@ -184,23 +185,23 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
   protected:
     bool checkStencilsForSpawnerSet(KivioStencilSpawnerSet *);
     bool checkGroupForSpawnerSet(KivioStencil *, KivioStencilSpawnerSet *);
-    KivioStencilSpawnerSet* findSpawnerSet(const QString& dirName, const QString& name);
+    KivioStencilSpawnerSet* findSpawnerSet(const TQString& dirName, const TQString& name);
 
     void saveOasisSettings( KoXmlWriter &/*settingsWriter*/ );
-    void loadOasisSettings( const QDomDocument&settingsDoc );
+    void loadOasisSettings( const TQDomDocument&settingsDoc );
 
-    KoView* createViewInstance( QWidget* parent, const char* name );
+    KoView* createViewInstance( TQWidget* tqparent, const char* name );
 
     /**
     * List of stencil spawner sets
     */
-    QPtrList <KivioStencilSpawnerSet> *m_pLstSpawnerSets;
+    TQPtrList <KivioStencilSpawnerSet> *m_pLstSpawnerSets;
 
 
     /**
     * Loads a KivioStencilSpawnerSet based on it's id
     */
-    bool loadStencilSpawnerSet(const QString &id, bool hidden);
+    bool loadStencilSpawnerSet(const TQString &id, bool hidden);
 
     /**
     * Overloaded function of @ref KoDocument.
@@ -225,7 +226,7 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
     *
     * @see #load
     */
-    QString m_strFileURL;
+    TQString m_strFileURL;
 
     /**
     * true if loading is in process, otherwise false.
@@ -235,7 +236,7 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
     */
     bool m_bLoading;
 
-    static QPtrList<KivioDoc>* s_docs;
+    static TQPtrList<KivioDoc>* s_docs;
     static int s_docId;
 
     KivioStencilSpawnerSet* m_pInternalSet;
@@ -245,12 +246,12 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
     DCOPObject *dcop;
     KoCommandHistory * m_commandHistory;
 
-    QFont m_font;
+    TQFont m_font;
 
-    QTimer* m_loadTimer;
+    TQTimer* m_loadTimer;
     unsigned int m_currentFile;
     KivioStencilSpawnerSet* m_currentSet;
-    QValueList<KivioStencilSpawnerSet*> m_stencilSetLoadQueue;
+    TQValueList<KivioStencilSpawnerSet*> m_stencilSetLoadQueue;
 
     bool m_docOpened; // Used to for a hack that make kivio not crash if you cancel startup dialog.
 };
diff --git a/kivio/kiviopart/kivio_factory.cpp b/kivio/kiviopart/kivio_factory.cpp
index 079f7c12..39a367ab 100644
--- a/kivio/kiviopart/kivio_factory.cpp
+++ b/kivio/kiviopart/kivio_factory.cpp
@@ -29,8 +29,8 @@
 KInstance* KivioFactory::s_global = 0;
 KAboutData* KivioFactory::s_aboutData = 0;
 
-KivioFactory::KivioFactory( QObject* parent, const char* name )
-: KoFactory( parent, name )
+KivioFactory::KivioFactory( TQObject* tqparent, const char* name )
+: KoFactory( tqparent, name )
 {
   global();
 }
@@ -43,11 +43,11 @@ KivioFactory::~KivioFactory()
   s_global = 0L;
 }
 
-KParts::Part* KivioFactory::createPartObject( QWidget *parentWidget, const char *widgetName, QObject* parent, const char* name, const char* classname, const QStringList & )
+KParts::Part* KivioFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
 {
   bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-  KivioDoc *doc = new KivioDoc( parentWidget, widgetName, parent, name, !bWantKoDocument );
+  KivioDoc *doc = new KivioDoc( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument );
 
   if ( !bWantKoDocument )
     doc->setReadWrite( false );
diff --git a/kivio/kiviopart/kivio_factory.h b/kivio/kiviopart/kivio_factory.h
index d9e335c4..1883be87 100644
--- a/kivio/kiviopart/kivio_factory.h
+++ b/kivio/kiviopart/kivio_factory.h
@@ -26,11 +26,12 @@ class KAboutData;
 
 class KIVIO_EXPORT KivioFactory : public KoFactory
 { Q_OBJECT
+  TQ_OBJECT
 public:
-  KivioFactory( QObject* parent = 0, const char* name = 0 );
+  KivioFactory( TQObject* tqparent = 0, const char* name = 0 );
   ~KivioFactory();
 
-  virtual KParts::Part *createPartObject( QWidget *parentWidget = 0, const char *widgetName = 0, QObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const QStringList &args = QStringList() );
+  virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
   static KInstance* global();
   static KAboutData* aboutData();
diff --git a/kivio/kiviopart/kivio_grid_data.cpp b/kivio/kiviopart/kivio_grid_data.cpp
index f7a7bf34..c52db1af 100644
--- a/kivio/kiviopart/kivio_grid_data.cpp
+++ b/kivio/kiviopart/kivio_grid_data.cpp
@@ -20,11 +20,11 @@
 #include "kivio_grid_data.h"
 #include "kivioglobal.h"
 #include "kivio_common.h"
-#include <qdom.h>
+#include <tqdom.h>
 
 KivioGridData::KivioGridData()
 {
-  color = QColor(200, 200, 200);
+  color = TQColor(200, 200, 200);
   freq = KoSize(10.0, 10.0);
   snap = KoSize(10.0, 10.0);
   isSnap = true;
@@ -35,7 +35,7 @@ KivioGridData::~KivioGridData()
 {
 }
 
-void KivioGridData::save(QDomElement& element, const QString& name)
+void KivioGridData::save(TQDomElement& element, const TQString& name)
 {
   Kivio::saveSize(element, name + "Freg", freq);
   Kivio::saveSize(element, name + "Snap", snap);
@@ -44,14 +44,14 @@ void KivioGridData::save(QDomElement& element, const QString& name)
   element.setAttribute(name + "IsShow", (int)isShow);
 }
 
-void KivioGridData::load(const QDomElement& element, const QString& name)
+void KivioGridData::load(const TQDomElement& element, const TQString& name)
 {
   KoSize sdef;
   sdef = KoSize(10.0, 10.0);
   freq = Kivio::loadSize(element, name + "Freg", sdef);
   snap = Kivio::loadSize(element, name + "Snap", sdef);
 
-  QColor def(QColor(228, 228, 228));
+  TQColor def(TQColor(228, 228, 228));
   color = XmlReadColor(element, name + "Color", def);
 
   isSnap = (bool)element.attribute(name + "IsSnap", "1").toInt();
diff --git a/kivio/kiviopart/kivio_grid_data.h b/kivio/kiviopart/kivio_grid_data.h
index 7148a5b5..90f8ccad 100644
--- a/kivio/kiviopart/kivio_grid_data.h
+++ b/kivio/kiviopart/kivio_grid_data.h
@@ -20,10 +20,10 @@
 #define KIVIO_GRID_DATA_H
 
 #include <KoSize.h>
-#include <qcolor.h>
+#include <tqcolor.h>
 #include <koffice_export.h>
 
-class QDomElement;
+class TQDomElement;
 
 class KIVIO_EXPORT KivioGridData
 {
@@ -31,12 +31,12 @@ public:
   KivioGridData();
   ~KivioGridData();
 
-  void save(QDomElement&, const QString&);
-  void load(const QDomElement&, const QString&);
+  void save(TQDomElement&, const TQString&);
+  void load(const TQDomElement&, const TQString&);
 
   KoSize freq;
   KoSize snap;
-  QColor color;
+  TQColor color;
   bool isSnap;
   bool isShow;
 };
diff --git a/kivio/kiviopart/kivio_icon_view.cpp b/kivio/kiviopart/kivio_icon_view.cpp
index 9a1c3b29..01e110e0 100644
--- a/kivio/kiviopart/kivio_icon_view.cpp
+++ b/kivio/kiviopart/kivio_icon_view.cpp
@@ -26,23 +26,23 @@
 #include "kivioglobal.h"
 #include "kivio_stencil.h"
 
-#include <qbrush.h>
-#include <qcursor.h>
-#include <qpalette.h>
+#include <tqbrush.h>
+#include <tqcursor.h>
+#include <tqpalette.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 
 KivioStencilSpawner* KivioIconView::m_pCurDrag = 0L;
-QPtrList<KivioIconView> KivioIconView::objList;
+TQPtrList<KivioIconView> KivioIconView::objList;
 
 /**********************************************************************
  *
  * KivioIconViewItem
  *
  **********************************************************************/
-KivioIconViewItem::KivioIconViewItem( QIconView *parent )
-    : QIconViewItem( parent )
+KivioIconViewItem::KivioIconViewItem( TQIconView *tqparent )
+    : TQIconViewItem( tqparent )
 {
     m_pSpawner = NULL;
     setText("stencil");
@@ -74,7 +74,7 @@ void KivioIconViewItem::setStencilSpawner( KivioStencilSpawner *pSpawn )
 
 }
 
-bool KivioIconViewItem::acceptDrop( const QMimeSource * ) const
+bool KivioIconViewItem::acceptDrop( const TQMimeSource * ) const
 {
     return false;
 }
@@ -85,8 +85,8 @@ bool KivioIconViewItem::acceptDrop( const QMimeSource * ) const
  * KivioIconView
  *
  **********************************************************************/
-KivioIconView::KivioIconView( bool _readWrite,QWidget *parent, const char *name )
-: QIconView( parent, name )
+KivioIconView::KivioIconView( bool _readWrite,TQWidget *tqparent, const char *name )
+: TQIconView( tqparent, name )
 {
   m_pSpawnerSet = NULL;
   m_pCurDrag = NULL;
@@ -108,8 +108,8 @@ KivioIconView::KivioIconView( bool _readWrite,QWidget *parent, const char *name
   setAcceptDrops(false);
   viewport()->setAcceptDrops(false);
   if(isReadWrite) {
-    connect(this, SIGNAL(doubleClicked(QIconViewItem*)), this, SLOT(slotDoubleClicked(QIconViewItem*)));
-    connect(this, SIGNAL(clicked(QIconViewItem*)), this, SLOT(slotClicked(QIconViewItem*)));
+    connect(this, TQT_SIGNAL(doubleClicked(TQIconViewItem*)), this, TQT_SLOT(slotDoubleClicked(TQIconViewItem*)));
+    connect(this, TQT_SIGNAL(clicked(TQIconViewItem*)), this, TQT_SLOT(slotClicked(TQIconViewItem*)));
   }
 }
 
@@ -138,12 +138,12 @@ void KivioIconView::setStencilSpawnerSet( KivioStencilSpawnerSet *pSet )
   }
 }
 
-QDragObject *KivioIconView::dragObject()
+TQDragObject *KivioIconView::dragObject()
 {
   if( !currentItem() || !isReadWrite)
     return 0;
 
-  QPoint orig = viewportToContents( viewport()->mapFromGlobal( QCursor::pos() ) );
+  TQPoint orig = viewportToContents( viewport()->mapFromGlobal( TQCursor::pos() ) );
   KivioSpawnerDrag *drag = new KivioSpawnerDrag( this, viewport() );
 
   const char*null_pix[]={
@@ -154,17 +154,17 @@ QDragObject *KivioIconView::dragObject()
 
   KivioIconViewItem *item = (KivioIconViewItem *)currentItem();
 
-  QIconDragItem id;
-  QString full;
+  TQIconDragItem id;
+  TQString full;
   full = item->spawner()->set()->dir() + "/" + item->spawner()->info()->title();
-  id.setData( QCString(full.ascii()));
+  id.setData( TQCString(full.ascii()));
 
   drag->append( id,
-      QRect( item->pixmapRect(FALSE).x() - orig.x(),
+      TQRect( item->pixmapRect(FALSE).x() - orig.x(),
               item->pixmapRect(FALSE).y() - orig.y(),
               item->pixmapRect().width(),
               item->pixmapRect().height() ),
-      QRect( item->textRect(FALSE).x() - orig.x(),
+      TQRect( item->textRect(FALSE).x() - orig.x(),
               item->textRect(FALSE).y() - orig.y(),
               item->textRect().width(),
               item->textRect().height() ),
@@ -187,9 +187,9 @@ void KivioIconView::clearCurrentDrag()
 }
 
 
-void KivioIconView::slotDoubleClicked( QIconViewItem *pQtItem )
+void KivioIconView::slotDoubleClicked( TQIconViewItem *pTQtItem )
 {
-  KivioIconViewItem* pItem = dynamic_cast<KivioIconViewItem *>(pQtItem);
+  KivioIconViewItem* pItem = dynamic_cast<KivioIconViewItem *>(pTQtItem);
 
   if( !pItem )
   {
@@ -202,7 +202,7 @@ void KivioIconView::slotDoubleClicked( QIconViewItem *pQtItem )
   emit createNewStencil(pSpawner);
 }
 
-void KivioIconView::slotClicked(QIconViewItem* item)
+void KivioIconView::slotClicked(TQIconViewItem* item)
 {
   KivioIconViewItem* stencilItem = dynamic_cast<KivioIconViewItem *>(item);
 
diff --git a/kivio/kiviopart/kivio_icon_view.h b/kivio/kiviopart/kivio_icon_view.h
index 00328991..fda327ef 100644
--- a/kivio/kiviopart/kivio_icon_view.h
+++ b/kivio/kiviopart/kivio_icon_view.h
@@ -19,36 +19,37 @@
 #ifndef KIVIO_ICON_VIEW_H
 #define KIVIO_ICON_VIEW_H
 
-#include <qdom.h>
-#include <qiconview.h>
-#include <qptrlist.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qdragobject.h>
+#include <tqdom.h>
+#include <tqiconview.h>
+#include <tqptrlist.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqdragobject.h>
 
 class KivioStencilSpawnerSet;
 class KivioStencilSpawner;
 
-class KivioIconView : public QIconView
+class KivioIconView : public TQIconView
 {
   Q_OBJECT
+  TQ_OBJECT
   protected:
     KivioStencilSpawnerSet *m_pSpawnerSet;
     static KivioStencilSpawner *m_pCurDrag;
 
-    QDragObject *dragObject();
+    TQDragObject *dragObject();
 
   protected slots:
-    void slotDoubleClicked(QIconViewItem*);
-    void slotClicked(QIconViewItem* item);
+    void slotDoubleClicked(TQIconViewItem*);
+    void slotClicked(TQIconViewItem* item);
 
   signals:
     void createNewStencil(KivioStencilSpawner * );
     void stencilSelected(KivioStencilSpawner*);
 
   public:
-    KivioIconView( bool _readWrite,QWidget *parent=0, const char *name=0 );
+    KivioIconView( bool _readWrite,TQWidget *tqparent=0, const char *name=0 );
     virtual ~KivioIconView();
 
     static void clearCurrentDrag();
@@ -58,11 +59,11 @@ class KivioIconView : public QIconView
     KivioStencilSpawnerSet *spawnerSet() { return m_pSpawnerSet; }
 
   private:
-    static QPtrList<KivioIconView> objList;
+    static TQPtrList<KivioIconView> objList;
     bool isReadWrite;
 };
 
-class KivioIconViewItem : public QIconViewItem
+class KivioIconViewItem : public TQIconViewItem
 {
   friend class KivioIconView;
 
@@ -70,13 +71,13 @@ class KivioIconViewItem : public QIconViewItem
     KivioStencilSpawner *m_pSpawner;
 
   public:
-    KivioIconViewItem( QIconView *parent );
+    KivioIconViewItem( TQIconView *tqparent );
     virtual ~KivioIconViewItem();
 
     void setStencilSpawner(KivioStencilSpawner*);
     KivioStencilSpawner *spawner() { return m_pSpawner; }
 
-    virtual bool acceptDrop( const QMimeSource *e ) const;
+    virtual bool acceptDrop( const TQMimeSource *e ) const;
 };
 
 
diff --git a/kivio/kiviopart/kivio_map.cpp b/kivio/kiviopart/kivio_map.cpp
index 0d3a3b2d..d2cecdba 100644
--- a/kivio/kiviopart/kivio_map.cpp
+++ b/kivio/kiviopart/kivio_map.cpp
@@ -16,9 +16,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#include <qprinter.h>
-#include <qdom.h>
-#include <qmessagebox.h>
+#include <tqprinter.h>
+#include <tqdom.h>
+#include <tqmessagebox.h>
 
 #include <KoStore.h>
 #include <KoXmlWriter.h>
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 
 KivioMap::KivioMap( KivioDoc* doc, const char* name )
-: QObject(doc,name)
+: TQObject(doc,name)
 {
   m_pDoc = doc;
   m_lstPages.setAutoDelete(true);
@@ -51,14 +51,14 @@ KivioMap::~KivioMap()
 
 void KivioMap::takePage( KivioPage* page )
 {
-    int pos=m_lstPages.findRef(page);
+    int pos=m_lstPages.tqfindRef(page);
     m_lstPages.take( pos );
     m_lstDeletedPages.append( page );
 }
 
 void KivioMap::insertPage( KivioPage* page )
 {
-    int pos=m_lstDeletedPages.findRef(page);
+    int pos=m_lstDeletedPages.tqfindRef(page);
     if ( pos != -1 )
         m_lstDeletedPages.take( pos);
     m_lstPages.append(page);
@@ -69,13 +69,13 @@ void KivioMap::addPage( KivioPage* page )
   m_lstPages.append(page);
 }
 
-void KivioMap::movePage( const QString& fromPageName, const QString& toPageName, bool before )
+void KivioMap::movePage( const TQString& fromPageName, const TQString& toPageName, bool before )
 {
   KivioPage* pagefrom = findPage(fromPageName);
   KivioPage* pageto = findPage(toPageName);
 
-  int from = m_lstPages.find(pagefrom);
-  int to = m_lstPages.find(pageto);
+  int from = m_lstPages.tqfind(pagefrom);
+  int to = m_lstPages.tqfind(pageto);
   if (!before)
     ++to;
 
@@ -92,25 +92,25 @@ void KivioMap::movePage( const QString& fromPageName, const QString& toPageName,
     }
 }
 
-QDomElement KivioMap::save( QDomDocument& doc )
+TQDomElement KivioMap::save( TQDomDocument& doc )
 {
     int next = 1;
 
-  QDomElement mymap = doc.createElement("KivioMap");
+  TQDomElement mymap = doc.createElement("KivioMap");
 
   // Before we save, tell all the pages/layers/stencil/targets/connectors to generate
   // their ids so we can restore connections when reloaded.
-  QPtrListIterator<KivioPage> it2(m_lstPages);
+  TQPtrListIterator<KivioPage> it2(m_lstPages);
   for( ; it2.current(); ++it2 )
   {
     next = it2.current()->generateStencilIds( next );
   }
 
   // Now save the pages
-  QPtrListIterator<KivioPage> it(m_lstPages);
+  TQPtrListIterator<KivioPage> it(m_lstPages);
   for( ; it.current(); ++it )
   {
-    QDomElement e = it.current()->save(doc);
+    TQDomElement e = it.current()->save(doc);
     if (e.isNull())
       return e;
     mymap.appendChild(e);
@@ -121,7 +121,7 @@ QDomElement KivioMap::save( QDomDocument& doc )
 
 void KivioMap::saveOasis(KoStore* store, KoXmlWriter* docWriter, KoGenStyles* styles)
 {
-  QPtrListIterator<KivioPage> it(m_lstPages);
+  TQPtrListIterator<KivioPage> it(m_lstPages);
   
   for( ; it.current(); ++it )
   {
@@ -129,16 +129,16 @@ void KivioMap::saveOasis(KoStore* store, KoXmlWriter* docWriter, KoGenStyles* st
   }
 }
 
-bool KivioMap::loadXML( const QDomElement& mymap )
+bool KivioMap::loadXML( const TQDomElement& mymap )
 {
   m_lstPages.clear();
   m_lstDeletedPages.clear();
 
   // FIXME: make this load the real page units and whatever
   // else
-  QDomNode n = mymap.firstChild();
+  TQDomNode n = mymap.firstChild();
   while( !n.isNull() ) {
-    QDomElement e = n.toElement();
+    TQDomElement e = n.toElement();
     if ( !e.isNull() && e.tagName() == "KivioPage" ) {
       KivioPage *t = m_pDoc->createPage();
       m_pDoc->addPage( t );
@@ -152,12 +152,12 @@ bool KivioMap::loadXML( const QDomElement& mymap )
 
 void KivioMap::update()
 {
-  QPtrListIterator<KivioPage> it( m_lstPages );
+  TQPtrListIterator<KivioPage> it( m_lstPages );
   for( ; it.current(); ++it )
     it.current()->update();
 }
 
-KivioPage* KivioMap::findPage( const QString& name )
+KivioPage* KivioMap::findPage( const TQString& name )
 {
   KivioPage *t;
 
@@ -202,11 +202,11 @@ DCOPObject* KivioMap::dcopObject()
     return m_dcop;
 }
 
-QStringList KivioMap::visiblePages() const
+TQStringList KivioMap::visiblePages() const
 {
-  QStringList pages;
+  TQStringList pages;
   
-  QPtrListIterator<KivioPage> it( m_lstPages );
+  TQPtrListIterator<KivioPage> it( m_lstPages );
   for( ; it.current(); ++it )
   {
     KivioPage* page = it.current();
@@ -217,11 +217,11 @@ QStringList KivioMap::visiblePages() const
   return pages;
 }
 
-QStringList KivioMap::hiddenPages() const
+TQStringList KivioMap::hiddenPages() const
 {
-  QStringList pages;
+  TQStringList pages;
   
-  QPtrListIterator<KivioPage> it( m_lstPages );
+  TQPtrListIterator<KivioPage> it( m_lstPages );
   for( ; it.current(); ++it )
   {
     KivioPage* page = it.current();
diff --git a/kivio/kiviopart/kivio_map.h b/kivio/kiviopart/kivio_map.h
index 4db3c1c2..f36e740a 100644
--- a/kivio/kiviopart/kivio_map.h
+++ b/kivio/kiviopart/kivio_map.h
@@ -27,20 +27,20 @@ class KoStore;
 class KoXmlWriter;
 class KoGenStyles;
 
-class QDomElement;
-class QDomDocument;
+class TQDomElement;
+class TQDomDocument;
 class DCOPObject;
 
-#include <qintdict.h>
-#include <qobject.h>
-#include <qptrlist.h>
-#include <qstringlist.h>
+#include <tqintdict.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
+#include <tqstringlist.h>
 
 /*
  * A map is a simple container for all pages. Usually a complete map is saved in one file.
  */
 
-class KivioMap : public QObject
+class KivioMap : public TQObject
 {
   public:
     /**
@@ -52,9 +52,9 @@ class KivioMap : public QObject
     */
     virtual ~KivioMap();
   
-    QDomElement save( QDomDocument& doc );
+    TQDomElement save( TQDomDocument& doc );
     void saveOasis(KoStore* store, KoXmlWriter* docWriter, KoGenStyles* styles);
-    bool loadXML( const QDomElement& mymap );
+    bool loadXML( const TQDomElement& mymap );
   
     /**
     * @param _page becomes added to the map.
@@ -69,9 +69,9 @@ class KivioMap : public QObject
     * If @param _before is true @param _from is inserted before (after otherwise)
     * @param _to.
     */
-    void movePage( const QString & _from, const QString & _to, bool _before = true );
+    void movePage( const TQString & _from, const TQString & _to, bool _before = true );
   
-    KivioPage* findPage( const QString& name );
+    KivioPage* findPage( const TQString& name );
   
     /**
     * Use the @ref #nextPage function to get all the other pages.
@@ -94,17 +94,17 @@ class KivioMap : public QObject
     */
     KivioPage* nextPage();
   
-    QPtrList<KivioPage>& pageList() { return m_lstPages; }
+    TQPtrList<KivioPage>& pageList() { return m_lstPages; }
     
     /**
     * Returns list of visible pages as stringlist.
     */
-    QStringList visiblePages() const;
+    TQStringList visiblePages() const;
     
     /**
     * Returns list of hidden pages as stringlist.
     */
-    QStringList hiddenPages() const;
+    TQStringList hiddenPages() const;
   
     /**
     * @return amount of pages in this map.
@@ -120,8 +120,8 @@ class KivioMap : public QObject
     void clear();
 
   private:
-    QPtrList<KivioPage> m_lstPages;
-    QPtrList<KivioPage> m_lstDeletedPages;
+    TQPtrList<KivioPage> m_lstPages;
+    TQPtrList<KivioPage> m_lstDeletedPages;
   
     KivioDoc* m_pDoc;
     DCOPObject* m_dcop;
diff --git a/kivio/kiviopart/kivio_page.cpp b/kivio/kiviopart/kivio_page.cpp
index 5a4ee2c5..4a8fd51b 100644
--- a/kivio/kiviopart/kivio_page.cpp
+++ b/kivio/kiviopart/kivio_page.cpp
@@ -21,23 +21,23 @@
 #include <ctype.h>
 #include <math.h>
 
-#include <qpainter.h>
-#include <qdrawutil.h>
-#include <qkeycode.h>
-#include <qregexp.h>
-#include <qpoint.h>
-#include <qcursor.h>
-#include <qptrstack.h>
-#include <qbuffer.h>
-#include <qmessagebox.h>
-#include <qclipboard.h>
-#include <qpicture.h>
-#include <qdom.h>
-#include <qtextstream.h>
-#include <qdragobject.h>
-#include <qmime.h>
-#include <qsortedlist.h>
-#include <qvaluelist.h>
+#include <tqpainter.h>
+#include <tqdrawutil.h>
+#include <tqkeycode.h>
+#include <tqregexp.h>
+#include <tqpoint.h>
+#include <tqcursor.h>
+#include <tqptrstack.h>
+#include <tqbuffer.h>
+#include <tqmessagebox.h>
+#include <tqclipboard.h>
+#include <tqpicture.h>
+#include <tqdom.h>
+#include <tqtextstream.h>
+#include <tqdragobject.h>
+#include <tqmime.h>
+#include <tqsortedlist.h>
+#include <tqvaluelist.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -78,14 +78,14 @@
 #include <fixx11h.h> // for None
 
 int KivioPage::s_id = 0L;
-QIntDict<KivioPage>* KivioPage::s_mapPages;
+TQIntDict<KivioPage>* KivioPage::s_mapPages;
 
-KivioPage::KivioPage( KivioMap *_map, const QString &pageName, const char *_name )
-: QObject( _map, _name ),
+KivioPage::KivioPage( KivioMap *_map, const TQString &pageName, const char *_name )
+: TQObject( _map, _name ),
   m_pCurLayer(NULL)
 {
   if ( s_mapPages == 0L )
-    s_mapPages = new QIntDict<KivioPage>;
+    s_mapPages = new TQIntDict<KivioPage>;
   m_id = s_id++;
   s_mapPages->insert( m_id, this );
 
@@ -107,7 +107,7 @@ KivioPage::KivioPage( KivioMap *_map, const QString &pageName, const char *_name
   setHidden(false);
   // Get a unique name so that we can offer scripting
   if ( !_name ) {
-    QCString s;
+    TQCString s;
     s.sprintf("Page%i", s_id );
     setName( s.data() );
   }
@@ -130,7 +130,7 @@ KivioPage::~KivioPage()
   delete m_dcop;
 }
 
-KivioPage* KivioPage::find( int _id )
+KivioPage* KivioPage::tqfind( int _id )
 {
   if ( !s_mapPages )
     return 0L;
@@ -138,27 +138,27 @@ KivioPage* KivioPage::find( int _id )
   return (*s_mapPages)[ _id ];
 }
 
-void KivioPage::print( QPainter &/*painter*/, KPrinter */*_printer*/ )
+void KivioPage::print( TQPainter &/*painter*/, KPrinter */*_printer*/ )
 {
 }
 
-void KivioPage::printPage( QPainter &/*_painter*/, const QRect& /*page_range*/, const QRect& /*view*/ )
+void KivioPage::printPage( TQPainter &/*_painter*/, const TQRect& /*page_range*/, const TQRect& /*view*/ )
 {
 }
 
-QDomElement KivioPage::save( QDomDocument& doc )
+TQDomElement KivioPage::save( TQDomDocument& doc )
 {
     // Write the name and 'hide' flag first as attributes
-    QDomElement page = doc.createElement( "KivioPage" );
+    TQDomElement page = doc.createElement( "KivioPage" );
     page.setAttribute( "name", m_strName );
     page.setAttribute( "hide", (int)m_bPageHide );
 
-    // Create a child element for the page layout
-    QDomElement layoutE = saveLayout( doc );
-    page.appendChild( layoutE );
+    // Create a child element for the page tqlayout
+    TQDomElement tqlayoutE = saveLayout( doc );
+    page.appendChild( tqlayoutE );
 
     // Save guides
-    QDomElement guidesElement = doc.createElement("GuidesLayout");
+    TQDomElement guidesElement = doc.createElement("GuidesLayout");
     page.appendChild(guidesElement);
     saveGuideLines(guidesElement);
 
@@ -166,7 +166,7 @@ QDomElement KivioPage::save( QDomDocument& doc )
     KivioLayer *pLayer = m_lstLayers.first();
     while( pLayer )
     {
-        QDomElement layerE = pLayer->saveXML(doc);
+        TQDomElement layerE = pLayer->saveXML(doc);
         if( layerE.isNull() )
         {
 	   kdDebug(43000) << "KivioPage::save() - Oh shit.  KivioLayer::saveXML() returned a bad element!" << endl;
@@ -191,20 +191,20 @@ void KivioPage::saveOasis(KoStore* /*store*/, KoXmlWriter* docWriter, KoGenStyle
     docWriter->addAttribute("draw:master-page-name", "Standard");
   } else {
     KoGenStyle pageLayout = m_pPageLayout.saveOasis();
-    QString layoutName = styles->lookup(pageLayout, "PL");
+    TQString tqlayoutName = styles->lookup(pageLayout, "PL");
 
     KoGenStyle masterPage(KoGenStyle::STYLE_MASTER);
-    masterPage.addAttribute("style:page-layout-name", layoutName);
-    QString masterName = styles->lookup(masterPage, "MP");
+    masterPage.addAttribute("style:page-tqlayout-name", tqlayoutName);
+    TQString masterName = styles->lookup(masterPage, "MP");
 
     docWriter->addAttribute("draw:master-page-name", masterName);
   }
 
   // TODO OASIS: Save guidelines!
 
-  QBuffer layerBuffer;
+  TQBuffer layerBuffer;
   layerBuffer.open(IO_WriteOnly);
-  KoXmlWriter layerWriter(&layerBuffer);
+  KoXmlWriter layerWriter(TQT_TQIODEVICE(&layerBuffer));
   layerWriter.startElement("draw:layer-set");
 
   // Iterate through all layers
@@ -216,24 +216,24 @@ void KivioPage::saveOasis(KoStore* /*store*/, KoXmlWriter* docWriter, KoGenStyle
   }
 
   layerWriter.endElement(); // draw:layer-set
-  QString layerSet = QString::fromUtf8(layerBuffer.buffer(), layerBuffer.buffer().size());
+  TQString layerSet = TQString::fromUtf8(layerBuffer.buffer(), layerBuffer.buffer().size());
   KoGenStyle pageStyle(Kivio::STYLE_PAGE, "drawing-page");
   pageStyle.addChildElement("draw:layer-set", layerSet);
-  QString styleName = styles->lookup(pageStyle, "PS");
+  TQString styleName = styles->lookup(pageStyle, "PS");
   docWriter->addAttribute("draw:style-name", styleName);
 
   docWriter->endElement(); // draw:page
 }
 
-QDomElement KivioPage::saveLayout( QDomDocument &doc )
+TQDomElement KivioPage::saveLayout( TQDomDocument &doc )
 {
-    QDomElement e = doc.createElement("PageLayout");
+    TQDomElement e = doc.createElement("PageLayout");
     Kivio::savePageLayout(e, m_pPageLayout);
 
     return e;
 }
 
-bool KivioPage::loadLayout( const QDomElement &e )
+bool KivioPage::loadLayout( const TQDomElement &e )
 {
     m_pPageLayout = Kivio::loadPageLayout(e);
     return true;
@@ -244,7 +244,7 @@ bool KivioPage::isLoading()
   return m_pDoc->isLoading();
 }
 
-bool KivioPage::loadXML( const QDomElement& pageE )
+bool KivioPage::loadXML( const TQDomElement& pageE )
 {
     m_strName = pageE.attribute("name");
     if (m_strName.isEmpty())
@@ -257,7 +257,7 @@ bool KivioPage::loadXML( const QDomElement& pageE )
     KivioLayer *pLayer;
     m_lstLayers.clear();
 
-    QDomNode node = pageE.firstChild();
+    TQDomNode node = pageE.firstChild();
     while( !node.isNull() )
     {
        if( node.nodeName() == "KivioLayer" )
@@ -306,7 +306,7 @@ bool KivioPage::loadXML( const QDomElement& pageE )
        kdDebug(43000) << "KivioLayer::loadXML() - loading layer connections" << endl;
        pLayer->searchForConnections(this);
 
-       m_lstLayers.find( pLayerBak );
+       m_lstLayers.tqfind( pLayerBak );
 
        pLayer = m_lstLayers.next();
     }
@@ -314,39 +314,39 @@ bool KivioPage::loadXML( const QDomElement& pageE )
   return true;
 }
 
-bool KivioPage::loadOasis(const QDomElement& page, KoOasisStyles& oasisStyles)
+bool KivioPage::loadOasis(const TQDomElement& page, KoOasisStyles& oasisStyles)
 {
-  m_strName = page.attributeNS( KoXmlNS::draw, "name", QString::null);
-  QDomElement* masterPage = oasisStyles.masterPages()[page.attributeNS( KoXmlNS::draw, "master-page-name", QString::null)];
+  m_strName = page.attributeNS( KoXmlNS::draw, "name", TQString());
+  TQDomElement* masterPage = oasisStyles.masterPages()[page.attributeNS( KoXmlNS::draw, "master-page-name", TQString())];
 
   if(!masterPage) {
-    kdDebug(430000) << "Couldn't find the master page! " << page.attributeNS( KoXmlNS::draw, "master-page-name", QString::null) << endl;
+    kdDebug(430000) << "Couldn't find the master page! " << page.attributeNS( KoXmlNS::draw, "master-page-name", TQString()) << endl;
     return false;
   }
 
-  const QDomElement *pageLayout = oasisStyles.findStyle(masterPage->attributeNS( KoXmlNS::style, "page-layout-name", QString::null ) );
+  const TQDomElement *pageLayout = oasisStyles.findStyle(masterPage->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) );
 
   if(!pageLayout) {
-    kdDebug(430000) << "Couldn't find the pagelayout!" << endl;
+    kdDebug(430000) << "Couldn't find the pagetqlayout!" << endl;
     return false;
   }
 
   m_pPageLayout.loadOasis(*pageLayout);
 
   if(m_pPageLayout.ptWidth <= 1e-13 || m_pPageLayout.ptHeight <= 1e-13) {
-    kdDebug(430000) << "Non valid pagelayout!" << endl;
+    kdDebug(430000) << "Non valid pagetqlayout!" << endl;
     return false;
   }
 
-  const QDomElement* style = oasisStyles.findStyle(page.attributeNS( KoXmlNS::draw, "style-name", QString::null) ); // Find the page style
+  const TQDomElement* style = oasisStyles.findStyle(page.attributeNS( KoXmlNS::draw, "style-name", TQString()) ); // Find the page style
 
   if(!style) {
     return false;
   }
 
-  QDomNode styleNode = KoDom::namedItemNS( *style, KoXmlNS::style, "properties");
+  TQDomNode styleNode = KoDom::namedItemNS( *style, KoXmlNS::style, "properties");
   styleNode = KoDom::namedItemNS( styleNode, KoXmlNS::draw, "layer-set");
-  QDomNode currentNode = styleNode.firstChild();
+  TQDomNode currentNode = styleNode.firstChild();
 
   // Load the layers
   while(!currentNode.isNull()) {
@@ -366,7 +366,7 @@ void KivioPage::update()
 {
 }
 
-KivioPage* KivioPage::findPage( const QString& name )
+KivioPage* KivioPage::findPage( const TQString& name )
 {
   if (!m_pMap)
     return 0L;
@@ -374,7 +374,7 @@ KivioPage* KivioPage::findPage( const QString& name )
   return m_pMap->findPage(name);
 }
 
-bool KivioPage::setPageName( const QString& name, bool init )
+bool KivioPage::setPageName( const TQString& name, bool init )
 {
   if ( map()->findPage( name ) )
     return false;
@@ -382,7 +382,7 @@ bool KivioPage::setPageName( const QString& name, bool init )
   if ( m_strName == name )
     return true;
 
-  QString old_name = m_strName;
+  TQString old_name = m_strName;
   m_strName = name;
 
   if (init)
@@ -399,8 +399,8 @@ bool KivioPage::setPageName( const QString& name, bool init )
  * An important note is that layers are drawn first to last.  So the last layer is the
  * most visible.
  */
-void KivioPage::paintContent( KivioPainter& painter, const QRect& rect, bool transparent,
-  QPoint p0, KoZoomHandler* zoom, bool drawConnectorTargets, bool drawSelection )
+void KivioPage::paintContent( KivioPainter& painter, const TQRect& rect, bool transparent,
+  TQPoint p0, KoZoomHandler* zoom, bool drawConnectorTargets, bool drawSelection )
 {
   KivioLayer *pLayer = m_lstLayers.first();
   while( pLayer )
@@ -560,7 +560,7 @@ void KivioPage::selectStencil( KivioStencil *pStencil )
   }
 
   // Don't allow reselection
-  if(m_lstSelection.findRef(pStencil) != -1) {
+  if(m_lstSelection.tqfindRef(pStencil) != -1) {
     return;
   }
 
@@ -631,7 +631,7 @@ void KivioPage::unselectAllStencils()
 
 bool KivioPage::isStencilSelected(KivioStencil *pStencil)
 {
-  return m_lstSelection.findRef( pStencil ) == -1;
+  return m_lstSelection.tqfindRef( pStencil ) == -1;
 }
 
 /**
@@ -769,8 +769,8 @@ void KivioPage::groupSelectedStencils()
 void KivioPage::ungroupSelectedStencils()
 {
   KivioStencil *pSelStencil, *pStencil;
-  QPtrList<KivioStencil> *pList;
-  QPtrList<KivioStencil> *pSelectThese = new QPtrList<KivioStencil>;
+  TQPtrList<KivioStencil> *pList;
+  TQPtrList<KivioStencil> *pSelectThese = new TQPtrList<KivioStencil>;
   KMacroCommand* macro = new KMacroCommand(i18n("Ungroup"));
   bool ungrouped = false;
 
@@ -842,7 +842,7 @@ void KivioPage::bringToFront()
     KivioStencil *pStencil, *pMove;
     KivioLayer *pLayer;
 
-    QPtrList <KivioStencil> newList;
+    TQPtrList <KivioStencil> newList;
 
     pLayer = m_pCurLayer;
 
@@ -889,7 +889,7 @@ void KivioPage::sendToBack()
     KivioStencil *pStencil, *pMove;
     KivioLayer *pLayer;
 
-    QPtrList <KivioStencil> newList;
+    TQPtrList <KivioStencil> newList;
 
     pLayer = m_pCurLayer;
 
@@ -941,7 +941,7 @@ void KivioPage::copy()
   KivioDragObject* kdo = new KivioDragObject();
   kdo->setStencilList(m_lstSelection);
   kdo->setStencilRect(getRectForAllSelectedStencils());
-  QApplication::clipboard()->setData(kdo, QClipboard::Clipboard);
+  TQApplication::tqclipboard()->setData(kdo, TQClipboard::Clipboard);
 }
 
 void KivioPage::cut()
@@ -983,11 +983,11 @@ void KivioPage::cut()
 
 void KivioPage::paste(KivioView* view)
 {
-  QPtrList<KivioStencil> list;
+  TQPtrList<KivioStencil> list;
   list.setAutoDelete(false);
   KivioDragObject kdo;
 
-  if(kdo.decode(QApplication::clipboard()->data(QClipboard::Clipboard), list, this)) {
+  if(kdo.decode(TQApplication::tqclipboard()->data(TQClipboard::Clipboard), list, this)) {
     unselectAllStencils();
     KivioStencil* stencil = list.first();
 
@@ -1049,7 +1049,7 @@ bool KivioPage::removeCurrentLayer()
 
     if( pLayer != m_pCurLayer )
     {
-        if( m_lstLayers.find( m_pCurLayer )==false )
+        if( m_lstLayers.tqfind( m_pCurLayer )==false )
         {
 	   kdDebug(43000) << "KivioLayer::removeCurrentLayer() - Couldn't find current layer in the list. Bad!" << endl;
             return false;
@@ -1069,7 +1069,7 @@ bool KivioPage::removeCurrentLayer()
         return false;
     }
 
-    KivioRemoveLayerCommand * cmd = new KivioRemoveLayerCommand( i18n("Remove Layer"), this , m_pCurLayer , m_lstLayers.findRef(m_pCurLayer) );
+    KivioRemoveLayerCommand * cmd = new KivioRemoveLayerCommand( i18n("Remove Layer"), this , m_pCurLayer , m_lstLayers.tqfindRef(m_pCurLayer) );
     doc()->addCommand( cmd );
     takeLayer( m_pCurLayer );
 /*
@@ -1087,7 +1087,7 @@ bool KivioPage::removeCurrentLayer()
 
 void KivioPage::takeLayer( KivioLayer *pLayer )
 {
-    int pos=m_lstLayers.findRef(pLayer);
+    int pos=m_lstLayers.tqfindRef(pLayer);
     m_lstLayers.take( pos );
 }
 
@@ -1183,13 +1183,13 @@ void KivioPage::alignStencils(AlignData d)
     }
 }
 
-class XYSortedStencilList : public QPtrList<KivioStencil>
+class XYSortedStencilList : public TQPtrList<KivioStencil>
 {
 public:
   XYSortedStencilList(bool sortX) :xsort(sortX) {};
 
 protected:
-  int compareItems(QPtrCollection::Item i1, QPtrCollection::Item i2)
+  int compareItems(TQPtrCollection::Item i1, TQPtrCollection::Item i2)
   {
     KivioStencil* s1 = (KivioStencil*)i1;
     KivioStencil* s2 = (KivioStencil*)i2;
@@ -1225,7 +1225,7 @@ void KivioPage::distributeStencils(DistributeData d)
 
   XYSortedStencilList xSortList(true);
   XYSortedStencilList ySortList(false);
-  QValueList<KoRect> oldRects;
+  TQValueList<KoRect> oldRects;
 
   while( pStencil )
   {
@@ -1252,10 +1252,10 @@ void KivioPage::distributeStencils(DistributeData d)
       y1 = y + pStencil->h();
       while( pStencil )
       {
-          x = QMIN(x,pStencil->x());
-          y = QMIN(y,pStencil->y());
-          x1 = QMAX(x1,pStencil->x() + pStencil->w());
-          y1 = QMAX(y1,pStencil->y() + pStencil->h());
+          x = TQMIN(x,pStencil->x());
+          y = TQMIN(y,pStencil->y());
+          x1 = TQMAX(x1,pStencil->x() + pStencil->w());
+          y1 = TQMAX(y1,pStencil->y() + pStencil->h());
           pStencil = m_lstSelection.next();
       }
       break;
@@ -1414,7 +1414,7 @@ void KivioPage::distributeStencils(DistributeData d)
 
   if(d.v != DistributeData::None || d.h != DistributeData::None) {
     KMacroCommand *macro = new KMacroCommand(i18n("Move Stencil"));
-    QValueListIterator<KoRect> it;
+    TQValueListIterator<KoRect> it;
     pStencil = m_lstSelection.first();
 
     for(it = oldRects.begin(); it != oldRects.end(); ++it) {
@@ -1624,19 +1624,19 @@ bool KivioPage::checkForTextBoxesInSelection()
   return false;
 }
 
-void KivioPage::setGuideLines(const QValueList<double> hGuideLines, const QValueList<double> vGuideLines)
+void KivioPage::setGuideLines(const TQValueList<double> hGuideLines, const TQValueList<double> vGuideLines)
 {
   m_hGuideLines = hGuideLines;
   m_vGuideLines = vGuideLines;
 }
 
-void KivioPage::saveGuideLines(QDomElement& element)
+void KivioPage::saveGuideLines(TQDomElement& element)
 {
-  QValueList<double>::iterator it;
-  QValueList<double>::iterator itEnd = m_hGuideLines.end();
+  TQValueList<double>::iterator it;
+  TQValueList<double>::iterator itEnd = m_hGuideLines.end();
 
   for(it = m_hGuideLines.begin(); it != itEnd; ++it) {
-    QDomElement e = element.ownerDocument().createElement("Guideline");
+    TQDomElement e = element.ownerDocument().createElement("Guideline");
     element.appendChild(e);
     XmlWriteDouble(e, "pos", *it);
     XmlWriteInt(e, "orient", (int)Qt::Horizontal);
@@ -1645,19 +1645,19 @@ void KivioPage::saveGuideLines(QDomElement& element)
   itEnd = m_vGuideLines.end();
 
   for(it = m_vGuideLines.begin(); it != itEnd; ++it) {
-    QDomElement e = element.ownerDocument().createElement("Guideline");
+    TQDomElement e = element.ownerDocument().createElement("Guideline");
     element.appendChild(e);
     XmlWriteDouble(e, "pos", *it);
     XmlWriteInt(e, "orient", (int)Qt::Vertical);
   }
 }
 
-void KivioPage::loadGuideLines(const QDomElement& element)
+void KivioPage::loadGuideLines(const TQDomElement& element)
 {
   m_hGuideLines.clear();
   m_vGuideLines.clear();
 
-  QDomElement e = element.firstChild().toElement();
+  TQDomElement e = element.firstChild().toElement();
 
   for( ; !e.isNull(); e = e.nextSibling().toElement() )
   {
diff --git a/kivio/kiviopart/kivio_page.h b/kivio/kiviopart/kivio_page.h
index 684871d7..872018a6 100644
--- a/kivio/kiviopart/kivio_page.h
+++ b/kivio/kiviopart/kivio_page.h
@@ -26,9 +26,9 @@ class KivioCanvas;
 class KivioDoc;
 class KoDocumentEntry;
 
-class QWidget;
-class QPainter;
-class QDomElement;
+class TQWidget;
+class TQPainter;
+class TQDomElement;
 
 class KivioLayer;
 class KoPoint;
@@ -36,13 +36,13 @@ class DCOPObject;
 
 #include <KoDocument.h>
 
-#include <qpen.h>
-#include <qptrlist.h>
-#include <qintdict.h>
-#include <qmemarray.h>
-#include <qrect.h>
-#include <qpalette.h>
-#include <qwidget.h>
+#include <tqpen.h>
+#include <tqptrlist.h>
+#include <tqintdict.h>
+#include <tqmemarray.h>
+#include <tqrect.h>
+#include <tqpalette.h>
+#include <tqwidget.h>
 #include <KoPoint.h>
 
 #include "kivio_stencil.h"
@@ -75,22 +75,23 @@ struct DistributeData
   Extent extent;
 };
 
-class KIVIO_EXPORT KivioPage : public QObject
+class KIVIO_EXPORT KivioPage : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KivioPage( KivioMap *_map, const QString &pageName,  const char *_name=0L );
+    KivioPage( KivioMap *_map, const TQString &pageName,  const char *_name=0L );
     ~KivioPage();
 
     virtual DCOPObject* dcopObject();
 
-    QString pageName()const { return m_strName; }
-    bool setPageName( const QString& name, bool init = false );
+    TQString pageName()const { return m_strName; }
+    bool setPageName( const TQString& name, bool init = false );
 
-    virtual QDomElement save( QDomDocument& );
+    virtual TQDomElement save( TQDomDocument& );
     virtual void saveOasis(KoStore* store, KoXmlWriter* docWriter, KoGenStyles* styles);
-    virtual bool loadXML( const QDomElement& );
-    bool loadOasis(const QDomElement& page, KoOasisStyles& oasisStyles);
+    virtual bool loadXML( const TQDomElement& );
+    bool loadOasis(const TQDomElement& page, KoOasisStyles& oasisStyles);
     bool isLoading();
     
     bool isHidden()const { return m_bPageHide; }
@@ -101,17 +102,17 @@ class KIVIO_EXPORT KivioPage : public QObject
     KivioDoc* doc()const { return m_pDoc; }
     KivioMap* map()const { return m_pMap; }
 
-    KivioPage *findPage( const QString & _name );
+    KivioPage *findPage( const TQString & _name );
 
-    void print( QPainter &painter, KPrinter *_printer );
+    void print( TQPainter &painter, KPrinter *_printer );
     void update();
     int id()const { return m_id; }
-    static KivioPage* find( int _id );
+    static KivioPage* tqfind( int _id );
 
     KoPageLayout paperLayout()const { return m_pPageLayout; }
     void setPaperLayout(const KoPageLayout&);
 
-    void paintContent( KivioPainter& painter, const QRect& rect, bool transparent, QPoint, KoZoomHandler*, bool, bool );
+    void paintContent( KivioPainter& painter, const TQRect& rect, bool transparent, TQPoint, KoZoomHandler*, bool, bool );
     void printContent( KivioPainter& painter, int xdpi = 0, int ydpi = 0 );
     void printSelected( KivioPainter& painter, int xdpi = 0, int ydpi = 0 );
     void printContent(KivioPainter& painter, KoZoomHandler* zoomHandler);
@@ -122,7 +123,7 @@ class KIVIO_EXPORT KivioPage : public QObject
     bool unselectStencil( KivioStencil * );
     void selectStencil( KivioStencil * );
     void selectStencils( double, double, double, double );
-    QPtrList<KivioStencil> *selectedStencils() { return &m_lstSelection; }
+    TQPtrList<KivioStencil> *selectedStencils() { return &m_lstSelection; }
     bool checkForStencilTypeInSelection(KivioStencilType type);
     bool checkForTextBoxesInSelection();
 
@@ -137,7 +138,7 @@ class KIVIO_EXPORT KivioPage : public QObject
     KivioLayer *curLayer()const { return m_pCurLayer; }
     void setCurLayer( KivioLayer *pLayer ) { m_pCurLayer=pLayer; }
 
-    QPtrList<KivioLayer> *layers() { return &m_lstLayers; }
+    TQPtrList<KivioLayer> *layers() { return &m_lstLayers; }
     KivioLayer *firstLayer();
     KivioLayer *nextLayer();
     KivioLayer *lastLayer();
@@ -160,8 +161,8 @@ class KIVIO_EXPORT KivioPage : public QObject
 
     void setHidePage(bool _hide);
 
-    QValueList<double> horizontalGuideLines() const { return m_hGuideLines; }
-    QValueList<double> verticalGuideLines() const { return m_vGuideLines; }
+    TQValueList<double> horizontalGuideLines() const { return m_hGuideLines; }
+    TQValueList<double> verticalGuideLines() const { return m_vGuideLines; }
 
   public slots:
     void deleteSelectedStencils();
@@ -177,13 +178,13 @@ class KIVIO_EXPORT KivioPage : public QObject
     
     void setPaintSelected(bool paint = true);
 
-    void setGuideLines(const QValueList<double> hGuideLines, const QValueList<double> vGuideLines);
+    void setGuideLines(const TQValueList<double> hGuideLines, const TQValueList<double> vGuideLines);
     void addGuideLine(Qt::Orientation orientation, double position);
 
   signals:
     void sig_updateView( KivioPage *_page );
-    void sig_updateView( KivioPage *_page, const QRect& );
-    void sig_nameChanged( KivioPage* page, const QString& old_name );
+    void sig_updateView( KivioPage *_page, const TQRect& );
+    void sig_nameChanged( KivioPage* page, const TQString& old_name );
 
     void sig_PageHidden(KivioPage *_page);
     void sig_PageShown(KivioPage *_page);
@@ -191,35 +192,35 @@ class KIVIO_EXPORT KivioPage : public QObject
     void sig_pageLayoutChanged(const KoPageLayout&);
 
   protected:
-    void printPage( QPainter &_painter, const QRect& page_range, const QRect& view );
+    void printPage( TQPainter &_painter, const TQRect& page_range, const TQRect& view );
 
-    QDomElement saveLayout( QDomDocument & );
-    bool loadLayout( const QDomElement & );
+    TQDomElement saveLayout( TQDomDocument & );
+    bool loadLayout( const TQDomElement & );
 
-    void saveGuideLines(QDomElement& element);
-    void loadGuideLines(const QDomElement& element);
+    void saveGuideLines(TQDomElement& element);
+    void loadGuideLines(const TQDomElement& element);
 
-    QString m_strName;
+    TQString m_strName;
 
     KivioMap *m_pMap;
     KivioDoc *m_pDoc;
 
-    QPtrList<KivioLayer> m_lstLayers;
+    TQPtrList<KivioLayer> m_lstLayers;
     KivioLayer *m_pCurLayer;
 
-    QPtrList<KivioStencil> m_lstSelection;
+    TQPtrList<KivioStencil> m_lstSelection;
 
     int m_id;
     bool m_bPageHide;
     static int s_id;
-    static QIntDict<KivioPage>* s_mapPages;
+    static TQIntDict<KivioPage>* s_mapPages;
 
     KoPageLayout m_pPageLayout;
 
     DCOPObject* m_dcop;
 
-    QValueList<double> m_hGuideLines;
-    QValueList<double> m_vGuideLines;
+    TQValueList<double> m_hGuideLines;
+    TQValueList<double> m_vGuideLines;
 };
 
 #endif
diff --git a/kivio/kiviopart/kivio_spawner_drag.cpp b/kivio/kiviopart/kivio_spawner_drag.cpp
index 169aaf79..7d952e05 100644
--- a/kivio/kiviopart/kivio_spawner_drag.cpp
+++ b/kivio/kiviopart/kivio_spawner_drag.cpp
@@ -25,8 +25,8 @@
 
 #include <kdebug.h>
 
-KivioSpawnerDrag::KivioSpawnerDrag( KivioIconView *view, QWidget *parent, const char *name )
-    : QIconDrag( parent, name )
+KivioSpawnerDrag::KivioSpawnerDrag( KivioIconView *view, TQWidget *tqparent, const char *name )
+    : TQIconDrag( tqparent, name )
 {
     m_pView = view;
 }
@@ -47,17 +47,17 @@ const char *KivioSpawnerDrag::format( int i ) const
         return 0L;
 }
 
-QByteArray KivioSpawnerDrag::encodedData( const char *mime ) const
+TQByteArray KivioSpawnerDrag::tqencodedData( const char *mime ) const
 {
-    QByteArray a;
+    TQByteArray a;
 
-    if( QString(mime) == "application/x-qiconlist" )
+    if( TQString(mime) == "application/x-qiconlist" )
     {
-        a = QIconDrag::encodedData(mime);
+        a = TQIconDrag::tqencodedData(mime);
     }
-    else if( QString(mime) == "kivio/stencilSpawner" )
+    else if( TQString(mime) == "kivio/stencilSpawner" )
     {
-        QString s = m_spawners.join("\r\n");
+        TQString s = m_spawners.join("\r\n");
         a.resize(s.length());
         memcpy( a.data(), s.latin1(), s.length() );
     }
@@ -65,18 +65,18 @@ QByteArray KivioSpawnerDrag::encodedData( const char *mime ) const
     return a;
 }
 
-bool KivioSpawnerDrag::canDecode( QMimeSource *e )
+bool KivioSpawnerDrag::canDecode( TQMimeSource *e )
 {
     return e->provides( "application/x-qiconlist" ) ||
            e->provides( "kivio/stencilSpawner" );
 }
 
-void KivioSpawnerDrag::append( const QIconDragItem &item, const QRect &pr,
-            const QRect &tr, KivioStencilSpawner &spawner )
+void KivioSpawnerDrag::append( const TQIconDragItem &item, const TQRect &pr,
+            const TQRect &tr, KivioStencilSpawner &spawner )
 {
-    QIconDrag::append( item, pr, tr );
+    TQIconDrag::append( item, pr, tr );
 
-    QString full = spawner.set()->dir() + "/" + spawner.info()->title();
+    TQString full = spawner.set()->dir() + "/" + spawner.info()->title();
     
     kdDebug(43000) << "KivioSpawnerDrag::append() - Adding " << full << endl;
 
diff --git a/kivio/kiviopart/kivio_spawner_drag.h b/kivio/kiviopart/kivio_spawner_drag.h
index 2e1acc6b..efc22880 100644
--- a/kivio/kiviopart/kivio_spawner_drag.h
+++ b/kivio/kiviopart/kivio_spawner_drag.h
@@ -19,27 +19,27 @@
 #ifndef KIVIO_SPAWNER_DRAG_H
 #define KIVIO_SPAWNER_DRAG_H
 
-#include <qdragobject.h>
-#include <qstringlist.h>
-#include <qiconview.h>
+#include <tqdragobject.h>
+#include <tqstringlist.h>
+#include <tqiconview.h>
 
 class KivioStencilSpawner;
 class KivioIconView;
 
-class KivioSpawnerDrag : public QIconDrag
+class KivioSpawnerDrag : public TQIconDrag
 {
 public:
-    KivioSpawnerDrag( KivioIconView *, QWidget *parent=0, const char *name=0);
+    KivioSpawnerDrag( KivioIconView *, TQWidget *tqparent=0, const char *name=0);
     virtual ~KivioSpawnerDrag();
 
     const char *format(int i) const;
-    QByteArray encodedData( const char *mime ) const;
-    static bool canDecode( QMimeSource* e );
-    void append( const QIconDragItem &item, const QRect &pr,
-                const QRect &tr, KivioStencilSpawner &spawner );
+    TQByteArray tqencodedData( const char *mime ) const;
+    static bool canDecode( TQMimeSource* e );
+    void append( const TQIconDragItem &item, const TQRect &pr,
+                const TQRect &tr, KivioStencilSpawner &spawner );
 
 private:
-    QStringList m_spawners;
+    TQStringList m_spawners;
     KivioIconView *m_pView;
 
 };
diff --git a/kivio/kiviopart/kivio_stackbar.cpp b/kivio/kiviopart/kivio_stackbar.cpp
index 71cae904..4c759a2d 100644
--- a/kivio/kiviopart/kivio_stackbar.cpp
+++ b/kivio/kiviopart/kivio_stackbar.cpp
@@ -19,23 +19,23 @@
 #include "kivio_stackbar.h"
 #include "stencilbarbutton.h"
 
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qapplication.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqapplication.h>
 
 #include <kdebug.h>
 
 
-KivioStackBar::KivioStackBar(KivioView* view, QWidget* parent, const char* name)
-  : QDockWindow(parent, name), m_view(view)
+KivioStackBar::KivioStackBar(KivioView* view, TQWidget* tqparent, const char* name)
+  : TQDockWindow(tqparent, name), m_view(view)
 {
-  QDockWindow::boxLayout()->setSpacing(0);
-  QDockWindow::boxLayout()->setMargin(0);
+  TQDockWindow::boxLayout()->setSpacing(0);
+  TQDockWindow::boxLayout()->setMargin(0);
   setResizeEnabled(true);
   setNewLine(true);
   m_visiblePage = 0;
   
-  connect(this, SIGNAL(placeChanged(QDockWindow::Place)), this, SLOT(newPlace(QDockWindow::Place)));
+  connect(this, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), this, TQT_SLOT(newPlace(TQDockWindow::Place)));
 }
 
 KivioStackBar::~KivioStackBar()
@@ -43,25 +43,25 @@ KivioStackBar::~KivioStackBar()
   kdDebug(43000) << "KivioStackBar::~KivioStackBar()" << endl;
 }
 
-void KivioStackBar::insertPage( QWidget* w, const QString& title )
+void KivioStackBar::insertPage( TQWidget* w, const TQString& title )
 {
-  if (w->parent() != this) {
-    w->reparent(this,QPoint(0,0));
+  if (TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(this)) {
+    w->reparent(this,TQPoint(0,0));
   }
 
   w->hide();
-  w->setFocusPolicy(NoFocus);
+  w->setFocusPolicy(TQ_NoFocus);
 
-  setMinimumWidth( QMAX(minimumSize().width(),w->minimumSize().width() ) );
-  setMaximumWidth( QMAX(maximumSize().width(),w->maximumSize().width() ) );
+  setMinimumWidth( TQMAX(tqminimumSize().width(),w->tqminimumSize().width() ) );
+  setMaximumWidth( TQMAX(tqmaximumSize().width(),w->tqmaximumSize().width() ) );
 
   DragBarButton* b = new DragBarButton( title, this );
   b->setOrientation(orientation());
-  connect( b, SIGNAL(clicked()), SLOT(showButtonPage()) );
-  connect( b, SIGNAL(beginDrag()), SLOT(buttonBeginDrag()) );
-  connect( b, SIGNAL(finishDrag()), SLOT(buttonFinishDrag()) );
-  connect( b, SIGNAL(closeRequired(DragBarButton*)), SLOT(slotDeleteButton(DragBarButton*)) );
-  connect(this, SIGNAL(orientationChanged(Orientation)), b, SLOT(setOrientation(Orientation)));
+  connect( b, TQT_SIGNAL(clicked()), TQT_SLOT(showButtonPage()) );
+  connect( b, TQT_SIGNAL(beginDrag()), TQT_SLOT(buttonBeginDrag()) );
+  connect( b, TQT_SIGNAL(finishDrag()), TQT_SLOT(buttonFinishDrag()) );
+  connect( b, TQT_SIGNAL(closeRequired(DragBarButton*)), TQT_SLOT(slotDeleteButton(DragBarButton*)) );
+  connect(this, TQT_SIGNAL(orientationChanged(Qt::Orientation)), b, TQT_SLOT(setOrientation(Qt::Orientation)));
 
   boxLayout()->addWidget(b);
   boxLayout()->addWidget(w, 1);
@@ -76,12 +76,12 @@ void KivioStackBar::insertPage( QWidget* w, const QString& title )
 
 void KivioStackBar::slotDeleteButton( DragBarButton *b )
 {
-  QWidget *pWidget = m_data[b];
+  TQWidget *pWidget = m_data[b];
   kdDebug(43000) << "Emitting deleteButton" << endl;
   emit deleteButton(b, pWidget, this);
 }
 
-void KivioStackBar::showPage( QWidget* w )
+void KivioStackBar::showPage( TQWidget* w )
 {
   emit aboutToShow( w );
 
@@ -105,7 +105,7 @@ void KivioStackBar::showButtonPage()
   showPage(findPage(b));
 }
 
-QWidget* KivioStackBar::findPage( DragBarButton* w )
+TQWidget* KivioStackBar::findPage( DragBarButton* w )
 {
   return m_data[w];
 }
@@ -113,15 +113,15 @@ QWidget* KivioStackBar::findPage( DragBarButton* w )
 /*
  * This does *NOT* delete the widget
 */
-void KivioStackBar::removePage( QWidget* widget )
+void KivioStackBar::removePage( TQWidget* widget )
 {
-  QPtrDictIterator<QWidget> it(m_data); // iterator for dict
+  TQPtrDictIterator<TQWidget> it(m_data); // iterator for dict
   DragBarButton* pBtn;
   while ( it.current() ) {
     if ( it.current() == widget ) {
       widget->hide();
       pBtn = (DragBarButton*)it.currentKey();
-      it.current()->reparent(0, QPoint(0,0));
+      it.current()->reparent(0, TQPoint(0,0));
       m_data.remove( it.currentKey() );
       delete pBtn;
       break;
@@ -138,7 +138,7 @@ void KivioStackBar::removePage( QWidget* widget )
 
 void KivioStackBar::deletePageAndButton( DragBarButton *pBtn )
 {
-  QWidget *pPage;
+  TQWidget *pPage;
 
   if( !pBtn ) {
     kdDebug(43000) << "KivioStackBar::deletePageAndButton() - pBtn is NULL!" << endl;
@@ -165,15 +165,15 @@ void KivioStackBar::deletePageAndButton( DragBarButton *pBtn )
 
 
   // Set the next current page, or set it to nothing
-  QPtrDictIterator<QWidget> it(m_data); // iterator for dict
+  TQPtrDictIterator<TQWidget> it(m_data); // iterator for dict
   if ( it.toFirst() ) {
     showPage( it.current() );
   }
 }
 
-QWidget* KivioStackBar::findPage( const QString& name )
+TQWidget* KivioStackBar::findPage( const TQString& name )
 {
-  QPtrDictIterator<QWidget> it(m_data); // iterator for dict
+  TQPtrDictIterator<TQWidget> it(m_data); // iterator for dict
   while ( it.current() ) {
     if ( it.current()->name() == name )
       return it.current();
@@ -192,9 +192,9 @@ void KivioStackBar::buttonFinishDrag()
   emit finishDragPage((DragBarButton*)sender());
 }
 
-void KivioStackBar::closeEvent(QCloseEvent* ev)
+void KivioStackBar::closeEvent(TQCloseEvent* ev)
 {
-  QPtrDictIterator<QWidget> it(m_data); // iterator for dict
+  TQPtrDictIterator<TQWidget> it(m_data); // iterator for dict
   while ( it.current() ) {
     slotDeleteButton((DragBarButton*)it.currentKey());
     if (it.current())
@@ -204,7 +204,7 @@ void KivioStackBar::closeEvent(QCloseEvent* ev)
   ev->ignore();
 }
 
-void KivioStackBar::newPlace(QDockWindow::Place place)
+void KivioStackBar::newPlace(TQDockWindow::Place place)
 {
   if((place == OutsideDock) && (orientation() == Qt::Horizontal)) {
     setOrientation(Qt::Vertical);
diff --git a/kivio/kiviopart/kivio_stackbar.h b/kivio/kiviopart/kivio_stackbar.h
index 55f26c31..6a4d6b81 100644
--- a/kivio/kiviopart/kivio_stackbar.h
+++ b/kivio/kiviopart/kivio_stackbar.h
@@ -19,8 +19,8 @@
 #ifndef KIVIO_STACK_BAR_H
 #define KIVIO_STACK_BAR_H
 
-#include <qdockwindow.h>
-#include <qptrdict.h>
+#include <tqdockwindow.h>
+#include <tqptrdict.h>
 
 namespace Kivio {
   class DragBarButton;
@@ -30,43 +30,44 @@ class KivioView;
 
 using namespace Kivio;
 
-class KivioStackBar : public QDockWindow
+class KivioStackBar : public TQDockWindow
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KivioStackBar(KivioView* view, QWidget* parent=0, const char* name=0);
+    KivioStackBar(KivioView* view, TQWidget* tqparent=0, const char* name=0);
     ~KivioStackBar();
   
-    QWidget* findPage(const QString& name);
-    QWidget* findPage(DragBarButton*);
-    void insertPage(QWidget*, const QString&);
-    void removePage(QWidget*);
+    TQWidget* findPage(const TQString& name);
+    TQWidget* findPage(DragBarButton*);
+    void insertPage(TQWidget*, const TQString&);
+    void removePage(TQWidget*);
     void deletePageAndButton(DragBarButton*);
-    void showPage(QWidget*);
+    void showPage(TQWidget*);
   
-    QWidget* visiblePage() const { return m_visiblePage; }
+    TQWidget* visiblePage() const { return m_visiblePage; }
     
     KivioView* view() const { return m_view; } 
   
   signals:
-    void aboutToShow(QWidget*);
+    void aboutToShow(TQWidget*);
     void beginDragPage(DragBarButton*);
     void finishDragPage(DragBarButton*);
-    void deleteButton(DragBarButton*, QWidget*, KivioStackBar*);
+    void deleteButton(DragBarButton*, TQWidget*, KivioStackBar*);
   
   protected:
-    virtual void closeEvent(QCloseEvent*);
+    virtual void closeEvent(TQCloseEvent*);
   
   protected slots:
     void showButtonPage();
     void buttonBeginDrag();
     void buttonFinishDrag();
     void slotDeleteButton(DragBarButton*);
-    void newPlace(QDockWindow::Place place);
+    void newPlace(TQDockWindow::Place place);
   
   private:
-    QPtrDict<QWidget> m_data;
-    QWidget* m_visiblePage;
+    TQPtrDict<TQWidget> m_data;
+    TQWidget* m_visiblePage;
     KivioView* m_view;
 };
 
diff --git a/kivio/kiviopart/kivio_stencil_geometry_panel.cpp b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp
index 34772634..fc2bd62e 100644
--- a/kivio/kiviopart/kivio_stencil_geometry_panel.cpp
+++ b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp
@@ -1,8 +1,8 @@
 #include "kivio_stencil_geometry_panel.h"
 
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qpixmap.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqpixmap.h>
 
 #include <knuminput.h>
 #include <klocale.h>
@@ -11,16 +11,16 @@
 #include <KoPageLayout.h>
 #include <KoUnitWidgets.h>
 
-KivioStencilGeometryPanel::KivioStencilGeometryPanel(QWidget* parent)
-: QWidget(parent,"KivioStencilGeometryPanel")
+KivioStencilGeometryPanel::KivioStencilGeometryPanel(TQWidget* tqparent)
+: TQWidget(tqparent,"KivioStencilGeometryPanel")
 {
-  QGridLayout* grid = new QGridLayout(this, 4, 2, 0, 2);
+  TQGridLayout* grid = new TQGridLayout(this, 4, 2, 0, 2);
 
-  QLabel* lx = new QLabel(i18n("X:"), this);
-  QLabel* ly = new QLabel(i18n("Y:"), this);
-  QLabel* lw = new QLabel(i18n("Width:"), this);
-  QLabel* lh = new QLabel(i18n("Height:"), this);
-//   QLabel *rotationLbl = new QLabel(this);
+  TQLabel* lx = new TQLabel(i18n("X:"), this);
+  TQLabel* ly = new TQLabel(i18n("Y:"), this);
+  TQLabel* lw = new TQLabel(i18n("Width:"), this);
+  TQLabel* lh = new TQLabel(i18n("Height:"), this);
+//   TQLabel *rotationLbl = new TQLabel(this);
 
   m_pX = new KoUnitDoubleSpinBox(this, 0.0, 1000.0, 0.5, 0.0);
   m_pY = new KoUnitDoubleSpinBox(this, 0.0, 1000.0, 0.5, 0.0);
@@ -29,11 +29,11 @@ KivioStencilGeometryPanel::KivioStencilGeometryPanel(QWidget* parent)
 //   m_rotationSBox = new KIntSpinBox(-360, 360, 1, 0, 10, this);
 //   m_rotationSBox->hide();
 
-  connect(m_pX, SIGNAL(valueChanged(double)), SLOT(xChange(double)));
-  connect(m_pY, SIGNAL(valueChanged(double)), SLOT(yChange(double)));
-  connect(m_pW, SIGNAL(valueChanged(double)), SLOT(wChange(double)));
-  connect(m_pH, SIGNAL(valueChanged(double)), SLOT(hChange(double)));
-//  connect(m_rotationSBox, SIGNAL(valueChanged(int)), SLOT(rotationChange(int)));
+  connect(m_pX, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(xChange(double)));
+  connect(m_pY, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(yChange(double)));
+  connect(m_pW, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(wChange(double)));
+  connect(m_pH, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(hChange(double)));
+//  connect(m_rotationSBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(rotationChange(int)));
 
   grid->addWidget(lx, 0, 0);
   grid->addWidget(m_pX, 1, 0);
diff --git a/kivio/kiviopart/kivio_stencil_geometry_panel.h b/kivio/kiviopart/kivio_stencil_geometry_panel.h
index 391e05ce..b049b2f3 100644
--- a/kivio/kiviopart/kivio_stencil_geometry_panel.h
+++ b/kivio/kiviopart/kivio_stencil_geometry_panel.h
@@ -1,16 +1,17 @@
 #ifndef KIVIO_STENCIL_GEOMETRY_PANEL_H
 #define KIVIO_STENCIL_GEOMETRY_PANEL_H
 
-#include <qwidget.h>
+#include <tqwidget.h>
 #include <KoUnit.h>
 
 class KoPageLayout;
 class KoUnitDoubleSpinBox;
 class KIntSpinBox;
 
-class KivioStencilGeometryPanel : public QWidget
+class KivioStencilGeometryPanel : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   protected:
     KoUnitDoubleSpinBox *m_pX, *m_pY, *m_pW, *m_pH;
     KIntSpinBox* m_rotationSBox;
@@ -39,7 +40,7 @@ class KivioStencilGeometryPanel : public QWidget
     void rotationChanged(int);
 
   public:
-    KivioStencilGeometryPanel(QWidget* parent);
+    KivioStencilGeometryPanel(TQWidget* tqparent);
     virtual ~KivioStencilGeometryPanel();
 };
 
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index 82aad1f6..7d050b86 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -24,25 +24,25 @@
 #include <time.h>
 #include <assert.h>
 
-#include <qlayout.h>
-#include <qwidgetstack.h>
-#include <qsplitter.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qprintdialog.h>
-#include <qptrcollection.h>
-#include <qkeycode.h>
-#include <qcheckbox.h>
-#include <qmime.h>
-#include <qtoolbutton.h>
-#include <qtimer.h>
-#include <qbutton.h>
-#include <qclipboard.h>
-#include <qprogressbar.h>
-
-#include <qstringlist.h>
-#include <qstrlist.h>
-#include <qimage.h>
+#include <tqlayout.h>
+#include <tqwidgetstack.h>
+#include <tqsplitter.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqprintdialog.h>
+#include <tqptrcollection.h>
+#include <tqkeycode.h>
+#include <tqcheckbox.h>
+#include <tqmime.h>
+#include <tqtoolbutton.h>
+#include <tqtimer.h>
+#include <tqbutton.h>
+#include <tqclipboard.h>
+#include <tqprogressbar.h>
+
+#include <tqstringlist.h>
+#include <tqstrlist.h>
+#include <tqimage.h>
 #include <kfiledialog.h>
 
 #include <kdialogbase.h>
@@ -114,7 +114,7 @@
 #include "KIvioViewIface.h"
 #include "kivio_command.h"
 #include "kiviostencilsetaction.h"
-#include <qiconview.h>
+#include <tqiconview.h>
 #include "kivioarrowheadaction.h"
 #include "kiviotextformatdlg.h"
 #include "kiviostencilformatdlg.h"
@@ -135,7 +135,7 @@
 
 using namespace Kivio;
 
-KivioView::KivioView( QWidget *_parent, const char *_name, KivioDoc* doc )
+KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
 : KoView( doc, _parent, _name )
 {
   m_bShowGuides = true;
@@ -153,18 +153,18 @@ KivioView::KivioView( QWidget *_parent, const char *_name, KivioDoc* doc )
 
   if(KStatusBar* sb = statusBar()) { // No statusbar in e.g. konqueror
     m_pageCountSLbl = new KStatusBarLabel(i18n("%1 current page, %2 total number of pages",
-                                          "Page %1/%2").arg(0).arg(0), PAGECOUNT_TEXT, sb);
+                                          "Page %1/%2").tqarg(0).tqarg(0), PAGECOUNT_TEXT, sb);
     addStatusBarItem(m_pageCountSLbl, 0, false);
 
     m_infoSLbl = new KStatusBarLabel("", INFO_TEXT, sb);
     addStatusBarItem(m_infoSLbl, 10, false);
 
     // Add coords to the statusbar
-    QString unit = KoUnit::unitName(m_pDoc->unit());
+    TQString unit = KoUnit::unitName(m_pDoc->unit());
     KoPoint xy(0, 0);
-    QString text = i18n("%1 x coord, %2 y coord, %3 and %4 the unit",
-                        "X: %1 %3 Y: %2 %4").arg(KGlobal::_locale->formatNumber(xy.x(), 2))
-                        .arg(KGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit);
+    TQString text = i18n("%1 x coord, %2 y coord, %3 and %4 the unit",
+                        "X: %1 %3 Y: %2 %4").tqarg(KGlobal::_locale->formatNumber(xy.x(), 2))
+                        .tqarg(KGlobal::_locale->formatNumber(xy.y(), 2)).tqarg(unit).tqarg(unit);
     m_coordSLbl = new KStatusBarLabel(text, MOUSEPOS_TEXT, sb);
     addStatusBarItem(m_coordSLbl, 0, true);
   }
@@ -172,50 +172,50 @@ KivioView::KivioView( QWidget *_parent, const char *_name, KivioDoc* doc )
   // Handle progress information from the doc
   m_statusBarProgress = 0;
 
-  connect(m_pDoc, SIGNAL(initProgress()), this, SLOT(initStatusBarProgress()));
-  connect(m_pDoc, SIGNAL(progress(int)), this, SLOT(setStatusBarProgress(int)));
-  connect(m_pDoc, SIGNAL(endProgress()), this, SLOT(removeStatusBarProgress()));
+  connect(m_pDoc, TQT_SIGNAL(initProgress()), TQT_TQOBJECT(this), TQT_SLOT(initStatusBarProgress()));
+  connect(m_pDoc, TQT_SIGNAL(progress(int)), TQT_TQOBJECT(this), TQT_SLOT(setStatusBarProgress(int)));
+  connect(m_pDoc, TQT_SIGNAL(endProgress()), TQT_TQOBJECT(this), TQT_SLOT(removeStatusBarProgress()));
 
   bool isModified = doc->isModified();
   m_pStencilBarDockManager = new StencilBarDockManager(this);
 
-  // QGridLayout for the entire view
-  QGridLayout *viewGrid = new QGridLayout(this);
+  // TQGridLayout for the entire view
+  TQGridLayout *viewGrid = new TQGridLayout(this);
 
   // A widget to hold the entire right side (old view)
-  QWidget *pRightSide = new QWidget(this);
+  TQWidget *pRightSide = new TQWidget(this);
   viewGrid->addWidget(pRightSide, 0, 0);
 
   // Split tabbar and Horz. Scroll Bar
-  QSplitter* tabSplit = new QSplitter(pRightSide);
+  TQSplitter* tabSplit = new TQSplitter(pRightSide);
 
   // Tab Bar
   m_pTabBar = new KoTabBar(tabSplit);
   connect( m_pTabBar,
-           SIGNAL(tabChanged(const QString&)),
-           SLOT( changePage(const QString&)));
-  connect( m_pTabBar, SIGNAL( doubleClicked() ), SLOT( renamePage() ) );
-  connect( m_pTabBar, SIGNAL( contextMenu( const QPoint& ) ),
-      SLOT( popupTabBarMenu( const QPoint& ) ) );
-  connect(m_pTabBar, SIGNAL(tabMoved(unsigned, unsigned)), this, SLOT(moveTab(unsigned, unsigned)));
-  m_pTabBar->setReverseLayout( QApplication::reverseLayout() );
+           TQT_SIGNAL(tabChanged(const TQString&)),
+           TQT_SLOT( changePage(const TQString&)));
+  connect( m_pTabBar, TQT_SIGNAL( doubleClicked() ), TQT_SLOT( renamePage() ) );
+  connect( m_pTabBar, TQT_SIGNAL( contextMenu( const TQPoint& ) ),
+      TQT_SLOT( popupTabBarMenu( const TQPoint& ) ) );
+  connect(m_pTabBar, TQT_SIGNAL(tabMoved(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(moveTab(unsigned, unsigned)));
+  m_pTabBar->setReverseLayout( TQApplication::reverseLayout() );
 
   // Scroll Bar
-  m_vertScrollBar = new QScrollBar(QScrollBar::Vertical,pRightSide);
-  m_horzScrollBar = new QScrollBar(QScrollBar::Horizontal,tabSplit);
+  m_vertScrollBar = new TQScrollBar(Qt::Vertical,pRightSide);
+  m_horzScrollBar = new TQScrollBar(Qt::Horizontal,tabSplit);
 
-  QValueList<int> sizes;
+  TQValueList<int> sizes;
   sizes << tabSplit->width() / 2 << tabSplit->width() / 2;
   tabSplit->setSizes(sizes);
-  QHBoxLayout* tabLayout = new QHBoxLayout();
+  TQHBoxLayout* tabLayout = new TQHBoxLayout();
   tabLayout->addWidget(tabSplit);
 
   // The widget on which we display the page
-  QWidgetStack* canvasBase = new QWidgetStack(pRightSide);
+  TQWidgetStack* canvasBase = new TQWidgetStack(pRightSide);
   m_pCanvas = new KivioCanvas(canvasBase,this,doc,m_vertScrollBar,m_horzScrollBar);
   canvasBase->addWidget(m_pCanvas,0);
   canvasBase->raiseWidget(m_pCanvas);
-  m_pCanvas->setFocusPolicy(QWidget::StrongFocus);
+  m_pCanvas->setFocusPolicy(TQ_StrongFocus);
 
   // Rulers
   vRuler = new KoRuler(pRightSide, m_pCanvas, Qt::Vertical, Kivio::Config::defaultPageLayout(),
@@ -226,39 +226,39 @@ KivioView::KivioView( QWidget *_parent, const char *_name, KivioDoc* doc )
     KoRuler::F_HELPLINES, m_pDoc->unit());
   hRuler->showMousePos(true);
   hRuler->setZoom(zoomHandler()->zoomedResolutionX());
-  connect(m_vertScrollBar, SIGNAL(valueChanged(int)), SLOT(setRulerVOffset(int)));
-  connect(m_horzScrollBar, SIGNAL(valueChanged(int)), SLOT(setRulerHOffset(int)));
-  connect(vRuler, SIGNAL(unitChanged(KoUnit::Unit)), SLOT(rulerChangedUnit(KoUnit::Unit)));
-  connect(hRuler, SIGNAL(unitChanged(KoUnit::Unit)), SLOT(rulerChangedUnit(KoUnit::Unit)));
-  connect(vRuler, SIGNAL(doubleClicked()), SLOT(paperLayoutDlg()));
-  connect(hRuler, SIGNAL(doubleClicked()), SLOT(paperLayoutDlg()));
-  connect(m_pDoc, SIGNAL(unitChanged(KoUnit::Unit)), SLOT(setRulerUnit(KoUnit::Unit)));
-  connect(m_pCanvas, SIGNAL(visibleAreaChanged()), SLOT(updateRulers()));
-
-  connect(vRuler, SIGNAL(addGuide(const QPoint&, bool, int)),
-          &(m_pCanvas->guideLines()), SLOT(addGuide(const QPoint&, bool, int)));
-  connect(vRuler, SIGNAL(moveGuide(const QPoint&, bool, int)),
-          &(m_pCanvas->guideLines()), SLOT(moveGuide(const QPoint&, bool, int)));
-  connect(hRuler, SIGNAL(addGuide(const QPoint&, bool, int)),
-          &(m_pCanvas->guideLines()), SLOT(addGuide(const QPoint&, bool, int)));
-  connect(hRuler, SIGNAL(moveGuide(const QPoint&, bool, int)),
-          &(m_pCanvas->guideLines()), SLOT(moveGuide(const QPoint&, bool, int)));
-  connect(&(m_pCanvas->guideLines()), SIGNAL(guideLinesChanged(KoView*)), m_pDoc, SLOT(updateGuideLines(KoView*)));
-
-  QGridLayout* layout = new QGridLayout(pRightSide);
-  layout->addWidget(hRuler, 0, 1);
-  layout->addWidget(vRuler, 1, 0);
-  layout->addWidget(canvasBase, 1, 1);
-  layout->addMultiCellLayout(tabLayout, 2, 2, 0, 1);
-  layout->addMultiCellWidget(m_vertScrollBar, 0, 1, 2, 2);
-  layout->setRowStretch(1, 10);
-  layout->setColStretch(1, 10);
-
-  QWidget::setFocusPolicy( QWidget::StrongFocus );
+  connect(m_vertScrollBar, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setRulerVOffset(int)));
+  connect(m_horzScrollBar, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setRulerHOffset(int)));
+  connect(vRuler, TQT_SIGNAL(unitChanged(KoUnit::Unit)), TQT_SLOT(rulerChangedUnit(KoUnit::Unit)));
+  connect(hRuler, TQT_SIGNAL(unitChanged(KoUnit::Unit)), TQT_SLOT(rulerChangedUnit(KoUnit::Unit)));
+  connect(vRuler, TQT_SIGNAL(doubleClicked()), TQT_SLOT(paperLayoutDlg()));
+  connect(hRuler, TQT_SIGNAL(doubleClicked()), TQT_SLOT(paperLayoutDlg()));
+  connect(m_pDoc, TQT_SIGNAL(unitChanged(KoUnit::Unit)), TQT_SLOT(setRulerUnit(KoUnit::Unit)));
+  connect(m_pCanvas, TQT_SIGNAL(visibleAreaChanged()), TQT_SLOT(updateRulers()));
+
+  connect(vRuler, TQT_SIGNAL(addGuide(const TQPoint&, bool, int)),
+          &(m_pCanvas->guideLines()), TQT_SLOT(addGuide(const TQPoint&, bool, int)));
+  connect(vRuler, TQT_SIGNAL(moveGuide(const TQPoint&, bool, int)),
+          &(m_pCanvas->guideLines()), TQT_SLOT(moveGuide(const TQPoint&, bool, int)));
+  connect(hRuler, TQT_SIGNAL(addGuide(const TQPoint&, bool, int)),
+          &(m_pCanvas->guideLines()), TQT_SLOT(addGuide(const TQPoint&, bool, int)));
+  connect(hRuler, TQT_SIGNAL(moveGuide(const TQPoint&, bool, int)),
+          &(m_pCanvas->guideLines()), TQT_SLOT(moveGuide(const TQPoint&, bool, int)));
+  connect(&(m_pCanvas->guideLines()), TQT_SIGNAL(guideLinesChanged(KoView*)), m_pDoc, TQT_SLOT(updateGuideLines(KoView*)));
+
+  TQGridLayout* tqlayout = new TQGridLayout(pRightSide);
+  tqlayout->addWidget(hRuler, 0, 1);
+  tqlayout->addWidget(vRuler, 1, 0);
+  tqlayout->addWidget(canvasBase, 1, 1);
+  tqlayout->addMultiCellLayout(tabLayout, 2, 2, 0, 1);
+  tqlayout->addMultiCellWidget(m_vertScrollBar, 0, 1, 2, 2);
+  tqlayout->setRowStretch(1, 10);
+  tqlayout->setColStretch(1, 10);
+
+  TQWidget::setFocusPolicy( TQ_StrongFocus );
   setFocusProxy( m_pCanvas );
 
-  connect( this, SIGNAL( invalidated() ), m_pCanvas, SLOT( update() ) );
-  connect( this, SIGNAL( regionInvalidated( const QRegion&, bool ) ), m_pCanvas, SLOT( repaint( const QRegion&, bool ) ) );
+  connect( TQT_TQOBJECT(this), TQT_SIGNAL( tqinvalidated() ), m_pCanvas, TQT_SLOT( update() ) );
+  connect( TQT_TQOBJECT(this), TQT_SIGNAL( regionInvalidated( const TQRegion&, bool ) ), m_pCanvas, TQT_SLOT( tqrepaint( const TQRegion&, bool ) ) );
 
   setInstance(KivioFactory::global());
   if ( !m_pDoc->isReadWrite() )
@@ -274,7 +274,7 @@ KivioView::KivioView( QWidget *_parent, const char *_name, KivioDoc* doc )
   createGeometryDock();
   createProtectionDock();
   paletteManager()->showWidget("birdseyepanel");
-  paletteManager()->showWidget("stencilgeometrypanel");
+  paletteManager()->showWidget("stenciltqgeometrypanel");
 
   setupActions();
 
@@ -286,15 +286,15 @@ KivioView::KivioView( QWidget *_parent, const char *_name, KivioDoc* doc )
   setActivePage(m_pDoc->map()->firstPage());
 
 
-  connect( m_pDoc, SIGNAL( sig_selectionChanged() ), SLOT( updateToolBars() ) );
-  connect( m_pDoc, SIGNAL( sig_addPage(KivioPage*) ), SLOT( addPage(KivioPage*) ) );
-  connect( m_pDoc, SIGNAL( sig_addSpawnerSet(KivioStencilSpawnerSet*) ), SLOT(addSpawnerToStackBar(KivioStencilSpawnerSet*)) );
-  connect( m_pDoc, SIGNAL( sig_updateView(KivioPage*) ), SLOT(slotUpdateView(KivioPage*)) );
-  connect( m_pDoc, SIGNAL( sig_pageNameChanged(KivioPage*,const QString&)), SLOT(slotPageRenamed(KivioPage*,const QString&)) );
+  connect( m_pDoc, TQT_SIGNAL( sig_selectionChanged() ), TQT_SLOT( updateToolBars() ) );
+  connect( m_pDoc, TQT_SIGNAL( sig_addPage(KivioPage*) ), TQT_SLOT( addPage(KivioPage*) ) );
+  connect( m_pDoc, TQT_SIGNAL( sig_addSpawnerSet(KivioStencilSpawnerSet*) ), TQT_SLOT(addSpawnerToStackBar(KivioStencilSpawnerSet*)) );
+  connect( m_pDoc, TQT_SIGNAL( sig_updateView(KivioPage*) ), TQT_SLOT(slotUpdateView(KivioPage*)) );
+  connect( m_pDoc, TQT_SIGNAL( sig_pageNameChanged(KivioPage*,const TQString&)), TQT_SLOT(slotPageRenamed(KivioPage*,const TQString&)) );
 
-  connect( m_pDoc, SIGNAL( sig_updateGrid()),SLOT(slotUpdateGrid()));
+  connect( m_pDoc, TQT_SIGNAL( sig_updateGrid()),TQT_SLOT(slotUpdateGrid()));
 
-  connect(m_pDoc, SIGNAL(loadingFinished()), this, SLOT(loadingFinished()));
+  connect(m_pDoc, TQT_SIGNAL(loadingFinished()), TQT_TQOBJECT(this), TQT_SLOT(loadingFinished()));
 
   initActions();
 
@@ -339,13 +339,13 @@ void KivioView::createGeometryDock()
   m_pStencilGeometryPanel = new KivioStencilGeometryPanel(this);
   m_pStencilGeometryPanel->setCaption(i18n("Geometry"));
   m_pStencilGeometryPanel->setUnit(m_pDoc->unit());
-  paletteManager()->addWidget(m_pStencilGeometryPanel, "stencilgeometrypanel", "geometrydocker");
+  paletteManager()->addWidget(m_pStencilGeometryPanel, "stenciltqgeometrypanel", "tqgeometrydocker");
 
-  connect( m_pStencilGeometryPanel, SIGNAL(positionChanged(double, double)), this, SLOT(slotChangeStencilPosition(double, double)) );
-  connect( m_pStencilGeometryPanel, SIGNAL(sizeChanged(double, double)), this, SLOT(slotChangeStencilSize(double, double)) );
-//   connect(m_pStencilGeometryPanel, SIGNAL(rotationChanged(int)), SLOT(slotChangeStencilRotation(int)));
+  connect( m_pStencilGeometryPanel, TQT_SIGNAL(positionChanged(double, double)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeStencilPosition(double, double)) );
+  connect( m_pStencilGeometryPanel, TQT_SIGNAL(sizeChanged(double, double)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeStencilSize(double, double)) );
+//   connect(m_pStencilGeometryPanel, TQT_SIGNAL(rotationChanged(int)), TQT_SLOT(slotChangeStencilRotation(int)));
 
-  connect( m_pDoc, SIGNAL(unitChanged(KoUnit::Unit)), m_pStencilGeometryPanel, SLOT(setUnit(KoUnit::Unit)) );
+  connect( m_pDoc, TQT_SIGNAL(unitChanged(KoUnit::Unit)), m_pStencilGeometryPanel, TQT_SLOT(setUnit(KoUnit::Unit)) );
 }
 
 void KivioView::createBirdEyeDock()
@@ -366,7 +366,7 @@ void KivioView::createProtectionDock()
 {
   m_pProtectionPanel = new KivioProtectionPanel(this,this);
   m_pProtectionPanel->setCaption(i18n("Protection"));
-  paletteManager()->addWidget(m_pProtectionPanel, "protectionpanel", "geometrydocker");
+  paletteManager()->addWidget(m_pProtectionPanel, "protectionpanel", "tqgeometrydocker");
 }
 
 void KivioView::createObjectListPalette()
@@ -380,149 +380,149 @@ void KivioView::setupActions()
 {
   KivioStencilSetAction* addStSet =  new KivioStencilSetAction( i18n("Add Stencil Set"),
     "open_stencilset", actionCollection(), "addStencilSet" );
-  connect(addStSet,SIGNAL(activated(const QString&)),SLOT(addStencilSet(const QString&)));
-  connect(this, SIGNAL(updateStencilSetList()), addStSet, SLOT(updateMenu()));
-  connect(addStSet, SIGNAL(showDialog()), this, SLOT(showAddStencilSetDialog()));
+  connect(addStSet,TQT_SIGNAL(activated(const TQString&)),TQT_SLOT(addStencilSet(const TQString&)));
+  connect(TQT_TQOBJECT(this), TQT_SIGNAL(updateStencilSetList()), addStSet, TQT_SLOT(updateMenu()));
+  connect(addStSet, TQT_SIGNAL(showDialog()), TQT_TQOBJECT(this), TQT_SLOT(showAddStencilSetDialog()));
 
-  m_alignAndDistribute = new KAction( i18n("Align && Distribute..."), CTRL+ALT+Key_A, this,
-    SLOT(alignStencilsDlg()), actionCollection(), "alignStencils" );
+  m_alignAndDistribute = new KAction( i18n("Align && Distribute..."), CTRL+ALT+Key_A, TQT_TQOBJECT(this),
+    TQT_SLOT(alignStencilsDlg()), actionCollection(), "alignStencils" );
 
-  m_editCut = KStdAction::cut( this, SLOT(cutStencil()), actionCollection(), "cutStencil" );
-  m_editCopy = KStdAction::copy( this, SLOT(copyStencil()), actionCollection(), "copyStencil" );
-  m_editPaste = KStdAction::paste( this, SLOT(pasteStencil()), actionCollection(), "pasteStencil" );
-  connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardDataChanged()));
+  m_editCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(cutStencil()), actionCollection(), "cutStencil" );
+  m_editCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copyStencil()), actionCollection(), "copyStencil" );
+  m_editPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(pasteStencil()), actionCollection(), "pasteStencil" );
+  connect(TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(clipboardDataChanged()));
 
-  m_selectAll = KStdAction::selectAll(this, SLOT(selectAllStencils()), actionCollection(), "selectAllStencils");
-  m_selectNone = KStdAction::deselect(this, SLOT(unselectAllStencils()), actionCollection(), "unselectAllStencils");
+  m_selectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(selectAllStencils()), actionCollection(), "selectAllStencils");
+  m_selectNone = KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(unselectAllStencils()), actionCollection(), "unselectAllStencils");
 
-  m_groupAction = new KAction( i18n("Group Selection"), "group", CTRL+Key_G, this, SLOT(groupStencils()), actionCollection(), "groupStencils" );
+  m_groupAction = new KAction( i18n("Group Selection"), "group", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(groupStencils()), actionCollection(), "groupStencils" );
   m_groupAction->setWhatsThis(i18n("Group selected objects into a single stencil"));
-  m_ungroupAction = new KAction( i18n("Ungroup"), "ungroup", CTRL+SHIFT+Key_G, this, SLOT(ungroupStencils()), actionCollection(), "ungroupStencils" );
+  m_ungroupAction = new KAction( i18n("Ungroup"), "ungroup", CTRL+SHIFT+Key_G, TQT_TQOBJECT(this), TQT_SLOT(ungroupStencils()), actionCollection(), "ungroupStencils" );
   m_ungroupAction->setWhatsThis(i18n("Break up a selected group stencil"));
 
-  m_stencilToFront = new KAction( i18n("Bring to Front"), "bring_forward", 0, this, SLOT(bringStencilToFront()), actionCollection(), "bringStencilToFront" );
-  m_stencilToBack = new KAction( i18n("Send to Back"), "send_backward", 0, this, SLOT(sendStencilToBack()), actionCollection(), "sendStencilToBack" );
+  m_stencilToFront = new KAction( i18n("Bring to Front"), "bring_forward", 0, TQT_TQOBJECT(this), TQT_SLOT(bringStencilToFront()), actionCollection(), "bringStencilToFront" );
+  m_stencilToBack = new KAction( i18n("Send to Back"), "send_backward", 0, TQT_TQOBJECT(this), TQT_SLOT(sendStencilToBack()), actionCollection(), "sendStencilToBack" );
 
-  m_menuTextFormatAction = new KAction(i18n("&Text..."), 0, 0, this, SLOT(textFormat()),
+  m_menuTextFormatAction = new KAction(i18n("&Text..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(textFormat()),
   actionCollection(), "textFormat");
 
-  m_menuStencilConnectorsAction = new KAction(i18n("&Stencils && Connectors..."), 0, 0, this, SLOT(stencilFormat()),
+  m_menuStencilConnectorsAction = new KAction(i18n("&Stencils && Connectors..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(stencilFormat()),
   actionCollection(), "stencilFormat");
 
-  m_arrowHeadsMenuAction = new KAction(i18n("&Arrowheads..."), 0, 0, this, SLOT(arrowHeadFormat()),
+  m_arrowHeadsMenuAction = new KAction(i18n("&Arrowheads..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(arrowHeadFormat()),
   actionCollection(), "arrowHeadFormat");
   m_arrowHeadsMenuAction->setWhatsThis(i18n("Arrowheads allow you to add an arrow to the beginning and/or end of a line."));
 
   /* Create the fg color button */
   m_setFGColor = new TKSelectColorAction( i18n("Line Color"), TKSelectColorAction::LineColor, actionCollection(), "setFGColor" );
   m_setFGColor->setWhatsThis(i18n("The line color allows you to choose a color for the lines of the stencils."));
-  connect(m_setFGColor,SIGNAL(activated()),SLOT(setFGColor()));
+  connect(m_setFGColor,TQT_SIGNAL(activated()),TQT_SLOT(setFGColor()));
   m_setBGColor = new TKSelectColorAction( i18n("Fill Color"), TKSelectColorAction::FillColor, actionCollection(), "setBGColor" );
   m_setBGColor->setWhatsThis(i18n("You can choose a color for the background of a stencil by using this button."));
-  connect(m_setBGColor,SIGNAL(activated()),SLOT(setBGColor()));
+  connect(m_setBGColor,TQT_SIGNAL(activated()),TQT_SLOT(setBGColor()));
 
   // Text bar
   m_setFontFamily = new KFontAction( i18n( "Font Family" ), 0, actionCollection(), "setFontFamily" );
-  connect( m_setFontFamily, SIGNAL(activated(const QString&)), SLOT(setFontFamily(const QString&)) );
+  connect( m_setFontFamily, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(setFontFamily(const TQString&)) );
 
   m_setFontSize = new KFontSizeAction( i18n( "Font Size" ), 0, actionCollection(), "setFontSize" );
-  connect( m_setFontSize, SIGNAL( fontSizeChanged( int ) ),
-           this, SLOT( setFontSize(int ) ) );
+  connect( m_setFontSize, TQT_SIGNAL( fontSizeChanged( int ) ),
+           TQT_TQOBJECT(this), TQT_SLOT( setFontSize(int ) ) );
 
 
   m_setTextColor = new TKSelectColorAction( i18n("Text Color"), TKSelectColorAction::TextColor, actionCollection(), "setTextColor" );
-  connect( m_setTextColor, SIGNAL(activated()), SLOT(setTextColor()) );
+  connect( m_setTextColor, TQT_SIGNAL(activated()), TQT_SLOT(setTextColor()) );
 
   m_setBold = new KToggleAction( i18n("Toggle Bold Text"), "text_bold", 0, actionCollection(), "setFontBold" );
-  connect( m_setBold, SIGNAL(toggled(bool)), SLOT(toggleFontBold(bool)) );
+  connect( m_setBold, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleFontBold(bool)) );
 
   m_setItalics = new KToggleAction( i18n("Toggle Italics Text"), "text_italic", 0, actionCollection(), "setFontItalics" );
-  connect( m_setItalics, SIGNAL(toggled(bool)), SLOT(toggleFontItalics(bool)) );
+  connect( m_setItalics, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleFontItalics(bool)) );
 
   m_setUnderline = new KToggleAction( i18n("Toggle Underline Text"), "text_under", 0, actionCollection(), "setFontUnderline" );
-  connect( m_setUnderline, SIGNAL(toggled(bool)), SLOT(toggleFontUnderline(bool)));
+  connect( m_setUnderline, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleFontUnderline(bool)));
 
   m_textAlignLeft = new KToggleAction( i18n( "Align &Left" ), "text_left", CTRL + Key_L,
-                                    this, SLOT( textAlignLeft() ),
+                                    TQT_TQOBJECT(this), TQT_SLOT( textAlignLeft() ),
                                     actionCollection(), "textAlignLeft" );
   m_textAlignLeft->setExclusiveGroup( "align" );
   m_textAlignCenter = new KToggleAction( i18n( "Align &Center" ), "text_center", CTRL + ALT + Key_C,
-                                      this, SLOT( textAlignCenter() ),
+                                      TQT_TQOBJECT(this), TQT_SLOT( textAlignCenter() ),
                                       actionCollection(), "textAlignCenter" );
   m_textAlignCenter->setExclusiveGroup( "align" );
   m_textAlignCenter->setChecked( TRUE );
   m_textAlignRight = new KToggleAction( i18n( "Align &Right" ), "text_right", CTRL + ALT + Key_R,
-                                      this, SLOT( textAlignRight() ),
+                                      TQT_TQOBJECT(this), TQT_SLOT( textAlignRight() ),
                                       actionCollection(), "textAlignRight" );
   m_textAlignRight->setExclusiveGroup( "align" );
   m_textVAlignSuper = new KToggleAction( i18n( "Superscript" ), "super", 0,
-                                            this, SLOT( textSuperScript() ),
+                                            TQT_TQOBJECT(this), TQT_SLOT( textSuperScript() ),
                                             actionCollection(), "textVAlignSuper" );
   m_textVAlignSuper->setExclusiveGroup( "valign" );
   m_textVAlignSub = new KToggleAction( i18n( "Subscript" ), "sub", 0,
-                                            this, SLOT( textSubScript() ),
+                                            TQT_TQOBJECT(this), TQT_SLOT( textSubScript() ),
                                             actionCollection(), "textVAlignSub" );
   m_textVAlignSub->setExclusiveGroup( "valign" );
 
-  m_lineWidthAction = new KoLineWidthAction(i18n("Line Width"), "linewidth", this, SLOT(setLineWidth(double)),
+  m_lineWidthAction = new KoLineWidthAction(i18n("Line Width"), "linewidth", TQT_TQOBJECT(this), TQT_SLOT(setLineWidth(double)),
     actionCollection(), "setLineWidth");
   m_lineWidthAction->setUnit(m_pDoc->unit());
-  connect(m_pDoc, SIGNAL(unitChanged(KoUnit::Unit)), m_lineWidthAction, SLOT(setUnit(KoUnit::Unit)));
+  connect(m_pDoc, TQT_SIGNAL(unitChanged(KoUnit::Unit)), m_lineWidthAction, TQT_SLOT(setUnit(KoUnit::Unit)));
 
-  m_lineStyleAction = new KoLineStyleAction(i18n("Line Style"), "linestyle", this, SLOT(setLineStyle(int)),
+  m_lineStyleAction = new KoLineStyleAction(i18n("Line Style"), "linestyle", TQT_TQOBJECT(this), TQT_SLOT(setLineStyle(int)),
     actionCollection(), "setLineStyle");
 
-  m_paperLayout = new KAction( i18n("Page Layout..."), 0, this, SLOT(paperLayoutDlg()), actionCollection(), "paperLayout" );
-  m_insertPage = new KAction( i18n("Insert Page"),"item_add", 0, this, SLOT(insertPage()), actionCollection(), "insertPage" );
-  m_removePage = new KAction( i18n("Remove Page"), "item_remove",0,this, SLOT(removePage()), actionCollection(), "removePage" );
+  m_paperLayout = new KAction( i18n("Page Layout..."), 0, TQT_TQOBJECT(this), TQT_SLOT(paperLayoutDlg()), actionCollection(), "paperLayout" );
+  m_insertPage = new KAction( i18n("Insert Page"),"item_add", 0, TQT_TQOBJECT(this), TQT_SLOT(insertPage()), actionCollection(), "insertPage" );
+  m_removePage = new KAction( i18n("Remove Page"), "item_remove",0,TQT_TQOBJECT(this), TQT_SLOT(removePage()), actionCollection(), "removePage" );
 
-  m_renamePage = new KAction( i18n("Rename Page..."), "item_rename",0,this, SLOT(renamePage()), actionCollection(), "renamePage" );
+  m_renamePage = new KAction( i18n("Rename Page..."), "item_rename",0,TQT_TQOBJECT(this), TQT_SLOT(renamePage()), actionCollection(), "renamePage" );
 
-  m_showPage = new KAction( i18n("Show Page..."),0 ,this,SLOT(showPage()), actionCollection(), "showPage" );
-  m_hidePage = new KAction( i18n("Hide Page"),0 ,this,SLOT(hidePage()), actionCollection(), "hidePage" );
+  m_showPage = new KAction( i18n("Show Page..."),0 ,TQT_TQOBJECT(this),TQT_SLOT(showPage()), actionCollection(), "showPage" );
+  m_hidePage = new KAction( i18n("Hide Page"),0 ,TQT_TQOBJECT(this),TQT_SLOT(hidePage()), actionCollection(), "hidePage" );
 
   showPageMargins = new KToggleAction( i18n("Show Page Margins"), "view_margins", 0, actionCollection(), "showPageMargins" );
-  connect( showPageMargins, SIGNAL(toggled(bool)), SLOT(togglePageMargins(bool)));
+  connect( showPageMargins, TQT_SIGNAL(toggled(bool)), TQT_SLOT(togglePageMargins(bool)));
 #if KDE_IS_VERSION(3,2,90)
   showPageMargins->setCheckedState(i18n("Hide Page Margins"));
 #endif
 
   showRulers = new KToggleAction( i18n("Show Rulers"), "view_ruler", 0, actionCollection(), "showRulers" );
-  connect( showRulers, SIGNAL(toggled(bool)), SLOT(toggleShowRulers(bool)));
+  connect( showRulers, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleShowRulers(bool)));
 #if KDE_IS_VERSION(3,2,90)
   showRulers->setCheckedState(i18n("Hide Rulers"));
 #endif
 
   // Grid actions
   showGrid = new KToggleAction( i18n("Show Grid"), "view_grid", 0, actionCollection(), "showGrid" );
-  connect( showGrid, SIGNAL(toggled(bool)), SLOT(toggleShowGrid(bool)));
+  connect( showGrid, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleShowGrid(bool)));
 #if KDE_IS_VERSION(3,2,90)
   showGrid->setCheckedState(i18n("Hide Grid"));
 #endif
 
   KToggleAction* snapGrid = new KToggleAction( i18n("Snap Grid"), "view_grid", 0, actionCollection(), "snapGrid" );
-  connect( snapGrid, SIGNAL(toggled(bool)), SLOT(toggleSnapGrid(bool)));
+  connect( snapGrid, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleSnapGrid(bool)));
 
   // Guides actions
   showGuides = new KToggleAction( i18n("Guide Lines"), 0, actionCollection(), "showGuides" );
-  connect( showGuides, SIGNAL(toggled(bool)), SLOT(toggleShowGuides(bool)));
-  KAction* addGuide = new KAction(i18n("Add Guide Line..."), 0, this, SLOT(addGuideLine()),
+  connect( showGuides, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleShowGuides(bool)));
+  KAction* addGuide = new KAction(i18n("Add Guide Line..."), 0, TQT_TQOBJECT(this), TQT_SLOT(addGuideLine()),
     actionCollection(), "addGuideLine");
-  connect(showGuides, SIGNAL(toggled(bool)), addGuide, SLOT(setEnabled(bool)));
+  connect(showGuides, TQT_SIGNAL(toggled(bool)), addGuide, TQT_SLOT(setEnabled(bool)));
   //--
 
   m_setArrowHeads = new KivioArrowHeadAction(i18n("Arrowheads"), "arrowheads", actionCollection(), "arrowHeads");
   m_setArrowHeads->setWhatsThis(i18n("Arrowheads allow you to add an arrow to the beginning and/or end of a line."));
-  connect( m_setArrowHeads, SIGNAL(endChanged(int)), SLOT(slotSetEndArrow(int)));
-  connect( m_setArrowHeads, SIGNAL(startChanged(int)), SLOT(slotSetStartArrow(int)));
+  connect( m_setArrowHeads, TQT_SIGNAL(endChanged(int)), TQT_SLOT(slotSetEndArrow(int)));
+  connect( m_setArrowHeads, TQT_SIGNAL(startChanged(int)), TQT_SLOT(slotSetStartArrow(int)));
 
-  KStdAction::preferences(this, SLOT(optionsDialog()), actionCollection(), "options");
+  KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsDialog()), actionCollection(), "options");
 
-  (void) new KAction(i18n("Install Stencil Set..."), 0, this,
-    SLOT(installStencilSet()), actionCollection(), "installStencilSet");
+  (void) new KAction(i18n("Install Stencil Set..."), 0, TQT_TQOBJECT(this),
+    TQT_SLOT(installStencilSet()), actionCollection(), "installStencilSet");
 
   m_editDelete = new KAction(i18n("Delete"), "editdelete", Key_Delete,
-    this, SLOT(deleteObject()), actionCollection(), "deleteObject");
+    TQT_TQOBJECT(this), TQT_SLOT(deleteObject()), actionCollection(), "deleteObject");
 }
 
 void KivioView::initActions()
@@ -538,9 +538,9 @@ void KivioView::initActions()
   m_setItalics->setChecked( false );
   m_setUnderline->setChecked( false );
   m_lineWidthAction->setCurrentWidth(1.0);
-  m_lineStyleAction->setCurrentSelection(Qt::SolidLine);
-  showAlign(Qt::AlignHCenter);
-  showVAlign(Qt::AlignVCenter);
+  m_lineStyleAction->setCurrentSelection(TQt::SolidLine);
+  showAlign(TQt::AlignHCenter);
+  showVAlign(TQt::AlignVCenter);
 
   m_pStencilGeometryPanel->setSize(0.0,0.0);
   m_pStencilGeometryPanel->setPosition(0.0,0.0);
@@ -552,18 +552,18 @@ void KivioView::initActions()
   m_menuTextFormatAction->setEnabled( false );
   m_menuStencilConnectorsAction->setEnabled( false );
 
-  m_setFGColor->setCurrentColor(QColor(0, 0, 0));
-  m_setBGColor->setCurrentColor(QColor(255, 255, 255));
-  m_setTextColor->setCurrentColor(QColor(0, 0, 0));
+  m_setFGColor->setCurrentColor(TQColor(0, 0, 0));
+  m_setBGColor->setCurrentColor(TQColor(255, 255, 255));
+  m_setTextColor->setCurrentColor(TQColor(0, 0, 0));
 
   viewZoom(zoomHandler()->zoom());
 }
 
 void KivioView::updateReadWrite( bool readwrite )
 {
-  QValueList<KAction*> actions = actionCollection()->actions();
-  QValueList<KAction*>::ConstIterator aIt = actions.begin();
-  QValueList<KAction*>::ConstIterator aEnd = actions.end();
+  TQValueList<KAction*> actions = actionCollection()->actions();
+  TQValueList<KAction*>::ConstIterator aIt = actions.begin();
+  TQValueList<KAction*>::ConstIterator aEnd = actions.end();
   for (; aIt != aEnd; ++aIt )
     (*aIt)->setEnabled( readwrite );
   if ( !readwrite )
@@ -586,10 +586,10 @@ void KivioView::addPage( KivioPage* page )
 {
   insertPage(  page );
 
-  QObject::connect( page, SIGNAL( sig_PageHidden( KivioPage* ) ),
-                    this, SLOT( slotPageHidden( KivioPage* ) ) );
-  QObject::connect( page, SIGNAL( sig_PageShown( KivioPage* ) ),
-                    this, SLOT( slotPageShown( KivioPage* ) ) );
+  TQObject::connect( page, TQT_SIGNAL( sig_PageHidden( KivioPage* ) ),
+                    TQT_TQOBJECT(this), TQT_SLOT( slotPageHidden( KivioPage* ) ) );
+  TQObject::connect( page, TQT_SIGNAL( sig_PageShown( KivioPage* ) ),
+                    TQT_TQOBJECT(this), TQT_SLOT( slotPageShown( KivioPage* ) ) );
 
   updatePageStatusLabel();
 }
@@ -605,9 +605,9 @@ void KivioView::insertPage( KivioPage* page )
 
 void KivioView::removePage( KivioPage *_t )
 {
-  QString m_pageName=_t->pageName();
+  TQString m_pageName=_t->pageName();
   m_pTabBar->removeTab( _t->pageName() );
-  QString n = m_pDoc->map()->visiblePages().first();
+  TQString n = m_pDoc->map()->visiblePages().first();
   setActivePage( m_pDoc->map()->findPage( n ) );
 
   updatePageStatusLabel();
@@ -616,8 +616,8 @@ void KivioView::removePage( KivioPage *_t )
 void KivioView::renamePage()
 {
     bool ok;
-    QString activeName = m_pActivePage->pageName();
-    QString newName = KInputDialog::getText( i18n("Rename Page"),
+    TQString activeName = m_pActivePage->pageName();
+    TQString newName = KInputDialog::getText( i18n("Rename Page"),
         i18n("Enter page name:"), activeName, &ok, this );
 
     // Have a different name ?
@@ -654,8 +654,8 @@ void KivioView::setActivePage( KivioPage* page )
     return;
 
   if(m_pActivePage) {
-    disconnect(m_pActivePage, SIGNAL(sig_pageLayoutChanged(const KoPageLayout&)), this,
-      SLOT(setRulerPageLayout(const KoPageLayout&)));
+    disconnect(m_pActivePage, TQT_SIGNAL(sig_pageLayoutChanged(const KoPageLayout&)), this,
+      TQT_SLOT(setRulerPageLayout(const KoPageLayout&)));
   }
 
   m_pActivePage = page;
@@ -667,8 +667,8 @@ void KivioView::setActivePage( KivioPage* page )
 
   m_pDoc->updateView(m_pActivePage);
   setRulerPageLayout(m_pActivePage->paperLayout());
-  connect(m_pActivePage, SIGNAL(sig_pageLayoutChanged(const KoPageLayout&)),
-    SLOT(setRulerPageLayout(const KoPageLayout&)));
+  connect(m_pActivePage, TQT_SIGNAL(sig_pageLayoutChanged(const KoPageLayout&)),
+    TQT_SLOT(setRulerPageLayout(const KoPageLayout&)));
 
   m_pCanvas->guideLines().setGuideLines(m_pActivePage->horizontalGuideLines(),
     m_pActivePage->verticalGuideLines());
@@ -683,12 +683,12 @@ void KivioView::setActiveSpawnerSet( KivioStencilSpawnerSet *set )
     m_pActiveSpawnerSet = set;
 }
 
-void KivioView::slotPageRenamed( KivioPage* page, const QString& old_name )
+void KivioView::slotPageRenamed( KivioPage* page, const TQString& old_name )
 {
   m_pTabBar->renameTab( old_name, page->pageName() );
 }
 
-void KivioView::changePage( const QString& name )
+void KivioView::changePage( const TQString& name )
 {
   if ( m_pActivePage->pageName() == name )
     return;
@@ -723,7 +723,7 @@ void KivioView::hidePage()
   }
 
   m_pActivePage->setHidden(true);
-  QString activeName = m_pActivePage->pageName();
+  TQString activeName = m_pActivePage->pageName();
 
   m_pTabBar->removeTab( activeName );
 
@@ -800,11 +800,11 @@ void KivioView::paperLayoutDlg()
 void KivioView::removePage()
 {
   if ( doc()->map()->count() <= 1 || doc()->map()->visiblePages().count()<=1 ) {
-    QApplication::beep();
+    TQApplication::beep();
     KMessageBox::sorry( this, i18n("You cannot delete the only page of the document."), i18n("Remove Page") );
     return;
   }
-  QApplication::beep();
+  TQApplication::beep();
   int ret = KMessageBox::warningContinueCancel(this,i18n("You are going to remove the active page.\nDo you want to continue?"),i18n("Remove Page"),KGuiItem(i18n("&Delete"),"editdelete"));
 
   if ( ret == KMessageBox::Continue ) {
@@ -830,7 +830,7 @@ void KivioView::slotUpdateView( KivioPage* page )
   m_objectListPalette->updateObjectList();
 }
 
-QWidget *KivioView::canvas() const
+TQWidget *KivioView::canvas() const
 {
   return canvasWidget();
 }
@@ -933,7 +933,7 @@ void KivioView::toggleSnapGrid(bool b)
   m_pDoc->setModified( true );
 }
 
-void KivioView::addStencilSet( const QString& name )
+void KivioView::addStencilSet( const TQString& name )
 {
   m_pDoc->addSpawnerSet(name);
 }
@@ -950,10 +950,10 @@ void KivioView::addSpawnerToStackBar( KivioStencilSpawnerSet *pSpawner )
   }
 
   KivioIconView *pView = new KivioIconView(m_pDoc->isReadWrite());
-  QObject::connect(pView, SIGNAL(createNewStencil(KivioStencilSpawner*)), this,
-                   SLOT(addStencilFromSpawner(KivioStencilSpawner*)));
-  connect(pView, SIGNAL(stencilSelected(KivioStencilSpawner*)),
-          m_addStencilTool, SLOT(activateNewStencil(KivioStencilSpawner* )));
+  TQObject::connect(pView, TQT_SIGNAL(createNewStencil(KivioStencilSpawner*)), this,
+                   TQT_SLOT(addStencilFromSpawner(KivioStencilSpawner*)));
+  connect(pView, TQT_SIGNAL(stencilSelected(KivioStencilSpawner*)),
+          m_addStencilTool, TQT_SLOT(activateNewStencil(KivioStencilSpawner* )));
 
   pView->setStencilSpawnerSet(pSpawner);
   m_pStencilBarDockManager->insertStencilSet(pView, pSpawner->name());
@@ -968,7 +968,7 @@ void KivioView::setFGColor()
   bool createMacro = false;
   while( pStencil )
   {
-    QColor col( m_setFGColor->color());
+    TQColor col( m_setFGColor->color());
 
     if ( col != pStencil->fgColor() )
     {
@@ -1000,7 +1000,7 @@ void KivioView::setBGColor()
 
   while( pStencil )
   {
-    QColor col( m_setBGColor->color());
+    TQColor col( m_setBGColor->color());
 
     if ( col != pStencil->bgColor() )
     {
@@ -1033,7 +1033,7 @@ void KivioView::setTextColor()
   bool createMacro = false;
   while( pStencil )
   {
-    QColor col(m_setTextColor->color());
+    TQColor col(m_setTextColor->color());
 
     if ( col != pStencil->textColor() )
     {
@@ -1134,21 +1134,21 @@ void KivioView::ungroupStencils()
 void KivioView::selectAllStencils()
 {
     m_pActivePage->selectAllStencils();
-    m_pCanvas->repaint();
+    m_pCanvas->tqrepaint();
 }
 
 void KivioView::unselectAllStencils()
 {
     m_pActivePage->unselectAllStencils();
-    m_pCanvas->repaint();
+    m_pCanvas->tqrepaint();
 }
 
-QColor KivioView::fgColor() const
+TQColor KivioView::fgColor() const
 {
     return m_setFGColor->color();
 }
 
-QColor KivioView::bgColor() const
+TQColor KivioView::bgColor() const
 {
     return m_setBGColor->color();
 }
@@ -1164,14 +1164,14 @@ int KivioView::lineStyle() const
 }
 
 
-void KivioView::setFontFamily( const QString &str )
+void KivioView::setFontFamily( const TQString &str )
 {
   canvasWidget()->setFocus();
   KivioStencil *pStencil = m_pActivePage->selectedStencils()->first();
   if (!pStencil)
     return;
 
-  QFont f;
+  TQFont f;
   KMacroCommand * macro = 0L;
   while( pStencil )
   {
@@ -1202,7 +1202,7 @@ void KivioView::setFontSize(int size )
   if (!pStencil)
     return;
 
-  QFont f;
+  TQFont f;
   KMacroCommand * macro = 0L;
   while( pStencil )
   {
@@ -1232,7 +1232,7 @@ void KivioView::toggleFontBold(bool b)
     if (!pStencil)
       return;
 
-    QFont f;
+    TQFont f;
     KMacroCommand * macro = 0L;
     while( pStencil )
     {
@@ -1261,7 +1261,7 @@ void KivioView::toggleFontItalics(bool b)
     if (!pStencil)
         return;
 
-    QFont f;
+    TQFont f;
     KMacroCommand * macro = new KMacroCommand( i18n("Change Stencil Font"));
     while( pStencil )
     {
@@ -1291,7 +1291,7 @@ void KivioView::toggleFontUnderline( bool b)
     if (!pStencil)
       return;
     KMacroCommand * macro = 0L;
-    QFont f;
+    TQFont f;
     while( pStencil )
     {
         f = pStencil->textFont();
@@ -1331,9 +1331,9 @@ void KivioView::updateToolBars()
         m_setItalics->setChecked( false );
         m_setUnderline->setChecked( false );
         m_lineWidthAction->setCurrentWidth(1.0);
-        m_lineStyleAction->setCurrentSelection(Qt::SolidLine);
-        showAlign(Qt::AlignHCenter);
-        showVAlign(Qt::AlignVCenter);
+        m_lineStyleAction->setCurrentSelection(TQt::SolidLine);
+        showAlign(TQt::AlignHCenter);
+        showVAlign(TQt::AlignVCenter);
 
         m_pStencilGeometryPanel->setSize(0.0,0.0);
         m_pStencilGeometryPanel->setPosition(0.0,0.0);
@@ -1347,7 +1347,7 @@ void KivioView::updateToolBars()
     }
     else
     {
-        QFont f = pStencil->textFont();
+        TQFont f = pStencil->textFont();
 
         m_setFontFamily->setFont( f.family() );
         m_setFontSize->setFontSize( f.pointSize() );
@@ -1568,13 +1568,13 @@ void KivioView::setHParaAlign( int i )
     KivioStencil *pStencil = m_pActivePage->selectedStencils()->first();
     if (!pStencil)
       return;
-    KMacroCommand *macro = new KMacroCommand( i18n("Change Stencil Horizontal Alignment"));
+    KMacroCommand *macro = new KMacroCommand( i18n("Change StencilQt::Horizontal Alignment"));
     bool createMacro = false;
     while( pStencil )
     {
         if ( pStencil->hTextAlign() != i)
         {
-            KivioChangeStencilHAlignmentCommand * cmd = new KivioChangeStencilHAlignmentCommand( i18n("Change Stencil Horizontal Alignment"), m_pActivePage, pStencil, pStencil->hTextAlign(), i);
+            KivioChangeStencilHAlignmentCommand * cmd = new KivioChangeStencilHAlignmentCommand( i18n("Change StencilQt::Horizontal Alignment"), m_pActivePage, pStencil, pStencil->hTextAlign(), i);
 
             pStencil->setHTextAlign(i);
             macro->addCommand( cmd );
@@ -1596,13 +1596,13 @@ void KivioView::setVParaAlign( int i )
     KivioStencil *pStencil = m_pActivePage->selectedStencils()->first();
     if (!pStencil)
       return;
-    KMacroCommand *macro = new KMacroCommand( i18n("Change Stencil Vertical Alignment"));
+    KMacroCommand *macro = new KMacroCommand( i18n("Change StencilQt::Vertical Alignment"));
     bool createMacro = false;
     while( pStencil )
     {
         if ( pStencil->vTextAlign() != i )
         {
-            KivioChangeStencilVAlignmentCommand * cmd = new KivioChangeStencilVAlignmentCommand( i18n("Change Stencil Vertical Alignment"), m_pActivePage, pStencil, pStencil->vTextAlign(), i);
+            KivioChangeStencilVAlignmentCommand * cmd = new KivioChangeStencilVAlignmentCommand( i18n("Change StencilQt::Vertical Alignment"), m_pActivePage, pStencil, pStencil->vTextAlign(), i);
             pStencil->setVTextAlign( i );
             macro->addCommand( cmd );
             createMacro = true;
@@ -1707,13 +1707,13 @@ void KivioView::addStencilFromSpawner( KivioStencilSpawner *pSpawner, double x,
 
     // Use default properties if we held ctrl down
 #if KDE_IS_VERSION(3, 4, 0)
-    if(kapp->keyboardMouseState() & Qt::ControlButton) {
+    if(kapp->keyboardMouseState() & TQt::ControlButton) {
 #else
     if(KApplication::keyboardModifiers() & KApplication::ControlModifier) {
 #endif
       pStencil->setFGColor(m_setFGColor->color());
       pStencil->setBGColor(m_setBGColor->color());
-      QFont f = m_setFontFamily->font();
+      TQFont f = m_setFontFamily->font();
       f.setPointSize(m_setFontSize->fontSize());
       f.setBold(m_setBold->isChecked());
       f.setItalic(m_setItalics->isChecked());
@@ -1733,7 +1733,7 @@ void KivioView::addStencilFromSpawner( KivioStencilSpawner *pSpawner, double x,
     m_pActivePage->addStencil( pStencil );
     m_pActivePage->selectStencil( pStencil );
 
-    // Mark the page as modified and repaint
+    // Mark the page as modified and tqrepaint
     m_pDoc->updateView(m_pActivePage);
     pluginManager()->activateDefaultTool();
     m_pCanvas->updateAutoGuideLines();
@@ -1743,12 +1743,12 @@ void KivioView::alignStencilsDlg()
 {
   KivioAlignDialog* dlg = new KivioAlignDialog(this, "AlignDialog");
 
-  if( dlg->exec() == QDialog::Accepted )
+  if( dlg->exec() == TQDialog::Accepted )
   {
     m_pActivePage->alignStencils(dlg->align());
     m_pActivePage->distributeStencils(dlg->distribute());
 
-    m_pCanvas->repaint();
+    m_pCanvas->tqrepaint();
   }
 
   delete dlg;
@@ -1783,11 +1783,11 @@ void KivioView::setupPrinter(KPrinter &p)
   }
 }
 
-void KivioView::popupTabBarMenu( const QPoint & _point )
+void KivioView::popupTabBarMenu( const TQPoint & _point )
 {
     if(!koDocument()->isReadWrite() || !factory())
         return;
-     static_cast<QPopupMenu*>(factory()->container("menupage_popup",this))->popup(_point);
+     static_cast<TQPopupMenu*>(factory()->container("menupage_popup",this))->popup(_point);
 }
 
 void KivioView::updateMenuPage()
@@ -1838,12 +1838,12 @@ void KivioView::setMousePos( int mx, int my )
   hRuler->setMousePos(mx, my);
 
   if((mx >= 0) && (my >= 0)) {
-    QString unit = KoUnit::unitName(m_pDoc->unit());
-    KoPoint xy = m_pCanvas->mapFromScreen(QPoint(mx, my));
+    TQString unit = KoUnit::unitName(m_pDoc->unit());
+    KoPoint xy = m_pCanvas->mapFromScreen(TQPoint(mx, my));
     xy.setX(KoUnit::toUserValue(xy.x(), m_pDoc->unit()));
     xy.setY(KoUnit::toUserValue(xy.y(), m_pDoc->unit()));
-    QString text = i18n("X: %1 %3 Y: %2 %4").arg(KGlobal::_locale->formatNumber(xy.x(), 2))
-      .arg(KGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit);
+    TQString text = i18n("X: %1 %3 Y: %2 %4").tqarg(KGlobal::_locale->formatNumber(xy.x(), 2))
+      .tqarg(KGlobal::_locale->formatNumber(xy.y(), 2)).tqarg(unit).tqarg(unit);
     m_coordSLbl->setText(text);
   }
 }
@@ -1889,9 +1889,9 @@ void KivioView::setRulerPageLayout(const KoPageLayout& l)
   m_pStencilGeometryPanel->setPageLayout(l);
 }
 
-void KivioView::viewZoom(const QString& s)
+void KivioView::viewZoom(const TQString& s)
 {
-  QString z(s);
+  TQString z(s);
   z.remove('%');
   z.simplifyWhiteSpace();
   bool ok = false;
@@ -1911,7 +1911,7 @@ void KivioView::viewZoom(const QString& s)
 void KivioView::textAlignLeft()
 {
   if ( m_textAlignLeft->isChecked() ) {
-    setHParaAlign( Qt::AlignLeft );
+    setHParaAlign( TQt::AlignLeft );
   } else {
     m_textAlignLeft->setChecked( true );
   }
@@ -1920,7 +1920,7 @@ void KivioView::textAlignLeft()
 void KivioView::textAlignCenter()
 {
   if ( m_textAlignCenter->isChecked() ) {
-    setHParaAlign( Qt::AlignHCenter );
+    setHParaAlign( TQt::AlignHCenter );
   } else {
     m_textAlignCenter->setChecked( true );
   }
@@ -1929,7 +1929,7 @@ void KivioView::textAlignCenter()
 void KivioView::textAlignRight()
 {
   if ( m_textAlignRight->isChecked() ) {
-    setHParaAlign( Qt::AlignRight );
+    setHParaAlign( TQt::AlignRight );
   } else {
     m_textAlignRight->setChecked( true );
   }
@@ -1938,10 +1938,10 @@ void KivioView::textAlignRight()
 void KivioView::textSuperScript()
 {
   if ( m_textVAlignSuper->isChecked() ) {
-    setVParaAlign( Qt::AlignTop );
+    setVParaAlign( TQt::AlignTop );
   } else {
     if ( !m_textVAlignSub->isChecked() ) {
-      setVParaAlign( Qt::AlignVCenter );
+      setVParaAlign( TQt::AlignVCenter );
     }
   }
 }
@@ -1949,10 +1949,10 @@ void KivioView::textSuperScript()
 void KivioView::textSubScript()
 {
   if ( m_textVAlignSub->isChecked() ) {
-    setVParaAlign( Qt::AlignBottom );
+    setVParaAlign( TQt::AlignBottom );
   } else {
     if ( !m_textVAlignSuper->isChecked() ) {
-      setVParaAlign( Qt::AlignVCenter );
+      setVParaAlign( TQt::AlignVCenter );
     }
   }
 }
@@ -1960,16 +1960,18 @@ void KivioView::textSubScript()
 void KivioView::showAlign( int align )
 {
   switch ( align ) {
-    case Qt::AlignAuto: // In left-to-right mode it's align left. TODO: alignright if text->isRightToLeft()
+#ifndef USE_QT4
+    case TQt::AlignAuto: // In left-to-right mode it's align left. TODO: alignright if text->isRightToLeft()
       kdWarning(43000) << k_funcinfo << "shouldn't be called with AlignAuto" << endl;
       // fallthrough
-    case Qt::AlignLeft:
+#endif // USE_QT4
+    case TQt::AlignLeft:
       m_textAlignLeft->setChecked( true );
       break;
-    case Qt::AlignHCenter:
+    case TQt::AlignHCenter:
       m_textAlignCenter->setChecked( true );
       break;
-    case Qt::AlignRight:
+    case TQt::AlignRight:
       m_textAlignRight->setChecked( true );
       break;
   }
@@ -1978,14 +1980,14 @@ void KivioView::showAlign( int align )
 void KivioView::showVAlign( int align )
 {
   switch(align) {
-    case Qt::AlignTop:
+    case TQt::AlignTop:
       m_textVAlignSuper->setChecked(true);
       break;
-    case Qt::AlignVCenter:
+    case TQt::AlignVCenter:
       m_textVAlignSuper->setChecked(false);
       m_textVAlignSub->setChecked(false);
       break;
-    case Qt::AlignBottom:
+    case TQt::AlignBottom:
       m_textVAlignSub->setChecked(true);
       break;
   }
@@ -2003,13 +2005,13 @@ void KivioView::textFormat()
     dlg.setVAlign(stencil->vTextAlign());
   } else {
     dlg.setFont(doc()->defaultFont());
-    dlg.setTextColor(QColor(0, 0, 0));
-    dlg.setHAlign(Qt::AlignHCenter);
-    dlg.setVAlign(Qt::AlignVCenter);
+    dlg.setTextColor(TQColor(0, 0, 0));
+    dlg.setHAlign(TQt::AlignHCenter);
+    dlg.setVAlign(TQt::AlignVCenter);
   }
 
   if(dlg.exec()) {
-    QPtrListIterator<KivioStencil> it(*activePage()->selectedStencils());
+    TQPtrListIterator<KivioStencil> it(*activePage()->selectedStencils());
 
     while((stencil = it.current()) != 0) {
       ++it;
@@ -2035,7 +2037,7 @@ void KivioView::stencilFormat()
     dlg.setFillPattern(stencil->fillPattern());
   } else {
     dlg.setLineWidth(1.0, m_pDoc->unit());
-    dlg.setLineColor(QColor(0, 0, 0));
+    dlg.setLineColor(TQColor(0, 0, 0));
   }
 
   dlg.setLineWidth(ls.width(), m_pDoc->unit());
@@ -2044,7 +2046,7 @@ void KivioView::stencilFormat()
   dlg.setLineEndStyle(ls.capStyle());
 
   if(dlg.exec()) {
-    QPtrListIterator<KivioStencil> it(*activePage()->selectedStencils());
+    TQPtrListIterator<KivioStencil> it(*activePage()->selectedStencils());
 
     while((stencil = it.current()) != 0) {
       ++it;
@@ -2085,7 +2087,7 @@ void KivioView::arrowHeadFormat()
   }
 
   if(dlg.exec()) {
-    QPtrListIterator<KivioStencil> it(*activePage()->selectedStencils());
+    TQPtrListIterator<KivioStencil> it(*activePage()->selectedStencils());
 
     while((stencil = it.current()) != 0) {
       ++it;
@@ -2111,7 +2113,7 @@ Kivio::PluginManager* KivioView::pluginManager()
 
 void KivioView::clipboardDataChanged()
 {
-  QMimeSource* data = QApplication::clipboard()->data();
+  TQMimeSource* data = TQApplication::tqclipboard()->data();
   KivioDragObject decoder(this);
   bool paste = decoder.canDecode(data);
   m_editPaste->setEnabled(paste);
@@ -2135,7 +2137,7 @@ void KivioView::partActivateEvent(KParts::PartActivateEvent* event)
 void KivioView::initStatusBarProgress()
 {
   if(!m_statusBarProgress) {
-    m_statusBarProgress = new QProgressBar(100, this);
+    m_statusBarProgress = new TQProgressBar(100, this);
     addStatusBarItem(m_statusBarProgress);
   }
 
@@ -2168,32 +2170,32 @@ void KivioView::installStencilSet()
 int KivioView::hTextAlign()
 {
   if(m_textAlignRight->isChecked()) {
-    return Qt::AlignRight;
+    return TQt::AlignRight;
   } else if(m_textAlignLeft->isChecked()) {
-    return Qt::AlignLeft;
+    return TQt::AlignLeft;
   }
 
-  return Qt::AlignHCenter;
+  return TQt::AlignHCenter;
 }
 
 int KivioView::vTextAlign()
 {
   if(m_textVAlignSub->isChecked() && !m_textVAlignSuper->isChecked()) {
-    return Qt::AlignBottom;
+    return TQt::AlignBottom;
   } else if(!m_textVAlignSub->isChecked() && m_textVAlignSuper->isChecked()) {
-    return Qt::AlignTop;
+    return TQt::AlignTop;
   }
 
-  return Qt::AlignVCenter;
+  return TQt::AlignVCenter;
 }
 
 void KivioView::updatePageStatusLabel()
 {
-  QString text = i18n("Page %1/%2").arg(m_pDoc->map()->pageList().find(activePage()) + 1).arg(m_pDoc->map()->count());
+  TQString text = i18n("Page %1/%2").tqarg(m_pDoc->map()->pageList().tqfind(activePage()) + 1).tqarg(m_pDoc->map()->count());
   m_pageCountSLbl->setText(text);
 }
 
-void KivioView::setStatusBarInfo(const QString& text)
+void KivioView::setStatusBarInfo(const TQString& text)
 {
   m_infoSLbl->setText(text);
 }
@@ -2201,8 +2203,8 @@ void KivioView::setStatusBarInfo(const QString& text)
 void KivioView::loadingFinished()
 {
   m_pTabBar->clear();
-  QPtrList<KivioPage> pages = m_pDoc->map()->pageList();
-  QPtrListIterator<KivioPage> it(pages);
+  TQPtrList<KivioPage> pages = m_pDoc->map()->pageList();
+  TQPtrListIterator<KivioPage> it(pages);
   KivioPage* page;
 
   while((page = it.current()) != 0) {
@@ -2227,9 +2229,9 @@ void KivioView::loadingFinished()
 
 void KivioView::moveTab(unsigned tab, unsigned target)
 {
-  QStringList tabs = m_pTabBar->tabs();
-  QString tabTitle = tabs[tab];
-  QString targetTitle = tabs[target];
+  TQStringList tabs = m_pTabBar->tabs();
+  TQString tabTitle = tabs[tab];
+  TQString targetTitle = tabs[target];
 
   if(target >= static_cast<unsigned>(m_pDoc->map()->count())) {
     targetTitle = m_pDoc->map()->lastPage()->pageName();
@@ -2252,7 +2254,7 @@ void KivioView::addGuideLine()
   KoPoint pos(0.0, 0.0);
   KoGuideLineDia dlg(this, pos, pageRect, m_pDoc->unit(), "addGuideDialog");
 
-  if(dlg.exec() == QDialog::Accepted) {
+  if(dlg.exec() == TQDialog::Accepted) {
     activePage()->addGuideLine(dlg.orientation(), dlg.pos());
     m_pDoc->updateGuideLines(activePage());
   }
@@ -2262,8 +2264,8 @@ void KivioView::showAddStencilSetDialog()
 {
   if(!m_addStencilSetDialog) {
     m_addStencilSetDialog = new Kivio::AddStencilSetDialog(this, "AddStencilSetDialog");
-    connect(m_addStencilSetDialog, SIGNAL(addStencilSet(const QString&)), this, SLOT(addStencilSet(const QString&)));
-    connect(this, SIGNAL(updateStencilSetList()), m_addStencilSetDialog, SLOT(updateList()));
+    connect(m_addStencilSetDialog, TQT_SIGNAL(addStencilSet(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(addStencilSet(const TQString&)));
+    connect(TQT_TQOBJECT(this), TQT_SIGNAL(updateStencilSetList()), m_addStencilSetDialog, TQT_SLOT(updateList()));
   }
 
   m_addStencilSetDialog->show();
diff --git a/kivio/kiviopart/kivio_view.h b/kivio/kiviopart/kivio_view.h
index a115363c..6a824423 100644
--- a/kivio/kiviopart/kivio_view.h
+++ b/kivio/kiviopart/kivio_view.h
@@ -58,10 +58,10 @@ class KToggleAction;
 class KSelectColorAction;
 class KActionMenu;
 
-class QStringList;
-class QPushButton;
-class QProgressBar;
-class QScrollBar;
+class TQStringList;
+class TQPushButton;
+class TQProgressBar;
+class TQScrollBar;
 class DCOPObject;
 class KoRuler;
 class KoZoomHandler;
@@ -71,9 +71,9 @@ class KoLineWidthAction;
 class KoLineStyleAction;
 class KoPaletteManager;
 
-#include <qdom.h>
-#include <qptrlist.h>
-#include <qframe.h>
+#include <tqdom.h>
+#include <tqptrlist.h>
+#include <tqframe.h>
 
 #include <KoView.h>
 #include <KoDocument.h>
@@ -85,10 +85,11 @@ using namespace Kivio;
 class KIVIO_EXPORT KivioView : public KoView
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class KivioCanvas;
 
   public:
-    KivioView( QWidget *_parent, const char *_name, KivioDoc *_doc );
+    KivioView( TQWidget *_parent, const char *_name, KivioDoc *_doc );
     ~KivioView();
 
     virtual DCOPObject* dcopObject();
@@ -108,7 +109,7 @@ class KIVIO_EXPORT KivioView : public KoView
     virtual void setupPrinter(KPrinter&);
     virtual void print(KPrinter&);
 
-    virtual QWidget* canvas() const;
+    virtual TQWidget* canvas() const;
     virtual int canvasXOffset() const;
     virtual int canvasYOffset() const;
 
@@ -124,8 +125,8 @@ class KIVIO_EXPORT KivioView : public KoView
 
 
     // Returns the current interface color/lineWidth settings
-    QColor fgColor()const;
-    QColor bgColor()const;
+    TQColor fgColor()const;
+    TQColor bgColor()const;
     double lineWidth()const;
     int lineStyle() const;
     void updateButton();
@@ -186,7 +187,7 @@ class KIVIO_EXPORT KivioView : public KoView
 
     void addStencilFromSpawner( KivioStencilSpawner *pSpawner, double x = 0.0, double y = 0.0 );
 
-    void changePage( const QString& _name );
+    void changePage( const TQString& _name );
 
     void updateToolBars();
 
@@ -204,7 +205,7 @@ class KIVIO_EXPORT KivioView : public KoView
 
     void setRulerPageLayout(const KoPageLayout& l);
 
-    void popupTabBarMenu( const QPoint& point );
+    void popupTabBarMenu( const TQPoint& point );
 
     void initStatusBarProgress();
     void setStatusBarProgress(int progress);
@@ -212,10 +213,10 @@ class KIVIO_EXPORT KivioView : public KoView
 
     void setActivePage( KivioPage* );
 
-    void setStatusBarInfo(const QString& text);
+    void setStatusBarInfo(const TQString& text);
 
   protected slots:
-    void slotPageRenamed( KivioPage* page, const QString& old_name );
+    void slotPageRenamed( KivioPage* page, const TQString& old_name );
     void slotUpdateView( KivioPage *_page );
     void slotUpdateGrid();
 
@@ -223,7 +224,7 @@ class KIVIO_EXPORT KivioView : public KoView
     void setBGColor();
     void setTextColor();
 
-    void setFontFamily( const QString & );
+    void setFontFamily( const TQString & );
     void setFontSize( int );
 
     void setLineWidth(double);
@@ -253,10 +254,10 @@ class KIVIO_EXPORT KivioView : public KoView
     void slotChangeStencilSize(double, double);
     void slotChangeStencilRotation(int);
 
-    void viewZoom(const QString& s);
+    void viewZoom(const TQString& s);
 
     void addSpawnerToStackBar( KivioStencilSpawnerSet * );
-    void addStencilSet( const QString& );
+    void addStencilSet( const TQString& );
 
     void setMousePos( int mx, int my );
     void setRulerUnit(KoUnit::Unit);
@@ -323,7 +324,7 @@ class KIVIO_EXPORT KivioView : public KoView
 
     KivioArrowHeadAction* m_setArrowHeads;
 
-    QStringList m_lineWidthList;
+    TQStringList m_lineWidthList;
 
     KivioDoc* m_pDoc;
     KivioPage* m_pActivePage;
@@ -373,10 +374,10 @@ class KIVIO_EXPORT KivioView : public KoView
     KoLineWidthAction* m_lineWidthAction;
     KoLineStyleAction* m_lineStyleAction;
 
-    QProgressBar* m_statusBarProgress;
+    TQProgressBar* m_statusBarProgress;
 
-    QScrollBar* m_vertScrollBar;
-    QScrollBar* m_horzScrollBar;
+    TQScrollBar* m_vertScrollBar;
+    TQScrollBar* m_horzScrollBar;
     Kivio::AddStencilTool* m_addStencilTool;
 
     Kivio::AddStencilSetDialog* m_addStencilSetDialog;
diff --git a/kivio/kiviopart/kivio_zoomaction.cpp b/kivio/kiviopart/kivio_zoomaction.cpp
index cfec4aea..b90be1e1 100644
--- a/kivio/kiviopart/kivio_zoomaction.cpp
+++ b/kivio/kiviopart/kivio_zoomaction.cpp
@@ -18,29 +18,29 @@
  */
 #include "kivio_zoomaction.h"
 #include "tkcombobox.h"
-#include <qregexp.h>
+#include <tqregexp.h>
 
 #include <klocale.h>
 
 using namespace Kivio;
 
-ZoomAction::ZoomAction(QObject* parent, const char* name)
-: TKSelectAction(parent,name)
+ZoomAction::ZoomAction(TQObject* tqparent, const char* name)
+: TKSelectAction(tqparent,name)
 {
   setEditable(true);
-  QStringList lst;
-  lst << i18n("%1%").arg("33");
-  lst << i18n("%1%").arg("50");
-  lst << i18n("%1%").arg("75");
-  lst << i18n("%1%").arg("100");
-  lst << i18n("%1%").arg("125");
-  lst << i18n("%1%").arg("150");
-  lst << i18n("%1%").arg("200");
-  lst << i18n("%1%").arg("250");
-  lst << i18n("%1%").arg("350");
-  lst << i18n("%1%").arg("400");
-  lst << i18n("%1%").arg("450");
-  lst << i18n("%1%").arg("500");
+  TQStringList lst;
+  lst << i18n("%1%").tqarg("33");
+  lst << i18n("%1%").tqarg("50");
+  lst << i18n("%1%").tqarg("75");
+  lst << i18n("%1%").tqarg("100");
+  lst << i18n("%1%").tqarg("125");
+  lst << i18n("%1%").tqarg("150");
+  lst << i18n("%1%").tqarg("200");
+  lst << i18n("%1%").tqarg("250");
+  lst << i18n("%1%").tqarg("350");
+  lst << i18n("%1%").tqarg("400");
+  lst << i18n("%1%").tqarg("450");
+  lst << i18n("%1%").tqarg("500");
   setItems(lst);
 }
 
@@ -48,9 +48,9 @@ ZoomAction::~ZoomAction()
 {
 }
 
-void ZoomAction::slotActivated( const QString& text )
+void ZoomAction::slotActivated( const TQString& text )
 {
-  QRegExp regexp("(\\d+)"); // "Captured" non-empty sequence of digits
+  TQRegExp regexp("(\\d+)"); // "Captured" non-empty sequence of digits
   regexp.search(text);
   bool ok=false;
   // Use templates, not macro to avoid to call the functiosn many times.
@@ -63,35 +63,35 @@ void ZoomAction::slotActivated( const QString& text )
 void ZoomAction::insertItem( int zoom )
 {
   // This code is taken from KWords changeZoomMenu
-  QValueList<int> list;
+  TQValueList<int> list;
   bool ok;
-  const QStringList itemsList(items());
-  QRegExp regexp("(\\d+)"); // "Captured" non-empty sequence of digits
+  const TQStringList itemsList(items());
+  TQRegExp regexp("(\\d+)"); // "Captured" non-empty sequence of digits
 
-  for (QStringList::ConstIterator it = itemsList.begin() ; it != itemsList.end() ; ++it) {
+  for (TQStringList::ConstIterator it = itemsList.begin() ; it != itemsList.end() ; ++it) {
     regexp.search(*it);
     const int val=regexp.cap(1).toInt(&ok);
     //zoom : limit inferior=10
-    if(ok && val>9 && list.contains(val)==0)
+    if(ok && val>9 && list.tqcontains(val)==0)
       list.append( val );
   }
   //necessary at the beginning when we read config
   //this value is not in combo list
-  if(list.contains(zoom)==0)
+  if(list.tqcontains(zoom)==0)
     list.append( zoom );
 
   qHeapSort( list );
 
-  QStringList lst;
-  for (QValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it)
-    lst.append( i18n("%1%").arg(*it) );
+  TQStringList lst;
+  for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it)
+    lst.append( i18n("%1%").tqarg(*it) );
   setItems(lst);
-  setCurrentItem(lst.findIndex(i18n("%1%").arg(zoom)));
+  setCurrentItem(lst.tqfindIndex(i18n("%1%").tqarg(zoom)));
 }
 
 void ZoomAction::setEditZoom( int zoom )
 {
-  const QString zt(i18n("%1%").arg(zoom));
+  const TQString zt(i18n("%1%").tqarg(zoom));
   setEditText(zt);
 }
 #include "kivio_zoomaction.moc"
diff --git a/kivio/kiviopart/kivio_zoomaction.h b/kivio/kiviopart/kivio_zoomaction.h
index 94a92014..d3a44a01 100644
--- a/kivio/kiviopart/kivio_zoomaction.h
+++ b/kivio/kiviopart/kivio_zoomaction.h
@@ -25,8 +25,9 @@ namespace Kivio {
 
 class ZoomAction : public TKSelectAction
 { Q_OBJECT
+  TQ_OBJECT
 public:
-  ZoomAction( QObject* parent, const char* name );
+  ZoomAction( TQObject* tqparent, const char* name );
   ~ZoomAction();
 
   void insertItem( int );
@@ -36,7 +37,7 @@ signals:
   void zoomActivated( int );
 
 protected slots:
-  void slotActivated( const QString& text );
+  void slotActivated( const TQString& text );
 };
 
 }
diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp
index b2ce80c9..f4f9e6cf 100644
--- a/kivio/kiviopart/kivioarrowheadaction.cpp
+++ b/kivio/kiviopart/kivioarrowheadaction.cpp
@@ -21,12 +21,12 @@
 #include "kivioarrowheadaction.h"
 #include "kivioglobal.h"
 
-#include <qbitmap.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qmenubar.h>
-#include <qwhatsthis.h>
+#include <tqbitmap.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqmenubar.h>
+#include <tqwhatsthis.h>
 
 #include <kpopupmenu.h>
 #include <ktoolbar.h>
@@ -37,9 +37,9 @@
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 
-KivioArrowHeadAction::KivioArrowHeadAction(const QString &text, const QString &pix,
-  QObject* parent, const char *name)
-  : KActionMenu(text, pix, parent, name)
+KivioArrowHeadAction::KivioArrowHeadAction(const TQString &text, const TQString &pix,
+  TQObject* tqparent, const char *name)
+  : KActionMenu(text, pix, tqparent, name)
 {
   m_emitSignals = true;
   setShortcutConfigurable( false );
@@ -55,8 +55,8 @@ KivioArrowHeadAction::KivioArrowHeadAction(const QString &text, const QString &p
   m_currentStart = m_currentEnd = 0;
   m_startPopup->setItemChecked(0, true);
   m_endPopup->setItemChecked(0, true);
-  connect(m_startPopup, SIGNAL(activated(int)), SLOT(setCurrentStartArrow(int)));
-  connect(m_endPopup, SIGNAL(activated(int)), SLOT(setCurrentEndArrow(int)));
+  connect(m_startPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(setCurrentStartArrow(int)));
+  connect(m_endPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(setCurrentEndArrow(int)));
 }
 
 KivioArrowHeadAction::~KivioArrowHeadAction()
@@ -74,20 +74,20 @@ KPopupMenu* KivioArrowHeadAction::popupMenu() const
   return m_popup;
 }
 
-void KivioArrowHeadAction::popup( const QPoint& global )
+void KivioArrowHeadAction::popup( const TQPoint& global )
 {
   popupMenu()->popup(global);
 }
 
-int KivioArrowHeadAction::plug( QWidget* widget, int index)
+int KivioArrowHeadAction::plug( TQWidget* widget, int index)
 {
   // This function is copied from KActionMenu::plug
   if (kapp && !kapp->authorizeKAction(name()))
     return -1;
   kdDebug(129) << "KAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
-  if ( widget->inherits("QPopupMenu") )
+  if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
   {
-    QPopupMenu* menu = static_cast<QPopupMenu*>( widget );
+    TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
     int id;
 
     if ( hasIconSet() )
@@ -100,7 +100,7 @@ int KivioArrowHeadAction::plug( QWidget* widget, int index)
       menu->setItemEnabled( id, false );
 
     addContainer( menu, id );
-    connect( menu, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) );
+    connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -111,8 +111,8 @@ int KivioArrowHeadAction::plug( QWidget* widget, int index)
     int id_ = KAction::getToolButtonID();
 
     if ( icon().isEmpty() && !iconSet().isNull() )
-      bar->insertButton( iconSet().pixmap(), id_, SIGNAL( clicked() ), this,
-                          SLOT( slotActivated() ), isEnabled(), plainText(),
+      bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this,
+                          TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
                           index );
     else
     {
@@ -123,25 +123,25 @@ int KivioArrowHeadAction::plug( QWidget* widget, int index)
       else
         instance = KGlobal::instance();
 
-      bar->insertButton( icon(), id_, SIGNAL( clicked() ), this,
-                          SLOT( slotActivated() ), isEnabled(), plainText(),
+      bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
+                          TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
                           index, instance );
     }
 
     addContainer( bar, id_ );
 
     if (!whatsThis().isEmpty())
-      QWhatsThis::add( bar->getButton(id_), whatsThis() );
+      TQWhatsThis::add( bar->getButton(id_), whatsThis() );
 
-    connect( bar, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) );
+    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
 
     bar->getButton(id_)->setPopup(popupMenu(), true );
 
     return containerCount() - 1;
   }
-  else if ( widget->inherits( "QMenuBar" ) )
+  else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) )
   {
-    QMenuBar *bar = static_cast<QMenuBar *>( widget );
+    TQMenuBar *bar = static_cast<TQMenuBar *>( widget );
 
     int id;
 
@@ -151,7 +151,7 @@ int KivioArrowHeadAction::plug( QWidget* widget, int index)
       bar->setItemEnabled( id, false );
 
     addContainer( bar, id );
-    connect( bar, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) );
+    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -161,10 +161,10 @@ int KivioArrowHeadAction::plug( QWidget* widget, int index)
 
 void KivioArrowHeadAction::loadArrowHeads(KPopupMenu* popup)
 {
-  QBitmap mask;
-  QPixmap pixAll = Kivio::arrowHeadPixmap();  
-  QPixmap pix(pixAll.width(), 17);
-  QPainter p(&pix, popup);
+  TQBitmap tqmask;
+  TQPixmap pixAll = Kivio::arrowHeadPixmap();  
+  TQPixmap pix(pixAll.width(), 17);
+  TQPainter p(&pix, popup);
   int cindex = 0;
 
   // insert item "None"
diff --git a/kivio/kiviopart/kivioarrowheadaction.h b/kivio/kiviopart/kivioarrowheadaction.h
index 10ffa717..08fca394 100644
--- a/kivio/kiviopart/kivioarrowheadaction.h
+++ b/kivio/kiviopart/kivioarrowheadaction.h
@@ -29,15 +29,16 @@ class KPopupMenu;
 class KivioArrowHeadAction : public KActionMenu
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KivioArrowHeadAction(const QString &text, const QString &pix,
-      QObject* parent = 0, const char *name = 0);
+    KivioArrowHeadAction(const TQString &text, const TQString &pix,
+      TQObject* tqparent = 0, const char *name = 0);
     ~KivioArrowHeadAction();
 
     KPopupMenu* popupMenu() const;
-    void popup( const QPoint& global );
+    void popup( const TQPoint& global );
 
-    virtual int plug( QWidget* widget, int index = -1 );
+    virtual int plug( TQWidget* widget, int index = -1 );
 
     int currentStartArrow();
     int currentEndArrow();
diff --git a/kivio/kiviopart/kiviodragobject.cpp b/kivio/kiviopart/kiviodragobject.cpp
index 811f4adb..35a6d7ff 100644
--- a/kivio/kiviopart/kiviodragobject.cpp
+++ b/kivio/kiviopart/kiviodragobject.cpp
@@ -19,12 +19,12 @@
 
 #include "kiviodragobject.h"
 
-#include <qcstring.h>
-#include <qstringlist.h>
-#include <qdom.h>
-#include <qtextstream.h>
-#include <qpixmap.h>
-#include <qimage.h>
+#include <tqcstring.h>
+#include <tqstringlist.h>
+#include <tqdom.h>
+#include <tqtextstream.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
 
 #include <kdebug.h>
 
@@ -37,8 +37,8 @@
 #include "kivio_doc.h"
 #include "kivio_stencil_spawner.h"
 
-KivioDragObject::KivioDragObject(QWidget* dragSource, const char* name)
-  : QDragObject(dragSource, name)
+KivioDragObject::KivioDragObject(TQWidget* dragSource, const char* name)
+  : TQDragObject(dragSource, name)
 {
   m_encodeMimeList[0] = "application/vnd.kde.kivio";
   m_encodeMimeList[1] = "text/xml";
@@ -51,12 +51,12 @@ const char* KivioDragObject::format(int i) const
     return m_encodeMimeList[i];
   }
   
-  QImageDrag id;
-  id.setImage(QImage()); // We need the format list!!!
+  TQImageDrag id;
+  id.setImage(TQImage()); // We need the format list!!!
   return id.format(i - NumEncodeFormats);
 }
 
-QByteArray KivioDragObject::encodedData(const char* mimetype) const
+TQByteArray KivioDragObject::tqencodedData(const char* mimetype) const
 {
   if((m_encodeMimeList[0] == mimetype) ||
       (m_encodeMimeList[1] == mimetype))
@@ -66,16 +66,16 @@ QByteArray KivioDragObject::encodedData(const char* mimetype) const
     return imageEncoded(mimetype);
   }
 
-  return QByteArray();
+  return TQByteArray();
 }
 
-bool KivioDragObject::canDecode(QMimeSource* e)
+bool KivioDragObject::canDecode(TQMimeSource* e)
 {
-  QValueList<QCString> decodeMimeList;
+  TQValueList<TQCString> decodeMimeList;
   decodeMimeList.append("application/vnd.kde.kivio");
   decodeMimeList.append("text/plain");
 
-  for(QValueList<QCString>::Iterator it = decodeMimeList.begin(); it != decodeMimeList.end(); ++it) {
+  for(TQValueList<TQCString>::Iterator it = decodeMimeList.begin(); it != decodeMimeList.end(); ++it) {
     if(e->provides(*it)) {
       return true;
     }
@@ -84,14 +84,14 @@ bool KivioDragObject::canDecode(QMimeSource* e)
   return false;
 }
 
-bool KivioDragObject::decode(QMimeSource* e, QPtrList<KivioStencil>& sl, KivioPage* page)
+bool KivioDragObject::decode(TQMimeSource* e, TQPtrList<KivioStencil>& sl, KivioPage* page)
 {
   bool ok = false;
 
   if(e->provides("application/vnd.kde.kivio")) {
-    QDomDocument doc("KivioSelection");
-    QByteArray data = e->encodedData("application/vnd.kde.kivio");
-    doc.setContent( QCString( data, data.size()+1 ) );
+    TQDomDocument doc("KivioSelection");
+    TQByteArray data = e->tqencodedData("application/vnd.kde.kivio");
+    doc.setContent( TQCString( data, data.size()+1 ) );
     KivioLayer l(page);
     ok = l.loadXML(doc.documentElement());
     KivioStencil* stencil = l.stencilList()->first();
@@ -102,8 +102,8 @@ bool KivioDragObject::decode(QMimeSource* e, QPtrList<KivioStencil>& sl, KivioPa
       stencil = l.stencilList()->next();
     }
   } else if(e->provides("text/plain")) {
-    QString str;
-    ok = QTextDrag::decode(e, str);
+    TQString str;
+    ok = TQTextDrag::decode(e, str);
     KivioStencilSpawner* ss = page->doc()->findInternalStencilSpawner("Dave Marotti - Text");
     KivioStencil* stencil = ss->newStencil();
     stencil->setPosition(0, 0);
@@ -117,7 +117,7 @@ bool KivioDragObject::decode(QMimeSource* e, QPtrList<KivioStencil>& sl, KivioPa
   return ok;
 }
 
-void KivioDragObject::setStencilList(QPtrList<KivioStencil> l)
+void KivioDragObject::setStencilList(TQPtrList<KivioStencil> l)
 {
   KivioStencil* stencil = l.first();
   m_stencilList.clear();
@@ -133,16 +133,16 @@ void KivioDragObject::setStencilRect(KoRect r)
   m_stencilRect = r;
 }
 
-QByteArray KivioDragObject::kivioEncoded() const
+TQByteArray KivioDragObject::kivioEncoded() const
 {
   if(m_stencilList.count() <= 0)
-    return QByteArray();
+    return TQByteArray();
 
-  QDomDocument doc("KivioSelection");
-  QDomElement elem = doc.createElement( "KivioSelection" );
+  TQDomDocument doc("KivioSelection");
+  TQDomElement elem = doc.createElement( "KivioSelection" );
   doc.appendChild(elem);
   KivioStencil *stencil = 0;
-  QPtrListIterator<KivioStencil> it(m_stencilList);
+  TQPtrListIterator<KivioStencil> it(m_stencilList);
 
   while((stencil = it.current()) != 0) {
     ++it;
@@ -153,21 +153,21 @@ QByteArray KivioDragObject::kivioEncoded() const
   return doc.toCString();
 }
 
-QByteArray KivioDragObject::imageEncoded(const char* mimetype) const
+TQByteArray KivioDragObject::imageEncoded(const char* mimetype) const
 {
   KoZoomHandler zoomHandler;
   zoomHandler.setZoomAndResolution(100, KoGlobal::dpiX(), KoGlobal::dpiY());
-  QPixmap buffer(zoomHandler.zoomItX(m_stencilRect.width()), zoomHandler.zoomItY(m_stencilRect.height()));
-  buffer.fill(Qt::white);
+  TQPixmap buffer(zoomHandler.zoomItX(m_stencilRect.width()), zoomHandler.zoomItY(m_stencilRect.height()));
+  buffer.fill(TQt::white);
   KivioScreenPainter p;
-  p.start( &buffer );
+  p.start( TQT_TQPAINTDEVICE(&buffer) );
   p.setTranslation(-zoomHandler.zoomItX(m_stencilRect.x()), -zoomHandler.zoomItY(m_stencilRect.y()));
   KivioIntraStencilData data;
   data.painter = &p;
   data.zoomHandler = &zoomHandler;
   data.printing = true;
   KivioStencil *stencil = 0;
-  QPtrListIterator<KivioStencil> it(m_stencilList);
+  TQPtrListIterator<KivioStencil> it(m_stencilList);
 
   while((stencil = it.current()) != 0) {
     ++it;
@@ -176,9 +176,9 @@ QByteArray KivioDragObject::imageEncoded(const char* mimetype) const
 
   p.stop();
 
-  QImageDrag id;
+  TQImageDrag id;
   id.setImage(buffer.convertToImage());
-  return id.encodedData(mimetype);
+  return id.tqencodedData(mimetype);
 }
 
 #include "kiviodragobject.moc"
diff --git a/kivio/kiviopart/kiviodragobject.h b/kivio/kiviopart/kiviodragobject.h
index 790b0efe..99d632f7 100644
--- a/kivio/kiviopart/kiviodragobject.h
+++ b/kivio/kiviopart/kiviodragobject.h
@@ -20,35 +20,36 @@
 #ifndef KIVIODRAGOBJECT_H
 #define KIVIODRAGOBJECT_H
 
-#include <qdragobject.h>
-#include <qptrlist.h>
+#include <tqdragobject.h>
+#include <tqptrlist.h>
 
 #include "kivio_stencil.h"
 #include <KoRect.h>
 
 class KivioPage;
 
-class KivioDragObject : public QDragObject
+class KivioDragObject : public TQDragObject
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KivioDragObject(QWidget* dragSource = 0, const char* name = 0);
+    KivioDragObject(TQWidget* dragSource = 0, const char* name = 0);
 
     const char* format(int i) const;
-    QByteArray encodedData(const char* mimetype) const;
-    bool canDecode(QMimeSource*);
-    bool decode(QMimeSource* e, QPtrList<KivioStencil>& sl, KivioPage* page);
-    void setStencilList(QPtrList<KivioStencil> l);
+    TQByteArray tqencodedData(const char* mimetype) const;
+    bool canDecode(TQMimeSource*);
+    bool decode(TQMimeSource* e, TQPtrList<KivioStencil>& sl, KivioPage* page);
+    void setStencilList(TQPtrList<KivioStencil> l);
     void setStencilRect(KoRect r);
 
   protected:
-    QByteArray kivioEncoded() const;
-    QByteArray imageEncoded(const char* mimetype) const;
+    TQByteArray kivioEncoded() const;
+    TQByteArray imageEncoded(const char* mimetype) const;
 
   private:
     enum { NumEncodeFormats = 2 };
-    QCString m_encodeMimeList[NumEncodeFormats];
-    QPtrList<KivioStencil> m_stencilList;
+    TQCString m_encodeMimeList[NumEncodeFormats];
+    TQPtrList<KivioStencil> m_stencilList;
     KoRect m_stencilRect;
 };
 
diff --git a/kivio/kiviopart/kivioglobal.cpp b/kivio/kiviopart/kivioglobal.cpp
index d9e08037..7479af08 100644
--- a/kivio/kiviopart/kivioglobal.cpp
+++ b/kivio/kiviopart/kivioglobal.cpp
@@ -19,9 +19,9 @@
 
 #include "kivioglobal.h"
 
-#include <qdom.h>
-#include <qpixmap.h>
-#include <qprinter.h>
+#include <tqdom.h>
+#include <tqpixmap.h>
+#include <tqprinter.h>
 
 #include <kdebug.h>
 #include <kglobal.h>
@@ -44,52 +44,52 @@ struct PaperSizeDef {
   int unit;
 };
 
-void Kivio::savePageLayout(QDomElement& e, const KoPageLayout& layout)
+void Kivio::savePageLayout(TQDomElement& e, const KoPageLayout& tqlayout)
 {
-  XmlWriteFloat(e, "width", layout.ptWidth);
-  XmlWriteFloat(e, "height", layout.ptHeight);
-  XmlWriteFloat(e, "marginLeft", layout.ptLeft);
-  XmlWriteFloat(e, "marginRight", layout.ptRight);
-  XmlWriteFloat(e, "marginTop", layout.ptTop);
-  XmlWriteFloat(e, "marginBottom", layout.ptBottom);
-  XmlWriteString(e, "format", KoPageFormat::formatString(layout.format));
-  XmlWriteString(e, "orientation", Kivio::orientationString(layout.orientation));
+  XmlWriteFloat(e, "width", tqlayout.ptWidth);
+  XmlWriteFloat(e, "height", tqlayout.ptHeight);
+  XmlWriteFloat(e, "marginLeft", tqlayout.ptLeft);
+  XmlWriteFloat(e, "marginRight", tqlayout.ptRight);
+  XmlWriteFloat(e, "marginTop", tqlayout.ptTop);
+  XmlWriteFloat(e, "marginBottom", tqlayout.ptBottom);
+  XmlWriteString(e, "format", KoPageFormat::formatString(tqlayout.format));
+  XmlWriteString(e, "orientation", Kivio::orientationString(tqlayout.orientation));
 }
 
-// ## TODO: remove this method, now that layout.saveOasis() does it all
-KoGenStyle Kivio::savePageLayout(const KoPageLayout& layout)
+// ## TODO: remove this method, now that tqlayout.saveOasis() does it all
+KoGenStyle Kivio::savePageLayout(const KoPageLayout& tqlayout)
 {
-  return layout.saveOasis();
+  return tqlayout.saveOasis();
 }
 
-KoPageLayout Kivio::loadPageLayout(const QDomElement& e)
+KoPageLayout Kivio::loadPageLayout(const TQDomElement& e)
 {
-  KoPageLayout layout;
+  KoPageLayout tqlayout;
 
   if(e.hasAttribute("unit")) {
     // Compatibility with Kivio <= 1.2.x
     kdDebug(43000) << "Compatibility mode..." << endl;
     KoUnit::Unit unit = Kivio::convToKoUnit(XmlReadInt(e, "unit", 0));
-    layout.ptWidth = KoUnit::fromUserValue(XmlReadFloat(e, "width", 0.0), unit);
-    layout.ptHeight = KoUnit::fromUserValue(XmlReadFloat(e, "height", 0.0), unit);
-    layout.ptLeft = KoUnit::fromUserValue(XmlReadFloat(e, "marginLeft", 0.0), unit);
-    layout.ptRight = KoUnit::fromUserValue(XmlReadFloat(e, "marginRight", 0.0), unit);
-    layout.ptTop = KoUnit::fromUserValue(XmlReadFloat(e, "marginTop", 0.0), unit);
-    layout.ptBottom = KoUnit::fromUserValue(XmlReadFloat(e, "marginBottom", 0.0), unit);
-    Kivio::setFormatOrientation(layout);
+    tqlayout.ptWidth = KoUnit::fromUserValue(XmlReadFloat(e, "width", 0.0), unit);
+    tqlayout.ptHeight = KoUnit::fromUserValue(XmlReadFloat(e, "height", 0.0), unit);
+    tqlayout.ptLeft = KoUnit::fromUserValue(XmlReadFloat(e, "marginLeft", 0.0), unit);
+    tqlayout.ptRight = KoUnit::fromUserValue(XmlReadFloat(e, "marginRight", 0.0), unit);
+    tqlayout.ptTop = KoUnit::fromUserValue(XmlReadFloat(e, "marginTop", 0.0), unit);
+    tqlayout.ptBottom = KoUnit::fromUserValue(XmlReadFloat(e, "marginBottom", 0.0), unit);
+    Kivio::setFormatOrientation(tqlayout);
     kdDebug(43000) << "Ready." << endl;
   } else {
-    layout.ptWidth = XmlReadFloat(e, "width", 0.0);
-    layout.ptHeight = XmlReadFloat(e, "height", 0.0);
-    layout.ptLeft = XmlReadFloat(e, "marginLeft", 0.0);
-    layout.ptRight = XmlReadFloat(e, "marginRight", 0.0);
-    layout.ptTop = XmlReadFloat(e, "marginTop", 0.0);
-    layout.ptBottom = XmlReadFloat(e, "marginBottom", 0.0);
-    layout.format = KoPageFormat::formatFromString(XmlReadString(e, "format", pageSizeString(KGlobal::locale()->pageSize())));
-    layout.orientation = Kivio::orientationFromString(XmlReadString(e, "orientation", "Portrait"));
+    tqlayout.ptWidth = XmlReadFloat(e, "width", 0.0);
+    tqlayout.ptHeight = XmlReadFloat(e, "height", 0.0);
+    tqlayout.ptLeft = XmlReadFloat(e, "marginLeft", 0.0);
+    tqlayout.ptRight = XmlReadFloat(e, "marginRight", 0.0);
+    tqlayout.ptTop = XmlReadFloat(e, "marginTop", 0.0);
+    tqlayout.ptBottom = XmlReadFloat(e, "marginBottom", 0.0);
+    tqlayout.format = KoPageFormat::formatFromString(XmlReadString(e, "format", pageSizeString(KGlobal::locale()->pageSize())));
+    tqlayout.orientation = Kivio::orientationFromString(XmlReadString(e, "orientation", "Portrait"));
   }
 
-  return layout;
+  return tqlayout;
 }
 
 KoUnit::Unit Kivio::convToKoUnit(int tkUnit)
@@ -114,7 +114,7 @@ KoUnit::Unit Kivio::convToKoUnit(int tkUnit)
   return KoUnit::U_PT;
 }
 
-QString Kivio::orientationString(KoOrientation o)
+TQString Kivio::orientationString(KoOrientation o)
 {
   if(o == PG_LANDSCAPE) {
     return "Landscape";
@@ -123,7 +123,7 @@ QString Kivio::orientationString(KoOrientation o)
   return "Portrait";
 }
 
-KoOrientation Kivio::orientationFromString(const QString& s)
+KoOrientation Kivio::orientationFromString(const TQString& s)
 {
   if(s == "Landscape") {
     return PG_LANDSCAPE;
@@ -132,7 +132,7 @@ KoOrientation Kivio::orientationFromString(const QString& s)
   return PG_PORTRAIT;
 }
 
-void Kivio::setFormatOrientation(KoPageLayout& layout)
+void Kivio::setFormatOrientation(KoPageLayout& tqlayout)
 {
   const PaperSizeDef PapersTable[] = {
     {"A0",841,1189,KoUnit::U_MM},
@@ -166,20 +166,20 @@ void Kivio::setFormatOrientation(KoPageLayout& layout)
   PaperSizeDef sizeDef = PapersTable[0];
   bool found = false;
   float width, height;
-  layout.format = PG_CUSTOM;
-  layout.orientation = PG_PORTRAIT;
+  tqlayout.format = PG_CUSTOM;
+  tqlayout.orientation = PG_PORTRAIT;
 
   while((sizeDef.unit != -2) && !found) {
     width = KoUnit::fromUserValue(sizeDef.width, static_cast<KoUnit::Unit>(sizeDef.unit));
     height = KoUnit::fromUserValue(sizeDef.height, static_cast<KoUnit::Unit>(sizeDef.unit));
 
-    if((layout.ptWidth == width) && (layout.ptHeight == height)) {
-      layout.format = KoPageFormat::formatFromString(sizeDef.title);
-      layout.orientation = PG_PORTRAIT;
+    if((tqlayout.ptWidth == width) && (tqlayout.ptHeight == height)) {
+      tqlayout.format = KoPageFormat::formatFromString(sizeDef.title);
+      tqlayout.orientation = PG_PORTRAIT;
       found = true;
-    } else if((layout.ptWidth == height) && (layout.ptHeight == width)) {
-      layout.format = KoPageFormat::formatFromString(sizeDef.title);
-      layout.orientation = PG_LANDSCAPE;
+    } else if((tqlayout.ptWidth == height) && (tqlayout.ptHeight == width)) {
+      tqlayout.format = KoPageFormat::formatFromString(sizeDef.title);
+      tqlayout.orientation = PG_LANDSCAPE;
       found = true;
     }
 
@@ -187,7 +187,7 @@ void Kivio::setFormatOrientation(KoPageLayout& layout)
   }
 }
 
-KoSize Kivio::loadSize(const QDomElement& e, const QString& name, const KoSize& def)
+KoSize Kivio::loadSize(const TQDomElement& e, const TQString& name, const KoSize& def)
 {
   KoSize size;
   if(e.hasAttribute(name + "Unit")) {
@@ -203,108 +203,108 @@ KoSize Kivio::loadSize(const QDomElement& e, const QString& name, const KoSize&
   return size;
 }
 
-void Kivio::saveSize(QDomElement& e, const QString& name, const KoSize& size)
+void Kivio::saveSize(TQDomElement& e, const TQString& name, const KoSize& size)
 {
   XmlWriteFloat(e, name + "Width", size.width());
   XmlWriteFloat(e, name + "Height", size.height());
 }
 
-QString Kivio::pageSizeString(int pageSize)
+TQString Kivio::pageSizeString(int pageSize)
 {
-  QString psStr = "A4";
+  TQString psStr = "A4";
 
   switch(pageSize) {
-    case QPrinter::A0:
+    case TQPrinter::A0:
       psStr = "A0";
       break;
-    case QPrinter::A1:
+    case TQPrinter::A1:
       psStr = "A1";
       break;
-    case QPrinter::A2:
+    case TQPrinter::A2:
       psStr = "A2";
       break;
-    case QPrinter::A3:
+    case TQPrinter::A3:
       psStr = "A3";
       break;
-    case QPrinter::A5:
+    case TQPrinter::A5:
       psStr = "A5";
       break;
-    case QPrinter::A6:
+    case TQPrinter::A6:
       psStr = "A6";
       break;
-    case QPrinter::A7:
+    case TQPrinter::A7:
       psStr = "A7";
       break;
-    case QPrinter::A8:
+    case TQPrinter::A8:
       psStr = "A8";
       break;
-    case QPrinter::A9:
+    case TQPrinter::A9:
       psStr = "A9";
       break;
-    case QPrinter::B0:
+    case TQPrinter::B0:
       psStr = "B0";
       break;
-    case QPrinter::B1:
+    case TQPrinter::B1:
       psStr = "B1";
       break;
-    case QPrinter::B10:
+    case TQPrinter::B10:
       psStr = "B10";
       break;
-    case QPrinter::B2:
+    case TQPrinter::B2:
       psStr = "B2";
       break;
-    case QPrinter::B3:
+    case TQPrinter::B3:
       psStr = "B3";
       break;
-    case QPrinter::B4:
+    case TQPrinter::B4:
       psStr = "B4";
       break;
-    case QPrinter::B5:
+    case TQPrinter::B5:
       psStr = "B5";
       break;
-    case QPrinter::B6:
+    case TQPrinter::B6:
       psStr = "B6";
       break;
-    case QPrinter::B7:
+    case TQPrinter::B7:
       psStr = "B7";
       break;
-    case QPrinter::B8:
+    case TQPrinter::B8:
       psStr = "B8";
       break;
-    case QPrinter::B9:
+    case TQPrinter::B9:
       psStr = "B9";
       break;
-    case QPrinter::C5E:
+    case TQPrinter::C5E:
       psStr = "C5";
       break;
-    case QPrinter::Comm10E:
+    case TQPrinter::Comm10E:
       psStr = "Comm10";
       break;
-    case QPrinter::DLE:
+    case TQPrinter::DLE:
       psStr = "DL";
       break;
-    case QPrinter::Executive:
+    case TQPrinter::Executive:
       psStr = "Executive";
       break;
-    case QPrinter::Folio:
+    case TQPrinter::Folio:
       psStr = "Folio";
       break;
-    case QPrinter::Ledger:
+    case TQPrinter::Ledger:
       psStr = "Ledger";
       break;
-    case QPrinter::Legal:
+    case TQPrinter::Legal:
       psStr = "Legal";
       break;
-    case QPrinter::Letter:
+    case TQPrinter::Letter:
       psStr = "Letter";
       break;
-    case QPrinter::Tabloid:
+    case TQPrinter::Tabloid:
       psStr = "Tabloid";
       break;
-    case QPrinter::Custom:
+    case TQPrinter::Custom:
       psStr = "Custom";
       break;
-    case QPrinter::A4:
+    case TQPrinter::A4:
     default:
       psStr = "A4";
       break;
@@ -313,7 +313,7 @@ QString Kivio::pageSizeString(int pageSize)
   return psStr;
 }
 
-QPixmap Kivio::arrowHeadPixmap()
+TQPixmap Kivio::arrowHeadPixmap()
 {
   const char* lineends[] = {
     "50 272 2 1",
@@ -1239,10 +1239,10 @@ QPixmap Kivio::arrowHeadPixmap()
     "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"*/
   };
 
-  return QPixmap(lineends);
+  return TQPixmap(lineends);
 }
 
-QPixmap Kivio::connectorTargetPixmap()
+TQPixmap Kivio::connectorTargetPixmap()
 {
   const char * connectorTarget_xpm[] = {
   "7 7 3 1",
@@ -1257,10 +1257,10 @@ QPixmap Kivio::connectorTargetPixmap()
   ".+. .+.",
   " .   . "};
 
-  return QPixmap(connectorTarget_xpm);
+  return TQPixmap(connectorTarget_xpm);
 }
 
-QPixmap Kivio::lockPixmap()
+TQPixmap Kivio::lockPixmap()
 {
   const char * lock_xpm[] = {
   "10 10 3 1",
@@ -1278,12 +1278,12 @@ QPixmap Kivio::lockPixmap()
   " .++++++. ",
   "  ......  "};
 
-  return QPixmap(lock_xpm);
+  return TQPixmap(lock_xpm);
 }
 
-QString Kivio::systemDefaultUnit()
+TQString Kivio::systemDefaultUnit()
 {
-  QString defMS = "cm";
+  TQString defMS = "cm";
 
   if(KGlobal::locale()->measureSystem() == KLocale::Imperial) {
     defMS = "in";
@@ -1292,20 +1292,20 @@ QString Kivio::systemDefaultUnit()
   return defMS;
 }
 
-QPixmap Kivio::generatePixmapFromStencil(int width, int height, KivioStencil* stencil)
+TQPixmap Kivio::generatePixmapFromStencil(int width, int height, KivioStencil* stencil)
 {
   KoZoomHandler zoomHandler;
-  QRect rect = zoomHandler.zoomRect(stencil->rect());
+  TQRect rect = zoomHandler.zoomRect(stencil->rect());
 
   double zw = (double)(width - 2) / (double)rect.width();
   double zh = (double)(height - 2) / (double)rect.height();
-  zoomHandler.setZoomAndResolution(qRound(kMin(zw, zh) * 100.0), KoGlobal::dpiX(), KoGlobal::dpiY());
+  zoomHandler.setZoomAndResolution(tqRound(kMin(zw, zh) * 100.0), KoGlobal::dpiX(), KoGlobal::dpiY());
   rect = zoomHandler.zoomRect(stencil->rect());
 
-  QPixmap pix(width, height);
-  pix.fill(Qt::white);
+  TQPixmap pix(width, height);
+  pix.fill(TQt::white);
   KivioScreenPainter kpainter;
-  kpainter.start(&pix);
+  kpainter.start(TQT_TQPAINTDEVICE(&pix));
   kpainter.translateBy(-rect.x() + ((width - rect.width()) / 2), -rect.y() + ((height - rect.height()) / 2));
   KivioIntraStencilData data;
   data.painter = &kpainter;
diff --git a/kivio/kiviopart/kivioglobal.h b/kivio/kiviopart/kivioglobal.h
index 28b3abed..1e94f79b 100644
--- a/kivio/kiviopart/kivioglobal.h
+++ b/kivio/kiviopart/kivioglobal.h
@@ -24,9 +24,9 @@
 #include <KoPageLayout.h>
 #include <KoSize.h>
 
-class QDomElement;
-class QPixmap;
-class QString;
+class TQDomElement;
+class TQPixmap;
+class TQString;
 class KoGenStyle;
 class KivioStencil;
 
@@ -37,14 +37,14 @@ namespace Kivio
   };
 
   /**
-   * Save a page layout to a QDomElement
+   * Save a page tqlayout to a TQDomElement
    */
-  void savePageLayout(QDomElement& e, const KoPageLayout& layout);
-  KoGenStyle savePageLayout(const KoPageLayout& layout);
+  void savePageLayout(TQDomElement& e, const KoPageLayout& tqlayout);
+  KoGenStyle savePageLayout(const KoPageLayout& tqlayout);
   /**
-   * Load a page layout from a QDomElement
+   * Load a page tqlayout from a TQDomElement
    */
-  KoPageLayout loadPageLayout(const QDomElement& e);
+  KoPageLayout loadPageLayout(const TQDomElement& e);
   /**
    * Convert from the old TkUnit to KoUnit
    */
@@ -52,51 +52,51 @@ namespace Kivio
   /**
    * Return an approperiate string for the orientation
    */
-  QString orientationString(KoOrientation o);
+  TQString orientationString(KoOrientation o);
   /**
    * Return the orientation based on the string
    */
-  KoOrientation orientationFromString(const QString& s);
-  void setFormatOrientation(KoPageLayout& layout);
+  KoOrientation orientationFromString(const TQString& s);
+  void setFormatOrientation(KoPageLayout& tqlayout);
 
   /**
-   * Load a KoSize from a QDomElement
+   * Load a KoSize from a TQDomElement
    */
-  KoSize loadSize(const QDomElement& e, const QString& name, const KoSize& def);
+  KoSize loadSize(const TQDomElement& e, const TQString& name, const KoSize& def);
   /**
-   * Save a KoSize to a QDomElement
+   * Save a KoSize to a TQDomElement
    */
-  void saveSize(QDomElement& e, const QString& name, const KoSize& size);
+  void saveSize(TQDomElement& e, const TQString& name, const KoSize& size);
 
   /**
-   * Get the pagesize string from a QPrinter::PageSize value
+   * Get the pagesize string from a TQPrinter::PageSize value
    */
-  QString pageSizeString(int pageSize);
+  TQString pageSizeString(int pageSize);
 
   /**
    * Returns a pixmap with all arrowheads
    */
-  QPixmap arrowHeadPixmap();
+  TQPixmap arrowHeadPixmap();
 
   /**
    * Returns the connector target pixmap
    */
-  QPixmap connectorTargetPixmap();
+  TQPixmap connectorTargetPixmap();
 
   /**
    * Returns the lock pixmap
    */
-  QPixmap lockPixmap();
+  TQPixmap lockPixmap();
 
   /**
    * Get system default unit
    */
-  QString systemDefaultUnit();
+  TQString systemDefaultUnit();
 
   /**
    * Generate a pixmap from a stencil
    */
-  QPixmap generatePixmapFromStencil(int width, int height, KivioStencil* stencil);
+  TQPixmap generatePixmapFromStencil(int width, int height, KivioStencil* stencil);
 }
 
 #endif
diff --git a/kivio/kiviopart/kiviosdk/diapathparser.cpp b/kivio/kiviopart/kiviosdk/diapathparser.cpp
index d0ceb271..1af85056 100644
--- a/kivio/kiviopart/kiviosdk/diapathparser.cpp
+++ b/kivio/kiviopart/kiviosdk/diapathparser.cpp
@@ -19,7 +19,7 @@
 
 #include "diapathparser.h"
 
-DiaPointFinder::DiaPointFinder(QValueList<float> *xlist,  QValueList<float> *ylist) :
+DiaPointFinder::DiaPointFinder(TQValueList<float> *xlist,  TQValueList<float> *ylist) :
 	SVGPathParser(), m_xlist(xlist), m_ylist(ylist)
 {
 	;
@@ -48,8 +48,8 @@ void DiaPointFinder::svgClosePath()
 {
 
 }
-DiaPathParser::DiaPathParser(QDomDocument *doc, QDomElement *shape, float xscale, float yscale, float lowestx, float lowesty) :
-	SVGPathParser(), m_doc(doc), m_shape(shape),
+DiaPathParser::DiaPathParser(TQDomDocument *doc, TQDomElement *tqshape, float xscale, float yscale, float lowestx, float lowesty) :
+	SVGPathParser(), m_doc(doc), m_tqshape(tqshape),
 	m_xscale(xscale), m_yscale(yscale),
 	m_lowestx(lowestx), m_lowesty(lowesty)
 {
@@ -69,15 +69,15 @@ void DiaPathParser::svgLineTo( double x1, double y1, bool )
 	float currentY = y1;
 
 	// Create the line
-	QDomElement kivioPointElement = m_doc->createElement("KivioPoint");
-	kivioPointElement.setAttribute("x", QString::number(diaPointToKivio(lastX,true) * m_xscale));
-	kivioPointElement.setAttribute("y", QString::number(diaPointToKivio(lastY, false) * m_yscale));
-	m_shape->appendChild(kivioPointElement);
+	TQDomElement kivioPointElement = m_doc->createElement("KivioPoint");
+	kivioPointElement.setAttribute("x", TQString::number(diaPointToKivio(lastX,true) * m_xscale));
+	kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(lastY, false) * m_yscale));
+	m_tqshape->appendChild(kivioPointElement);
 
 	kivioPointElement = m_doc->createElement("KivioPoint");
-	kivioPointElement.setAttribute("x", QString::number(diaPointToKivio(currentX,true) * m_xscale));
-	kivioPointElement.setAttribute("y", QString::number(diaPointToKivio(currentY, false) * m_yscale));
-	m_shape->appendChild(kivioPointElement);
+	kivioPointElement.setAttribute("x", TQString::number(diaPointToKivio(currentX,true) * m_xscale));
+	kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(currentY, false) * m_yscale));
+	m_tqshape->appendChild(kivioPointElement);
 	lastX = currentX;
 	lastY = currentY;
 }
@@ -93,37 +93,37 @@ void DiaPathParser::svgCurveToCubic( double x1, double y1, double x2, double y2,
 	float currentY = y3;
 
 	// Create the bezier
-	QDomElement kivioPointElement = m_doc->createElement("KivioPoint");
+	TQDomElement kivioPointElement = m_doc->createElement("KivioPoint");
 	kivioPointElement.setAttribute("x",
-		QString::number(diaPointToKivio(lastX,true) * m_xscale));
+		TQString::number(diaPointToKivio(lastX,true) * m_xscale));
 	kivioPointElement.setAttribute("y",
-		QString::number(diaPointToKivio(lastY, false) * m_yscale));
+		TQString::number(diaPointToKivio(lastY, false) * m_yscale));
 	kivioPointElement.setAttribute("type", "bezier");
-	m_shape->appendChild(kivioPointElement);
+	m_tqshape->appendChild(kivioPointElement);
 
 	kivioPointElement = m_doc->createElement("KivioPoint");
 	kivioPointElement.setAttribute("x",
-		QString::number(diaPointToKivio(lastControlX,true) * m_xscale));
+		TQString::number(diaPointToKivio(lastControlX,true) * m_xscale));
 	kivioPointElement.setAttribute("y",
-		QString::number(diaPointToKivio(lastControlY, false) * m_yscale));
+		TQString::number(diaPointToKivio(lastControlY, false) * m_yscale));
 	kivioPointElement.setAttribute("type", "bezier");
-	m_shape->appendChild(kivioPointElement);
+	m_tqshape->appendChild(kivioPointElement);
 
 	kivioPointElement = m_doc->createElement("KivioPoint");
 	kivioPointElement.setAttribute("x",
-			QString::number(diaPointToKivio(currentControlX,true) * m_xscale));
+			TQString::number(diaPointToKivio(currentControlX,true) * m_xscale));
 	kivioPointElement.setAttribute("y",
-		QString::number(diaPointToKivio(currentControlY, false) * m_yscale));
+		TQString::number(diaPointToKivio(currentControlY, false) * m_yscale));
 	kivioPointElement.setAttribute("type", "bezier");
-	m_shape->appendChild(kivioPointElement);
+	m_tqshape->appendChild(kivioPointElement);
 
 	kivioPointElement = m_doc->createElement("KivioPoint");
 	kivioPointElement.setAttribute("x",
-		QString::number(diaPointToKivio(currentX,true) * m_xscale));
+		TQString::number(diaPointToKivio(currentX,true) * m_xscale));
 	kivioPointElement.setAttribute("y",
-		QString::number(diaPointToKivio(currentY, false) * m_yscale));
+		TQString::number(diaPointToKivio(currentY, false) * m_yscale));
 	kivioPointElement.setAttribute("type", "bezier");
-	m_shape->appendChild(kivioPointElement);
+	m_tqshape->appendChild(kivioPointElement);
 	lastX = currentX;
 	lastY = currentY;
 }
diff --git a/kivio/kiviopart/kiviosdk/diapathparser.h b/kivio/kiviopart/kiviosdk/diapathparser.h
index b4522400..0a9439f6 100644
--- a/kivio/kiviopart/kiviosdk/diapathparser.h
+++ b/kivio/kiviopart/kiviosdk/diapathparser.h
@@ -21,27 +21,27 @@
 #define __DIAPATHPARSER_H__
 
 #include "svgpathparser.h"
-#include <qvaluelist.h>
-#include <qdom.h>
+#include <tqvaluelist.h>
+#include <tqdom.h>
 
 class DiaPointFinder : public SVGPathParser
 {
 	public:
-		DiaPointFinder(QValueList<float> *xlist,  QValueList<float> *ylist);
+		DiaPointFinder(TQValueList<float> *xlist,  TQValueList<float> *ylist);
 		void svgMoveTo( double x1, double y1, bool abs = true );
 		void svgLineTo( double x1, double y1, bool abs = true );
 		void svgCurveToCubic( double x1, double y1, double x2, double y2, double x3, double y3, bool abs = true );
 		void svgClosePath();
 
 	private:
-		QValueList<float> *m_xlist;
-		QValueList<float> *m_ylist;
+		TQValueList<float> *m_xlist;
+		TQValueList<float> *m_ylist;
 };
 
 class DiaPathParser : public SVGPathParser
 {
 	public:
-		DiaPathParser(QDomDocument *doc, QDomElement *shape, float xscale, float yscale, float lowestx, float lowesty);
+		DiaPathParser(TQDomDocument *doc, TQDomElement *tqshape, float xscale, float yscale, float lowestx, float lowesty);
 
 		void svgMoveTo( double x1, double y1, bool abs = true );
 		void svgLineTo( double x1, double y1, bool abs = true );
@@ -51,8 +51,8 @@ class DiaPathParser : public SVGPathParser
 	private:
 		float diaPointToKivio(float point, bool xpoint);
 
-		QDomDocument *m_doc;
-		QDomElement *m_shape;
+		TQDomDocument *m_doc;
+		TQDomElement *m_tqshape;
 		float lastX;
 		float lastY;
 		float m_xscale;
diff --git a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp
index 9971f5f7..23b03be6 100644
--- a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp
@@ -59,8 +59,8 @@
 #include <math.h>
 #include <KoZoomHandler.h>
 
-#include <qbitmap.h>
-#include <qpainter.h>
+#include <tqbitmap.h>
+#include <tqpainter.h>
 
 /**
  * Default constructor.
@@ -75,7 +75,7 @@ Kivio1DStencil::Kivio1DStencil()
     m_pLineStyle = new KivioLineStyle();
     m_pTextStyle = new KivioTextStyle();
 
-    m_pConnectorPoints = new QPtrList<KivioConnectorPoint>;
+    m_pConnectorPoints = new TQPtrList<KivioConnectorPoint>;
     m_pConnectorPoints->setAutoDelete(true);
 
     m_pStart = new KivioConnectorPoint(this, true);
@@ -116,12 +116,12 @@ Kivio1DStencil::~Kivio1DStencil()
    delete m_pConnectorPoints;
 }
 
-void Kivio1DStencil::setFGColor( QColor c )
+void Kivio1DStencil::setFGColor( TQColor c )
 {
     m_pLineStyle->setColor(c);
 }
 
-QColor Kivio1DStencil::fgColor()
+TQColor Kivio1DStencil::fgColor()
 {
     return m_pLineStyle->color();
 }
@@ -156,12 +156,12 @@ int Kivio1DStencil::fillPattern()
     return m_pFillStyle->brushStyle();
 }
 
-void Kivio1DStencil::setBGColor( QColor c )
+void Kivio1DStencil::setBGColor( TQColor c )
 {
     m_pFillStyle->setColor(c);
 }
 
-QColor Kivio1DStencil::bgColor()
+TQColor Kivio1DStencil::bgColor()
 {
     return m_pFillStyle->color();
 }
@@ -413,10 +413,10 @@ void Kivio1DStencil::updateGeometry()
 
 
 // file i/o routines
-bool Kivio1DStencil::loadXML( const QDomElement &e )
+bool Kivio1DStencil::loadXML( const TQDomElement &e )
 {
-   QDomNode node;
-   QString name;
+   TQDomNode node;
+   TQString name;
 
    node = e.firstChild();
    while( !node.isNull() )
@@ -437,9 +437,9 @@ bool Kivio1DStencil::loadXML( const QDomElement &e )
 }
 
 
-QDomElement Kivio1DStencil::createRootElement( QDomDocument &doc )
+TQDomElement Kivio1DStencil::createRootElement( TQDomDocument &doc )
 {
-   QDomElement e = doc.createElement("KivioPluginStencil");
+   TQDomElement e = doc.createElement("KivioPluginStencil");
 
    XmlWriteString( e, "id", m_pSpawner->info()->id() );
    XmlWriteString( e, "setId", m_pSpawner->set()->id() );
@@ -448,9 +448,9 @@ QDomElement Kivio1DStencil::createRootElement( QDomDocument &doc )
 }
 
 
-QDomElement Kivio1DStencil::saveXML( QDomDocument &doc )
+TQDomElement Kivio1DStencil::saveXML( TQDomDocument &doc )
 {
-   QDomElement e = createRootElement(doc);
+   TQDomElement e = createRootElement(doc);
 
    e.appendChild( saveProperties(doc) );
 
@@ -643,9 +643,9 @@ int Kivio1DStencil::resizeHandlePositions()
     return (int)krhpNone;
 }
 
-QDomElement Kivio1DStencil::saveConnectors( QDomDocument &doc )
+TQDomElement Kivio1DStencil::saveConnectors( TQDomDocument &doc )
 {
-    QDomElement eConns = doc.createElement("KivioConnectorList");
+    TQDomElement eConns = doc.createElement("KivioConnectorList");
 
     KivioConnectorPoint *p;
     p = m_pConnectorPoints->first();
@@ -659,15 +659,15 @@ QDomElement Kivio1DStencil::saveConnectors( QDomDocument &doc )
     return eConns;
 }
 
-bool Kivio1DStencil::loadConnectors( const QDomElement &e )
+bool Kivio1DStencil::loadConnectors( const TQDomElement &e )
 {
     m_pConnectorPoints->clear();
 
     KivioConnectorPoint *p;
 
-    QDomNode node = e.firstChild();
-    QDomElement e2;
-    QString name;
+    TQDomNode node = e.firstChild();
+    TQDomElement e2;
+    TQString name;
 
     while( !node.isNull() )
     {
@@ -715,11 +715,11 @@ bool Kivio1DStencil::loadConnectors( const QDomElement &e )
     return true;
 }
 
-QDomElement Kivio1DStencil::saveProperties( QDomDocument &doc )
+TQDomElement Kivio1DStencil::saveProperties( TQDomDocument &doc )
 {
-    QDomElement propE = doc.createElement("KivioStencilProperties");
+    TQDomElement propE = doc.createElement("KivioStencilProperties");
 
-    QDomElement connE = doc.createElement("Kivio1DProperties");
+    TQDomElement connE = doc.createElement("Kivio1DProperties");
     XmlWriteFloat( connE, "connectorWidth", m_connectorWidth );
     XmlWriteInt( connE, "needsWidth", m_needsWidth );
     propE.appendChild( connE );
@@ -732,7 +732,7 @@ QDomElement Kivio1DStencil::saveProperties( QDomDocument &doc )
 
     propE.appendChild( saveConnectors(doc) );
 
-    QDomElement customE = doc.createElement("CustomData");
+    TQDomElement customE = doc.createElement("CustomData");
     if( saveCustom( customE, doc )==true )
     {
        propE.appendChild( customE );
@@ -741,11 +741,11 @@ QDomElement Kivio1DStencil::saveProperties( QDomDocument &doc )
     return propE;
 }
 
-bool Kivio1DStencil::loadProperties( const QDomElement &e )
+bool Kivio1DStencil::loadProperties( const TQDomElement &e )
 {
-    QDomNode node;
-    QDomElement nodeE;
-    QString nodeName;
+    TQDomNode node;
+    TQDomElement nodeE;
+    TQString nodeName;
 
     node = e.firstChild();
     while( !node.isNull() )
@@ -785,12 +785,12 @@ bool Kivio1DStencil::loadProperties( const QDomElement &e )
     return true;
 }
 
-bool Kivio1DStencil::loadCustom( const QDomElement & )
+bool Kivio1DStencil::loadCustom( const TQDomElement & )
 {
    return true;
 }
 
-bool Kivio1DStencil::saveCustom( QDomElement &, QDomDocument & )
+bool Kivio1DStencil::saveCustom( TQDomElement &, TQDomDocument & )
 {
    return false;
 }
@@ -849,21 +849,21 @@ void Kivio1DStencil::drawText( KivioIntraStencilData *pData )
   _w = 10000000;
   _h = 10000000;
 
-  QFont f = m_pTextStyle->font();
+  TQFont f = m_pTextStyle->font();
   int tf = m_pTextStyle->hTextAlign() | m_pTextStyle->vTextAlign();
 
   f.setPointSizeFloat(f.pointSizeFloat() * (((float)zoomHandler->zoom()) / 100.0));
   painter->setFont(f);
-  QRect boundRect = painter->boundingRect( _x, _y, _w, _h, tf, m_pTextStyle->text() );
-  QPixmap pix(boundRect.width(), boundRect.height());
+  TQRect boundRect = painter->boundingRect( _x, _y, _w, _h, tf, m_pTextStyle->text() );
+  TQPixmap pix(boundRect.width(), boundRect.height());
   pix.fill();
-  QPainter p(&pix);
+  TQPainter p(&pix);
   p.setPen(m_pTextStyle->color());
   p.setFont(f);
   p.drawText( 0, 0, boundRect.width(), boundRect.height(), tf, m_pTextStyle->text() );
-  QBitmap mask;
-  mask = pix;
-  pix.setMask(mask);
+  TQBitmap tqmask;
+  tqmask = pix;
+  pix.setMask(tqmask);
   painter->drawPixmap(_x, _y, pix);
 }
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.h b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.h
index a1af2086..b42d650b 100644
--- a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.h
+++ b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.h
@@ -5,8 +5,8 @@
 #include <config.h>
 #endif
 
-#include <qdom.h>
-#include <qptrlist.h>
+#include <tqdom.h>
+#include <tqptrlist.h>
 
 #include <koffice_export.h>
 
@@ -25,7 +25,7 @@ class KivioStencil;
 class KIVIO_EXPORT Kivio1DStencil : public KivioStencil
 {
 protected:
-    QPtrList <KivioConnectorPoint> *m_pConnectorPoints;
+    TQPtrList <KivioConnectorPoint> *m_pConnectorPoints;
 
     KivioConnectorPoint *m_pStart, *m_pEnd;
     KivioConnectorPoint *m_pLeft, *m_pRight;
@@ -43,15 +43,15 @@ protected:
     bool boolAllTrue( bool *, int );
     bool boolContainsFalse( bool *, int );
 
-    virtual QDomElement createRootElement( QDomDocument & );
+    virtual TQDomElement createRootElement( TQDomDocument & );
 
-    virtual bool saveCustom( QDomElement &, QDomDocument & );
-    QDomElement saveConnectors( QDomDocument &doc );
-    QDomElement saveProperties( QDomDocument &doc );
+    virtual bool saveCustom( TQDomElement &, TQDomDocument & );
+    TQDomElement saveConnectors( TQDomDocument &doc );
+    TQDomElement saveProperties( TQDomDocument &doc );
 
-    virtual bool loadCustom( const QDomElement & );
-    bool loadConnectors( const QDomElement & );
-    bool loadProperties( const QDomElement & );
+    virtual bool loadCustom( const TQDomElement & );
+    bool loadConnectors( const TQDomElement & );
+    bool loadProperties( const TQDomElement & );
 
     // For easier duplication
     void copyBasicInto( Kivio1DStencil * );
@@ -64,22 +64,22 @@ public:
     virtual bool connected();
 
     // fg color functions
-    virtual void setFGColor( QColor c );
-    virtual QColor fgColor();
+    virtual void setFGColor( TQColor c );
+    virtual TQColor fgColor();
 
 
     // bg color functions
-    virtual void setBGColor( QColor c );
-    virtual QColor bgColor();
+    virtual void setBGColor( TQColor c );
+    virtual TQColor bgColor();
 
-    virtual void setText( const QString & t ) { m_pTextStyle->setText(t); }
-    virtual QString text() { return m_pTextStyle->text(); }
+    virtual void setText( const TQString & t ) { m_pTextStyle->setText(t); }
+    virtual TQString text() { return m_pTextStyle->text(); }
 
-    virtual void setTextColor( QColor c ) { m_pTextStyle->setColor(c); }
-    virtual QColor textColor() { return m_pTextStyle->color(); }
+    virtual void setTextColor( TQColor c ) { m_pTextStyle->setColor(c); }
+    virtual TQColor textColor() { return m_pTextStyle->color(); }
 
-    virtual QFont textFont() { return m_pTextStyle->font(); }
-    virtual void setTextFont( const QFont &f ) { m_pTextStyle->setFont(f); }
+    virtual TQFont textFont() { return m_pTextStyle->font(); }
+    virtual void setTextFont( const TQFont &f ) { m_pTextStyle->setFont(f); }
 
     virtual int hTextAlign() { return m_pTextStyle->hTextAlign(); }
     virtual int vTextAlign() { return m_pTextStyle->vTextAlign(); }
@@ -124,14 +124,14 @@ public:
     virtual void customDrag( KivioCustomDragData * );
 
 
-    // geometry management
+    // tqgeometry management
     virtual void updateGeometry();
     virtual void updateConnectorPoints( KivioConnectorPoint *, double, double );
 
 
     // file i/o routines
-    virtual bool loadXML( const QDomElement & );
-    virtual QDomElement saveXML( QDomDocument & );
+    virtual bool loadXML( const TQDomElement & );
+    virtual TQDomElement saveXML( TQDomDocument & );
 
 
     // duplication routines
diff --git a/kivio/kiviopart/kiviosdk/kivio_arrowhead.cpp b/kivio/kiviopart/kiviosdk/kivio_arrowhead.cpp
index de464113..6728f7aa 100644
--- a/kivio/kiviopart/kiviosdk/kivio_arrowhead.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_arrowhead.cpp
@@ -39,9 +39,9 @@ KivioArrowHead::~KivioArrowHead()
 {
 }
 
-QDomElement KivioArrowHead::saveXML( QDomDocument &doc )
+TQDomElement KivioArrowHead::saveXML( TQDomDocument &doc )
 {
-    QDomElement e = doc.createElement("KivioArrowHead");
+    TQDomElement e = doc.createElement("KivioArrowHead");
 
     XmlWriteFloat( e, "cut", m_cut );
     XmlWriteFloat( e, "w", m_w );
@@ -51,7 +51,7 @@ QDomElement KivioArrowHead::saveXML( QDomDocument &doc )
     return e;
 }
 
-bool KivioArrowHead::loadXML( const QDomElement &e )
+bool KivioArrowHead::loadXML( const TQDomElement &e )
 {
     m_cut   = XmlReadFloat( e, "cut", 0.0f );
     m_w     = XmlReadFloat( e, "w", 10.0f );
@@ -243,7 +243,7 @@ void KivioArrowHead::paintArrowLine( KivioArrowHeadData *d )
     pvecX = nvecY;
     pvecY = -nvecX;
 
-    QPtrList<KivioPoint>l;
+    TQPtrList<KivioPoint>l;
     l.setAutoDelete(true);
 
     float _x;
@@ -275,7 +275,7 @@ void KivioArrowHead::paintArrowLine( KivioArrowHeadData *d )
 void KivioArrowHead::paintArrowTriangle( KivioArrowHeadData *d, bool solid )
 {
     KivioPainter *painter = d->painter;
-    QColor cbg = painter->bgColor();
+    TQColor cbg = painter->bgColor();
 
     if(solid) {
       painter->setBGColor(painter->fgColor());
@@ -299,7 +299,7 @@ void KivioArrowHead::paintArrowTriangle( KivioArrowHeadData *d, bool solid )
     pvecX = nvecY;
     pvecY = -nvecX;
 
-    QPtrList<KivioPoint>l;
+    TQPtrList<KivioPoint>l;
     l.setAutoDelete(true);
 
     float _x = zoomHandler->zoomItX(d->x);
@@ -329,7 +329,7 @@ void KivioArrowHead::paintArrowTriangle( KivioArrowHeadData *d, bool solid )
 void KivioArrowHead::paintDoubleTriangle( KivioArrowHeadData *d, bool solid )
 {
     KivioPainter *painter = d->painter;
-    QColor cbg = painter->bgColor();
+    TQColor cbg = painter->bgColor();
 
     if(solid) {
       painter->setBGColor(painter->fgColor());
@@ -353,9 +353,9 @@ void KivioArrowHead::paintDoubleTriangle( KivioArrowHeadData *d, bool solid )
     pvecX = nvecY;
     pvecY = -nvecX;
 
-    QPtrList<KivioPoint> l1;
+    TQPtrList<KivioPoint> l1;
     l1.setAutoDelete(true);
-    QPtrList<KivioPoint> l2;
+    TQPtrList<KivioPoint> l2;
     l2.setAutoDelete(true);
 
     float _x = zoomHandler->zoomItX(d->x);
@@ -483,7 +483,7 @@ void KivioArrowHead::paintPipe( KivioArrowHeadData *d )
 void KivioArrowHead::paintDiamond( KivioArrowHeadData *d, bool solid )
 {
     KivioPainter *painter = d->painter;
-    QColor cbg = painter->bgColor();
+    TQColor cbg = painter->bgColor();
 
     if(solid) {
       painter->setBGColor(painter->fgColor());
@@ -505,7 +505,7 @@ void KivioArrowHead::paintDiamond( KivioArrowHeadData *d, bool solid )
     pvecX = nvecY;
     pvecY = -nvecX;
 
-    QPtrList<KivioPoint> l;
+    TQPtrList<KivioPoint> l;
     l.setAutoDelete(true);
 
     float _x = zoomHandler->zoomItX(d->x);
@@ -535,7 +535,7 @@ void KivioArrowHead::paintDiamond( KivioArrowHeadData *d, bool solid )
 void KivioArrowHead::paintCircle( KivioArrowHeadData *d, bool solid )
 {
     KivioPainter *painter = d->painter;
-    QColor cbg = painter->bgColor();
+    TQColor cbg = painter->bgColor();
 
     if(solid) {
       painter->setBGColor(painter->fgColor());
@@ -588,7 +588,7 @@ void KivioArrowHead::paintCrowFoot( KivioArrowHeadData *d )
     pvecX = nvecY;
     pvecY = -nvecX;
 
-    QPtrList<KivioPoint>l;
+    TQPtrList<KivioPoint>l;
     l.setAutoDelete(true);
 
     float _x;
@@ -639,7 +639,7 @@ void KivioArrowHead::paintFork( KivioArrowHeadData *d )
     pvecX = nvecY;
     pvecY = -nvecX;
 
-    QPtrList<KivioPoint>l;
+    TQPtrList<KivioPoint>l;
     l.setAutoDelete(true);
 
     float _x;
diff --git a/kivio/kiviopart/kiviosdk/kivio_arrowhead.h b/kivio/kiviopart/kiviosdk/kivio_arrowhead.h
index e76faebf..2587d090 100644
--- a/kivio/kiviopart/kiviosdk/kivio_arrowhead.h
+++ b/kivio/kiviopart/kiviosdk/kivio_arrowhead.h
@@ -23,8 +23,8 @@
 #include <config.h>
 #endif
 
-#include <qcolor.h>
-#include <qdom.h>
+#include <tqcolor.h>
+#include <tqdom.h>
 #include <koffice_export.h>
 #define KIVIO_CUT_LENGTH         -1.0f
 #define KIVIO_CUT_HALF_LENGTH    -2.0f
@@ -136,8 +136,8 @@ class KIVIO_EXPORT KivioArrowHead
 
     void paint( KivioPainter *, float, float, float, float, KoZoomHandler* zoomHandler );
 
-    bool loadXML( const QDomElement & );
-    QDomElement saveXML( QDomDocument & );
+    bool loadXML( const TQDomElement & );
+    TQDomElement saveXML( TQDomDocument & );
 };
 
 #endif
diff --git a/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.cpp
index 9073e152..a9e78928 100644
--- a/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.cpp
@@ -65,7 +65,7 @@ KivioBaseConnectorStencil::KivioBaseConnectorStencil()
     m_pFillStyle = new KivioFillStyle();
     m_pLineStyle = new KivioLineStyle();
 
-    m_pConnectorPoints = new QPtrList<KivioConnectorPoint>;
+    m_pConnectorPoints = new TQPtrList<KivioConnectorPoint>;
     m_pConnectorPoints->setAutoDelete(true);
 
 }
@@ -81,12 +81,12 @@ KivioBaseConnectorStencil::~KivioBaseConnectorStencil()
     delete m_pConnectorPoints;
 }
 
-void KivioBaseConnectorStencil::setFGColor( QColor c )
+void KivioBaseConnectorStencil::setFGColor( TQColor c )
 {
     m_pLineStyle->setColor(c);
 }
 
-QColor KivioBaseConnectorStencil::fgColor()
+TQColor KivioBaseConnectorStencil::fgColor()
 {
     return m_pLineStyle->color();
 }
@@ -101,12 +101,12 @@ double KivioBaseConnectorStencil::lineWidth()
     return m_pLineStyle->width();
 }
 
-void KivioBaseConnectorStencil::setBGColor( QColor c )
+void KivioBaseConnectorStencil::setBGColor( TQColor c )
 {
     m_pFillStyle->setColor(c);
 }
 
-QColor KivioBaseConnectorStencil::bgColor()
+TQColor KivioBaseConnectorStencil::bgColor()
 {
     return m_pFillStyle->color();
 }
@@ -225,7 +225,7 @@ void KivioBaseConnectorStencil::paintSelectionHandles( KivioIntraStencilData *pD
   double x1, y1;
 
   painter->setLineWidth(1.0f);
-  painter->setFGColor(QColor(0,0,0));
+  painter->setFGColor(TQColor(0,0,0));
 
   KivioConnectorPoint *p = m_pConnectorPoints->first();
   while( p )
@@ -234,9 +234,9 @@ void KivioBaseConnectorStencil::paintSelectionHandles( KivioIntraStencilData *pD
     y1 = zoomHandler->zoomItY(p->y()) - HWo2;
 
     if( p->target() )
-        painter->setBGColor(QColor(200,0,0));
+        painter->setBGColor(TQColor(200,0,0));
     else
-        painter->setBGColor(QColor(0,200,0));
+        painter->setBGColor(TQColor(0,200,0));
 
     painter->fillRect( x1, y1, HWP1, HWP1 );
 
@@ -356,14 +356,14 @@ void KivioBaseConnectorStencil::updateGeometry()
 
 
 // file i/o routines
-bool KivioBaseConnectorStencil::loadXML( const QDomElement & )
+bool KivioBaseConnectorStencil::loadXML( const TQDomElement & )
 {
     return false;
 }
 
-QDomElement KivioBaseConnectorStencil::saveXML( QDomDocument & )
+TQDomElement KivioBaseConnectorStencil::saveXML( TQDomDocument & )
 {
-    return QDomElement();
+    return TQDomElement();
 }
 
 
@@ -484,9 +484,9 @@ int KivioBaseConnectorStencil::resizeHandlePositions()
     return (int)krhpNone;
 }
 
-QDomElement KivioBaseConnectorStencil::saveConnectors( QDomDocument &doc )
+TQDomElement KivioBaseConnectorStencil::saveConnectors( TQDomDocument &doc )
 {
-    QDomElement eConns = doc.createElement("KivioConnectors");
+    TQDomElement eConns = doc.createElement("KivioConnectors");
 
     KivioConnectorPoint *p;
     p = m_pConnectorPoints->first();
@@ -500,15 +500,15 @@ QDomElement KivioBaseConnectorStencil::saveConnectors( QDomDocument &doc )
     return eConns;
 }
 
-bool KivioBaseConnectorStencil::loadConnectors( const QDomElement &e )
+bool KivioBaseConnectorStencil::loadConnectors( const TQDomElement &e )
 {
     m_pConnectorPoints->clear();
 
     KivioConnectorPoint *p;
 
-    QDomNode node = e.firstChild();
-    QDomElement e2;
-    QString name;
+    TQDomNode node = e.firstChild();
+    TQDomElement e2;
+    TQString name;
 
     while( !node.isNull() )
     {
@@ -531,9 +531,9 @@ bool KivioBaseConnectorStencil::loadConnectors( const QDomElement &e )
     return true;
 }
 
-QDomElement KivioBaseConnectorStencil::saveProperties( QDomDocument &doc )
+TQDomElement KivioBaseConnectorStencil::saveProperties( TQDomDocument &doc )
 {
-    QDomElement propE = doc.createElement("KivioConnectorProperties");
+    TQDomElement propE = doc.createElement("KivioConnectorProperties");
 
     propE.appendChild( m_pLineStyle->saveXML( doc ) );
 
@@ -542,10 +542,10 @@ QDomElement KivioBaseConnectorStencil::saveProperties( QDomDocument &doc )
     return propE;
 }
 
-bool KivioBaseConnectorStencil::loadProperties( const QDomElement &e )
+bool KivioBaseConnectorStencil::loadProperties( const TQDomElement &e )
 {
-    QDomNode node;
-    QString nodeName;
+    TQDomNode node;
+    TQString nodeName;
 
     node = e.firstChild();
     while( !node.isNull() )
diff --git a/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.h b/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.h
index e8d621c0..f7e2dddb 100644
--- a/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.h
+++ b/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.h
@@ -23,8 +23,8 @@
 #include <config.h>
 #endif
 
-#include <qdom.h>
-#include <qptrlist.h>
+#include <tqdom.h>
+#include <tqptrlist.h>
 
 #include "kivio_stencil.h"
 
@@ -39,7 +39,7 @@ class KivioStencil;
 class KivioBaseConnectorStencil : public KivioStencil
 {
 protected:
-    QPtrList <KivioConnectorPoint> *m_pConnectorPoints;
+    TQPtrList <KivioConnectorPoint> *m_pConnectorPoints;
 
     KivioFillStyle *m_pFillStyle;
     KivioLineStyle *m_pLineStyle;
@@ -49,24 +49,24 @@ protected:
     bool boolAllTrue( bool *, int );
     bool boolContainsFalse( bool *, int );
 
-    QDomElement saveConnectors( QDomDocument &doc );
-    bool loadConnectors( const QDomElement & );
+    TQDomElement saveConnectors( TQDomDocument &doc );
+    bool loadConnectors( const TQDomElement & );
 
-    QDomElement saveProperties( QDomDocument &doc );
-    bool loadProperties( const QDomElement & );
+    TQDomElement saveProperties( TQDomDocument &doc );
+    bool loadProperties( const TQDomElement & );
 
 public:
     KivioBaseConnectorStencil();
     virtual ~KivioBaseConnectorStencil();
 
     // fg color functions
-    virtual void setFGColor( QColor c );
-    virtual QColor fgColor();
+    virtual void setFGColor( TQColor c );
+    virtual TQColor fgColor();
 
 
     // bg color functions
-    virtual void setBGColor( QColor c );
-    virtual QColor bgColor();
+    virtual void setBGColor( TQColor c );
+    virtual TQColor bgColor();
 
 
     // line width functions
@@ -100,13 +100,13 @@ public:
     virtual void customDrag( KivioCustomDragData * );
 
 
-    // geometry management
+    // tqgeometry management
     virtual void updateGeometry();
 
 
     // file i/o routines
-    virtual bool loadXML( const QDomElement & );
-    virtual QDomElement saveXML( QDomDocument & );
+    virtual bool loadXML( const TQDomElement & );
+    virtual TQDomElement saveXML( TQDomDocument & );
 
 
     // duplication routines
diff --git a/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp
index 8a79c287..f3903685 100644
--- a/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp
@@ -20,7 +20,7 @@ KivioBaseTargetStencil::KivioBaseTargetStencil()
     m_pLineStyle = new KivioLineStyle();
     m_pTextStyle = new KivioTextStyle();
 
-    m_pTargets = new QPtrList<KivioConnectorTarget>;
+    m_pTargets = new TQPtrList<KivioConnectorTarget>;
     m_pTargets->setAutoDelete(true);
 }
 
@@ -40,12 +40,12 @@ KivioBaseTargetStencil::~KivioBaseTargetStencil()
 // KivioLineStyle
 //
 //////////////////////////////////////////////////////////////////////////////
-QColor KivioBaseTargetStencil::fgColor()
+TQColor KivioBaseTargetStencil::fgColor()
 {
     return m_pLineStyle->color();
 }
 
-void KivioBaseTargetStencil::setFGColor( QColor c )
+void KivioBaseTargetStencil::setFGColor( TQColor c )
 {
     m_pLineStyle->setColor(c);
 }
@@ -67,12 +67,12 @@ double KivioBaseTargetStencil::lineWidth()
 // KivioFillStyle
 //
 //////////////////////////////////////////////////////////////////////////////
-void KivioBaseTargetStencil::setBGColor( QColor c )
+void KivioBaseTargetStencil::setBGColor( TQColor c )
 {
     m_pFillStyle->setColor(c);
 }
 
-QColor KivioBaseTargetStencil::bgColor()
+TQColor KivioBaseTargetStencil::bgColor()
 {
     return m_pFillStyle->color();
 }
@@ -92,20 +92,20 @@ KivioFillStyle *KivioBaseTargetStencil::fillStyle()
 // KivioTextStyle
 //
 //////////////////////////////////////////////////////////////////////////////
-QColor KivioBaseTargetStencil::textColor()
+TQColor KivioBaseTargetStencil::textColor()
 {
     return m_pTextStyle->color();
 }
-void KivioBaseTargetStencil::setTextColor( QColor c )
+void KivioBaseTargetStencil::setTextColor( TQColor c )
 {
     m_pTextStyle->setColor(c);
 }
 
-QFont KivioBaseTargetStencil::textFont()
+TQFont KivioBaseTargetStencil::textFont()
 {
     return m_pTextStyle->font();
 }
-void KivioBaseTargetStencil::setTextFont( const QFont &f )
+void KivioBaseTargetStencil::setTextFont( const TQFont &f )
 {
     m_pTextStyle->setFont(f);
 }
@@ -130,12 +130,12 @@ void KivioBaseTargetStencil::setVTextAlign(int a)
     m_pTextStyle->setVTextAlign(a);
 }
 
-void KivioBaseTargetStencil::setText( const QString &a )
+void KivioBaseTargetStencil::setText( const TQString &a )
 {
     m_pTextStyle->setText(a);
 }
 
-QString KivioBaseTargetStencil::text()
+TQString KivioBaseTargetStencil::text()
 {
     return m_pTextStyle->text();
 }
@@ -160,7 +160,7 @@ void KivioBaseTargetStencil::paintOutline( KivioIntraStencilData * )
 
 void KivioBaseTargetStencil::paintConnectorTargets( KivioIntraStencilData *pData )
 {
-  QPixmap *targetPic;
+  TQPixmap *targetPic;
   KivioPainter *painter;
   double x, y;
 
@@ -197,10 +197,10 @@ void KivioBaseTargetStencil::paintConnectorTargets( KivioIntraStencilData *pData
 // File I/O
 //
 //////////////////////////////////////////////////////////////////////////////
-bool KivioBaseTargetStencil::loadXML( const QDomElement &e )
+bool KivioBaseTargetStencil::loadXML( const TQDomElement &e )
 {
-   QDomNode node;
-   QString name;
+   TQDomNode node;
+   TQString name;
 
    node = e.firstChild();
    while( !node.isNull() )
@@ -220,9 +220,9 @@ bool KivioBaseTargetStencil::loadXML( const QDomElement &e )
    return true;
 }
 
-QDomElement KivioBaseTargetStencil::createRootElement( QDomDocument &doc )
+TQDomElement KivioBaseTargetStencil::createRootElement( TQDomDocument &doc )
 {
-   QDomElement e = doc.createElement("KivioPluginStencil");
+   TQDomElement e = doc.createElement("KivioPluginStencil");
 
    XmlWriteString( e, "id", m_pSpawner->info()->id() );
    XmlWriteString( e, "setId", m_pSpawner->set()->id() );
@@ -230,9 +230,9 @@ QDomElement KivioBaseTargetStencil::createRootElement( QDomDocument &doc )
    return e;
 }
 
-QDomElement KivioBaseTargetStencil::saveXML( QDomDocument &doc )
+TQDomElement KivioBaseTargetStencil::saveXML( TQDomDocument &doc )
 {
-   QDomElement e = createRootElement( doc );
+   TQDomElement e = createRootElement( doc );
 
    e.appendChild( saveProperties(doc) );
 
@@ -240,11 +240,11 @@ QDomElement KivioBaseTargetStencil::saveXML( QDomDocument &doc )
 }
 
 
-QDomElement KivioBaseTargetStencil::saveProperties( QDomDocument &doc )
+TQDomElement KivioBaseTargetStencil::saveProperties( TQDomDocument &doc )
 {
-    QDomElement baseE = doc.createElement("KivioStencilProperties");
+    TQDomElement baseE = doc.createElement("KivioStencilProperties");
 
-    QDomElement geoE = doc.createElement("Geometry");
+    TQDomElement geoE = doc.createElement("Geometry");
     XmlWriteFloat( geoE, "x", m_x );
     XmlWriteFloat( geoE, "y", m_y );
     XmlWriteFloat( geoE, "w", m_w );
@@ -257,7 +257,7 @@ QDomElement KivioBaseTargetStencil::saveProperties( QDomDocument &doc )
     baseE.appendChild( saveTargets(doc) );
 
     // Only save custom data if this returns true (means there is custom data)
-    QDomElement customE = doc.createElement("CustomData");
+    TQDomElement customE = doc.createElement("CustomData");
     if( saveCustom( customE, doc )==true )
     {
        baseE.appendChild( customE );
@@ -266,11 +266,11 @@ QDomElement KivioBaseTargetStencil::saveProperties( QDomDocument &doc )
     return baseE;
 }
 
-bool KivioBaseTargetStencil::loadProperties( const QDomElement &e )
+bool KivioBaseTargetStencil::loadProperties( const TQDomElement &e )
 {
-    QDomNode node;
-    QDomElement nodeE;
-    QString nodeName;
+    TQDomNode node;
+    TQDomElement nodeE;
+    TQString nodeName;
 
     node = e.firstChild();
     while( !node.isNull() )
@@ -312,21 +312,21 @@ bool KivioBaseTargetStencil::loadProperties( const QDomElement &e )
     return true;
 }
 
-bool KivioBaseTargetStencil::saveCustom( QDomElement &, QDomDocument & )
+bool KivioBaseTargetStencil::saveCustom( TQDomElement &, TQDomDocument & )
 {
    return false;
 }
 
-bool KivioBaseTargetStencil::loadCustom( const QDomElement & )
+bool KivioBaseTargetStencil::loadCustom( const TQDomElement & )
 {
     return true;
 }
 
-QDomElement KivioBaseTargetStencil::saveTargets( QDomDocument &doc )
+TQDomElement KivioBaseTargetStencil::saveTargets( TQDomDocument &doc )
 {
     KivioConnectorTarget *p;
 
-    QDomElement e = doc.createElement("TargetList");
+    TQDomElement e = doc.createElement("TargetList");
 
     p = m_pTargets->first();
     while( p )
@@ -339,12 +339,12 @@ QDomElement KivioBaseTargetStencil::saveTargets( QDomDocument &doc )
     return e;
 }
 
-bool KivioBaseTargetStencil::loadTargets( const QDomElement &e )
+bool KivioBaseTargetStencil::loadTargets( const TQDomElement &e )
 {
     KivioConnectorTarget *p;
-    QDomNode node;
-    QDomElement targetE;
-    QString nodeName;
+    TQDomNode node;
+    TQDomElement targetE;
+    TQString nodeName;
 
     m_pTargets->clear();
 
@@ -501,7 +501,7 @@ void KivioBaseTargetStencil::copyBasicInto( KivioBaseTargetStencil *pStencil )
         pTgTarget = pStencil->m_pTargets->next();
     }
 
-    // Copy the geometry
+    // Copy the tqgeometry
     pStencil->m_x = m_x;
     pStencil->m_y = m_y;
     pStencil->m_w = m_w;
@@ -514,17 +514,17 @@ void KivioBaseTargetStencil::copyBasicInto( KivioBaseTargetStencil *pStencil )
 int KivioBaseTargetStencil::resizeHandlePositions()
 {
    // Calculate the resize handle positions
-   int mask = KIVIO_RESIZE_HANDLE_POSITION_ALL;
+   int tqmask = KIVIO_RESIZE_HANDLE_POSITION_ALL;
 
    if( m_pProtection->at( kpWidth ) )
    {
-      mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW);
+      tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW);
    }
 
    if( m_pProtection->at( kpHeight) )
    {
-      mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS);
+      tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS);
    }
 
-   return mask;
+   return tqmask;
 }
diff --git a/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.h b/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.h
index 7af49718..082ffbfb 100644
--- a/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.h
+++ b/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.h
@@ -19,10 +19,10 @@
 #ifndef KIVIO_BASE_TARGET_STENCIL_H
 #define KIVIO_BASE_TARGET_STENCIL_H
 
-#include <qfont.h>
-#include <qcolor.h>
-#include <qdom.h>
-#include <qptrlist.h>
+#include <tqfont.h>
+#include <tqcolor.h>
+#include <tqdom.h>
+#include <tqptrlist.h>
 
 class KivioCustomDragData;
 class KivioConnectorPoint;
@@ -44,17 +44,17 @@ protected:
     KivioFillStyle *m_pFillStyle;
     KivioTextStyle *m_pTextStyle;
 
-    QPtrList<KivioConnectorTarget> *m_pTargets;
+    TQPtrList<KivioConnectorTarget> *m_pTargets;
 
-    virtual QDomElement createRootElement( QDomDocument & );
+    virtual TQDomElement createRootElement( TQDomDocument & );
 
-    virtual bool saveCustom( QDomElement &, QDomDocument & );
-    virtual QDomElement saveProperties( QDomDocument & );
-    virtual QDomElement saveTargets( QDomDocument & );
+    virtual bool saveCustom( TQDomElement &, TQDomDocument & );
+    virtual TQDomElement saveProperties( TQDomDocument & );
+    virtual TQDomElement saveTargets( TQDomDocument & );
 
-    virtual bool loadCustom( const QDomElement & );
-    virtual bool loadProperties( const QDomElement & );
-    virtual bool loadTargets( const QDomElement & );
+    virtual bool loadCustom( const TQDomElement & );
+    virtual bool loadProperties( const TQDomElement & );
+    virtual bool loadTargets( const TQDomElement & );
 
     virtual void copyBasicInto( KivioBaseTargetStencil * );
 
@@ -70,8 +70,8 @@ public:
     // KivioLineStyle
     //
     //////////////////////////////
-    virtual QColor fgColor();
-    virtual void setFGColor( QColor c );
+    virtual TQColor fgColor();
+    virtual void setFGColor( TQColor c );
 
     virtual void setLineWidth( double l );
     virtual double lineWidth();
@@ -83,8 +83,8 @@ public:
     // KivioFillStyle
     //
     //////////////////////////////
-    virtual void setBGColor( QColor c );
-    virtual QColor bgColor();
+    virtual void setBGColor( TQColor c );
+    virtual TQColor bgColor();
 
     virtual KivioFillStyle *fillStyle();
 
@@ -95,11 +95,11 @@ public:
     // KivioTextStyle
     //
     //////////////////////////////
-    virtual QColor textColor();
-    virtual void setTextColor( QColor c );
+    virtual TQColor textColor();
+    virtual void setTextColor( TQColor c );
 
-    virtual QFont textFont();
-    virtual void setTextFont( const QFont &f );
+    virtual TQFont textFont();
+    virtual void setTextFont( const TQFont &f );
 
     virtual int hTextAlign();
     virtual int vTextAlign();
@@ -107,8 +107,8 @@ public:
     virtual void setHTextAlign(int a);
     virtual void setVTextAlign(int a);
 
-    virtual void setText( const QString &a );
-    virtual QString text();
+    virtual void setText( const TQString &a );
+    virtual TQString text();
 
 
 
@@ -128,8 +128,8 @@ public:
     // File I/O
     //
     ///////////////////////////////
-    virtual bool loadXML( const QDomElement & );
-    virtual QDomElement saveXML( QDomDocument & );
+    virtual bool loadXML( const TQDomElement & );
+    virtual TQDomElement saveXML( TQDomDocument & );
 
 
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_common.cpp b/kivio/kiviopart/kiviosdk/kivio_common.cpp
index 8de8e1e0..e43c9fda 100644
--- a/kivio/kiviopart/kiviosdk/kivio_common.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_common.cpp
@@ -19,29 +19,29 @@
 #include "kivio_common.h"
 #include "kivio_connector_point.h"
 #include <kdebug.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
 #include <math.h>
 #include <KoPoint.h>
 #include <KoRect.h>
 
 /**
- * Read a floating point value from a @ref QDomElement.
+ * Read a floating point value from a @ref TQDomElement.
  *
- * @param e The @ref QDomElement to read from
+ * @param e The @ref TQDomElement to read from
  * @param att The attribute to locate
  * @param def The default value to return if the attribute is not found
  *
- * This will read a floating point attribute from a @ref QDomElement, and
+ * This will read a floating point attribute from a @ref TQDomElement, and
  * if it is not found, return the default value.
  */
-float XmlReadFloat( const QDomElement &e, const QString &att, const float &def)
+float XmlReadFloat( const TQDomElement &e, const TQString &att, const float &def)
 {
     // Check if this value exists, if not, return the default
     if( e.hasAttribute( att )==false )
         return def;
     
     // Read the attribute
-    QString val = e.attribute( att );
+    TQString val = e.attribute( att );
     bool ok=false;
     
     // Make sure it is a floating point value.  If not, return the default
@@ -58,38 +58,38 @@ float XmlReadFloat( const QDomElement &e, const QString &att, const float &def)
 
 
 /**
- * Write a floating point value to a @ref QDomElement
+ * Write a floating point value to a @ref TQDomElement
  *
- * @param e The @ref QDomElement to write to
+ * @param e The @ref TQDomElement to write to
  * @param att The attribute to write
  * @param val The value of the attribute to write
  *
- * This will write a floating point value to a @ref QDomElement.
+ * This will write a floating point value to a @ref TQDomElement.
  */
-void XmlWriteFloat( QDomElement &e, const QString &att, const float &val )
+void XmlWriteFloat( TQDomElement &e, const TQString &att, const float &val )
 {
     e.setAttribute( att, (double)val );
 }
 
 
 /**
- * Read an int value from a @ref QDomElement.
+ * Read an int value from a @ref TQDomElement.
  *
- * @param e The @ref QDomElement to read from
+ * @param e The @ref TQDomElement to read from
  * @param att The attribute to locate
  * @param def The default value to return if the attribute is not found
  *
- * This will read an int attribute from a @ref QDomElement, and
+ * This will read an int attribute from a @ref TQDomElement, and
  * if it is not found, return the default value.
  */
-int XmlReadInt( const QDomElement &e, const QString &att, const int &def)
+int XmlReadInt( const TQDomElement &e, const TQString &att, const int &def)
 {
     // Check if this value exists, if not, return the default
     if( e.hasAttribute( att )==false )
         return def;
 
     // Read the attribute
-    QString val = e.attribute( att, "1" );
+    TQString val = e.attribute( att, "1" );
     bool ok=false;
 
     // Make sure it is a floating point value.  If not, return the default
@@ -106,38 +106,38 @@ int XmlReadInt( const QDomElement &e, const QString &att, const int &def)
 
 
 /**
- * Write a int value to a @ref QDomElement
+ * Write a int value to a @ref TQDomElement
  *
- * @param e The @ref QDomElement to write to
+ * @param e The @ref TQDomElement to write to
  * @param att The attribute to write
  * @param val The value of the attribute to write
  *
- * This will write an int value to a @ref QDomElement.
+ * This will write an int value to a @ref TQDomElement.
  */
-void XmlWriteInt( QDomElement &e, const QString &att, const int &val )
+void XmlWriteInt( TQDomElement &e, const TQString &att, const int &val )
 {
     e.setAttribute( att, (int)val );
 }
 
 
 /**
- * Read an uint value from a @ref QDomElement.
+ * Read an uint value from a @ref TQDomElement.
  *
- * @param e The @ref QDomElement to read from
+ * @param e The @ref TQDomElement to read from
  * @param att The attribute to locate
  * @param def The default value to return if the attribute is not found
  *
- * This will read an uint attribute from a @ref QDomElement, and
+ * This will read an uint attribute from a @ref TQDomElement, and
  * if it is not found, return the default value.
  */
-uint XmlReadUInt( const QDomElement &e, const QString &att, const uint &def)
+uint XmlReadUInt( const TQDomElement &e, const TQString &att, const uint &def)
 {
     // Check if this value exists, if not, return the default
     if( e.hasAttribute( att )==false )
         return def;
 
     // Read the attribute
-    QString val = e.attribute( att, "1" );
+    TQString val = e.attribute( att, "1" );
     bool ok=false;
 
     // Make sure it is a floating point value.  If not, return the default
@@ -154,77 +154,77 @@ uint XmlReadUInt( const QDomElement &e, const QString &att, const uint &def)
 
 
 /**
- * Write an uint value to a @ref QDomElement
+ * Write an uint value to a @ref TQDomElement
  *
- * @param e The @ref QDomElement to write to
+ * @param e The @ref TQDomElement to write to
  * @param att The attribute to write
  * @param val The value of the attribute to write
  *
- * This will write an uint value to a @ref QDomElement.
+ * This will write an uint value to a @ref TQDomElement.
  */
-void XmlWriteUInt( QDomElement &e, const QString &att, const uint &val )
+void XmlWriteUInt( TQDomElement &e, const TQString &att, const uint &val )
 {
     e.setAttribute( att, (uint)val );
 }
 
 
 /**
- * Read a @ref QString from a @ref QDomElement.
+ * Read a @ref TQString from a @ref TQDomElement.
  *
- * @param e The @ref QDomElement to read from
+ * @param e The @ref TQDomElement to read from
  * @param att The attribute to locate
  * @param def The default value to return if the attribute is not found
  *
- * This will read a QString attribute from a @ref QDomElement, and
+ * This will read a TQString attribute from a @ref TQDomElement, and
  * if it is not found, return the default value.
  */
-QString XmlReadString( const QDomElement &e, const QString &att, const QString &def )
+TQString XmlReadString( const TQDomElement &e, const TQString &att, const TQString &def )
 {
     // Check if the attribute exists, if not, return the default
     if( e.hasAttribute( att )==false )
-        return QString(def);
+        return TQString(def);
     // Otherwise return the attribute
     else return e.attribute( att );
 }
 
 
 /**
- * Write a QString to a @ref QDomElement
+ * Write a TQString to a @ref TQDomElement
  *
- * @param e The @ref QDomElement to write to
+ * @param e The @ref TQDomElement to write to
  * @param att The attribute to write
  * @param val The value of the attribute to write
  *
- * This will write a QString to a @ref QDomElement.
+ * This will write a TQString to a @ref TQDomElement.
  */
-void XmlWriteString( QDomElement &e,  const QString &att,  const QString &val )
+void XmlWriteString( TQDomElement &e,  const TQString &att,  const TQString &val )
 {
     e.setAttribute( att, val );
 }
 
 
 /**
- * Read a QColor value from a @ref QDomElement.
+ * Read a TQColor value from a @ref TQDomElement.
  *
- * @param e The @ref QDomElement to read from
+ * @param e The @ref TQDomElement to read from
  * @param att The attribute to locate
  * @param def The default value to return if the attribute is not found
  *
- * This will read a QColor attribute from a @ref QDomElement, and
+ * This will read a TQColor attribute from a @ref TQDomElement, and
  * if it is not found, return the default value.
  */
-QColor XmlReadColor( const QDomElement &e, const QString &att, const QColor &def)
+TQColor XmlReadColor( const TQDomElement &e, const TQString &att, const TQColor &def)
 {
     // Check if this value exists, if not, return the default
     if( e.hasAttribute( att )==false )
         return def;
 
     // Read the attribute
-    QString val = e.attribute( att, "1" );
+    TQString val = e.attribute( att, "1" );
     bool ok=false;
-    QColor newColor;
+    TQColor newColor;
 
-    if( val.contains("#") ) // Is it #RRGGBB format?
+    if( val.tqcontains("#") ) // Is it #RRGGBB format?
     {
         newColor.setNamedColor(val);
         return newColor;
@@ -235,25 +235,25 @@ QColor XmlReadColor( const QDomElement &e, const QString &att, const QColor &def
     uint iVal = val.toUInt( &ok );
     if( !ok )
     {
-       kdDebug(43000) << "Invalid XML-value read for " << att.ascii() << ", expected QColor" << endl;
+       kdDebug(43000) << "Invalid XML-value read for " << att.ascii() << ", expected TQColor" << endl;
         return 1;
     }
 
     // Return the value
-    return QColor(iVal);
+    return TQColor(iVal);
 }
 
 
 /**
- * Write a QColor value to a @ref QDomElement
+ * Write a TQColor value to a @ref TQDomElement
  *
- * @param e The @ref QDomElement to write to
+ * @param e The @ref TQDomElement to write to
  * @param att The attribute to write
  * @param val The value of the attribute to write
  *
- * This will write a QColor value to a @ref QDomElement.
+ * This will write a TQColor value to a @ref TQDomElement.
  */
-void XmlWriteColor( QDomElement &e, const QString &att, const QColor &val )
+void XmlWriteColor( TQDomElement &e, const TQString &att, const TQColor &val )
 {
     // Write it out in #RRGGBB format
     e.setAttribute( att, val.name() );
@@ -261,23 +261,23 @@ void XmlWriteColor( QDomElement &e, const QString &att, const QColor &val )
 
 
 /**
- * Read a double value from a @ref QDomElement.
+ * Read a double value from a @ref TQDomElement.
  *
- * @param e The @ref QDomElement to read from
+ * @param e The @ref TQDomElement to read from
  * @param att The attribute to locate
  * @param def The default value to return if the attribute is not found
  *
- * This will read a double attribute from a @ref QDomElement, and
+ * This will read a double attribute from a @ref TQDomElement, and
  * if it is not found, return the default value.
  */
-double XmlReadDouble( const QDomElement &e, const QString &att, const double &def)
+double XmlReadDouble( const TQDomElement &e, const TQString &att, const double &def)
 {
     // Check if this value exists, if not, return the default
     if( e.hasAttribute( att )==false )
         return def;
 
     // Read the attribute
-    QString val = e.attribute( att, "1.0" );
+    TQString val = e.attribute( att, "1.0" );
     bool ok=false;
 
     // Make sure it is a floating point value.  If not, return the default
@@ -294,21 +294,21 @@ double XmlReadDouble( const QDomElement &e, const QString &att, const double &de
 
 
 /**
- * Write a double value to a @ref QDomElement
+ * Write a double value to a @ref TQDomElement
  *
- * @param e The @ref QDomElement to write to
+ * @param e The @ref TQDomElement to write to
  * @param att The attribute to write
  * @param val The value of the attribute to write
  *
- * This will write a double value to a @ref QDomElement.
+ * This will write a double value to a @ref TQDomElement.
  */
-void XmlWriteDouble( QDomElement &e, const QString &att, const double &val )
+void XmlWriteDouble( TQDomElement &e, const TQString &att, const double &val )
 {
     e.setAttribute( att, (double)val );
 }
 
 
-#define WHICH_QUAD( vertex, hitPos ) \
+#define WHICH_TQUAD( vertex, hitPos ) \
 	( (vertex.x() > hitPos->x()) ? ((vertex.y() > hitPos->y()) ? 1 : 4 ) : ((vertex.y() > hitPos->y())?2:3))
 
 #define X_INTERCEPT( point1, point2, hitY ) \
@@ -330,7 +330,7 @@ void XmlWriteDouble( QDomElement &e, const QString &att, const double &val )
  * across two quadrants, you need to determine which side of the test point it crossed, and then
  * either add or subtract 2.
  *
- * Quad layout:
+ * Quad tqlayout:
  *   1 2
  *   4 3
  */
@@ -341,13 +341,13 @@ bool PointInPoly( KoPoint *points, int numPoints, KoPoint *hitPos )
 
 	edge = 0;
 
-	quad = WHICH_QUAD( points[ edge ], hitPos );
+	quad = WHICH_TQUAD( points[ edge ], hitPos );
 	total = 0; // count of absolute sectors crossed
 
 	// Loop through all the vertices
 	do {
 		next = (edge + 1) % numPoints;
-		next_quad = WHICH_QUAD( points[ next ], hitPos );
+		next_quad = WHICH_TQUAD( points[ next ], hitPos );
 
 		// Calculate how many quads have been crossed
 		delta = next_quad - quad;
@@ -384,19 +384,19 @@ bool PointInPoly( KoPoint *points, int numPoints, KoPoint *hitPos )
 		return false;
 }
 
-KoRect XmlReadRect( const QDomElement &e, const QString &att, const KoRect &def )
+KoRect XmlReadRect( const TQDomElement &e, const TQString &att, const KoRect &def )
 {
     // Check if this value exists, if not, return the default
     if( e.hasAttribute( att )==false )
         return def;
 
     // Read the attribute
-    QString val = e.attribute( att );
+    TQString val = e.attribute( att );
 
-    if (val.find("[") == 0 && val.find("]") == (int)val.length()-1) {
+    if (val.tqfind("[") == 0 && val.tqfind("]") == (int)val.length()-1) {
       val.remove(0,1);
       val.remove(val.length()-1,1);
-      QStringList vlist = QStringList::split(",",val);
+      TQStringList vlist = TQStringList::split(",",val);
       if (vlist.count() == 4) {
         bool allOk = true;
         bool ok = false;
@@ -421,9 +421,9 @@ KoRect XmlReadRect( const QDomElement &e, const QString &att, const KoRect &def
     return def;
 }
 
-void  XmlWriteRect( QDomElement &e, const QString &att, const KoRect &val )
+void  XmlWriteRect( TQDomElement &e, const TQString &att, const KoRect &val )
 {
-    e.setAttribute( att, QString("[%1,%2,%3,%4]").arg(val.x()).arg(val.y()).arg(val.width()).arg(val.height()) );
+    e.setAttribute( att, TQString("[%1,%2,%3,%4]").tqarg(val.x()).tqarg(val.y()).tqarg(val.width()).tqarg(val.height()) );
 }
 
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_common.h b/kivio/kiviopart/kiviosdk/kivio_common.h
index 7ddb3382..44576ece 100644
--- a/kivio/kiviopart/kiviosdk/kivio_common.h
+++ b/kivio/kiviopart/kiviosdk/kivio_common.h
@@ -19,8 +19,8 @@
 #ifndef KIVIO_COMMON_H
 #define KIVIO_COMMON_H
 
-#include <qdom.h>
-#include <qcolor.h>
+#include <tqdom.h>
+#include <tqcolor.h>
 
 class KivioConnectorPoint;
 class KoPoint;
@@ -28,26 +28,26 @@ class KoRect;
 
 extern "C" {
 
-   KoRect XmlReadRect( const QDomElement &, const QString &, const KoRect & );
-   void  XmlWriteRect( QDomElement &, const QString &, const KoRect & );
+   KoRect XmlReadRect( const TQDomElement &, const TQString &, const KoRect & );
+   void  XmlWriteRect( TQDomElement &, const TQString &, const KoRect & );
    
-   QColor XmlReadColor( const QDomElement &, const QString &, const QColor & );
-   void  XmlWriteColor( QDomElement &, const QString &, const QColor & );
+   TQColor XmlReadColor( const TQDomElement &, const TQString &, const TQColor & );
+   void  XmlWriteColor( TQDomElement &, const TQString &, const TQColor & );
    
-   int XmlReadInt( const QDomElement &, const QString &, const int & );
-   void  XmlWriteInt( QDomElement &, const QString &, const int & );
+   int XmlReadInt( const TQDomElement &, const TQString &, const int & );
+   void  XmlWriteInt( TQDomElement &, const TQString &, const int & );
    
-   uint XmlReadUInt( const QDomElement &, const QString &, const uint & );
-   void  XmlWriteUInt( QDomElement &, const QString &, const uint & );
+   uint XmlReadUInt( const TQDomElement &, const TQString &, const uint & );
+   void  XmlWriteUInt( TQDomElement &, const TQString &, const uint & );
    
-   double XmlReadDouble( const QDomElement &, const QString &, const double & );
-   void  XmlWriteDouble( QDomElement &, const QString &, const double & );
+   double XmlReadDouble( const TQDomElement &, const TQString &, const double & );
+   void  XmlWriteDouble( TQDomElement &, const TQString &, const double & );
    
-   float XmlReadFloat( const QDomElement &, const QString &, const float & );
-   void  XmlWriteFloat( QDomElement &, const QString &, const float & );
+   float XmlReadFloat( const TQDomElement &, const TQString &, const float & );
+   void  XmlWriteFloat( TQDomElement &, const TQString &, const float & );
    
-   QString XmlReadString( const QDomElement &, const QString &, const QString & );
-   void    XmlWriteString( QDomElement &,  const QString &, const QString & );
+   TQString XmlReadString( const TQDomElement &, const TQString &, const TQString & );
+   void    XmlWriteString( TQDomElement &,  const TQString &, const TQString & );
    
    bool PointInPoly( KoPoint *points, int numPoints, KoPoint *hitPos );
    
diff --git a/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp b/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp
index d0ca6616..0208f932 100644
--- a/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp
@@ -83,10 +83,10 @@ void KivioConnectorPoint::setTarget( KivioConnectorTarget *pTarget  )
  * Sets the x coordinate.
  *
  * @param newX The new value
- * @param updateStencil Whether or not the stencil's geometry should be updated (def=true)
+ * @param updateStencil Whether or not the stencil's tqgeometry should be updated (def=true)
  *
  * Sets the X coordinate to a new value, and optionally
- * updates the stencil's geometry if updateStencil is true.
+ * updates the stencil's tqgeometry if updateStencil is true.
  */
 void KivioConnectorPoint::setX( double newX, bool updateStencil )
 {
@@ -102,10 +102,10 @@ void KivioConnectorPoint::setX( double newX, bool updateStencil )
  * Sets the y coordinate.
  *
  * @param newY The new value
- * @param updateStencil Whether or not the stencil's geometry should be updated (def=true)
+ * @param updateStencil Whether or not the stencil's tqgeometry should be updated (def=true)
  *
  * Sets the Y coordinate to a new value, and optionally
- * updates the stencil's geometry if updateStencil is true.
+ * updates the stencil's tqgeometry if updateStencil is true.
  */
 void KivioConnectorPoint::setY( double newY, bool updateStencil )
 {
@@ -122,10 +122,10 @@ void KivioConnectorPoint::setY( double newY, bool updateStencil )
  *
  * @param newX The new x value
  * @param newY The new y value
- * @param updateStencil Whether or not the stencil's geometry should be updated (def=true)
+ * @param updateStencil Whether or not the stencil's tqgeometry should be updated (def=true)
  *
  * Sets the X & Y coordinates to new values, and optionally
- * updates the stencil's geometry if updateStencil is true.
+ * updates the stencil's tqgeometry if updateStencil is true.
  */
  void KivioConnectorPoint::setPosition( double newX, double newY, bool updateStencil )
 {
@@ -165,11 +165,11 @@ void KivioConnectorPoint::disconnect( bool removeFromTargetList )
 /**
  * Loads this object from an XML file.
  *
- * @param e The QDomElement to load from.
+ * @param e The TQDomElement to load from.
  *
  * This will load the necessary values from an XML file.
  */
-bool KivioConnectorPoint::loadXML( const QDomElement &e )
+bool KivioConnectorPoint::loadXML( const TQDomElement &e )
 {
     m_pos.setX(XmlReadFloat( e, "x", 1.0f ));
     m_pos.setY(XmlReadFloat( e, "y", 1.0f ));
@@ -183,15 +183,15 @@ bool KivioConnectorPoint::loadXML( const QDomElement &e )
 /**
  * Saves this object to an XML file.
  *
- * @param doc The QDomDocument to save to.
+ * @param doc The TQDomDocument to save to.
  *
- * This creates a new QDomElement and saves its data to it.
+ * This creates a new TQDomElement and saves its data to it.
  *
  * @returns The new element created and saved to.
  */
-QDomElement KivioConnectorPoint::saveXML( QDomDocument &doc )
+TQDomElement KivioConnectorPoint::saveXML( TQDomDocument &doc )
 {
-    QDomElement e = doc.createElement("KivioConnectorPoint");
+    TQDomElement e = doc.createElement("KivioConnectorPoint");
 
     XmlWriteFloat( e, "x", m_pos.x() );
     XmlWriteFloat( e, "y", m_pos.y() );
diff --git a/kivio/kiviopart/kiviosdk/kivio_connector_point.h b/kivio/kiviopart/kiviosdk/kivio_connector_point.h
index f5cb58c2..fa177402 100644
--- a/kivio/kiviopart/kiviosdk/kivio_connector_point.h
+++ b/kivio/kiviopart/kiviosdk/kivio_connector_point.h
@@ -19,7 +19,7 @@
 #ifndef KIVIO_CONNECTOR_POINT_H
 #define KIVIO_CONNECTOR_POINT_H
 
-#include <qdom.h>
+#include <tqdom.h>
 
 #include <KoPoint.h>
 #include <koffice_export.h>
@@ -49,8 +49,8 @@ public:
     KivioConnectorPoint();
     virtual ~KivioConnectorPoint();
 
-    bool loadXML( const QDomElement & );
-    QDomElement saveXML( QDomDocument & );
+    bool loadXML( const TQDomElement & );
+    TQDomElement saveXML( TQDomDocument & );
 
     KivioConnectorTarget *target() const { return m_pTarget; }
     void setTarget( KivioConnectorTarget * );
diff --git a/kivio/kiviopart/kiviosdk/kivio_connector_target.cpp b/kivio/kiviopart/kiviosdk/kivio_connector_target.cpp
index 60fe0316..deac1b4d 100644
--- a/kivio/kiviopart/kiviosdk/kivio_connector_target.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_connector_target.cpp
@@ -30,7 +30,7 @@ KivioConnectorTarget::KivioConnectorTarget()
 {
     m_position.setX( 0.0f );
     m_position.setY( 0.0f );
-    m_pConnectors = new QPtrList<KivioConnectorPoint>;
+    m_pConnectors = new TQPtrList<KivioConnectorPoint>;
     m_pConnectors->setAutoDelete(false);
     m_id = -1;
     m_xOffset = m_yOffset = 0;
@@ -40,7 +40,7 @@ KivioConnectorTarget::KivioConnectorTarget(double x, double y)
 {
     m_position.setX( x );
     m_position.setY( y );
-    m_pConnectors = new QPtrList<KivioConnectorPoint>;
+    m_pConnectors = new TQPtrList<KivioConnectorPoint>;
     m_pConnectors->setAutoDelete(false);
 
     m_id = -1;
@@ -51,7 +51,7 @@ KivioConnectorTarget::KivioConnectorTarget(double x, double y, double xOffset, d
 {
     m_position.setX( x );
     m_position.setY( y );
-    m_pConnectors = new QPtrList<KivioConnectorPoint>;
+    m_pConnectors = new TQPtrList<KivioConnectorPoint>;
     m_pConnectors->setAutoDelete(false);
 
     m_id = -1;
@@ -109,7 +109,7 @@ KivioConnectorTarget::~KivioConnectorTarget()
 /**
  * Loads this object from an XML file.
  */
-bool KivioConnectorTarget::loadXML( const QDomElement &e )
+bool KivioConnectorTarget::loadXML( const TQDomElement &e )
 {
     if( e.tagName().compare( "KivioConnectorTarget" ) != 0 )
     {
@@ -129,9 +129,9 @@ bool KivioConnectorTarget::loadXML( const QDomElement &e )
 /**
  * Saves this object to an XML file.
  */
-QDomElement KivioConnectorTarget::saveXML( QDomDocument &doc )
+TQDomElement KivioConnectorTarget::saveXML( TQDomDocument &doc )
 {
-    QDomElement e;
+    TQDomElement e;
 
     e = doc.createElement("KivioConnectorTarget");
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_connector_target.h b/kivio/kiviopart/kiviosdk/kivio_connector_target.h
index 533102ab..94df6e53 100644
--- a/kivio/kiviopart/kiviosdk/kivio_connector_target.h
+++ b/kivio/kiviopart/kiviosdk/kivio_connector_target.h
@@ -19,8 +19,8 @@
 #ifndef KIVIO_CONNECTOR_TARGET_H
 #define KIVIO_CONNECTOR_TARGET_H
 
-#include <qdom.h>
-#include <qptrlist.h>
+#include <tqdom.h>
+#include <tqptrlist.h>
 
 #include <KoPoint.h>
 
@@ -35,7 +35,7 @@ protected:
     KoPoint m_position;
     double m_xOffset, m_yOffset;
     int m_id;
-    QPtrList<KivioConnectorPoint> *m_pConnectors;
+    TQPtrList<KivioConnectorPoint> *m_pConnectors;
 
 public:
     KivioConnectorTarget();
@@ -43,8 +43,8 @@ public:
     KivioConnectorTarget( double, double, double, double );
     virtual ~KivioConnectorTarget();
 
-    bool loadXML( const QDomElement & );
-    QDomElement saveXML( QDomDocument & );
+    bool loadXML( const TQDomElement & );
+    TQDomElement saveXML( TQDomDocument & );
 
     KivioConnectorTarget *duplicate();
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
index ba7cd9ba..e3cf726b 100644
--- a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
@@ -17,10 +17,10 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include <qdom.h>
-#include <qfile.h>
-#include <qregexp.h>
-#include <qstringlist.h>
+#include <tqdom.h>
+#include <tqfile.h>
+#include <tqregexp.h>
+#include <tqstringlist.h>
 #include <kdebug.h>
 #include <math.h>
 
@@ -37,7 +37,7 @@ KivioDiaStencilSpawner::~KivioDiaStencilSpawner()
 {
 }
 
-QDomElement KivioDiaStencilSpawner::saveXML(QDomDocument &d)
+TQDomElement KivioDiaStencilSpawner::saveXML(TQDomDocument &d)
 {
 	return m_smlStencilSpawner->saveXML(d);
 }
@@ -69,13 +69,13 @@ float KivioDiaStencilSpawner::diaPointToKivio(float point, bool xpoint)
 	return returnPoint;
 }
 
-bool KivioDiaStencilSpawner::load(const QString &file)
+bool KivioDiaStencilSpawner::load(const TQString &file)
 {
-	QDomDocument dia("test");
-	QDomDocument kivio("XML");
+	TQDomDocument dia("test");
+	TQDomDocument kivio("XML");
 
 	m_filename = file;
-	QFile f(file);
+	TQFile f(file);
 
 	if(f.open(IO_ReadOnly) == false)
 	{
@@ -83,33 +83,33 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 		return false;
 	}
 	dia.setContent(&f);
-	QDomNode diaMain = dia.namedItem("shape");
+	TQDomNode diaMain = dia.namedItem("tqshape");
 
 	// Set "creator" attribute
-	QDomElement firstElement = kivio.createElement("KivioShapeStencil");
+	TQDomElement firstElement = kivio.createElement("KivioShapeStencil");
 	firstElement.setAttribute("creator", "kiviodiafilter");
 
 	kivio.appendChild(firstElement);
 
 	// Add KivioSMLStencilSpawnerInfo
-	QDomElement spawnerInfoElement = kivio.createElement("KivioSMLStencilSpawnerInfo");
-	QDomElement authorInfoElement = kivio.createElement("Author");
+	TQDomElement spawnerInfoElement = kivio.createElement("KivioSMLStencilSpawnerInfo");
+	TQDomElement authorInfoElement = kivio.createElement("Author");
 	authorInfoElement.setAttribute("data", "n/a");
-	QDomElement titleInfoElement = kivio.createElement("Title");
+	TQDomElement titleInfoElement = kivio.createElement("Title");
 	titleInfoElement.setAttribute("data", diaMain.namedItem("name").toElement().text());
-	QDomElement idInfoElement = kivio.createElement("Id");
+	TQDomElement idInfoElement = kivio.createElement("Id");
 	idInfoElement.setAttribute("data", diaMain.namedItem("name").toElement().text());
-	QDomElement descriptionInfoElement = kivio.createElement("Description");
+	TQDomElement descriptionInfoElement = kivio.createElement("Description");
 	descriptionInfoElement.setAttribute("data", diaMain.namedItem("description").toElement().text());
-	QDomElement versionInfoElement = kivio.createElement("Version");
+	TQDomElement versionInfoElement = kivio.createElement("Version");
 	versionInfoElement.setAttribute("data", "1.0");
-	QDomElement webInfoElement = kivio.createElement("Web");
+	TQDomElement webInfoElement = kivio.createElement("Web");
 	webInfoElement.setAttribute("data", "http://");
-	QDomElement emailInfoElement = kivio.createElement("Email");
+	TQDomElement emailInfoElement = kivio.createElement("Email");
 	emailInfoElement.setAttribute("data", "n/a");
-	QDomElement copyrightInfoElement = kivio.createElement("Copyright");
+	TQDomElement copyrightInfoElement = kivio.createElement("Copyright");
 	copyrightInfoElement.setAttribute("data", "n/a");
-	QDomElement autoUpdateInfoElement = kivio.createElement("AutoUpdate");
+	TQDomElement autoUpdateInfoElement = kivio.createElement("AutoUpdate");
 	autoUpdateInfoElement.setAttribute("data", "off");
 
 	spawnerInfoElement.appendChild(authorInfoElement);
@@ -127,15 +127,15 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 	m_xscale = m_yscale = 20.0f;
 
 	// Add Dimensions
-	QDomElement dimensionsElement = kivio.createElement("Dimensions");
+	TQDomElement dimensionsElement = kivio.createElement("Dimensions");
 	kivio.documentElement().appendChild(dimensionsElement);
 
 	// Calculate Dimensions
-	QDomElement svgElement = diaMain.namedItem("svg:svg").toElement();
-	QDomNode svgNode = svgElement.firstChild();
+	TQDomElement svgElement = diaMain.namedItem("svg:svg").toElement();
+	TQDomNode svgNode = svgElement.firstChild();
 	while(!svgNode.isNull())
 	{
-		QDomElement svgChild = svgNode.toElement();
+		TQDomElement svgChild = svgNode.toElement();
 		if(!svgChild.isNull())
 		{
 			if(svgChild.tagName() == "svg:rect")
@@ -175,13 +175,13 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 			{
 				if(svgChild.hasAttribute("points"))
 				{
-					QStringList points = QStringList::split(" ", svgChild.attribute("points"));
-					for(QStringList::Iterator it = points.begin(); it != points.end(); ++it)
+					TQStringList points = TQStringList::split(" ", svgChild.attribute("points"));
+					for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it)
 					{
-						QString x, y;
+						TQString x, y;
 
-						QStringList parsed = QStringList::split(",", (*it));
-						QStringList::Iterator itp = parsed.begin();
+						TQStringList parsed = TQStringList::split(",", (*it));
+						TQStringList::Iterator itp = parsed.begin();
 						x = (*itp);
 						++itp;
 						y = (*itp);
@@ -194,13 +194,13 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 			{
 				if(svgChild.hasAttribute("points"))
 				{
-					QStringList points = QStringList::split(" ", svgChild.attribute("points"));
-					for(QStringList::Iterator it = points.begin(); it != points.end(); ++it)
+					TQStringList points = TQStringList::split(" ", svgChild.attribute("points"));
+					for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it)
 					{
-						QString x, y;
+						TQString x, y;
 
-						QStringList parsed = QStringList::split(",", (*it));
-						QStringList::Iterator itp = parsed.begin();
+						TQStringList parsed = TQStringList::split(",", (*it));
+						TQStringList::Iterator itp = parsed.begin();
 						x = (*itp);
 						++itp;
 						y = (*itp);
@@ -222,8 +222,8 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 		svgNode = svgNode.nextSibling();
 	}
 
-	QValueList<float>::Iterator itx = m_xlist.begin();
-	QValueList<float>::Iterator ity = m_ylist.begin();
+	TQValueList<float>::Iterator itx = m_xlist.begin();
+	TQValueList<float>::Iterator ity = m_ylist.begin();
 	m_highestx = *itx;
 	m_lowestx = *itx;
 	m_highesty = *ity;
@@ -233,14 +233,14 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 
 	for( ; itx != m_xlist.end(); ++itx)
 	{
-		m_highestx = QMAX(m_highestx, *itx);
-		m_lowestx = QMIN(m_lowestx, *itx);
+		m_highestx = TQMAX(m_highestx, *itx);
+		m_lowestx = TQMIN(m_lowestx, *itx);
 	}
 
 	for( ; ity != m_ylist.end(); ++ity)
 	{
-		m_highesty = QMAX(m_highesty, *ity);
-		m_lowesty = QMIN(m_lowesty, *ity);
+		m_highesty = TQMAX(m_highesty, *ity);
+		m_lowesty = TQMIN(m_lowesty, *ity);
 	}
 
 	//if( svgElement.hasAttribute("width") && svgElement.hasAttribute("height"))
@@ -250,26 +250,26 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 	//}
 	//else
 	{
-		// scale the shape to be close to 30 by 30
+		// scale the tqshape to be close to 30 by 30
 		m_yscale = 30.0/(m_highesty - m_lowesty);
 		m_xscale = 30.0/(m_highestx - m_lowestx);
 	}
 
 	// Add KivioConnectorTarget's
-	QDomElement connectionsElement = diaMain.namedItem("connections").toElement();
-	QDomNode connectionsNode = connectionsElement.firstChild();
+	TQDomElement connectionsElement = diaMain.namedItem("connections").toElement();
+	TQDomNode connectionsNode = connectionsElement.firstChild();
 	while(!connectionsNode.isNull())
 	{
-		QDomElement connectionChild = connectionsNode.toElement();
+		TQDomElement connectionChild = connectionsNode.toElement();
 		if(!connectionChild.isNull())
 		{
 			if(connectionChild.tagName() == "point")
 			{
 				if(connectionChild.hasAttribute("x") && connectionChild.hasAttribute("y"))
 				{
-					QDomElement kivioConnectorTarget = kivio.createElement("KivioConnectorTarget");
-					kivioConnectorTarget.setAttribute("x", QString::number(diaPointToKivio(connectionChild.attribute("x").toFloat(),true) * m_xscale));
-					kivioConnectorTarget.setAttribute("y", QString::number(diaPointToKivio(connectionChild.attribute("y").toFloat(), false) * m_yscale));
+					TQDomElement kivioConnectorTarget = kivio.createElement("KivioConnectorTarget");
+					kivioConnectorTarget.setAttribute("x", TQString::number(diaPointToKivio(connectionChild.attribute("x").toFloat(),true) * m_xscale));
+					kivioConnectorTarget.setAttribute("y", TQString::number(diaPointToKivio(connectionChild.attribute("y").toFloat(), false) * m_yscale));
 
 					kivio.documentElement().appendChild(kivioConnectorTarget);
 				}
@@ -283,7 +283,7 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 	int runs = 0;
 	while(!svgNode.isNull())
 	{
-		QDomElement svgChild = svgNode.toElement();
+		TQDomElement svgChild = svgNode.toElement();
 		if(!svgChild.isNull())
 		{
 			if(svgChild.tagName() == "svg:rect")
@@ -292,13 +292,13 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 				// TODO: rx and ry -> rounded rects
 				if(svgChild.hasAttribute("x") && svgChild.hasAttribute("y") && svgChild.hasAttribute("width") && svgChild.hasAttribute("height"))
 				{
-					QDomElement kivioShape = kivio.createElement("KivioShape");
+					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Rectangle");
-					kivioShape.setAttribute("name", QString::fromLatin1("Element") + QString::number(runs));
-					kivioShape.setAttribute("x", QString::number(diaPointToKivio(svgChild.attribute("x").toFloat(),true) * m_xscale));
-					kivioShape.setAttribute("y", QString::number(diaPointToKivio(svgChild.attribute("y").toFloat(), false) * m_yscale));
-					kivioShape.setAttribute("w", QString::number(svgChild.attribute("width").toFloat() * m_xscale));
-					kivioShape.setAttribute("h", QString::number(svgChild.attribute("height").toFloat() * m_yscale));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("x", TQString::number(diaPointToKivio(svgChild.attribute("x").toFloat(),true) * m_xscale));
+					kivioShape.setAttribute("y", TQString::number(diaPointToKivio(svgChild.attribute("y").toFloat(), false) * m_yscale));
+					kivioShape.setAttribute("w", TQString::number(svgChild.attribute("width").toFloat() * m_xscale));
+					kivioShape.setAttribute("h", TQString::number(svgChild.attribute("height").toFloat() * m_yscale));
 					kivio.documentElement().appendChild(kivioShape);
 				}
 			}
@@ -307,13 +307,13 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 				runs++;
 				if(svgChild.hasAttribute("cx") && svgChild.hasAttribute("cy") && svgChild.hasAttribute("r"))
 				{
-					QDomElement kivioShape = kivio.createElement("KivioShape");
+					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Ellipse");
-					kivioShape.setAttribute("name", QString::fromLatin1("Element") + QString::number(runs));
-					kivioShape.setAttribute("x", QString::number((diaPointToKivio(svgChild.attribute("cx").toFloat() - svgChild.attribute("r").toFloat(),true) * m_xscale)));
-					kivioShape.setAttribute("y", QString::number((diaPointToKivio(svgChild.attribute("cy").toFloat() - svgChild.attribute("r").toFloat(), false) * m_yscale)));
-					kivioShape.setAttribute("w", QString::number(svgChild.attribute("r").toFloat() * m_xscale * 2));
-					kivioShape.setAttribute("h", QString::number(svgChild.attribute("r").toFloat() * m_yscale * 2));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("x", TQString::number((diaPointToKivio(svgChild.attribute("cx").toFloat() - svgChild.attribute("r").toFloat(),true) * m_xscale)));
+					kivioShape.setAttribute("y", TQString::number((diaPointToKivio(svgChild.attribute("cy").toFloat() - svgChild.attribute("r").toFloat(), false) * m_yscale)));
+					kivioShape.setAttribute("w", TQString::number(svgChild.attribute("r").toFloat() * m_xscale * 2));
+					kivioShape.setAttribute("h", TQString::number(svgChild.attribute("r").toFloat() * m_yscale * 2));
 					kivio.documentElement().appendChild(kivioShape);
 				}
 			}
@@ -322,13 +322,13 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 				runs++;
 				if(svgChild.hasAttribute("cx") && svgChild.hasAttribute("cy") && svgChild.hasAttribute("rx") && svgChild.hasAttribute("ry"))
 				{
-					QDomElement kivioShape = kivio.createElement("KivioShape");
+					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Ellipse");
-					kivioShape.setAttribute("name", QString::fromLatin1("Element") + QString::number(runs));
-					kivioShape.setAttribute("x", QString::number((diaPointToKivio(svgChild.attribute("cx").toFloat() - svgChild.attribute("rx").toFloat(),true) * m_xscale)));
-					kivioShape.setAttribute("y", QString::number((diaPointToKivio(svgChild.attribute("cy").toFloat() - svgChild.attribute("ry").toFloat(), false) * m_yscale)));
-					kivioShape.setAttribute("w", QString::number(svgChild.attribute("rx").toFloat() * m_xscale * 2));
-					kivioShape.setAttribute("h", QString::number(svgChild.attribute("ry").toFloat() * m_yscale * 2));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("x", TQString::number((diaPointToKivio(svgChild.attribute("cx").toFloat() - svgChild.attribute("rx").toFloat(),true) * m_xscale)));
+					kivioShape.setAttribute("y", TQString::number((diaPointToKivio(svgChild.attribute("cy").toFloat() - svgChild.attribute("ry").toFloat(), false) * m_yscale)));
+					kivioShape.setAttribute("w", TQString::number(svgChild.attribute("rx").toFloat() * m_xscale * 2));
+					kivioShape.setAttribute("h", TQString::number(svgChild.attribute("ry").toFloat() * m_yscale * 2));
 					kivio.documentElement().appendChild(kivioShape);
 				}
 			}
@@ -337,15 +337,15 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 				runs++;
 				if(svgChild.hasAttribute("x1") && svgChild.hasAttribute("y1") && svgChild.hasAttribute("x2") && svgChild.hasAttribute("y2"))
 				{
-					QDomElement kivioShape = kivio.createElement("KivioShape");
+					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "LineArray");
-					kivioShape.setAttribute("name", QString::fromLatin1("Element") + QString::number(runs));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
 
-					QDomElement lineArrayElement = kivio.createElement("Line");
-					lineArrayElement.setAttribute("x1", QString::number(diaPointToKivio(svgChild.attribute("x1").toFloat(),true) * m_xscale));
-					lineArrayElement.setAttribute("y1", QString::number(diaPointToKivio(svgChild.attribute("y1").toFloat(), false) * m_yscale));
-					lineArrayElement.setAttribute("x2", QString::number(diaPointToKivio(svgChild.attribute("x2").toFloat(),true) * m_xscale));
-					lineArrayElement.setAttribute("y2", QString::number(diaPointToKivio(svgChild.attribute("y2").toFloat(), false) * m_yscale));
+					TQDomElement lineArrayElement = kivio.createElement("Line");
+					lineArrayElement.setAttribute("x1", TQString::number(diaPointToKivio(svgChild.attribute("x1").toFloat(),true) * m_xscale));
+					lineArrayElement.setAttribute("y1", TQString::number(diaPointToKivio(svgChild.attribute("y1").toFloat(), false) * m_yscale));
+					lineArrayElement.setAttribute("x2", TQString::number(diaPointToKivio(svgChild.attribute("x2").toFloat(),true) * m_xscale));
+					lineArrayElement.setAttribute("y2", TQString::number(diaPointToKivio(svgChild.attribute("y2").toFloat(), false) * m_yscale));
 
 					kivioShape.appendChild(lineArrayElement);
 					kivio.documentElement().appendChild(kivioShape);
@@ -356,24 +356,24 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 				runs++;
 				if(svgChild.hasAttribute("points"))
 				{
-					QDomElement kivioShape = kivio.createElement("KivioShape");
+					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Polyline");
-					kivioShape.setAttribute("name", QString::fromLatin1("Element") + QString::number(runs));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
 
-					QStringList points = QStringList::split(" ", svgChild.attribute("points"));
-					for(QStringList::Iterator it = points.begin(); it != points.end(); ++it)
+					TQStringList points = TQStringList::split(" ", svgChild.attribute("points"));
+					for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it)
 					{
-						QString x, y;
+						TQString x, y;
 
-						QStringList parsed = QStringList::split(",", (*it));
-						QStringList::Iterator itp = parsed.begin();
+						TQStringList parsed = TQStringList::split(",", (*it));
+						TQStringList::Iterator itp = parsed.begin();
 						x = (*itp);
 						++itp;
 						y = (*itp);
 
-						QDomElement kivioPointElement = kivio.createElement("KivioPoint");
-						kivioPointElement.setAttribute("x", QString::number(diaPointToKivio(x.toFloat(),true) * m_xscale));
-						kivioPointElement.setAttribute("y", QString::number(diaPointToKivio(y.toFloat(), false) * m_yscale));
+						TQDomElement kivioPointElement = kivio.createElement("KivioPoint");
+						kivioPointElement.setAttribute("x", TQString::number(diaPointToKivio(x.toFloat(),true) * m_xscale));
+						kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(y.toFloat(), false) * m_yscale));
 
 						kivioShape.appendChild(kivioPointElement);
 					}
@@ -385,24 +385,24 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 				runs++;
 				if(svgChild.hasAttribute("points"))
 				{
-					QDomElement kivioShape = kivio.createElement("KivioShape");
+					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Polygon");
-					kivioShape.setAttribute("name", QString::fromLatin1("Element") + QString::number(runs));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
 
-					QStringList points = QStringList::split(" ", svgChild.attribute("points"));
-					for(QStringList::Iterator it = points.begin(); it != points.end(); ++it)
+					TQStringList points = TQStringList::split(" ", svgChild.attribute("points"));
+					for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it)
 					{
-						QString x, y;
+						TQString x, y;
 
-						QStringList parsed = QStringList::split(",", (*it));
-						QStringList::Iterator itp = parsed.begin();
+						TQStringList parsed = TQStringList::split(",", (*it));
+						TQStringList::Iterator itp = parsed.begin();
 						x = (*itp);
 						++itp;
 						y = (*itp);
 
-						QDomElement kivioPointElement = kivio.createElement("KivioPoint");
-						kivioPointElement.setAttribute("x", QString::number(diaPointToKivio(x.toFloat(),true) * m_xscale));
-						kivioPointElement.setAttribute("y", QString::number(diaPointToKivio(y.toFloat(), false) * m_yscale));
+						TQDomElement kivioPointElement = kivio.createElement("KivioPoint");
+						kivioPointElement.setAttribute("x", TQString::number(diaPointToKivio(x.toFloat(),true) * m_xscale));
+						kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(y.toFloat(), false) * m_yscale));
 
 						kivioShape.appendChild(kivioPointElement);
 					}
@@ -413,11 +413,11 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 			{
 				runs++;
 				bool isClosed;
-				QDomElement kivioShape = kivio.createElement("KivioShape");
+				TQDomElement kivioShape = kivio.createElement("KivioShape");
 				if(svgChild.hasAttribute("d"))
 				{
 
-					if(svgChild.attribute("d").contains('z') || svgChild.attribute("d").contains('Z'))
+					if(svgChild.attribute("d").tqcontains('z') || svgChild.attribute("d").tqcontains('Z'))
 					{
 						isClosed = true;
 						kivioShape.setAttribute("type", "ClosedPath");
@@ -428,7 +428,7 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 						kivioShape.setAttribute("type", "OpenPath");
 					}
 
-					kivioShape.setAttribute("name", QString::fromLatin1("Element") + QString::number(runs));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
 
 					DiaPathParser *dpp = new DiaPathParser(&kivio,
 						&kivioShape, m_xscale, m_yscale,
@@ -447,16 +447,16 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 					// stroke-linejoin: milter, bevel, round
 					// stroke-linecap: round, square, flat
 					// fill: ?
-					QStringList styles = QStringList::split(";", svgChild.attribute("style"));
+					TQStringList styles = TQStringList::split(";", svgChild.attribute("style"));
 					for( uint idx = 0; idx < styles.count(); idx++)
 					{
 						//kdDebug(43000) << "Style: " << styles[idx] << endl;
-						if( isClosed && styles[idx].contains("fill:"))
+						if( isClosed && styles[idx].tqcontains("fill:"))
 						{
-							QDomElement fillStyle = kivio.createElement("KivioFillStyle");
-							if( styles[idx].contains("forground"))
+							TQDomElement fillStyle = kivio.createElement("KivioFillStyle");
+							if( styles[idx].tqcontains("forground"))
 								fillStyle.setAttribute("color", "#0000");
-							else if (styles[idx].contains("background"))
+							else if (styles[idx].tqcontains("background"))
 								fillStyle.setAttribute("color", "#ffff");
 
 							fillStyle.setAttribute("colorStyle", "1");
@@ -472,8 +472,8 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 
 	// Apply width and height
 
-	dimensionsElement.setAttribute("w", QString::number((fabs(m_highestx - m_lowestx)) * m_xscale));
-	dimensionsElement.setAttribute("h", QString::number((fabs(m_highesty - m_lowesty)) * m_yscale));
+	dimensionsElement.setAttribute("w", TQString::number((fabs(m_highestx - m_lowestx)) * m_xscale));
+	dimensionsElement.setAttribute("h", TQString::number((fabs(m_highesty - m_lowesty)) * m_yscale));
 
 	m_xlist.clear();
 	m_ylist.clear();
@@ -481,7 +481,7 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 	return loadXML(file, kivio);
 }
 
-bool KivioDiaStencilSpawner::loadXML(const QString &file, QDomDocument &d)
+bool KivioDiaStencilSpawner::loadXML(const TQString &file, TQDomDocument &d)
 {
 	bool ret = m_smlStencilSpawner->loadXML(file, d);
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.h b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.h
index 2ae8ef47..9d3977de 100644
--- a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.h
+++ b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.h
@@ -19,10 +19,10 @@
 #ifndef KIVIO_DIA_STENCIL_SPAWNER_H
 #define KIVIO_DIA_STENCIL_SPAWNER_H
 
-#include <qdom.h>
-#include <qvaluelist.h>
-#include <qptrlist.h>
-#include <qstring.h>
+#include <tqdom.h>
+#include <tqvaluelist.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
 
 #include "kivio_connector_target.h"
 //#define protected public // ewww... what a gory hack
@@ -36,26 +36,26 @@ class KivioDiaStencilSpawner : public KivioStencilSpawner
 	KivioDiaStencilSpawner(KivioStencilSpawnerSet *);
 	virtual ~KivioDiaStencilSpawner();
 
-	virtual bool load(const QString &file);
-	virtual bool loadXML(const QString &file, QDomDocument &d);
+	virtual bool load(const TQString &file);
+	virtual bool loadXML(const TQString &file, TQDomDocument &d);
 
-	virtual QDomElement saveXML(QDomDocument &d);
+	virtual TQDomElement saveXML(TQDomDocument &d);
 
-	virtual QString &filename() { return m_filename; }
+	virtual TQString &filename() { return m_filename; }
 
 	virtual KivioStencil *newStencil();
 
-	QPtrList<KivioConnectorTarget> *targets() { return m_smlStencilSpawner->targets(); }
+	TQPtrList<KivioConnectorTarget> *targets() { return m_smlStencilSpawner->targets(); }
 
     protected:
 	void calculateDimensions(float x, float y);
 	float diaPointToKivio(float point, bool xpoint);
 
 	KivioSMLStencilSpawner *m_smlStencilSpawner;
-	QString m_filename;
+	TQString m_filename;
 
-	QValueList<float> m_xlist;
-	QValueList<float> m_ylist;
+	TQValueList<float> m_xlist;
+	TQValueList<float> m_ylist;
 	float m_lowestx;
 	float m_lowesty;
 	float m_highestx;
diff --git a/kivio/kiviopart/kiviosdk/kivio_fill_style.cpp b/kivio/kiviopart/kiviosdk/kivio_fill_style.cpp
index 893dd6fc..29f0f1f5 100644
--- a/kivio/kiviopart/kiviosdk/kivio_fill_style.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_fill_style.cpp
@@ -30,9 +30,9 @@
 KivioFillStyle::KivioFillStyle()
 {
     m_colorStyle = kcsSolid;
-    m_color = QColor(255,255,255);
-    m_color2 = QColor(255,255,255);
-    m_brushStyle = QBrush::SolidPattern;
+    m_color = TQColor(255,255,255);
+    m_color2 = TQColor(255,255,255);
+    m_brushStyle = Qt::SolidPattern;
     m_gradientType = KImageEffect::VerticalGradient;
 }
 
@@ -81,13 +81,13 @@ void KivioFillStyle::copyInto( KivioFillStyle *pTarget ) const
  *
  * @param e The element to load from
  */
-bool KivioFillStyle::loadXML( const QDomElement &e )
+bool KivioFillStyle::loadXML( const TQDomElement &e )
 {
-  QDomElement ele;
-  QDomNode node;
+  TQDomElement ele;
+  TQDomNode node;
 
-  m_color = XmlReadColor( e, "color", QColor(255,255,255).rgb() );
-  m_color2 = XmlReadColor( e, "gradientColor", QColor(255,255,255).rgb() );
+  m_color = XmlReadColor( e, "color", TQColor(255,255,255).rgb() );
+  m_color2 = XmlReadColor( e, "gradientColor", TQColor(255,255,255).rgb() );
 
   m_colorStyle = static_cast<KivioColorStyle>(XmlReadInt( e, "colorStyle", kcsSolid ));
 
@@ -103,11 +103,11 @@ bool KivioFillStyle::loadXML( const QDomElement &e )
  *
  * @param doc The document to create nodes for.
  *
- * @returns QDomElement is returned.
+ * @returns TQDomElement is returned.
  */
-QDomElement KivioFillStyle::saveXML( QDomDocument &doc )
+TQDomElement KivioFillStyle::saveXML( TQDomDocument &doc )
 {
-  QDomElement e = doc.createElement("KivioFillStyle");
+  TQDomElement e = doc.createElement("KivioFillStyle");
 
   XmlWriteColor( e, "color", m_color );
   XmlWriteColor( e, "gradientColor", m_color2 );
@@ -119,9 +119,9 @@ QDomElement KivioFillStyle::saveXML( QDomDocument &doc )
   return e;
 }
 
-QBrush KivioFillStyle::brush()
+TQBrush KivioFillStyle::brush()
 {
-  QBrush b;
+  TQBrush b;
   b.setColor(m_color);
 
   switch(m_colorStyle) {
@@ -130,7 +130,7 @@ QBrush KivioFillStyle::brush()
       break;
 
     case kcsNone:
-      b.setStyle(QBrush::NoBrush);
+      b.setStyle(Qt::NoBrush);
       break;
 
     case kcsGradient:
diff --git a/kivio/kiviopart/kiviosdk/kivio_fill_style.h b/kivio/kiviopart/kiviosdk/kivio_fill_style.h
index e6f96eb8..4be7303b 100644
--- a/kivio/kiviopart/kiviosdk/kivio_fill_style.h
+++ b/kivio/kiviopart/kiviosdk/kivio_fill_style.h
@@ -19,9 +19,9 @@
 #ifndef KIVIO_FILL_STYLE_H
 #define KIVIO_FILL_STYLE_H
 
-#include <qbrush.h>
-#include <qcolor.h>
-#include <qdom.h>
+#include <tqbrush.h>
+#include <tqcolor.h>
+#include <tqdom.h>
 
 #include <kimageeffect.h>
 
@@ -43,9 +43,9 @@ public:
 
 protected:
     KivioColorStyle m_colorStyle;       // The color style to use when filling
-    QColor m_color;                     // The color to use when solid filling
-    QColor m_color2;                     // The second color to use when using a gradient
-    QBrush::BrushStyle m_brushStyle;    // The brush pattern to use when solid filling (maybe gradient too?)
+    TQColor m_color;                     // The color to use when solid filling
+    TQColor m_color2;                     // The second color to use when using a gradient
+    Qt::BrushStyle m_brushStyle;    // The brush pattern to use when solid filling (maybe gradient too?)
     KImageEffect::GradientType m_gradientType;  //Which type of gradient to use
 
 public:
@@ -55,26 +55,26 @@ public:
 
     void copyInto( KivioFillStyle *pTarget ) const;
 
-    bool loadXML( const QDomElement & );
-    QDomElement saveXML( QDomDocument & );
+    bool loadXML( const TQDomElement & );
+    TQDomElement saveXML( TQDomDocument & );
 
 
     inline KivioColorStyle colorStyle() const { return m_colorStyle; }
     inline void setKivioColorStyle( KivioColorStyle k ) { m_colorStyle = k; }
 
 
-    inline QColor color() const { return m_color; }
-    inline void setColor( const QColor& c ) { m_color = c; }
-    inline QColor color2() const { return m_color2; }
-    inline void setColor2( const QColor& c ) { m_color2 = c; }
+    inline TQColor color() const { return m_color; }
+    inline void setColor( const TQColor& c ) { m_color = c; }
+    inline TQColor color2() const { return m_color2; }
+    inline void setColor2( const TQColor& c ) { m_color2 = c; }
 
-    inline QBrush::BrushStyle brushStyle() const { return m_brushStyle; }
-    inline void setBrushStyle( QBrush::BrushStyle b ) { m_brushStyle = b; }
+    inline Qt::BrushStyle brushStyle() const { return m_brushStyle; }
+    inline void setBrushStyle( Qt::BrushStyle b ) { m_brushStyle = b; }
 
     inline KImageEffect::GradientType gradientType() const { return m_gradientType; }
     inline void setGradientType(KImageEffect::GradientType t) { m_gradientType = t; }
 
-    QBrush brush();
+    TQBrush brush();
 };
 
 #endif
diff --git a/kivio/kiviopart/kiviosdk/kivio_gradient.cpp b/kivio/kiviopart/kiviosdk/kivio_gradient.cpp
index 0cae5d5e..eaa35c3c 100644
--- a/kivio/kiviopart/kiviosdk/kivio_gradient.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_gradient.cpp
@@ -29,11 +29,11 @@ KivioGradient::KivioGradient()
       m_pPoints(NULL)
 {
     // Allocate the color list
-    m_pColors = new QPtrList<QColor>;
+    m_pColors = new TQPtrList<TQColor>;
     m_pColors->setAutoDelete(true);
 
     // Allocate the point list
-    m_pPoints = new QPtrList<KivioPoint>;
+    m_pPoints = new TQPtrList<KivioPoint>;
     m_pPoints->setAutoDelete(true);
 
     m_gradientType = kgtNone;
@@ -77,12 +77,12 @@ KivioGradient::KivioGradient( const KivioGradient &source )
     m_gradientType = source.m_gradientType;
 
     // Duplicate the colors list
-    QColor *pColor;
-    m_pColors = new QPtrList<QColor>;
+    TQColor *pColor;
+    m_pColors = new TQPtrList<TQColor>;
     pColor = source.m_pColors->first();
     while( pColor )
     {
-        m_pColors->append( new QColor(*pColor) );
+        m_pColors->append( new TQColor(*pColor) );
 
         pColor = source.m_pColors->next();
     }
@@ -90,7 +90,7 @@ KivioGradient::KivioGradient( const KivioGradient &source )
 
     // Duplicate the point list
     KivioPoint *pPoint;
-    m_pPoints = new QPtrList<KivioPoint>;
+    m_pPoints = new TQPtrList<KivioPoint>;
     pPoint = source.m_pPoints->first();
     while( pPoint )
     {
@@ -124,16 +124,16 @@ void KivioGradient::copyInto( KivioGradient *pTarget ) const
     }
 
     // Allocate a new color array
-    pTarget->m_pColors = new QPtrList<QColor>;
+    pTarget->m_pColors = new TQPtrList<TQColor>;
     pTarget->m_pColors->setAutoDelete(true);
 
 
     // Copy the colors
-    QColor *pColor;
+    TQColor *pColor;
     pColor = m_pColors->first();
     while( pColor )
     {
-        pTarget->m_pColors->append( new QColor(*pColor) );
+        pTarget->m_pColors->append( new TQColor(*pColor) );
 
         pColor = m_pColors->next();
     }
@@ -144,7 +144,7 @@ void KivioGradient::copyInto( KivioGradient *pTarget ) const
         pTarget->m_pPoints = NULL;
     }
 
-    pTarget->m_pPoints = new QPtrList<KivioPoint>;
+    pTarget->m_pPoints = new TQPtrList<KivioPoint>;
     pTarget->m_pPoints->setAutoDelete(true);
 
     KivioPoint *pPoint;
@@ -163,7 +163,7 @@ void KivioGradient::copyInto( KivioGradient *pTarget ) const
  *
  * FIXME: Implement this
  */
-bool KivioGradient::loadXML( const QDomElement & )
+bool KivioGradient::loadXML( const TQDomElement & )
 {
     return false;
 }
@@ -174,7 +174,7 @@ bool KivioGradient::loadXML( const QDomElement & )
  *
  * FIXME: Implement this
  */
-QDomElement KivioGradient::saveXML( QDomDocument &doc )
+TQDomElement KivioGradient::saveXML( TQDomDocument &doc )
 {
 
     return doc.createElement("KivioGradient");
diff --git a/kivio/kiviopart/kiviosdk/kivio_gradient.h b/kivio/kiviopart/kiviosdk/kivio_gradient.h
index 0d9acfee..3e854e2e 100644
--- a/kivio/kiviopart/kiviosdk/kivio_gradient.h
+++ b/kivio/kiviopart/kiviosdk/kivio_gradient.h
@@ -19,9 +19,9 @@
 #ifndef KIVIO_GRADIENT_H
 #define KIVIO_GRADIENT_H
 
-#include <qptrlist.h>
-#include <qcolor.h>
-#include <qdom.h>
+#include <tqptrlist.h>
+#include <tqcolor.h>
+#include <tqdom.h>
 class KivioPoint;
 
 class KivioGradient
@@ -40,8 +40,8 @@ public:
     } KivioGradientType;
     
 protected:
-    QPtrList <QColor> *m_pColors;              // A list of the colors in the gradient
-    QPtrList <KivioPoint> *m_pPoints;         // A list of the points for each color
+    TQPtrList <TQColor> *m_pColors;              // A list of the colors in the gradient
+    TQPtrList <KivioPoint> *m_pPoints;         // A list of the points for each color
     KivioGradientType m_gradientType;       // The type of gradient
     
     
@@ -52,13 +52,13 @@ public:
     
     void copyInto( KivioGradient *pTarget ) const;
     
-    bool loadXML( const QDomElement & );
-    QDomElement saveXML( QDomDocument & );
+    bool loadXML( const TQDomElement & );
+    TQDomElement saveXML( TQDomDocument & );
     
     
-    QPtrList<QColor> *colors() const { return m_pColors; }
+    TQPtrList<TQColor> *colors() const { return m_pColors; }
     
-    QPtrList<KivioPoint> *points() const { return m_pPoints; }
+    TQPtrList<KivioPoint> *points() const { return m_pPoints; }
     
     KivioGradientType gradientType() const { return m_gradientType; }
     void setGradientType( KivioGradientType t ) { m_gradientType=t; }
diff --git a/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp
index f29fee68..2965ee74 100644
--- a/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp
@@ -29,7 +29,7 @@ KivioGroupStencil::KivioGroupStencil()
     : KivioStencil(),
     m_pGroupList(NULL)
 {
-    m_pGroupList = new QPtrList<KivioStencil>;
+    m_pGroupList = new TQPtrList<KivioStencil>;
     m_pGroupList->setAutoDelete(true);
 
     m_x = m_y = 1000000000000.0f;
@@ -83,7 +83,7 @@ void KivioGroupStencil::paintConnectorTargets( KivioIntraStencilData *pData )
     }
 }
 
-void KivioGroupStencil::setFGColor( QColor c )
+void KivioGroupStencil::setFGColor( TQColor c )
 {
     // Draw the group in outline mode
     KivioStencil *pStencil = m_pGroupList->first();
@@ -95,7 +95,7 @@ void KivioGroupStencil::setFGColor( QColor c )
     }
 }
 
-void KivioGroupStencil::setBGColor( QColor c )
+void KivioGroupStencil::setBGColor( TQColor c )
 {
     // Draw the group in outline mode
     KivioStencil *pStencil = m_pGroupList->first();
@@ -202,15 +202,15 @@ KivioStencil *KivioGroupStencil::duplicate()
     return pGroup;
 }
 
-bool KivioGroupStencil::loadXML( const QDomElement &e, KivioLayer *pLayer )
+bool KivioGroupStencil::loadXML( const TQDomElement &e, KivioLayer *pLayer )
 {
-    QDomNode node;
+    TQDomNode node;
     KivioStencil *pStencil;
 
     node = e.firstChild();
     while( !node.isNull() )
     {
-        QString name = node.nodeName();
+        TQString name = node.nodeName();
 
         if( name == "KivioGroupStencil" )
         {
@@ -255,11 +255,11 @@ bool KivioGroupStencil::loadXML( const QDomElement &e, KivioLayer *pLayer )
     return true;
 }
 
-QDomElement KivioGroupStencil::saveXML( QDomDocument &doc )
+TQDomElement KivioGroupStencil::saveXML( TQDomDocument &doc )
 {
-    QDomElement e = doc.createElement("KivioGroupStencil");
+    TQDomElement e = doc.createElement("KivioGroupStencil");
 
-    QDomElement stencilE;
+    TQDomElement stencilE;
     KivioStencil *pStencil = m_pGroupList->first();
     while( pStencil )
     {
@@ -503,13 +503,13 @@ void KivioGroupStencil::searchForConnections( KivioPage *p )
         pStencil->searchForConnections( p );
 
         // Restore it
-        m_pGroupList->find( pCur );
+        m_pGroupList->tqfind( pCur );
 
         pStencil = m_pGroupList->next();
     }
 }
 
-void KivioGroupStencil::setTextColor( QColor c )
+void KivioGroupStencil::setTextColor( TQColor c )
 {
     KivioStencil *pStencil = m_pGroupList->first();
     while( pStencil )
@@ -520,7 +520,7 @@ void KivioGroupStencil::setTextColor( QColor c )
     }
 }
 
-void KivioGroupStencil::setText( const QString &text )
+void KivioGroupStencil::setText( const TQString &text )
 {
     KivioStencil *pStencil = m_pGroupList->first();
     while( pStencil )
@@ -531,12 +531,12 @@ void KivioGroupStencil::setText( const QString &text )
     }
 }
 
-QString KivioGroupStencil::text()
+TQString KivioGroupStencil::text()
 {
     KivioStencil *pStencil = m_pGroupList->first();
 
     if( !pStencil )
-        return QString("");
+        return TQString("");
 
     return pStencil->text();
 }
@@ -557,7 +557,7 @@ int KivioGroupStencil::hTextAlign()
     KivioStencil *pStencil = m_pGroupList->first();
 
     if( !pStencil )
-        return Qt::AlignHCenter;
+        return TQt::AlignHCenter;
 
     return pStencil->hTextAlign();
 }
@@ -578,12 +578,12 @@ int KivioGroupStencil::vTextAlign()
     KivioStencil *pStencil = m_pGroupList->first();
 
     if( !pStencil )
-        return Qt::AlignVCenter;
+        return TQt::AlignVCenter;
 
     return pStencil->vTextAlign();
 }
 
-void KivioGroupStencil::setTextFont( const QFont &f )
+void KivioGroupStencil::setTextFont( const TQFont &f )
 {
     KivioStencil *pStencil = m_pGroupList->first();
     while( pStencil )
@@ -594,7 +594,7 @@ void KivioGroupStencil::setTextFont( const QFont &f )
     }
 }
 
-QFont KivioGroupStencil::textFont()
+TQFont KivioGroupStencil::textFont()
 {
   KivioStencil *pStencil = m_pGroupList->first();
 
@@ -604,12 +604,12 @@ QFont KivioGroupStencil::textFont()
   return pStencil->textFont();
 }
 
-QColor KivioGroupStencil::textColor()
+TQColor KivioGroupStencil::textColor()
 {
   KivioStencil *pStencil = m_pGroupList->first();
 
   if( !pStencil )
-    return QColor(0, 0, 0);
+    return TQColor(0, 0, 0);
 
   return pStencil->textColor();
 }
@@ -619,31 +619,31 @@ int KivioGroupStencil::resizeHandlePositions()
     return KIVIO_RESIZE_HANDLE_POSITION_ALL;
 }
 
-QString KivioGroupStencil::getTextBoxName(const KoPoint& p)
+TQString KivioGroupStencil::getTextBoxName(const KoPoint& p)
 {
   int id = checkForCollision(p);
   
   if(id < 0) {
-    return QString::null;
+    return TQString();
   }
   
   KivioStencil* pStencil = m_pGroupList->at(id);
-  QString name = QString::number(id) + "-" + pStencil->getTextBoxName(p);
+  TQString name = TQString::number(id) + "-" + pStencil->getTextBoxName(p);
   return name;
 }
 
-void KivioGroupStencil::setText(const QString& text, const QString& name)
+void KivioGroupStencil::setText(const TQString& text, const TQString& name)
 {
   int id = name.section("-", 0, 0).toInt();
-  QString n = name.section("-", 1);
+  TQString n = name.section("-", 1);
   
   m_pGroupList->at(id)->setText(text, n);
 }
 
-QString KivioGroupStencil::text(const QString& name)
+TQString KivioGroupStencil::text(const TQString& name)
 {
   int id = name.section("-", 0, 0).toInt();
-  QString n = name.section("-", 1);
+  TQString n = name.section("-", 1);
   
   return m_pGroupList->at(id)->text(n);
 }
@@ -683,66 +683,66 @@ bool KivioGroupStencil::hasTextBox() const
   return false;
 }
 
-QColor KivioGroupStencil::textColor(const QString& textBoxName)
+TQColor KivioGroupStencil::textColor(const TQString& textBoxName)
 {
   int id = textBoxName.section("-", 0, 0).toInt();
-  QString n = textBoxName.section("-", 1);
+  TQString n = textBoxName.section("-", 1);
 
   return m_pGroupList->at(id)->textColor(n);
 }
 
-void KivioGroupStencil::setTextColor(const QString& textBoxName, const QColor& color)
+void KivioGroupStencil::setTextColor(const TQString& textBoxName, const TQColor& color)
 {
   int id = textBoxName.section("-", 0, 0).toInt();
-  QString n = textBoxName.section("-", 1);
+  TQString n = textBoxName.section("-", 1);
 
   m_pGroupList->at(id)->setTextColor(n, color);
 }
 
-QFont KivioGroupStencil::textFont(const QString& textBoxName)
+TQFont KivioGroupStencil::textFont(const TQString& textBoxName)
 {
   int id = textBoxName.section("-", 0, 0).toInt();
-  QString n = textBoxName.section("-", 1);
+  TQString n = textBoxName.section("-", 1);
 
   return m_pGroupList->at(id)->textFont(n);
 }
 
-void KivioGroupStencil::setTextFont(const QString& textBoxName, const QFont& font)
+void KivioGroupStencil::setTextFont(const TQString& textBoxName, const TQFont& font)
 {
   int id = textBoxName.section("-", 0, 0).toInt();
-  QString n = textBoxName.section("-", 1);
+  TQString n = textBoxName.section("-", 1);
 
   m_pGroupList->at(id)->setTextFont(n, font);
 }
 
-int KivioGroupStencil::hTextAlign(const QString& textBoxName)
+int KivioGroupStencil::hTextAlign(const TQString& textBoxName)
 {
   int id = textBoxName.section("-", 0, 0).toInt();
-  QString n = textBoxName.section("-", 1);
+  TQString n = textBoxName.section("-", 1);
 
   return m_pGroupList->at(id)->hTextAlign(n);
 }
 
-int KivioGroupStencil::vTextAlign(const QString& textBoxName)
+int KivioGroupStencil::vTextAlign(const TQString& textBoxName)
 {
   int id = textBoxName.section("-", 0, 0).toInt();
-  QString n = textBoxName.section("-", 1);
+  TQString n = textBoxName.section("-", 1);
 
   return m_pGroupList->at(id)->vTextAlign(n);
 }
 
-void KivioGroupStencil::setHTextAlign(const QString& textBoxName, int align)
+void KivioGroupStencil::setHTextAlign(const TQString& textBoxName, int align)
 {
   int id = textBoxName.section("-", 0, 0).toInt();
-  QString n = textBoxName.section("-", 1);
+  TQString n = textBoxName.section("-", 1);
 
   m_pGroupList->at(id)->setHTextAlign(n, align);
 }
 
-void KivioGroupStencil::setVTextAlign(const QString& textBoxName, int align)
+void KivioGroupStencil::setVTextAlign(const TQString& textBoxName, int align)
 {
   int id = textBoxName.section("-", 0, 0).toInt();
-  QString n = textBoxName.section("-", 1);
+  TQString n = textBoxName.section("-", 1);
 
   m_pGroupList->at(id)->setVTextAlign(n, align);
 }
diff --git a/kivio/kiviopart/kiviosdk/kivio_group_stencil.h b/kivio/kiviopart/kiviosdk/kivio_group_stencil.h
index e2ae148f..a9084dde 100644
--- a/kivio/kiviopart/kiviosdk/kivio_group_stencil.h
+++ b/kivio/kiviopart/kiviosdk/kivio_group_stencil.h
@@ -22,7 +22,7 @@
 
 #include "kivio_stencil.h"
 
-#include <qdom.h>
+#include <tqdom.h>
 
 class KivioIntraStencilData;
 class KivioLayer;
@@ -33,7 +33,7 @@ class KivioGroupStencil : public KivioStencil
 {
   protected:
     // The list of child stencils
-    QPtrList<KivioStencil> *m_pGroupList;
+    TQPtrList<KivioStencil> *m_pGroupList;
     int checkForCollision(const KoPoint& p);
 
   public:
@@ -42,8 +42,8 @@ class KivioGroupStencil : public KivioStencil
 
 
     // File I/O routines
-    virtual bool loadXML( const QDomElement &, KivioLayer * );
-    virtual QDomElement saveXML( QDomDocument & );
+    virtual bool loadXML( const TQDomElement &, KivioLayer * );
+    virtual TQDomElement saveXML( TQDomDocument & );
 
 
     // Painting routines
@@ -57,17 +57,17 @@ class KivioGroupStencil : public KivioStencil
 
 
     // FG/Color operations
-    virtual void setFGColor( QColor );
-    virtual void setBGColor( QColor );
+    virtual void setFGColor( TQColor );
+    virtual void setBGColor( TQColor );
 
 
 
     // Text operations
-    virtual QColor textColor();
-    virtual void setTextColor( QColor );
+    virtual TQColor textColor();
+    virtual void setTextColor( TQColor );
 
-    virtual QFont textFont();
-    virtual void setTextFont( const QFont & );
+    virtual TQFont textFont();
+    virtual void setTextFont( const TQFont & );
 
     virtual int hTextAlign();
     virtual int vTextAlign();
@@ -75,8 +75,8 @@ class KivioGroupStencil : public KivioStencil
     virtual void setHTextAlign(int);
     virtual void setVTextAlign(int);
 
-    virtual void setText( const QString & );
-    virtual QString text();
+    virtual void setText( const TQString & );
+    virtual TQString text();
 
 
     // Line width
@@ -89,7 +89,7 @@ class KivioGroupStencil : public KivioStencil
 
     // Group operations
     virtual void addToGroup( KivioStencil * );
-    virtual QPtrList<KivioStencil> *groupList() { return m_pGroupList; }
+    virtual TQPtrList<KivioStencil> *groupList() { return m_pGroupList; }
 
 
     // Position / Dimension operations
@@ -115,26 +115,26 @@ class KivioGroupStencil : public KivioStencil
 
     /**
       Returns the name of the text box that is at @param p.
-      If there exist no text box at @param p then it returns QString::null.
+      If there exist no text box at @param p then it returns TQString().
     */
-    virtual QString getTextBoxName(const KoPoint& p);
+    virtual TQString getTextBoxName(const KoPoint& p);
 
-    virtual void setText(const QString& text, const QString& name);
-    virtual QString text(const QString& name);
+    virtual void setText(const TQString& text, const TQString& name);
+    virtual TQString text(const TQString& name);
 
     virtual bool hasTextBox() const;
 
-    virtual QColor textColor(const QString& textBoxName);
-    virtual void setTextColor(const QString& textBoxName, const QColor& color);
+    virtual TQColor textColor(const TQString& textBoxName);
+    virtual void setTextColor(const TQString& textBoxName, const TQColor& color);
 
-    virtual QFont textFont(const QString& textBoxName);
-    virtual void setTextFont(const QString& textBoxName, const QFont& font);
+    virtual TQFont textFont(const TQString& textBoxName);
+    virtual void setTextFont(const TQString& textBoxName, const TQFont& font);
 
-    virtual int hTextAlign(const QString& textBoxName);
-    virtual int vTextAlign(const QString& textBoxName);
+    virtual int hTextAlign(const TQString& textBoxName);
+    virtual int vTextAlign(const TQString& textBoxName);
 
-    virtual void setHTextAlign(const QString& textBoxName, int align);
-    virtual void setVTextAlign(const QString& textBoxName, int align);
+    virtual void setHTextAlign(const TQString& textBoxName, int align);
+    virtual void setVTextAlign(const TQString& textBoxName, int align);
 };
 
 #endif
diff --git a/kivio/kiviopart/kiviosdk/kivio_layer.cpp b/kivio/kiviopart/kiviosdk/kivio_layer.cpp
index 4c567f00..999d053d 100644
--- a/kivio/kiviopart/kiviosdk/kivio_layer.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_layer.cpp
@@ -31,7 +31,7 @@
 #include "kivio_doc.h"
 #include "kivio_page.h"
 
-#include <qdom.h>
+#include <tqdom.h>
 
 #include <klocale.h>
 #include <kdebug.h>
@@ -46,10 +46,10 @@ KivioLayer::KivioLayer( KivioPage *pPage )
     m_pPage = pPage;
     m_name = i18n("Untitled Layer");
 
-    m_pStencilList = new QPtrList<KivioStencil>;
+    m_pStencilList = new TQPtrList<KivioStencil>;
     m_pStencilList->setAutoDelete(true);
 
-    m_pDeletedStencilList = new QPtrList<KivioStencil>;
+    m_pDeletedStencilList = new TQPtrList<KivioStencil>;
     m_pDeletedStencilList->setAutoDelete(true);
 
     m_flags = 0;
@@ -81,7 +81,7 @@ KivioLayer::~KivioLayer()
 
 bool KivioLayer::addStencil( KivioStencil *pStencil )
 {
-    int pos = m_pDeletedStencilList->findRef(pStencil);
+    int pos = m_pDeletedStencilList->tqfindRef(pStencil);
     if ( pos != -1 )
         m_pDeletedStencilList->take( pos);
 
@@ -92,14 +92,14 @@ bool KivioLayer::addStencil( KivioStencil *pStencil )
 
 void KivioLayer::takeStencilFromList(  KivioStencil *pStencil )
 {
-    int pos=m_pStencilList->findRef(pStencil);
+    int pos=m_pStencilList->tqfindRef(pStencil);
     m_pStencilList->take( pos );
     m_pDeletedStencilList->append( pStencil );
 }
 
 void KivioLayer::insertStencil( KivioStencil *pStencil )
 {
-    int pos=m_pDeletedStencilList->findRef(pStencil);
+    int pos=m_pDeletedStencilList->tqfindRef(pStencil);
     if ( pos != -1 )
         m_pDeletedStencilList->take( pos);
 
@@ -124,9 +124,9 @@ bool KivioLayer::removeStencil( KivioStencil *pStencil )
  *
  * @returns A new, loaded stencil.
  */
-KivioStencil *KivioLayer::loadSMLStencil( const QDomElement &stencilE )
+KivioStencil *KivioLayer::loadSMLStencil( const TQDomElement &stencilE )
 {
-    QString setId, _id;
+    TQString setId, _id;
 
     kdDebug(43000) << "KivioLayer::loadSMLStencil() " << setId << " " << _id << endl;
 
@@ -166,7 +166,7 @@ KivioStencil *KivioLayer::loadSMLStencil( const QDomElement &stencilE )
  *
  * @returns A new, loaded stencil.
  */
-KivioStencil *KivioLayer::loadGroupStencil( const QDomElement &stencilE )
+KivioStencil *KivioLayer::loadGroupStencil( const TQDomElement &stencilE )
 {
    kdDebug(43000) << "KivioLayer::loadGroupStencil()" << endl;
 
@@ -181,9 +181,9 @@ KivioStencil *KivioLayer::loadGroupStencil( const QDomElement &stencilE )
     return pStencil;
 }
 
-KivioStencil *KivioLayer::loadPluginStencil( const QDomElement &stencilE )
+KivioStencil *KivioLayer::loadPluginStencil( const TQDomElement &stencilE )
 {
-    QString setId, _id;
+    TQString setId, _id;
 
     kdDebug(43000) << "KivioLayer::loadPluginStencil() " << setId.ascii() << " / " << _id << endl;
 
@@ -210,17 +210,17 @@ KivioStencil *KivioLayer::loadPluginStencil( const QDomElement &stencilE )
     return NULL;
 }
 
-bool KivioLayer::loadXML( const QDomElement &layerE )
+bool KivioLayer::loadXML( const TQDomElement &layerE )
 {
     m_flags = XmlReadInt( layerE, "flags", 1 );
     kdDebug(43000) << "Flags: " << m_flags << endl;
     m_name = XmlReadString( layerE, "name", "layerX" );
 
-    QDomNode node;
+    TQDomNode node;
     node = layerE.firstChild();
     while( !node.isNull() )
     {
-        QString name = node.nodeName();
+        TQString name = node.nodeName();
         if( name == "KivioSMLStencil" || name == "KivioPyStencil" )
         {
             KivioStencil *pStencil = loadSMLStencil( node.toElement() );
@@ -270,16 +270,16 @@ bool KivioLayer::loadXML( const QDomElement &layerE )
     return true;
 }
 
-void KivioLayer::loadOasis(const QDomElement& layer)
+void KivioLayer::loadOasis(const TQDomElement& layer)
 {
   m_name = layer.attribute("draw:name");
   // TODO OASIS Load flags
 }
 
 
-QDomElement KivioLayer::saveXML( QDomDocument &doc )
+TQDomElement KivioLayer::saveXML( TQDomDocument &doc )
 {
-    QDomElement e = doc.createElement("KivioLayer");
+    TQDomElement e = doc.createElement("KivioLayer");
 
     XmlWriteInt( e, "flags", m_flags );
     XmlWriteString( e, "name", m_name );
@@ -303,7 +303,7 @@ void KivioLayer::saveOasis(KoXmlWriter* layerWriter)
   layerWriter->endElement(); // draw:layer
 }
 
-void KivioLayer::paintContent( KivioPainter& painter, const QRect&, bool, QPoint, 
+void KivioLayer::paintContent( KivioPainter& painter, const TQRect&, bool, TQPoint, 
   KoZoomHandler* zoom )
 {
   if(!visible()) {
@@ -313,7 +313,7 @@ void KivioLayer::paintContent( KivioPainter& painter, const QRect&, bool, QPoint
   KivioStencil *pStencil = m_pStencilList->first();
   KivioIntraStencilData data;
 
-  painter.setFGColor( QColor(0,0,0) );
+  painter.setFGColor( TQColor(0,0,0) );
 
   data.painter = &painter;
   data.zoomHandler = zoom;
@@ -346,7 +346,7 @@ void KivioLayer::printContent( KivioPainter& painter, int xdpi, int ydpi )
   KoZoomHandler zoomHandler;
   zoomHandler.setZoomAndResolution(100, xdpi, ydpi);
 
-  painter.setFGColor( QColor(0,0,0) );
+  painter.setFGColor( TQColor(0,0,0) );
 
   data.painter = &painter;
   data.zoomHandler = &zoomHandler;
@@ -368,7 +368,7 @@ void KivioLayer::printContent(KivioPainter& painter, KoZoomHandler* zoomHandler)
   KivioStencil *pStencil = m_pStencilList->first();
   KivioIntraStencilData data;
 
-  painter.setFGColor( QColor(0,0,0) );
+  painter.setFGColor( TQColor(0,0,0) );
 
   data.painter = &painter;
   data.zoomHandler = zoomHandler;
@@ -382,7 +382,7 @@ void KivioLayer::printContent(KivioPainter& painter, KoZoomHandler* zoomHandler)
   }
 }
 
-void KivioLayer::paintConnectorTargets( KivioPainter& painter, const QRect&, bool, QPoint,
+void KivioLayer::paintConnectorTargets( KivioPainter& painter, const TQRect&, bool, TQPoint,
   KoZoomHandler* zoom )
 {
   if(!visible()) {
@@ -391,7 +391,7 @@ void KivioLayer::paintConnectorTargets( KivioPainter& painter, const QRect&, boo
 
   KivioIntraStencilData data;
 
-  painter.setFGColor( QColor(0,0,0) );
+  painter.setFGColor( TQColor(0,0,0) );
 
   data.painter = &painter;
   data.zoomHandler = zoom;
@@ -407,7 +407,7 @@ void KivioLayer::paintConnectorTargets( KivioPainter& painter, const QRect&, boo
   }
 }
 
-void KivioLayer::paintSelectionHandles( KivioPainter& painter, const QRect&, bool, QPoint, KoZoomHandler* zoom )
+void KivioLayer::paintSelectionHandles( KivioPainter& painter, const TQRect&, bool, TQPoint, KoZoomHandler* zoom )
 {
   if(!visible()) {
     return;
@@ -415,7 +415,7 @@ void KivioLayer::paintSelectionHandles( KivioPainter& painter, const QRect&, boo
 
   KivioIntraStencilData data;
 
-  painter.setFGColor( QColor(0,0,0) );
+  painter.setFGColor( TQColor(0,0,0) );
 
   data.painter = &painter;
   data.zoomHandler = zoom;
@@ -532,7 +532,7 @@ void KivioLayer::searchForConnections( KivioPage *p )
         pStencil->searchForConnections( p );
 
         // Restore it
-        m_pStencilList->find( pCur );
+        m_pStencilList->tqfind( pCur );
 
         pStencil = m_pStencilList->next();
     }
@@ -540,7 +540,7 @@ void KivioLayer::searchForConnections( KivioPage *p )
 
 KivioStencil *KivioLayer::takeStencil( KivioStencil *p )
 {
-    m_pStencilList->find( p );
+    m_pStencilList->tqfind( p );
 
     return m_pStencilList->take();
 }
diff --git a/kivio/kiviopart/kiviosdk/kivio_layer.h b/kivio/kiviopart/kiviosdk/kivio_layer.h
index 88cbe2e0..957f5d26 100644
--- a/kivio/kiviopart/kiviosdk/kivio_layer.h
+++ b/kivio/kiviopart/kiviosdk/kivio_layer.h
@@ -19,9 +19,9 @@
 #ifndef KIVIO_LAYER_H
 #define KIVIO_LAYER_H
 
-#include <qdom.h>
-#include <qptrlist.h>
-#include <qobject.h>
+#include <tqdom.h>
+#include <tqptrlist.h>
+#include <tqobject.h>
 #include <KoPoint.h>
 class KivioConnectorPoint;
 class KivioConnectorTarget;
@@ -30,7 +30,7 @@ class KivioPainter;
 class KoPoint;
 class DCOPObject;
 class KoZoomHandler;
-class QDomElement;
+class TQDomElement;
 class KoStore;
 class KoXmlWriter;
 
@@ -47,15 +47,15 @@ protected:
     friend class KivioGroupStencil;
 
     int m_flags;
-    QPtrList <KivioStencil> *m_pStencilList;
-    QPtrList <KivioStencil> *m_pDeletedStencilList;
-    QString m_name;
+    TQPtrList <KivioStencil> *m_pStencilList;
+    TQPtrList <KivioStencil> *m_pDeletedStencilList;
+    TQString m_name;
     KivioPage *m_pPage;
     DCOPObject* m_dcop;
 
-    KivioStencil *loadSMLStencil( const QDomElement & );
-    KivioStencil *loadGroupStencil( const QDomElement & );
-    KivioStencil *loadPluginStencil( const QDomElement & );
+    KivioStencil *loadSMLStencil( const TQDomElement & );
+    KivioStencil *loadGroupStencil( const TQDomElement & );
+    KivioStencil *loadPluginStencil( const TQDomElement & );
 
 
 public:
@@ -66,7 +66,7 @@ public:
 
     virtual DCOPObject* dcopObject();
 
-    QPtrList<KivioStencil> *stencilList() { return m_pStencilList; }
+    TQPtrList<KivioStencil> *stencilList() { return m_pStencilList; }
 
     bool visible() { return (m_flags & FLOW_LAYER_VISIBLE); }
     void setVisible( bool f );
@@ -80,27 +80,27 @@ public:
     void setPrintable(bool f);
     bool printable() { return !(m_flags & FLOW_LAYER_NOT_PRINTABLE); }
 
-    QString name() const { return m_name; }
-    void setName( const QString &n ) { m_name = QString(n); }
+    TQString name() const { return m_name; }
+    void setName( const TQString &n ) { m_name = TQString(n); }
 
     bool addStencil( KivioStencil * );
     bool removeStencil( KivioStencil * );
 
-    bool loadXML( const QDomElement & );
-    void loadOasis(const QDomElement& layer);
-    QDomElement saveXML( QDomDocument & );
+    bool loadXML( const TQDomElement & );
+    void loadOasis(const TQDomElement& layer);
+    TQDomElement saveXML( TQDomDocument & );
     void saveOasis(KoXmlWriter* layerWriter);
 
     KivioStencil *checkForStencil( KoPoint *, int *, float, bool );
 
     void printContent( KivioPainter& painter, int xdpi = 0, int ydpi = 0 );
     void printContent(KivioPainter& painter, KoZoomHandler* zoomHandler);
-    void paintContent( KivioPainter& painter, const QRect& rect, bool transparent, QPoint p0,
+    void paintContent( KivioPainter& painter, const TQRect& rect, bool transparent, TQPoint p0,
       KoZoomHandler* zoom );
-    void paintConnectorTargets( KivioPainter& painter, const QRect& rect, bool transparent,
-      QPoint p0, KoZoomHandler* zoom );
-    void paintSelectionHandles( KivioPainter& painter, const QRect& rect, bool transparent,
-      QPoint p0, KoZoomHandler* zoom );
+    void paintConnectorTargets( KivioPainter& painter, const TQRect& rect, bool transparent,
+      TQPoint p0, KoZoomHandler* zoom );
+    void paintSelectionHandles( KivioPainter& painter, const TQRect& rect, bool transparent,
+      TQPoint p0, KoZoomHandler* zoom );
 
     KivioStencil *firstStencil() { return m_pStencilList->first(); }
     KivioStencil *nextStencil() { return m_pStencilList->next(); }
diff --git a/kivio/kiviopart/kiviosdk/kivio_line_style.cpp b/kivio/kiviopart/kiviosdk/kivio_line_style.cpp
index f321a60f..7622a289 100644
--- a/kivio/kiviopart/kiviosdk/kivio_line_style.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_line_style.cpp
@@ -21,11 +21,11 @@
 
 KivioLineStyle::KivioLineStyle()
 {
-    m_color = QColor(0,0,0);
+    m_color = TQColor(0,0,0);
     m_width = 1.0f;
-    m_capStyle = Qt::FlatCap;
-    m_joinStyle = Qt::RoundJoin;
-    m_style = Qt::SolidLine;
+    m_capStyle = TQt::FlatCap;
+    m_joinStyle = TQt::RoundJoin;
+    m_style = TQt::SolidLine;
 }
 
 KivioLineStyle::KivioLineStyle( const KivioLineStyle &ls )
@@ -50,9 +50,9 @@ void KivioLineStyle::copyInto( KivioLineStyle *pTarget )
     pTarget->m_style     = m_style;
 }
 
-QDomElement KivioLineStyle::saveXML( QDomDocument &doc )
+TQDomElement KivioLineStyle::saveXML( TQDomDocument &doc )
 {
-    QDomElement e = doc.createElement("KivioLineStyle");
+    TQDomElement e = doc.createElement("KivioLineStyle");
 
     XmlWriteColor( e, "color",     m_color );
     XmlWriteFloat( e, "width",     m_width );
@@ -62,19 +62,19 @@ QDomElement KivioLineStyle::saveXML( QDomDocument &doc )
     return e;
 }
 
-bool KivioLineStyle::loadXML( const QDomElement &e )
+bool KivioLineStyle::loadXML( const TQDomElement &e )
 {
-    m_color     = XmlReadColor( e, "color",     QColor(0,0,0) );
+    m_color     = XmlReadColor( e, "color",     TQColor(0,0,0) );
     m_width     = XmlReadFloat( e, "width",     1.0f );
-    m_capStyle  = XmlReadInt(   e, "capStyle",  Qt::RoundCap );
-    m_joinStyle = XmlReadInt(   e, "joinStyle", Qt::RoundJoin );
-    m_style     = XmlReadInt(   e, "pattern",   Qt::SolidLine );
+    m_capStyle  = XmlReadInt(   e, "capStyle",  TQt::RoundCap );
+    m_joinStyle = XmlReadInt(   e, "joinStyle", TQt::RoundJoin );
+    m_style     = XmlReadInt(   e, "pattern",   TQt::SolidLine );
     return true;
 }
 
-QPen KivioLineStyle::pen( float scale ) const
+TQPen KivioLineStyle::pen( float scale ) const
 {
-    QPen p;
+    TQPen p;
     float s = m_width * scale;
 
     p.setColor( m_color );
diff --git a/kivio/kiviopart/kiviosdk/kivio_line_style.h b/kivio/kiviopart/kiviosdk/kivio_line_style.h
index 4126324b..8ba812e3 100644
--- a/kivio/kiviopart/kiviosdk/kivio_line_style.h
+++ b/kivio/kiviopart/kiviosdk/kivio_line_style.h
@@ -23,15 +23,15 @@
 #include <config.h>
 #endif
 
-#include <qcolor.h>
-#include <qdom.h>
-#include <qpen.h>
+#include <tqcolor.h>
+#include <tqdom.h>
+#include <tqpen.h>
 
 
 class KivioLineStyle
 {
 protected:
-    QColor m_color;
+    TQColor m_color;
     float  m_width;
     int    m_capStyle;
     int    m_joinStyle;
@@ -45,13 +45,13 @@ public:
 
     void copyInto( KivioLineStyle * );
 
-    QDomElement saveXML( QDomDocument & );
-    bool loadXML( const QDomElement & );
+    TQDomElement saveXML( TQDomDocument & );
+    bool loadXML( const TQDomElement & );
 
-    QPen pen( float ) const;
+    TQPen pen( float ) const;
 
-    QColor color() const { return m_color; }
-    void setColor( QColor c ){ m_color=c; }
+    TQColor color() const { return m_color; }
+    void setColor( TQColor c ){ m_color=c; }
 
     float width() const { return m_width; }
     void setWidth( float f ){ m_width=f; }
diff --git a/kivio/kiviopart/kiviosdk/kivio_painter.cpp b/kivio/kiviopart/kiviosdk/kivio_painter.cpp
index 33f5eb6d..2550fa52 100644
--- a/kivio/kiviopart/kiviosdk/kivio_painter.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_painter.cpp
@@ -44,12 +44,12 @@ KivioPainter::~KivioPainter()
 }
 
 
-void KivioPainter::setFGColor( const QColor &c )
+void KivioPainter::setFGColor( const TQColor &c )
 {
     m_pLineStyle->setColor(c);
 }
 
-QColor KivioPainter::fgColor() const
+TQColor KivioPainter::fgColor() const
 {
     return m_pLineStyle->color();
 }
diff --git a/kivio/kiviopart/kiviosdk/kivio_painter.h b/kivio/kiviopart/kiviosdk/kivio_painter.h
index 6e0869fd..4cea0a16 100644
--- a/kivio/kiviopart/kiviosdk/kivio_painter.h
+++ b/kivio/kiviopart/kiviosdk/kivio_painter.h
@@ -19,12 +19,12 @@
 #ifndef KIVIO_PAINTER_H
 #define KIVIO_PAINTER_H
 
-#include <qfont.h>
-#include <qptrlist.h>
-#include <qpaintdevice.h>
-#include <qpixmap.h>
-#include <qpointarray.h>
-#include <qwmatrix.h>
+#include <tqfont.h>
+#include <tqptrlist.h>
+#include <tqpaintdevice.h>
+#include <tqpixmap.h>
+#include <tqpointarray.h>
+#include <tqwmatrix.h>
 
 #include "kivio_fill_style.h"
 
@@ -38,13 +38,13 @@ protected:
     KivioFillStyle *m_pFillStyle;
     KivioLineStyle *m_pLineStyle;
 
-    QColor m_textColor;
+    TQColor m_textColor;
 
 public:
     KivioPainter();
     virtual ~KivioPainter();
 
-    virtual bool start( QPaintDevice * ) { return false;}
+    virtual bool start( TQPaintDevice * ) { return false;}
     virtual bool stop() { return false;}
 
 
@@ -58,17 +58,17 @@ public:
     virtual float lineWidth() const;
     virtual void setLineWidth( const float &f );
 
-    // virtual void setClipRect( QRect * );
-    // virtual QRect *clipRect();
+    // virtual void setClipRect( TQRect * );
+    // virtual TQRect *clipRect();
 
-    virtual QColor fgColor() const;
-    virtual void setFGColor( const QColor &c );
+    virtual TQColor fgColor() const;
+    virtual void setFGColor( const TQColor &c );
 
-    virtual QColor bgColor() const { return m_pFillStyle->color(); }
-    virtual void setBGColor( const QColor &c ) { m_pFillStyle->setColor(c); }
+    virtual TQColor bgColor() const { return m_pFillStyle->color(); }
+    virtual void setBGColor( const TQColor &c ) { m_pFillStyle->setColor(c); }
 
-    virtual QColor textColor() const { return m_textColor; }
-    virtual void setTextColor( const QColor &c ) { m_textColor = c; }
+    virtual TQColor textColor() const { return m_textColor; }
+    virtual void setTextColor( const TQColor &c ) { m_textColor = c; }
 
     virtual KivioFillStyle *fillStyle() { return m_pFillStyle; }
 
@@ -85,8 +85,8 @@ public:
     virtual void drawLine( float, float, float, float ) {;}
     virtual void drawArc( float, float, float, float, float, float ) {;}
 
-    virtual void drawBezier( QPtrList<KivioPoint> * ) {;}
-    virtual void drawBezier( QPointArray & ) {;}
+    virtual void drawBezier( TQPtrList<KivioPoint> * ) {;}
+    virtual void drawBezier( TQPointArray & ) {;}
 
     virtual void drawRect( float, float, float, float ) {;}
     virtual void fillRect( float, float, float, float ) {;}
@@ -103,24 +103,24 @@ public:
     virtual void drawChord( float, float, float, float, float, float ) {;}
     virtual void fillChord( float, float, float, float, float, float ) {;}
 
-    virtual void drawOpenPath( QPtrList<KivioPoint> * ) {;}
-    virtual void drawClosedPath( QPtrList<KivioPoint> * ) {;}
+    virtual void drawOpenPath( TQPtrList<KivioPoint> * ) {;}
+    virtual void drawClosedPath( TQPtrList<KivioPoint> * ) {;}
 
-    virtual void drawLineArray( QPtrList<KivioPoint> * ) {;}
-    virtual void drawPolyline( QPtrList<KivioPoint> * ) {;}
-    virtual void drawPolygon( QPtrList<KivioPoint> * ) {;}
+    virtual void drawLineArray( TQPtrList<KivioPoint> * ) {;}
+    virtual void drawPolyline( TQPtrList<KivioPoint> * ) {;}
+    virtual void drawPolygon( TQPtrList<KivioPoint> * ) {;}
 
-    virtual void drawLineArray( QPointArray & ) {;}
-    virtual void drawPolyline( QPointArray & ) {;}
-    virtual void drawPolygon( QPointArray & ) {;}
+    virtual void drawLineArray( TQPointArray & ) {;}
+    virtual void drawPolyline( TQPointArray & ) {;}
+    virtual void drawPolygon( TQPointArray & ) {;}
 
-    virtual void setFont( const QFont & ) {;}
-    virtual void drawText( int, int, int, int, int, const QString & ) {;}
-    virtual QRect boundingRect( int, int, int, int, int, const QString & ) { return QRect(0,0,100,100); }
+    virtual void setFont( const TQFont & ) {;}
+    virtual void drawText( int, int, int, int, int, const TQString & ) {;}
+    virtual TQRect boundingRect( int, int, int, int, int, const TQString & ) { return TQRect(0,0,100,100); }
 
 
     // These shouldn't be used for anything except the screen painter right now...
-    virtual void drawPixmap( float, float, const QPixmap & ) {;}
+    virtual void drawPixmap( float, float, const TQPixmap & ) {;}
 
     /*\
     |*| Miscellaneous Functions
@@ -135,7 +135,7 @@ public:
        cpfLock=0x10
     };
     virtual void drawHandle( float, float, int ) { ; }
-    virtual void drawSelectionBox( const QRect& ) { ; }
+    virtual void drawSelectionBox( const TQRect& ) { ; }
 
     virtual void saveState() {;}
     virtual void restoreState() {;}
@@ -145,7 +145,7 @@ public:
     virtual void rotateBy(int) {;}
     virtual int rotation() { return 0; }
 
-    virtual void setWorldMatrix(QWMatrix, bool) {;}
+    virtual void setWorldMatrix(TQWMatrix, bool) {;}
 };
 
 #endif
diff --git a/kivio/kiviopart/kiviosdk/kivio_plugin_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_plugin_stencil_spawner.cpp
index be4ce300..a70227c1 100644
--- a/kivio/kiviopart/kiviosdk/kivio_plugin_stencil_spawner.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_plugin_stencil_spawner.cpp
@@ -26,8 +26,8 @@
 #include "kivio_common.h"
 #include "kivio_stencil.h"
 
-#include <qdom.h>
-#include <qfileinfo.h>
+#include <tqdom.h>
+#include <tqfileinfo.h>
 #include <kdebug.h>
 
 KivioPluginStencilSpawner::KivioPluginStencilSpawner( KivioStencilSpawnerSet *pSet )
@@ -41,9 +41,9 @@ KivioPluginStencilSpawner::~KivioPluginStencilSpawner()
 {
 }
 
-bool KivioPluginStencilSpawner::load( const QString &f )
+bool KivioPluginStencilSpawner::load( const TQString &f )
 {
-  QFileInfo lib(f);
+  TQFileInfo lib(f);
   
   if( lib.exists())
   {
@@ -69,9 +69,9 @@ bool KivioPluginStencilSpawner::load( const QString &f )
   return true;
 }
 
-QDomElement KivioPluginStencilSpawner::saveXML( QDomDocument &doc )
+TQDomElement KivioPluginStencilSpawner::saveXML( TQDomDocument &doc )
 {
-    QDomElement spawnE = doc.createElement("KivioPluginStencilSpawner");
+    TQDomElement spawnE = doc.createElement("KivioPluginStencilSpawner");
 
     XmlWriteString( spawnE, "id", m_pInfo->id() );
 
@@ -87,7 +87,7 @@ KivioStencil *KivioPluginStencilSpawner::newStencil()
 }
 
 
-KivioStencil *KivioPluginStencilSpawner::newStencil(const QString& arg)
+KivioStencil *KivioPluginStencilSpawner::newStencil(const TQString& arg)
 {
     KivioStencil *pStencil = fac->NewStencil(arg);
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_plugin_stencil_spawner.h b/kivio/kiviopart/kiviosdk/kivio_plugin_stencil_spawner.h
index da4cb932..06ba844f 100644
--- a/kivio/kiviopart/kiviosdk/kivio_plugin_stencil_spawner.h
+++ b/kivio/kiviopart/kiviosdk/kivio_plugin_stencil_spawner.h
@@ -22,14 +22,14 @@
 class KivioIntraStencilData;
 class KivioStencil;
 class KivioStencilFactory;
-class QDomDocument;
+class TQDomDocument;
 
 #include "kivio_stencil_spawner.h"
 #include "kivio_stencil_spawner_info.h"
-#include <qpixmap.h>
+#include <tqpixmap.h>
 
 //typedef KivioStencil *(*NewStencilFunc)();
-//typedef QPixmap *(*GetIconFunc)();
+//typedef TQPixmap *(*GetIconFunc)();
 //typedef KivioStencilSpawnerInfo *(*GetSpawnerInfoFunc)();
 
 
@@ -38,26 +38,26 @@ class KivioPluginStencilSpawner : public KivioStencilSpawner
 protected:
     KivioStencilFactory *fac;
     void *m_handle;
-    QPixmap *m_pIcon;
-    QString m_filename;
+    TQPixmap *m_pIcon;
+    TQString m_filename;
     KivioStencilSpawnerInfo *m_pSInfo;
 
     KivioStencil *(*pNewStencil)();
-    QPixmap *(*pGetIcon)();
+    TQPixmap *(*pGetIcon)();
     KivioStencilSpawnerInfo *(*pGetSpawnerInfo)();
 
 public:
     KivioPluginStencilSpawner( KivioStencilSpawnerSet * );
     virtual ~KivioPluginStencilSpawner();
 
-    virtual bool load( const QString & );
-    virtual QDomElement saveXML( QDomDocument & );
+    virtual bool load( const TQString & );
+    virtual TQDomElement saveXML( TQDomDocument & );
 
     virtual KivioStencil *newStencil();
-    virtual KivioStencil *newStencil(const QString &arg);
+    virtual KivioStencil *newStencil(const TQString &arg);
     virtual KivioStencilSpawnerInfo *info();
 
-    virtual QPixmap *icon() { return m_pIcon; }
+    virtual TQPixmap *icon() { return m_pIcon; }
 };
 
 #endif
diff --git a/kivio/kiviopart/kiviosdk/kivio_point.cpp b/kivio/kiviopart/kiviosdk/kivio_point.cpp
index a18a4176..b3afae70 100644
--- a/kivio/kiviopart/kiviosdk/kivio_point.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_point.cpp
@@ -109,7 +109,7 @@ void KivioPoint::copyInto( KivioPoint *pTarget ) const
  * This will figure out the KivioPointType from a string.  For example,
  * "normal" will return kptNormal.
  */
-KivioPoint::KivioPointType KivioPoint::pointTypeFromString( const QString &str )
+KivioPoint::KivioPointType KivioPoint::pointTypeFromString( const TQString &str )
 {
     int i;
     
@@ -135,7 +135,7 @@ KivioPoint::KivioPointType KivioPoint::pointTypeFromString( const QString &str )
  * @param e The element to load from
  * @returns true on success, false on failure.
  */
-bool KivioPoint::loadXML( const QDomElement &e )
+bool KivioPoint::loadXML( const TQDomElement &e )
 {
     if( e.tagName().compare( "KivioPoint" ) != 0 )
     {
@@ -157,15 +157,15 @@ bool KivioPoint::loadXML( const QDomElement &e )
  * Save this object to an XML element
  *
  * @param doc The document we are saving to
- * @returns QDomElement
+ * @returns TQDomElement
  */
-QDomElement KivioPoint::saveXML( QDomDocument &doc )
+TQDomElement KivioPoint::saveXML( TQDomDocument &doc )
 {
-    QDomElement e = doc.createElement("KivioPoint");
+    TQDomElement e = doc.createElement("KivioPoint");
     
 
-    XmlWriteFloat( e, QString("x"), m_x );
-    XmlWriteFloat( e, QString("y"), m_y );
-    XmlWriteString( e, QString("type"), QString(KivioPointTypeNames[m_pointType]) );
+    XmlWriteFloat( e, TQString("x"), m_x );
+    XmlWriteFloat( e, TQString("y"), m_y );
+    XmlWriteString( e, TQString("type"), TQString(KivioPointTypeNames[m_pointType]) );
     return e;
 }
diff --git a/kivio/kiviopart/kiviosdk/kivio_point.h b/kivio/kiviopart/kiviosdk/kivio_point.h
index 52158c92..2a04bbf2 100644
--- a/kivio/kiviopart/kiviosdk/kivio_point.h
+++ b/kivio/kiviopart/kiviosdk/kivio_point.h
@@ -19,7 +19,7 @@
 #ifndef KIVIO_POINT_H
 #define KIVIO_POINT_H
 
-#include <qdom.h>
+#include <tqdom.h>
 
 class KivioPoint
 {
@@ -45,10 +45,10 @@ public:
     
     void copyInto( KivioPoint * ) const;
     
-    bool loadXML( const QDomElement & );
-    QDomElement saveXML( QDomDocument & );
+    bool loadXML( const TQDomElement & );
+    TQDomElement saveXML( TQDomDocument & );
 
-    static KivioPoint::KivioPointType pointTypeFromString( const QString & );
+    static KivioPoint::KivioPointType pointTypeFromString( const TQString & );
 
     inline double x() const { return m_x; }
     inline double y() const { return m_y; }
diff --git a/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp
index 0b34f46d..46526892 100644
--- a/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp
@@ -24,9 +24,9 @@ KivioView *view;
 
 #include "kivio_page.h"
 
-#include <qpainter.h>
-#include <qbrush.h>
-#include <qcolor.h>
+#include <tqpainter.h>
+#include <tqbrush.h>
+#include <tqcolor.h>
 #include <kdebug.h>
 #include <math.h>
 #include <KoZoomHandler.h>
@@ -40,7 +40,7 @@ extern "C" {
 KivioPyStencil::KivioPyStencil()
     : KivioStencil()
 {
-   m_pConnectorTargets = new QPtrList<KivioConnectorTarget>;
+   m_pConnectorTargets = new TQPtrList<KivioConnectorTarget>;
    m_pConnectorTargets->setAutoDelete(true);
 
    static bool first_time = true;
@@ -63,7 +63,7 @@ KivioPyStencil::KivioPyStencil()
 
 
    vars = Py_BuildValue( "{s:d,s:d,s:d,s:d,s:d,s:d,s:{},s:[],s:[],s:{}}",
-                            "x", m_x, "y", m_y, "w", m_w, "h", m_h, "x2", x2, "y2", y2 , "style","connectors","connector_targets","shapes");
+                            "x", m_x, "y", m_y, "w", m_w, "h", m_h, "x2", x2, "y2", y2 , "style","connectors","connector_targets","tqshapes");
 
    resizeCode = "";
 }
@@ -74,7 +74,7 @@ KivioPyStencil::~KivioPyStencil()
 }
 
 
-int KivioPyStencil::init( QString initCode )
+int KivioPyStencil::init( TQString initCode )
 {
   runPython(kivio_module);
   if ( !runPython( initCode ) )
@@ -93,16 +93,16 @@ int KivioPyStencil::init( QString initCode )
 }
 
 
-bool KivioPyStencil::loadXML( const QDomElement &e )
+bool KivioPyStencil::loadXML( const TQDomElement &e )
 {
-    QDomNode node;
-    QDomElement ele;
+    TQDomNode node;
+    TQDomElement ele;
 
 
     node = e.firstChild();
     while( !node.isNull() )
     {
-        QString nodeName = node.nodeName();
+        TQString nodeName = node.nodeName();
 
         ele = node.toElement();
 
@@ -110,7 +110,7 @@ bool KivioPyStencil::loadXML( const QDomElement &e )
         {
             resizeCode = XmlReadString( ele, "resizeCode", "" );
 
-            QString sVars = XmlReadString( ele, "vars", "" );
+            TQString sVars = XmlReadString( ele, "vars", "" );
 
             PyObject* mainmod = PyImport_AddModule("__main__");
             PyObject* gdic = PyModule_GetDict(mainmod);
@@ -150,11 +150,11 @@ bool KivioPyStencil::loadXML( const QDomElement &e )
 /**
  * Help function for loading from an XML node.
  */
-void KivioPyStencil::loadConnectorTargetListXML( const QDomElement &e )
+void KivioPyStencil::loadConnectorTargetListXML( const TQDomElement &e )
 {
-    QDomNode node;
-    QDomElement ele;
-    QString nodeName;
+    TQDomNode node;
+    TQDomElement ele;
+    TQString nodeName;
     KivioConnectorTarget *pTarget;
 
     pTarget = m_pConnectorTargets->first();
@@ -175,15 +175,15 @@ void KivioPyStencil::loadConnectorTargetListXML( const QDomElement &e )
 }
 
 
-QDomElement KivioPyStencil::saveXML( QDomDocument &doc )
+TQDomElement KivioPyStencil::saveXML( TQDomDocument &doc )
 {
-    QDomElement e = doc.createElement("KivioPyStencil");
+    TQDomElement e = doc.createElement("KivioPyStencil");
 
     XmlWriteString( e, "id", m_pSpawner->info()->id() );
     XmlWriteString( e, "setId", m_pSpawner->set()->id() );
 
 
-    QDomElement dE = doc.createElement("PyData");
+    TQDomElement dE = doc.createElement("PyData");
 
     // The python variables
     PyObject* mainmod = PyImport_AddModule("__main__");
@@ -203,7 +203,7 @@ QDomElement KivioPyStencil::saveXML( QDomDocument &doc )
     if ( !PyRun_String(dump_code, Py_file_input, gdic, ldic) )
         PyErr_Print();
 
-    QString sVars = PyString_AsString( PyDict_GetItemString( ldic, "res") );
+    TQString sVars = PyString_AsString( PyDict_GetItemString( ldic, "res") );
 
     XmlWriteString( dE, "vars", sVars );
     XmlWriteString( dE, "resizeCode", resizeCode );
@@ -212,8 +212,8 @@ QDomElement KivioPyStencil::saveXML( QDomDocument &doc )
 
 
     // Save the target list
-    QDomElement clE = doc.createElement("KivioConnectorTargetList");
-    QDomElement targetE;
+    TQDomElement clE = doc.createElement("KivioConnectorTargetList");
+    TQDomElement targetE;
     KivioConnectorTarget *pTarget = m_pConnectorTargets->first();
     while( pTarget )
     {
@@ -247,7 +247,7 @@ void KivioPyStencil::updateGeometry()
 
     KivioConnectorTarget *pTarget, *pOriginal;
 
-    QPtrList<KivioConnectorTarget> *pOriginalTargets = ((KivioPyStencilSpawner*)m_pSpawner)->targets();
+    TQPtrList<KivioConnectorTarget> *pOriginalTargets = ((KivioPyStencilSpawner*)m_pSpawner)->targets();
 
     pTarget = m_pConnectorTargets->first();
     pOriginal = pOriginalTargets->first();
@@ -406,45 +406,45 @@ void KivioPyStencil::paint( KivioIntraStencilData *d, bool outlined )
 {
   KoZoomHandler* zoomHandler = d->zoomHandler;
 
-  PyObject *shapes = PyDict_Values( PyDict_GetItemString( vars, "shapes" ) );
+  PyObject *tqshapes = PyDict_Values( PyDict_GetItemString( vars, "tqshapes" ) );
 
-  if ( !shapes ) {
+  if ( !tqshapes ) {
     return;
   }
 
-  int size = PyList_Size( shapes );
+  int size = PyList_Size( tqshapes );
 
   for ( int i=0; i<size; i++ ) {
-    PyObject *shape = PyList_GetItem( shapes, i );
-    if ( !PyDict_Check(shape) )
+    PyObject *tqshape = PyList_GetItem( tqshapes, i );
+    if ( !PyDict_Check(tqshape) )
       continue;
 
     int fill = KivioFillStyle::kcsNone;
 
-    // if style dosn't defined for shape, applay default for stencil
+    // if style dosn't defined for tqshape, applay default for stencil
     setStyle( d, PyDict_GetItemString( vars, "style" ) , fill );
-    setStyle( d, shape, fill );
+    setStyle( d, tqshape, fill );
 
     if ( isSelected() )
-      setStyle( d, PyDict_GetItemString( shape, "selected" ) , fill );
+      setStyle( d, PyDict_GetItemString( tqshape, "selected" ) , fill );
 
     if ( outlined )
         fill = KivioFillStyle::kcsNone;
 
-    QString stype = getStringFromDict( shape, "type" );
+    TQString stype = getStringFromDict( tqshape, "type" );
     stype = stype.lower();
 
-    double x = zoomHandler->zoomItX(getDoubleFromDict(shape,"x"));
-    double y = zoomHandler->zoomItY(getDoubleFromDict(shape,"y"));
-    double w = zoomHandler->zoomItX(getDoubleFromDict(shape,"w"));
-    double h = zoomHandler->zoomItY(getDoubleFromDict(shape,"h"));
-    //double x2 = zoomHandler->zoomItX(getDoubleFromDict(shape,"x2"));
-    //double y2 = zoomHandler->zoomItY(getDoubleFromDict(shape,"y2"));
+    double x = zoomHandler->zoomItX(getDoubleFromDict(tqshape,"x"));
+    double y = zoomHandler->zoomItY(getDoubleFromDict(tqshape,"y"));
+    double w = zoomHandler->zoomItX(getDoubleFromDict(tqshape,"w"));
+    double h = zoomHandler->zoomItY(getDoubleFromDict(tqshape,"h"));
+    //double x2 = zoomHandler->zoomItX(getDoubleFromDict(tqshape,"x2"));
+    //double y2 = zoomHandler->zoomItY(getDoubleFromDict(tqshape,"y2"));
 
     // get points list
-    QPtrList<KivioPoint> points;
+    TQPtrList<KivioPoint> points;
     points.setAutoDelete(true);
-    PyObject *pyPoints = PyDict_GetItemString( shape, "points" );
+    PyObject *pyPoints = PyDict_GetItemString( tqshape, "points" );
     if ( pyPoints && PyList_Check(pyPoints) ) {
       int size = PyList_Size(pyPoints);
       for ( int i=0; i<size; i++ ) {
@@ -466,26 +466,26 @@ void KivioPyStencil::paint( KivioIntraStencilData *d, bool outlined )
     if ( stype == "textbox" ) {
       int tf = vTextAlign() | hTextAlign();
 
-      QFont f = textFont();
+      TQFont f = textFont();
       f.setPointSizeFloat(f.pointSizeFloat() * (((float)zoomHandler->zoom()) / 100.0));
 
       d->painter->setFont( f );
-      QString text = getStringFromDict(shape,"text");
+      TQString text = getStringFromDict(tqshape,"text");
 
       if ( !text.isEmpty() ) {
-        d->painter->drawText( int( x ), int( y ), int( w ), int( h ), tf | Qt::WordBreak, text );
+        d->painter->drawText( int( x ), int( y ), int( w ), int( h ), tf | TQt::WordBreak, text );
       }
     }
 
     if ( stype == "arc" ) {
-      double a1 = getDoubleFromDict(shape,"a1");
-      double a2 = getDoubleFromDict(shape,"a2");
+      double a1 = getDoubleFromDict(tqshape,"a1");
+      double a2 = getDoubleFromDict(tqshape,"a2");
       d->painter->drawArc(x,y,w,h,a1,a2);
     }
 
     if ( stype == "roundrect" ) {
-      double rx = zoomHandler->zoomItX(getDoubleFromDict(shape,"rx"));
-      double ry = zoomHandler->zoomItY(getDoubleFromDict(shape,"ry"));
+      double rx = zoomHandler->zoomItX(getDoubleFromDict(tqshape,"rx"));
+      double ry = zoomHandler->zoomItY(getDoubleFromDict(tqshape,"ry"));
 
       if (fill) {
         d->painter->fillRoundRect( x, y, w, h, rx, ry );
@@ -526,7 +526,7 @@ void KivioPyStencil::paint( KivioIntraStencilData *d, bool outlined )
 
 
 
-int KivioPyStencil::runPython(QString code)
+int KivioPyStencil::runPython(TQString code)
 {
 
     view = dynamic_cast<KivioView*>(KoDocument::documentList()->first()->views().getFirst());
@@ -572,13 +572,13 @@ double KivioPyStencil::getDoubleFromDict( PyObject *dict, const char *key )
     return 0.0;
 }
 
-QString KivioPyStencil::getStringFromDict( PyObject *dict, const char *key )
+TQString KivioPyStencil::getStringFromDict( PyObject *dict, const char *key )
 {
     PyObject *val = PyDict_GetItemString(dict,const_cast<char*>(key));
     if ( val && PyString_Check(val) )
-        return QString( PyString_AsString(val) );
+        return TQString( PyString_AsString(val) );
 
-    return QString("");
+    return TQString("");
 }
 
 
@@ -606,19 +606,19 @@ KivioCollisionType KivioPyStencil::checkForCollision( KoPoint *pPoint, double )
 int KivioPyStencil::resizeHandlePositions()
 {
    // Calculate the resize handle positions
-   int mask = KIVIO_RESIZE_HANDLE_POSITION_ALL;
+   int tqmask = KIVIO_RESIZE_HANDLE_POSITION_ALL;
 
    if( m_pProtection->at( kpWidth ) )
    {
-      mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW);
+      tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW);
    }
 
    if( m_pProtection->at( kpHeight) )
    {
-      mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS);
+      tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS);
    }
 
-   return mask;
+   return tqmask;
 }
 
 
@@ -627,7 +627,7 @@ int KivioPyStencil::resizeHandlePositions()
  */
 void KivioPyStencil::paintConnectorTargets( KivioIntraStencilData *pData )
 {
-  QPixmap targetPic;
+  TQPixmap targetPic;
   KivioPainter *painter;
   double x, y;
 
@@ -756,7 +756,7 @@ void KivioPyStencil::setStyle( KivioIntraStencilData *d, PyObject *s, int &fillS
   PyObject *color = PyDict_GetItemString(s,"color");
 
   if ( color ) {
-    QColor c = readColor(color);
+    TQColor c = readColor(color);
 
     if ( c.isValid() ) {
       p->setFGColor(c);
@@ -766,7 +766,7 @@ void KivioPyStencil::setStyle( KivioIntraStencilData *d, PyObject *s, int &fillS
   color = PyDict_GetItemString(s,"bgcolor");
 
   if ( color ) {
-    QColor c = readColor(color);
+    TQColor c = readColor(color);
 
     if ( c.isValid() ) {
       p->setBGColor(c);
@@ -776,7 +776,7 @@ void KivioPyStencil::setStyle( KivioIntraStencilData *d, PyObject *s, int &fillS
   color = PyDict_GetItemString(s,"textcolor");
 
   if ( color ) {
-    QColor c = readColor(color);
+    TQColor c = readColor(color);
 
     if ( c.isValid() ) {
       p->setTextColor(c);
@@ -793,7 +793,7 @@ void KivioPyStencil::setStyle( KivioIntraStencilData *d, PyObject *s, int &fillS
   PyObject *o_fillStyle = PyDict_GetItemString(s,"fillstyle");
 
   if ( o_fillStyle ) {
-    QString sfill = getStringFromDict(s,"fillstyle");
+    TQString sfill = getStringFromDict(s,"fillstyle");
 
     if ( sfill == "solid" ) {
       fillStyle = KivioFillStyle::kcsSolid;
@@ -804,8 +804,8 @@ void KivioPyStencil::setStyle( KivioIntraStencilData *d, PyObject *s, int &fillS
     }
   }
 
-  QString  sfont = getStringFromDict(s,"font");
-  QFont f;
+  TQString  sfont = getStringFromDict(s,"font");
+  TQFont f;
   int fontSize = (int)getDoubleFromDict(s,"fontsize");
 
   if(!fontSize) {
@@ -824,13 +824,13 @@ void KivioPyStencil::setStyle( KivioIntraStencilData *d, PyObject *s, int &fillS
   p->setFont(f);
 }
 
-QColor KivioPyStencil::readColor( PyObject *color )
+TQColor KivioPyStencil::readColor( PyObject *color )
 {
     if ( !color )
-        return QColor();
+        return TQColor();
 
     if ( PyString_Check(color) ) {
-        return QColor( PyString_AsString(color) );
+        return TQColor( PyString_AsString(color) );
     }
 
     if ( PyList_Check(color) ) {
@@ -847,12 +847,12 @@ QColor KivioPyStencil::readColor( PyObject *color )
             if ( PyNumber_Check(bo) )
                 b = PyInt_AsLong( PyNumber_Int(bo));
 
-            return QColor(r,g,b);
+            return TQColor(r,g,b);
 
         }
     }
 
-    return QColor();
+    return TQColor();
 
 }
 
@@ -862,46 +862,46 @@ void KivioPyStencil::PyDebug( PyObject * o )
 }
 
 
-QColor KivioPyStencil::fgColor()
+TQColor KivioPyStencil::fgColor()
 {
-    QColor color = readColor( PyDict_GetItemString( PyDict_GetItemString(vars,"style"), "color" ) );
+    TQColor color = readColor( PyDict_GetItemString( PyDict_GetItemString(vars,"style"), "color" ) );
     if ( color.isValid() )
         return color;
     else
-        return QColor(0,0,0);
+        return TQColor(0,0,0);
 }
 
-void KivioPyStencil::setFGColor( QColor c )
+void KivioPyStencil::setFGColor( TQColor c )
 {
     PyDict_SetItemString(  PyDict_GetItemString(vars,"style") , "color"  , Py_BuildValue("[i,i,i]", c.red(), c.green(), c.blue() ) ) ;
 }
 
 
-QColor KivioPyStencil::bgColor()
+TQColor KivioPyStencil::bgColor()
 {
-    QColor color = readColor( PyDict_GetItemString( PyDict_GetItemString(vars,"style"), "bgcolor" ) );
+    TQColor color = readColor( PyDict_GetItemString( PyDict_GetItemString(vars,"style"), "bgcolor" ) );
     if ( color.isValid() )
         return color;
     else
-        return QColor(0,0,0);
+        return TQColor(0,0,0);
 }
 
-void KivioPyStencil::setBGColor( QColor c )
+void KivioPyStencil::setBGColor( TQColor c )
 {
     PyDict_SetItemString(  PyDict_GetItemString(vars,"style") , "bgcolor"  , Py_BuildValue("[i,i,i]", c.red(), c.green(), c.blue() ) ) ;
 }
 
 
-QColor KivioPyStencil::textColor()
+TQColor KivioPyStencil::textColor()
 {
-    QColor color = readColor( PyDict_GetItemString( PyDict_GetItemString(vars,"style"), "textcolor" ) );
+    TQColor color = readColor( PyDict_GetItemString( PyDict_GetItemString(vars,"style"), "textcolor" ) );
     if ( color.isValid() )
         return color;
     else
-        return QColor(0,0,0);
+        return TQColor(0,0,0);
 }
 
-void KivioPyStencil::setTextColor( QColor c )
+void KivioPyStencil::setTextColor( TQColor c )
 {
     PyDict_SetItemString(  PyDict_GetItemString(vars,"style") , "textcolor"  , Py_BuildValue("[i,i,i]", c.red(), c.green(), c.blue() ) ) ;
 }
@@ -922,27 +922,27 @@ void KivioPyStencil::setLineWidth( double w )
 }
 
 
-void KivioPyStencil::setText( const QString &s )
+void KivioPyStencil::setText( const TQString &s )
 {
-   PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"shapes"), "text" );
+   PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"tqshapes"), "text" );
    if ( to )
       PyDict_SetItemString(to, "text", Py_BuildValue("s", s.latin1() ));
 }
 
 
-QString KivioPyStencil::text()
+TQString KivioPyStencil::text()
 {
-    PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"shapes"), "text" );
+    PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"tqshapes"), "text" );
     if ( to ) {
         return getStringFromDict(to, "text");
     }
-    return QString("");
+    return TQString("");
 }
 
-void KivioPyStencil::setTextFont( const QFont &f )
+void KivioPyStencil::setTextFont( const TQFont &f )
 {
     double fs = f.pointSizeFloat();
-    QString family = f.family();
+    TQString family = f.family();
 
     int bold     = f.bold();
     int italic   = f.italic();
@@ -955,7 +955,7 @@ void KivioPyStencil::setTextFont( const QFont &f )
     PyDict_SetItemString(  PyDict_GetItemString(vars,"style") , "underline"  , Py_BuildValue("i",underline ) ) ;
 }
 
-QFont KivioPyStencil::textFont()
+TQFont KivioPyStencil::textFont()
 {
     PyObject *fn = PyDict_GetItemString( PyDict_GetItemString(vars,"style"), "font" );
     PyObject *fs = PyDict_GetItemString( PyDict_GetItemString(vars,"style"), "fontsize" );
@@ -963,7 +963,7 @@ QFont KivioPyStencil::textFont()
     PyObject *it = PyDict_GetItemString( PyDict_GetItemString(vars,"style"), "italic" );
     PyObject *ul = PyDict_GetItemString( PyDict_GetItemString(vars,"style"), "underline" );
 
-    QFont f;
+    TQFont f;
 
     if ( fs )
         if ( PyNumber_Check(fs))
@@ -996,7 +996,7 @@ int KivioPyStencil::hTextAlign()
         if ( PyNumber_Check(hta) )
             return ( PyInt_AsLong( PyNumber_Int(hta)));
 
-    return Qt::AlignHCenter;
+    return TQt::AlignHCenter;
 }
 
 int KivioPyStencil::vTextAlign()
@@ -1007,7 +1007,7 @@ int KivioPyStencil::vTextAlign()
         if ( PyNumber_Check(vta) )
             return ( PyInt_AsLong( PyNumber_Int(vta)));
 
-    return Qt::AlignVCenter;
+    return TQt::AlignVCenter;
 }
 
 void KivioPyStencil::setHTextAlign(int hta)
diff --git a/kivio/kiviopart/kiviosdk/kivio_py_stencil.h b/kivio/kiviopart/kiviosdk/kivio_py_stencil.h
index 0ee18a5c..44905922 100644
--- a/kivio/kiviopart/kiviosdk/kivio_py_stencil.h
+++ b/kivio/kiviopart/kiviosdk/kivio_py_stencil.h
@@ -28,11 +28,11 @@
 
 #ifdef HAVE_PYTHON
 
-#include <qptrlist.h>
-#include <qcolor.h>
-#include <qfont.h>
+#include <tqptrlist.h>
+#include <tqcolor.h>
+#include <tqfont.h>
 
-/* slots gets defined in Qt 3.2 and conflicts with python 2.3 headers */
+/* slots gets defined in TQt 3.2 and conflicts with python 2.3 headers */
 #undef slots
 #include <Python.h>
 #define slots
@@ -52,9 +52,9 @@ public:
     virtual ~KivioPyStencil();
 
 
-    virtual bool loadXML( const QDomElement & );
-    virtual QDomElement saveXML( QDomDocument & );
-    virtual void loadConnectorTargetListXML( const QDomElement & );
+    virtual bool loadXML( const TQDomElement & );
+    virtual TQDomElement saveXML( TQDomDocument & );
+    virtual void loadConnectorTargetListXML( const TQDomElement & );
 
     virtual void updateGeometry();
     virtual KivioStencil *duplicate();
@@ -70,21 +70,21 @@ public:
 
     virtual int generateIds( int );
 
-    virtual QColor fgColor();
-    virtual void setFGColor( QColor );
+    virtual TQColor fgColor();
+    virtual void setFGColor( TQColor );
 
-    virtual void setBGColor( QColor );
-    virtual QColor bgColor();
+    virtual void setBGColor( TQColor );
+    virtual TQColor bgColor();
 
     virtual void setLineWidth( double );
     virtual double lineWidth();
 
     // FOnt stuff
-    virtual QColor textColor();
-    virtual void setTextColor( QColor );
+    virtual TQColor textColor();
+    virtual void setTextColor( TQColor );
 
-    virtual QFont textFont();
-    virtual void setTextFont( const QFont & );
+    virtual TQFont textFont();
+    virtual void setTextFont( const TQFont & );
 
     virtual int hTextAlign();
     virtual int vTextAlign();
@@ -92,13 +92,13 @@ public:
     virtual void setHTextAlign(int);
     virtual void setVTextAlign(int);
 
-    virtual void setText( const QString & );
-    virtual QString text();
+    virtual void setText( const TQString & );
+    virtual TQString text();
 
 
 protected:
     PyObject *vars, *globals;
-    QString resizeCode; // python code to be runed when resize
+    TQString resizeCode; // python code to be runed when resize
     double old_x, old_y, old_w, old_h;
 
     virtual void rescaleShapes( PyObject * ); // find recursive for x,y,w,h in object( dict or list ) and update them
@@ -107,19 +107,19 @@ protected:
     *   set style settings from dict, return tru if need to use fill... methods or false if draw...
     */
     virtual void setStyle( KivioIntraStencilData *d, PyObject *style, int &fillStyle );
-    QColor readColor( PyObject *color ); // used by setStyle
+    TQColor readColor( PyObject *color ); // used by setStyle
 
 
-    QPtrList<KivioConnectorTarget> *m_pConnectorTargets;
+    TQPtrList<KivioConnectorTarget> *m_pConnectorTargets;
 
     /**
     *   init stencil using initCode, return 1, if ok, or 0 if was some error ( maybe python syntax error )
     */
-    int init( QString initCode);
+    int init( TQString initCode);
 
-    int runPython(QString code);
+    int runPython(TQString code);
     double getDoubleFromDict( PyObject *dict, const char* key );
-    QString getStringFromDict( PyObject *dict, const char* key );
+    TQString getStringFromDict( PyObject *dict, const char* key );
 
     void PyDebug( PyObject * ); // show var
 };
diff --git a/kivio/kiviopart/kiviosdk/kivio_py_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_py_stencil_spawner.cpp
index e8713917..8c4279e1 100644
--- a/kivio/kiviopart/kiviosdk/kivio_py_stencil_spawner.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_py_stencil_spawner.cpp
@@ -29,14 +29,14 @@
 #include "kivio_stencil_spawner_info.h"
 
 #include <iostream>
-#include <qdom.h>
-#include <qfile.h>
-#include <qiodevice.h>
-#include <qpainter.h>
-#include <qpoint.h>
-#include <qpixmap.h>
-#include <qrect.h>
-#include <qfileinfo.h>
+#include <tqdom.h>
+#include <tqfile.h>
+#include <tqiodevice.h>
+#include <tqpainter.h>
+#include <tqpoint.h>
+#include <tqpixmap.h>
+#include <tqrect.h>
+#include <tqfileinfo.h>
 
 #include <kdebug.h>
 
@@ -47,7 +47,7 @@ KivioPyStencilSpawner::KivioPyStencilSpawner( KivioStencilSpawnerSet *p )
     m_pStencil = new KivioPyStencil();
 	m_pStencil->setSpawner(this);
 
-    m_pTargets = new QPtrList<KivioConnectorTarget>;
+    m_pTargets = new TQPtrList<KivioConnectorTarget>;
     m_pTargets->setAutoDelete(true);
 }
 
@@ -68,22 +68,22 @@ KivioPyStencilSpawner::~KivioPyStencilSpawner()
     kdDebug(43000) << "* PyStencilSpawner "<< m_pInfo->id() << " deleted" << endl;
 }
 
-QDomElement KivioPyStencilSpawner::saveXML( QDomDocument &doc )
+TQDomElement KivioPyStencilSpawner::saveXML( TQDomDocument &doc )
 {
-    QDomElement spawnE = doc.createElement("KivioPyStencilSpawner");
+    TQDomElement spawnE = doc.createElement("KivioPyStencilSpawner");
 
     XmlWriteString( spawnE, "id", m_pInfo->id() );
 
     return spawnE;
 }
 
-bool KivioPyStencilSpawner::load( const QString &file )
+bool KivioPyStencilSpawner::load( const TQString &file )
 {
     KivioConnectorTarget *pTarget;
-    QDomDocument d("test");
+    TQDomDocument d("test");
 
-    m_filename = QString(file);
-    QFile f(file);
+    m_filename = TQString(file);
+    TQFile f(file);
 
     if( f.open( IO_ReadOnly )==false )
     {
@@ -93,10 +93,10 @@ bool KivioPyStencilSpawner::load( const QString &file )
 
     d.setContent(&f);
 
-    QDomElement root = d.documentElement();
-    QDomElement e;
-    QDomNode node = root.firstChild();
-    QString nodeName;
+    TQDomElement root = d.documentElement();
+    TQDomElement e;
+    TQDomNode node = root.firstChild();
+    TQString nodeName;
 
     while( !node.isNull() )
     {
@@ -104,7 +104,7 @@ bool KivioPyStencilSpawner::load( const QString &file )
 
         if( nodeName.compare("KivioPyStencilSpawnerInfo")==0 )
         {
-            m_pInfo->loadXML( (const QDomElement)node.toElement() );
+            m_pInfo->loadXML( (const TQDomElement)node.toElement() );
         }
         else if( nodeName.compare("init")==0 )
         {
@@ -143,11 +143,11 @@ bool KivioPyStencilSpawner::load( const QString &file )
     }
 
     // Now load the xpm
-    QFileInfo finfo(file);
-    QString pixFile = finfo.dirPath(true) + "/" + finfo.baseName() + ".xpm";
+    TQFileInfo finfo(file);
+    TQString pixFile = finfo.dirPath(true) + "/" + finfo.baseName() + ".xpm";
 
     if(!m_icon.load( pixFile )) {
-      QString pixFile = finfo.dirPath(true) + "/" + finfo.baseName() + ".png";
+      TQString pixFile = finfo.dirPath(true) + "/" + finfo.baseName() + ".png";
       m_icon.load( pixFile );
     }
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_py_stencil_spawner.h b/kivio/kiviopart/kiviosdk/kivio_py_stencil_spawner.h
index 75b4dcb2..ab4697b3 100644
--- a/kivio/kiviopart/kiviosdk/kivio_py_stencil_spawner.h
+++ b/kivio/kiviopart/kiviosdk/kivio_py_stencil_spawner.h
@@ -19,9 +19,9 @@
 #ifndef KIVIO_PY_STENCIL_SPAWNER_H
 #define KIVIO_PY_STENCIL_SPAWNER_H
 
-#include <qdom.h>
-#include <qptrlist.h>
-#include <qstring.h>
+#include <tqdom.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
 
 #include "kivio_stencil_spawner.h"
 #include <config.h>
@@ -32,36 +32,36 @@ class KivioStencilSpawnerSet;
 class KivioStencil;
 class KivioPyStencil;
 class KivioConnectorTarget;
-class QPainter;
-class QPixmap;
-class QRect;
+class TQPainter;
+class TQPixmap;
+class TQRect;
 
 class KivioPyStencilSpawner : public KivioStencilSpawner
 {
 protected:
     KivioPyStencil *m_pStencil;
-    QString m_filename;
+    TQString m_filename;
 
     // Target list
-    QPtrList<KivioConnectorTarget>*m_pTargets;
+    TQPtrList<KivioConnectorTarget>*m_pTargets;
 
 protected:
-    void loadShape( QDomNode & );
-    QString readDesc( const QString & );
+    void loadShape( TQDomNode & );
+    TQString readDesc( const TQString & );
 
 public:
     KivioPyStencilSpawner( KivioStencilSpawnerSet * );
     virtual ~KivioPyStencilSpawner();
 
-    virtual bool load( const QString & );
+    virtual bool load( const TQString & );
 
-    virtual QDomElement saveXML( QDomDocument & );
+    virtual TQDomElement saveXML( TQDomDocument & );
 
-    virtual QString &filename() { return m_filename; }
+    virtual TQString &filename() { return m_filename; }
 
     virtual KivioStencil *newStencil();
 
-    QPtrList <KivioConnectorTarget> *targets() { return m_pTargets; }
+    TQPtrList <KivioConnectorTarget> *targets() { return m_pTargets; }
 };
 
 #else // HAVE_PYTHON
diff --git a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp
index 0e1beb3e..07f005fa 100644
--- a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp
@@ -21,15 +21,15 @@
 #include "kivio_point.h"
 #include "kivio_screen_painter.h"
 
-#include <qimage.h>
-#include <qpen.h>
-#include <qbrush.h>
-#include <qsimplerichtext.h>
-#include <qpalette.h>
+#include <tqimage.h>
+#include <tqpen.h>
+#include <tqbrush.h>
+#include <tqsimplerichtext.h>
+#include <tqpalette.h>
 
 #include <kdebug.h>
 
-#define PAINTER_CHECK() { if(!m_pPainter) { kdDebug(43000) << "KivioScreenPainter::PAINTER_CHECK() - no QPainter exists." << endl; } }
+#define PAINTER_CHECK() { if(!m_pPainter) { kdDebug(43000) << "KivioScreenPainter::PAINTER_CHECK() - no TQPainter exists." << endl; } }
 
 
 KivioScreenPainter::KivioScreenPainter()
@@ -40,7 +40,7 @@ KivioScreenPainter::KivioScreenPainter()
    m_rotation = 0;
 }
 
-KivioScreenPainter::KivioScreenPainter(QPainter* painter)
+KivioScreenPainter::KivioScreenPainter(TQPainter* painter)
     : m_pPainter(painter)
 {
    m_transX = 0.0f;
@@ -52,32 +52,32 @@ KivioScreenPainter::~KivioScreenPainter()
 {
     if( m_pPainter )
     {
-       kdDebug(43000) << "KivioScreenPainter::~KivioScreenPainter - A QPainter slipped through the cracks" << endl;
+       kdDebug(43000) << "KivioScreenPainter::~KivioScreenPainter - A TQPainter slipped through the cracks" << endl;
         delete m_pPainter;
         m_pPainter = NULL;
     }
 }
 
 /**
- * Starts the drawing on a @ref QPaintDevice
+ * Starts the drawing on a @ref TQPaintDevice
  *
  * @param dev The device to paint on
  *
  * Call this function before you call any other @ref KivioScreenPainter
- * functions.  This will create an internal QPainter object for drawing
+ * functions.  This will create an internal TQPainter object for drawing
  * with.  If you fail to call this function, nothing will work.
  */
-bool KivioScreenPainter::start( QPaintDevice *dev )
+bool KivioScreenPainter::start( TQPaintDevice *dev )
 {
     // Bomb out if one exists already
     if( m_pPainter )
     {
-       kdDebug(43000) << "KivioScreenPainter::start() - A QPainter already exists" << endl;
+       kdDebug(43000) << "KivioScreenPainter::start() - A TQPainter already exists" << endl;
         return false;
     }
 
     // Allocate a new drawing thingy
-    m_pPainter = new QPainter(dev);
+    m_pPainter = new TQPainter(dev);
 
     return true;
 }
@@ -160,7 +160,7 @@ void KivioScreenPainter::drawArc( float x1, float y1, float w1, float h1, float
  * This will draw a quad-bezier curve in the current fgColor
  * and lineWidth.  @ref pArray must have 4 points.
  */
-void KivioScreenPainter::drawBezier( QPointArray &pArray )
+void KivioScreenPainter::drawBezier( TQPointArray &pArray )
 {
     PAINTER_CHECK();
 
@@ -183,7 +183,7 @@ void KivioScreenPainter::drawRect( float x1, float y1, float w1, float h1 )
     PAINTER_CHECK();
 
     m_pPainter->setPen(m_pLineStyle->pen(1.0f));
-    m_pPainter->setBrush(QBrush::NoBrush);
+    m_pPainter->setBrush(TQBrush::NoBrush);
     m_pPainter->drawRect( int(x1), int(y1), int(w1), int(h1) );
 }
 
@@ -203,12 +203,12 @@ void KivioScreenPainter::fillRect( float x1, float y1, float w1, float h1 )
 {
     PAINTER_CHECK();
 
-    QBrush b;
+    TQBrush b;
     b = m_pFillStyle->brush();
 
     if(m_pFillStyle->colorStyle() == KivioFillStyle::kcsGradient) {
-      QPixmap pix((int)w1, (int)h1);
-      QImage image = KImageEffect::gradient(pix.size(), m_pFillStyle->color(), m_pFillStyle->color2(),
+      TQPixmap pix((int)w1, (int)h1);
+      TQImage image = KImageEffect::gradient(pix.size(), m_pFillStyle->color(), m_pFillStyle->color2(),
         (KImageEffect::GradientType) m_pFillStyle->gradientType());
       pix.convertFromImage(image);
       b.setPixmap(pix);
@@ -240,7 +240,7 @@ void KivioScreenPainter::drawRoundRect( float x1, float y1, float w1, float h1,
     PAINTER_CHECK();
 
     m_pPainter->setPen(m_pLineStyle->pen(1.0f));
-    m_pPainter->setBrush(QBrush::NoBrush);
+    m_pPainter->setBrush(TQBrush::NoBrush);
     m_pPainter->drawRoundRect( int(x1), int(y1), int(w1), int(h1), int(a1), int(a2) );
 }
 
@@ -263,12 +263,12 @@ void KivioScreenPainter::fillRoundRect( float x1, float y1, float w1, float h1,
 {
     PAINTER_CHECK();
 
-    QBrush b;
+    TQBrush b;
     b = m_pFillStyle->brush();
 
     if(m_pFillStyle->colorStyle() == KivioFillStyle::kcsGradient) {
-      QPixmap pix((int)w1, (int)h1);
-      QImage image = KImageEffect::gradient(pix.size(), m_pFillStyle->color(), m_pFillStyle->color2(),
+      TQPixmap pix((int)w1, (int)h1);
+      TQImage image = KImageEffect::gradient(pix.size(), m_pFillStyle->color(), m_pFillStyle->color2(),
         (KImageEffect::GradientType) m_pFillStyle->gradientType());
       pix.convertFromImage(image);
       b.setPixmap(pix);
@@ -300,7 +300,7 @@ void KivioScreenPainter::drawPie( float x1, float y1, float w1, float h1, float
     PAINTER_CHECK();
 
     m_pPainter->setPen(m_pLineStyle->pen(1.0f));
-    m_pPainter->setBrush(QBrush::NoBrush);
+    m_pPainter->setBrush(TQBrush::NoBrush);
     m_pPainter->drawPie( int(x1), int(y1), int(w1), int(h1), int(a1), int(a2) );
 }
 
@@ -322,12 +322,12 @@ void KivioScreenPainter::fillPie( float x1, float y1, float w1, float h1, float
 {
     PAINTER_CHECK();
 
-    QBrush b;
+    TQBrush b;
     b = m_pFillStyle->brush();
 
     if(m_pFillStyle->colorStyle() == KivioFillStyle::kcsGradient) {
-      QPixmap pix((int)w1, (int)h1);
-      QImage image = KImageEffect::gradient(pix.size(), m_pFillStyle->color(), m_pFillStyle->color2(),
+      TQPixmap pix((int)w1, (int)h1);
+      TQImage image = KImageEffect::gradient(pix.size(), m_pFillStyle->color(), m_pFillStyle->color2(),
         (KImageEffect::GradientType) m_pFillStyle->gradientType());
       pix.convertFromImage(image);
       b.setPixmap(pix);
@@ -359,7 +359,7 @@ void KivioScreenPainter::drawChord( float x1, float y1, float w1, float h1, floa
     PAINTER_CHECK();
 
     m_pPainter->setPen(m_pLineStyle->pen(1.0f));
-    m_pPainter->setBrush(QBrush::NoBrush);
+    m_pPainter->setBrush(TQBrush::NoBrush);
     m_pPainter->drawChord( int(x1), int(y1), int(w1), int(h1), int(a1), int(a2) );
 }
 
@@ -381,12 +381,12 @@ void KivioScreenPainter::fillChord( float x1, float y1, float w1, float h1, floa
 {
     PAINTER_CHECK();
 
-    QBrush b;
+    TQBrush b;
     b = m_pFillStyle->brush();
 
     if(m_pFillStyle->colorStyle() == KivioFillStyle::kcsGradient) {
-      QPixmap pix((int)w1, (int)h1);
-      QImage image = KImageEffect::gradient(pix.size(), m_pFillStyle->color(),
+      TQPixmap pix((int)w1, (int)h1);
+      TQImage image = KImageEffect::gradient(pix.size(), m_pFillStyle->color(),
         m_pFillStyle->color2(), m_pFillStyle->gradientType());
       pix.convertFromImage(image);
       b.setPixmap(pix);
@@ -416,7 +416,7 @@ void KivioScreenPainter::drawEllipse( float x1, float y1, float w1, float h1 )
     PAINTER_CHECK();
 
     m_pPainter->setPen(m_pLineStyle->pen(1.0f));
-    m_pPainter->setBrush(QBrush::NoBrush);
+    m_pPainter->setBrush(TQBrush::NoBrush);
     m_pPainter->drawEllipse( int(x1), int(y1), int(w1), int(h1) );
 }
 
@@ -436,12 +436,12 @@ void KivioScreenPainter::fillEllipse( float x1, float y1, float w1, float h1 )
 {
     PAINTER_CHECK();
 
-    QBrush b;
+    TQBrush b;
     b = m_pFillStyle->brush();
 
     if(m_pFillStyle->colorStyle() == KivioFillStyle::kcsGradient) {
-      QPixmap pix((int)w1, (int)h1);
-      QImage image = KImageEffect::gradient(pix.size(), m_pFillStyle->color(), m_pFillStyle->color2(),
+      TQPixmap pix((int)w1, (int)h1);
+      TQImage image = KImageEffect::gradient(pix.size(), m_pFillStyle->color(), m_pFillStyle->color2(),
         (KImageEffect::GradientType) m_pFillStyle->gradientType());
       pix.convertFromImage(image);
       b.setPixmap(pix);
@@ -463,16 +463,16 @@ void KivioScreenPainter::fillEllipse( float x1, float y1, float w1, float h1 )
  * The list of points should contain a list of points in
  * pairs.  Lines are drawn from p1->p2 p3->p4 p5->p6, etc...
  */
-void KivioScreenPainter::drawLineArray( QPtrList<KivioPoint> *pList )
+void KivioScreenPainter::drawLineArray( TQPtrList<KivioPoint> *pList )
 {
   PAINTER_CHECK();
 
   KivioPoint *pPoint;
-  QPointArray points(pList->count());
+  TQPointArray points(pList->count());
   int i;
-  QBrush b;
+  TQBrush b;
 
-  b.setStyle( QBrush::NoBrush );
+  b.setStyle( Qt::NoBrush );
 
   i=0;
   pPoint = pList->first();
@@ -497,12 +497,12 @@ void KivioScreenPainter::drawLineArray( QPtrList<KivioPoint> *pList )
  *
  * Draws a polyline (hollow) from p1->p2->p3->pn
  */
-void KivioScreenPainter::drawPolyline( QPtrList<KivioPoint> *pList )
+void KivioScreenPainter::drawPolyline( TQPtrList<KivioPoint> *pList )
 {
   PAINTER_CHECK();
 
   KivioPoint *pPoint;
-  QPointArray points( pList->count() );
+  TQPointArray points( pList->count() );
   int i = 0;
   pPoint = pList->first();
 
@@ -524,12 +524,12 @@ void KivioScreenPainter::drawPolyline( QPtrList<KivioPoint> *pList )
  *
  * Draws a filled (if set) polygon from p1->p2->p3->pn->p1
  */
-void KivioScreenPainter::drawPolygon( QPtrList<KivioPoint> *pList )
+void KivioScreenPainter::drawPolygon( TQPtrList<KivioPoint> *pList )
 {
   PAINTER_CHECK();
 
   KivioPoint *pPoint;
-  QPointArray points( pList->count() );
+  TQPointArray points( pList->count() );
   int i = 0;
   pPoint = pList->first();
 
@@ -542,21 +542,21 @@ void KivioScreenPainter::drawPolygon( QPtrList<KivioPoint> *pList )
   drawPolygon(points);
 }
 
-void KivioScreenPainter::drawPolyline( QPointArray &pArray )
+void KivioScreenPainter::drawPolyline( TQPointArray &pArray )
 {
   PAINTER_CHECK();
 
   m_pPainter->setPen(m_pLineStyle->pen(1.0f));
-  m_pPainter->setBrush( QBrush::NoBrush );
+  m_pPainter->setBrush( TQBrush::NoBrush );
 
-  m_pPainter->drawPolyline( pArray, 0, pArray.size() );
+  m_pPainter->tqdrawPolyline( pArray, 0, pArray.size() );
 }
 
-void KivioScreenPainter::drawPolygon( QPointArray &pArray )
+void KivioScreenPainter::drawPolygon( TQPointArray &pArray )
 {
   PAINTER_CHECK();
 
-  QBrush b;
+  TQBrush b;
   b = m_pFillStyle->brush();
 
   if(m_pFillStyle->colorStyle() == KivioFillStyle::kcsGradient) {
@@ -566,17 +566,17 @@ void KivioScreenPainter::drawPolygon( QPointArray &pArray )
     w1 = h1 = 0;
 
     for(unsigned int i = 0; i < pArray.count(); i++) {
-      x1 = QMIN(x1, pArray[i].x());
-      y1 = QMIN(y1, pArray[i].y());
-      w1 = QMAX(w1, pArray[i].x());
-      h1 = QMAX(h1, pArray[i].y());
+      x1 = TQMIN(x1, pArray[i].x());
+      y1 = TQMIN(y1, pArray[i].y());
+      w1 = TQMAX(w1, pArray[i].x());
+      h1 = TQMAX(h1, pArray[i].y());
     }
 
     w1 = w1 - x1;
     h1 = h1 - y1;
 
-    QPixmap pix(w1, h1);
-    QImage image = KImageEffect::gradient(pix.size(), m_pFillStyle->color(), m_pFillStyle->color2(),
+    TQPixmap pix(w1, h1);
+    TQImage image = KImageEffect::gradient(pix.size(), m_pFillStyle->color(), m_pFillStyle->color2(),
       (KImageEffect::GradientType) m_pFillStyle->gradientType());
     pix.convertFromImage(image);
     b.setPixmap(pix);
@@ -586,16 +586,16 @@ void KivioScreenPainter::drawPolygon( QPointArray &pArray )
   m_pPainter->setPen(m_pLineStyle->pen(1.0f));
   m_pPainter->setBrush(b);
 
-  m_pPainter->drawPolygon( pArray, true );
+  m_pPainter->tqdrawPolygon( pArray, true );
   m_pPainter->setBrushOrigin(0, 0);
 }
 
-void KivioScreenPainter::drawLineArray( QPointArray &pArray )
+void KivioScreenPainter::drawLineArray( TQPointArray &pArray )
 {
     PAINTER_CHECK();
 
     m_pPainter->setPen(m_pLineStyle->pen(1.0f));
-    m_pPainter->setBrush(QBrush::NoBrush);
+    m_pPainter->setBrush(TQBrush::NoBrush);
 
     m_pPainter->drawLineSegments(pArray);
 }
@@ -609,15 +609,15 @@ void KivioScreenPainter::drawLineArray( QPointArray &pArray )
  * Draws a filled (if set) curve with the points stored
  * in pPoints.  They can be made up of bezier, arc, and normal points.
  */
-void KivioScreenPainter::drawClosedPath( QPtrList<KivioPoint> *pPoints )
+void KivioScreenPainter::drawClosedPath( TQPtrList<KivioPoint> *pPoints )
 {
     PAINTER_CHECK();
 
-    QBrush brush;
+    TQBrush brush;
 
     KivioPoint *pPoint, *pPoint2, *pPoint3, *pPoint4;
-    QPtrList <KivioPoint> *pPointList = pPoints;
-    QPointArray controlPoints(4), bPoints(0), tmpPoints;
+    TQPtrList <KivioPoint> *pPointList = pPoints;
+    TQPointArray controlPoints(4), bPoints(0), tmpPoints;
 
     int pointIndex=0;
     pPoint = pPointList->first();
@@ -648,10 +648,10 @@ void KivioScreenPainter::drawClosedPath( QPtrList<KivioPoint> *pPoints )
                 return;
             }
 
-            controlPoints.setPoint( 0, qRound(pPoint->x()), qRound(pPoint->y()) );
-            controlPoints.setPoint( 1, qRound(pPoint2->x()), qRound(pPoint2->y()) );
-            controlPoints.setPoint( 2, qRound(pPoint3->x()), qRound(pPoint3->y()) );
-            controlPoints.setPoint( 3, qRound(pPoint4->x()), qRound(pPoint4->y()) );
+            controlPoints.setPoint( 0, tqRound(pPoint->x()), tqRound(pPoint->y()) );
+            controlPoints.setPoint( 1, tqRound(pPoint2->x()), tqRound(pPoint2->y()) );
+            controlPoints.setPoint( 2, tqRound(pPoint3->x()), tqRound(pPoint3->y()) );
+            controlPoints.setPoint( 3, tqRound(pPoint4->x()), tqRound(pPoint4->y()) );
 
             tmpPoints = controlPoints.cubicBezier();
 
@@ -678,8 +678,8 @@ void KivioScreenPainter::drawClosedPath( QPtrList<KivioPoint> *pPoints )
                 return;
             }
 
-            tmpPoints.makeArc( qRound(pPoint->x()), qRound(pPoint->y()), qRound(pPoint2->x()), qRound(pPoint2->y()),
-                               qRound(pPoint3->x()), qRound(pPoint3->y()) );
+            tmpPoints.makeArc( tqRound(pPoint->x()), tqRound(pPoint->y()), tqRound(pPoint2->x()), tqRound(pPoint2->y()),
+                               tqRound(pPoint3->x()), tqRound(pPoint3->y()) );
 
             for( int j=0; j<int(tmpPoints.size()); j++ )
             {
@@ -716,15 +716,15 @@ void KivioScreenPainter::drawClosedPath( QPtrList<KivioPoint> *pPoints )
     }
 }
 
-void KivioScreenPainter::drawOpenPath( QPtrList<KivioPoint> *pPoints )
+void KivioScreenPainter::drawOpenPath( TQPtrList<KivioPoint> *pPoints )
 {
     PAINTER_CHECK();
 
-    QBrush brush;
+    TQBrush brush;
 
     KivioPoint *pPoint, *pPoint2, *pPoint3, *pPoint4;
-    QPtrList <KivioPoint> *pPointList = pPoints;
-    QPointArray controlPoints(4), bPoints(0), tmpPoints;
+    TQPtrList <KivioPoint> *pPointList = pPoints;
+    TQPointArray controlPoints(4), bPoints(0), tmpPoints;
 
     int pointIndex=0;
     pPoint = pPointList->first();
@@ -755,10 +755,10 @@ void KivioScreenPainter::drawOpenPath( QPtrList<KivioPoint> *pPoints )
                 return;
             }
 
-            controlPoints.setPoint( 0, qRound(pPoint->x()), qRound(pPoint->y()) );
-            controlPoints.setPoint( 1, qRound(pPoint2->x()), qRound(pPoint2->y()) );
-            controlPoints.setPoint( 2, qRound(pPoint3->x()), qRound(pPoint3->y()) );
-            controlPoints.setPoint( 3, qRound(pPoint4->x()), qRound(pPoint4->y()) );
+            controlPoints.setPoint( 0, tqRound(pPoint->x()), tqRound(pPoint->y()) );
+            controlPoints.setPoint( 1, tqRound(pPoint2->x()), tqRound(pPoint2->y()) );
+            controlPoints.setPoint( 2, tqRound(pPoint3->x()), tqRound(pPoint3->y()) );
+            controlPoints.setPoint( 3, tqRound(pPoint4->x()), tqRound(pPoint4->y()) );
 
             tmpPoints = controlPoints.cubicBezier();
 
@@ -785,8 +785,8 @@ void KivioScreenPainter::drawOpenPath( QPtrList<KivioPoint> *pPoints )
                 return;
             }
 
-            tmpPoints.makeArc( qRound(pPoint->x()), qRound(pPoint->y()), qRound(pPoint2->x()), qRound(pPoint2->y()),
-                               qRound(pPoint3->x()), qRound(pPoint3->y()) );
+            tmpPoints.makeArc( tqRound(pPoint->x()), tqRound(pPoint->y()), tqRound(pPoint2->x()), tqRound(pPoint2->y()),
+                               tqRound(pPoint3->x()), tqRound(pPoint3->y()) );
 
             for( int j=0; j<int(tmpPoints.size()); j++ )
             {
@@ -803,41 +803,41 @@ void KivioScreenPainter::drawOpenPath( QPtrList<KivioPoint> *pPoints )
     }
 
     m_pPainter->setPen(m_pLineStyle->pen(1.0f));
-    m_pPainter->setBrush( QBrush::NoBrush );
+    m_pPainter->setBrush( TQBrush::NoBrush );
 
     m_pPainter->drawPolyline( bPoints );
 }
 
-void KivioScreenPainter::setFont( const QFont &f )
+void KivioScreenPainter::setFont( const TQFont &f )
 {
     PAINTER_CHECK();
 
     m_pPainter->setFont( f );
 }
 
-void KivioScreenPainter::drawText( int x, int y, int w, int h, int tf, const QString &str )
+void KivioScreenPainter::drawText( int x, int y, int w, int h, int tf, const TQString &str )
 {
     PAINTER_CHECK();
 
     m_pPainter->setPen( m_textColor );
     m_pPainter->drawText( x, y, w, h, tf, str );
-/*    QSimpleRichText textArea(str, m_pPainter->font());
+/*    TQSimpleRichText textArea(str, m_pPainter->font());
     textArea.setWidth(w);
-    QColorGroup cg;
-    cg.setColor(QColorGroup::Base, m_pFillStyle->color());
-    cg.setColor(QColorGroup::Text, m_textColor);
-    QBrush b = m_pFillStyle->brush();
-    textArea.draw(m_pPainter, x, y, QRect(0, 0, 0, 0), cg, &b);*/
+    TQColorGroup cg;
+    cg.setColor(TQColorGroup::Base, m_pFillStyle->color());
+    cg.setColor(TQColorGroup::Text, m_textColor);
+    TQBrush b = m_pFillStyle->brush();
+    textArea.draw(m_pPainter, x, y, TQRect(0, 0, 0, 0), cg, &b);*/
 }
 
-QRect KivioScreenPainter::boundingRect( int x, int y, int w, int h, int tf, const QString &str )
+TQRect KivioScreenPainter::boundingRect( int x, int y, int w, int h, int tf, const TQString &str )
 {
    PAINTER_CHECK();
 
    return m_pPainter->boundingRect( x,y,w,h, tf, str );
 }
 
-void KivioScreenPainter::drawPixmap( float x, float y, const QPixmap &pix )
+void KivioScreenPainter::drawPixmap( float x, float y, const TQPixmap &pix )
 {
   PAINTER_CHECK();
   m_pPainter->drawPixmap( (int)x, (int)y, pix );
@@ -846,9 +846,9 @@ void KivioScreenPainter::drawPixmap( float x, float y, const QPixmap &pix )
 void KivioScreenPainter::drawHandle( float x, float y, int flags )
 {
   PAINTER_CHECK();
-  QColor fillColor, penColor;
-  QBrush b;
-  QPen p;
+  TQColor fillColor, penColor;
+  TQBrush b;
+  TQPen p;
 
   const float HW = 6.0f;
   const float HWP1 = HW+1.0f;
@@ -862,17 +862,17 @@ void KivioScreenPainter::drawHandle( float x, float y, int flags )
     x1 = x - 4;
     y1 = y - 4;
 
-    m_pPainter->drawPixmap( qRound(x1), qRound(y1), Kivio::lockPixmap() );
+    m_pPainter->drawPixmap( tqRound(x1), tqRound(y1), Kivio::lockPixmap() );
     return;
   }
 
   if( flags & cpfConnected )
   {
-    fillColor = QColor(200,0,0);
+    fillColor = TQColor(200,0,0);
   }
   else
   {
-    fillColor = QColor(0,200,0);
+    fillColor = TQColor(0,200,0);
   }
 
   penColor.setRgb(0, 0, 0);
@@ -891,27 +891,27 @@ void KivioScreenPainter::drawHandle( float x, float y, int flags )
 //   m_pPainter->fillRect( x1, y1, HWP1, HWP1, b );
 
   if(flags & cpfEnd) {
-    m_pPainter->drawEllipse( qRound(x1), qRound(y1), qRound(HWP1), qRound(HWP1) );
+    m_pPainter->drawEllipse( tqRound(x1), tqRound(y1), tqRound(HWP1), tqRound(HWP1) );
   } else {
-    m_pPainter->drawRect( qRound(x1), qRound(y1), qRound(HWP1), qRound(HWP1) );
+    m_pPainter->drawRect( tqRound(x1), tqRound(y1), tqRound(HWP1), tqRound(HWP1) );
   }
 
   // Now put something in it if needed
   if( flags & cpfConnectable )
   {
-    b.setColor(QColor(0,0,0));
+    b.setColor(TQColor(0,0,0));
 
-    m_pPainter->fillRect(qRound(x-1),qRound(y-1),3,3, b);
+    m_pPainter->fillRect(tqRound(x-1),tqRound(y-1),3,3, b);
   }
 }
 
-void KivioScreenPainter::drawSelectionBox( const QRect& r )
+void KivioScreenPainter::drawSelectionBox( const TQRect& r )
 {
    PAINTER_CHECK();
-   QPen p;
-   p.setColor(QColor(0,200,0));
+   TQPen p;
+   p.setColor(TQColor(0,200,0));
    p.setStyle(Qt::DashLine);
-   m_pPainter->setBrush(Qt::NoBrush);
+   m_pPainter->setBrush(TQt::NoBrush);
    m_pPainter->setPen(p);
    m_pPainter->drawRect(r);
 }
@@ -973,7 +973,7 @@ int KivioScreenPainter::rotation()
   return m_rotation;
 }
 
-void KivioScreenPainter::setWorldMatrix(QWMatrix m, bool c)
+void KivioScreenPainter::setWorldMatrix(TQWMatrix m, bool c)
 {
   PAINTER_CHECK();
   m_pPainter->setWorldMatrix(m, c);
diff --git a/kivio/kiviopart/kiviosdk/kivio_screen_painter.h b/kivio/kiviopart/kiviosdk/kivio_screen_painter.h
index 8d76061d..3e569eba 100644
--- a/kivio/kiviopart/kiviosdk/kivio_screen_painter.h
+++ b/kivio/kiviopart/kiviosdk/kivio_screen_painter.h
@@ -21,9 +21,9 @@
 
 #include "kivio_painter.h"
 
-#include <qfont.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include <tqfont.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
 
 class KivioPoint;
 
@@ -31,20 +31,20 @@ class KivioPoint;
 class KivioScreenPainter : public KivioPainter
 {
 protected:
-    QPainter *m_pPainter;
+    TQPainter *m_pPainter;
     float m_transX, m_transY;
     int m_rotation;
 
 public:
     KivioScreenPainter();
-    KivioScreenPainter(QPainter* painter);
+    KivioScreenPainter(TQPainter* painter);
     virtual ~KivioScreenPainter();
 
-    virtual bool start( QPaintDevice * );
+    virtual bool start( TQPaintDevice * );
     virtual bool stop();
 
-    QPainter *painter() { return m_pPainter; }
-    void setPainter(QPainter* p) { m_pPainter = p; }
+    TQPainter *painter() { return m_pPainter; }
+    void setPainter(TQPainter* p) { m_pPainter = p; }
 
     /*\
     |*|
@@ -55,7 +55,7 @@ public:
     void drawLine( float, float, float, float );
     void drawArc( float, float, float, float, float, float );
 
-    void drawBezier( QPointArray & );
+    void drawBezier( TQPointArray & );
 
     void drawRect( float, float, float, float );
     void fillRect( float, float, float, float );
@@ -72,28 +72,28 @@ public:
     void drawEllipse( float, float, float, float );
     void fillEllipse( float, float, float, float );
 
-    void drawLineArray( QPtrList<KivioPoint> * );
+    void drawLineArray( TQPtrList<KivioPoint> * );
 
 
-    void drawPolyline( QPtrList<KivioPoint> * );
-    void drawPolygon( QPtrList<KivioPoint> * );
+    void drawPolyline( TQPtrList<KivioPoint> * );
+    void drawPolygon( TQPtrList<KivioPoint> * );
 
-    void drawPolyline( QPointArray & );
-    void drawPolygon( QPointArray & );
-    void drawLineArray( QPointArray & );
+    void drawPolyline( TQPointArray & );
+    void drawPolygon( TQPointArray & );
+    void drawLineArray( TQPointArray & );
 
-    void drawClosedPath( QPtrList<KivioPoint> * );
-    void drawOpenPath( QPtrList<KivioPoint> * );
+    void drawClosedPath( TQPtrList<KivioPoint> * );
+    void drawOpenPath( TQPtrList<KivioPoint> * );
 
-    void setFont( const QFont & );
+    void setFont( const TQFont & );
     void drawText( int x, int y, int w, int h, int tf,
-                const QString &str );
-    virtual QRect boundingRect( int, int, int, int, int, const QString & );
+                const TQString &str );
+    virtual TQRect boundingRect( int, int, int, int, int, const TQString & );
 
-    void drawPixmap( float, float, const QPixmap & );
+    void drawPixmap( float, float, const TQPixmap & );
 
     void drawHandle( float, float, int );
-    virtual void drawSelectionBox( const QRect& );
+    virtual void drawSelectionBox( const TQRect& );
 
     virtual void saveState();
     virtual void restoreState();
@@ -103,7 +103,7 @@ public:
     virtual void rotateBy(int);
     virtual int rotation();
 
-    virtual void setWorldMatrix(QWMatrix, bool);
+    virtual void setWorldMatrix(TQWMatrix, bool);
 };
 
 #endif
diff --git a/kivio/kiviopart/kiviosdk/kivio_shape.cpp b/kivio/kiviopart/kiviosdk/kivio_shape.cpp
index da023415..dad8459a 100644
--- a/kivio/kiviopart/kiviosdk/kivio_shape.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_shape.cpp
@@ -44,7 +44,7 @@ KivioShape::KivioShape()
  */
 KivioShape::KivioShape( const KivioShape &source )
 {
-    source.m_shapeData.copyInto( &m_shapeData );
+    source.m_tqshapeData.copyInto( &m_tqshapeData );
 }
 
 
@@ -68,7 +68,7 @@ void KivioShape::copyInto( KivioShape *pTarget ) const
     if( !pTarget )
         return;
 
-    m_shapeData.copyInto( &(pTarget->m_shapeData) );
+    m_tqshapeData.copyInto( &(pTarget->m_tqshapeData) );
 }
 
 
@@ -78,30 +78,30 @@ void KivioShape::copyInto( KivioShape *pTarget ) const
  * @param e The element to load from
  * @returns true on success, false on failure.
  */
-bool KivioShape::loadXML( const QDomElement &e )
+bool KivioShape::loadXML( const TQDomElement &e )
 {
-    QDomElement ele;
-    QDomNode node = e.firstChild();
+    TQDomElement ele;
+    TQDomNode node = e.firstChild();
 
-    QString name = XmlReadString( e, "name", "" );
-    m_shapeData.setName( name );
-    m_shapeData.setShapeType( (KivioShapeData::KivioShapeType)XmlReadInt( e, "shapeType", -1 ));
+    TQString name = XmlReadString( e, "name", "" );
+    m_tqshapeData.setName( name );
+    m_tqshapeData.setShapeType( (KivioShapeData::KivioShapeType)XmlReadInt( e, "tqshapeType", -1 ));
 
-    if( m_shapeData.name().isEmpty() ||
-        m_shapeData.shapeType() == -1 )
+    if( m_tqshapeData.name().isEmpty() ||
+        m_tqshapeData.tqshapeType() == -1 )
     {
-       kdWarning(43000) << "-LOAD KivioShape::loadXML() - Unknown shape or bad name read. Shape load aborted." << endl;
+       kdWarning(43000) << "-LOAD KivioShape::loadXML() - Unknown tqshape or bad name read. Shape load aborted." << endl;
        return false;
     }
 
     while( !node.isNull() )
     {
-        QString nodeName = node.nodeName();
+        TQString nodeName = node.nodeName();
         ele = node.toElement();
 
         if( nodeName == "KivioShapeData" )
         {
-            m_shapeData.loadXML( ele );
+            m_tqshapeData.loadXML( ele );
         }
 
         node = node.nextSibling();
@@ -114,55 +114,55 @@ bool KivioShape::loadXML( const QDomElement &e )
  * Save this object to an XML element
  *
  * @param doc The document to save to
- * @returns QDomElement representing this object.
+ * @returns TQDomElement representing this object.
  */
-QDomElement KivioShape::saveXML( QDomDocument &doc )
+TQDomElement KivioShape::saveXML( TQDomDocument &doc )
 {
-    QDomElement e = doc.createElement("KivioShape");
+    TQDomElement e = doc.createElement("KivioShape");
 
-    XmlWriteString( e, "name", m_shapeData.m_name );
-    XmlWriteInt( e, "shapeType", m_shapeData.m_shapeType );
+    XmlWriteString( e, "name", m_tqshapeData.m_name );
+    XmlWriteInt( e, "tqshapeType", m_tqshapeData.m_tqshapeType );
 
-    e.appendChild( m_shapeData.saveXML( doc ) );
+    e.appendChild( m_tqshapeData.saveXML( doc ) );
 
     return e;
 }
 
 
 /**
- * Loads a shape of type arc
+ * Loads a tqshape of type arc
  *
  * @param e The element to load from
  * @returns A newly allocated KivioShape, or NULL on error.
  *
  * FIXME: implement this
  */
-KivioShape *KivioShape::loadShapeArc( const QDomElement & )
+KivioShape *KivioShape::loadShapeArc( const TQDomElement & )
 {
     return NULL;
 }
 
 
 /**
- * Loads a shape of type closed-path.
+ * Loads a tqshape of type closed-path.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
  */
-KivioShape *KivioShape::loadShapeClosedPath( const QDomElement &e )
+KivioShape *KivioShape::loadShapeClosedPath( const TQDomElement &e )
 {
     KivioShape *pShape = NULL;
     KivioPoint *pPoint = NULL;
-    QDomNode node;
-    QString nodeName;
+    TQDomNode node;
+    TQString nodeName;
     
 
-    // Create the new shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstClosedPath;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstClosedPath;
+    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
 
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -176,16 +176,16 @@ KivioShape *KivioShape::loadShapeClosedPath( const QDomElement &e )
             // Allocate a new point, load it, and store it in the list
             pPoint = new KivioPoint(0.0f, 0.0f, KivioPoint::kptBezier);
             pPoint->loadXML( node.toElement() );
-            pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioFillStyle" )
         {
-            pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() );
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
     
         node = node.nextSibling();
@@ -196,25 +196,25 @@ KivioShape *KivioShape::loadShapeClosedPath( const QDomElement &e )
 
 
 /**
- * Loads a shape of type bezier
+ * Loads a tqshape of type bezier
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
  */
-KivioShape *KivioShape::loadShapeBezier( const QDomElement &e )
+KivioShape *KivioShape::loadShapeBezier( const TQDomElement &e )
 {
     KivioShape *pShape = NULL;
     KivioPoint *pPoint = NULL;
-    QDomNode node;
-    QString nodeName;
+    TQDomNode node;
+    TQString nodeName;
     
 
-    // Create the new shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstBezier;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstBezier;
+    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
 
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -230,25 +230,25 @@ KivioShape *KivioShape::loadShapeBezier( const QDomElement &e )
             pPoint->loadXML( node.toElement() );
             if( pPoint->pointType() != KivioPoint::kptBezier )
             {
-	       kdDebug(43000) << "KivioShape::loadShapeBezier() - Non-bezier point found.  Aborting shape." << endl;
+	       kdDebug(43000) << "KivioShape::loadShapeBezier() - Non-bezier point found.  Aborting tqshape." << endl;
                 delete pPoint;
                 delete pShape;
                 return NULL;
             }
-            pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
     }
     
-    if( pShape->m_shapeData.m_pOriginalPointList->count() != 4 )
+    if( pShape->m_tqshapeData.m_pOriginalPointList->count() != 4 )
     {
-       kdDebug(43000) << "KivioShape::loadShapeBezier() - Wrong number of points loaded, should be 4, shape aborted" << endl;
+       kdDebug(43000) << "KivioShape::loadShapeBezier() - Wrong number of points loaded, should be 4, tqshape aborted" << endl;
         delete pShape;
         return NULL;
     }
@@ -258,27 +258,27 @@ KivioShape *KivioShape::loadShapeBezier( const QDomElement &e )
 
 
 /**
- * Loads a shape of type ellipse.
+ * Loads a tqshape of type ellipse.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
  */
-KivioShape *KivioShape::loadShapeEllipse( const QDomElement &e )
+KivioShape *KivioShape::loadShapeEllipse( const TQDomElement &e )
 {
     KivioShape *pShape = NULL;
-    QDomNode node;
-    QString nodeName;
+    TQDomNode node;
+    TQString nodeName;
     
 
-    // Create the new shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstEllipse;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstEllipse;
+    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
 
-    pShape->m_shapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) );
-    pShape->m_shapeData.m_dimensions.set( XmlReadFloat( e, "w", 0.0f ), XmlReadFloat( e, "h", 0.0f ) );
+    pShape->m_tqshapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) );
+    pShape->m_tqshapeData.m_dimensions.set( XmlReadFloat( e, "w", 0.0f ), XmlReadFloat( e, "h", 0.0f ) );
         
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -288,11 +288,11 @@ KivioShape *KivioShape::loadShapeEllipse( const QDomElement &e )
         
         if( nodeName == "KivioFillStyle" )
         {
-            pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() );
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -303,26 +303,26 @@ KivioShape *KivioShape::loadShapeEllipse( const QDomElement &e )
 
 
 /**
- * Loads a shape of type line-array.
+ * Loads a tqshape of type line-array.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
  */
-KivioShape *KivioShape::loadShapeLineArray( const QDomElement &e )
+KivioShape *KivioShape::loadShapeLineArray( const TQDomElement &e )
 {
     KivioShape *pShape = NULL;
     KivioPoint *pPoint = NULL;
-    QDomNode node;
-    QString nodeName;
-    QDomElement lineElement;
+    TQDomNode node;
+    TQString nodeName;
+    TQDomElement lineElement;
     
 
-    // Create the new shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstLineArray;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstLineArray;
+    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
 
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -337,14 +337,14 @@ KivioShape *KivioShape::loadShapeLineArray( const QDomElement &e )
 
             // Allocate a new point, load it, and store it in the list
             pPoint = new KivioPoint( XmlReadFloat( lineElement, "x1", 0.0f ), XmlReadFloat( lineElement, "y1", 0.0f ) );
-            pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
             pPoint = new KivioPoint( XmlReadFloat( lineElement, "x2", 0.0f ), XmlReadFloat( lineElement, "y2", 0.0f ) );
-            pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -355,25 +355,25 @@ KivioShape *KivioShape::loadShapeLineArray( const QDomElement &e )
 
 
 /**
- * Loads a shape of type open-path.
+ * Loads a tqshape of type open-path.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
  */
-KivioShape *KivioShape::loadShapeOpenPath( const QDomElement &e )
+KivioShape *KivioShape::loadShapeOpenPath( const TQDomElement &e )
 {
     KivioShape *pShape = NULL;
     KivioPoint *pPoint = NULL;
-    QDomNode node;
-    QString nodeName;
+    TQDomNode node;
+    TQString nodeName;
     
 
-    // Create the new shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstOpenPath;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstOpenPath;
+    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
 
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -387,12 +387,12 @@ KivioShape *KivioShape::loadShapeOpenPath( const QDomElement &e )
             // Allocate a new point, load it, and store it in the list
             pPoint = new KivioPoint(0.0f, 0.0f, KivioPoint::kptBezier);
             pPoint->loadXML( node.toElement() );
-            pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -403,39 +403,39 @@ KivioShape *KivioShape::loadShapeOpenPath( const QDomElement &e )
 
 
 /**
- * Loads a shape of type pie.
+ * Loads a tqshape of type pie.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
  *
  * FIXME: Implement this
  */
-KivioShape *KivioShape::loadShapePie( const QDomElement & )
+KivioShape *KivioShape::loadShapePie( const TQDomElement & )
 {
     return NULL;
 }
 
 
 /**
- * Loads a shape of type polygon.
+ * Loads a tqshape of type polygon.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
  */
-KivioShape *KivioShape::loadShapePolygon( const QDomElement &e )
+KivioShape *KivioShape::loadShapePolygon( const TQDomElement &e )
 {
     KivioShape *pShape = NULL;
     KivioPoint *pPoint = NULL;
-    QDomNode node;
-    QString nodeName;
+    TQDomNode node;
+    TQString nodeName;
     
 
-    // Create the new shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstPolygon;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstPolygon;
+    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
 
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -449,16 +449,16 @@ KivioShape *KivioShape::loadShapePolygon( const QDomElement &e )
             // Allocate a new point, load it, and store it in the list
             pPoint = new KivioPoint();
             pPoint->loadXML( node.toElement() );
-            pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioFillStyle" )
         {
-            pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() );
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -469,25 +469,25 @@ KivioShape *KivioShape::loadShapePolygon( const QDomElement &e )
 
 
 /**
- * Loads a shape of type polyline.
+ * Loads a tqshape of type polyline.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
  */
-KivioShape *KivioShape::loadShapePolyline( const QDomElement &e )
+KivioShape *KivioShape::loadShapePolyline( const TQDomElement &e )
 {
     KivioShape *pShape = NULL;
     KivioPoint *pPoint = NULL;
-    QDomNode node;
-    QString nodeName;
+    TQDomNode node;
+    TQString nodeName;
     
 
-    // Create the new shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstPolyline;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstPolyline;
+    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
 
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -501,12 +501,12 @@ KivioShape *KivioShape::loadShapePolyline( const QDomElement &e )
             // Allocate a new point, load it, and store it in the list
             pPoint = new KivioPoint();
             pPoint->loadXML( node.toElement() );
-            pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -517,27 +517,27 @@ KivioShape *KivioShape::loadShapePolyline( const QDomElement &e )
 
 
 /**
- * Loads a shape of type rectangle.
+ * Loads a tqshape of type rectangle.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
  */
-KivioShape *KivioShape::loadShapeRectangle( const QDomElement &e )
+KivioShape *KivioShape::loadShapeRectangle( const TQDomElement &e )
 {
     KivioShape *pShape = NULL;
-    QDomNode node;
-    QString nodeName;
+    TQDomNode node;
+    TQString nodeName;
     
 
-    // Create the new shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstRectangle;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstRectangle;
+    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
 
-    pShape->m_shapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) );
-    pShape->m_shapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) );
+    pShape->m_tqshapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) );
+    pShape->m_tqshapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) );
     
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -548,11 +548,11 @@ KivioShape *KivioShape::loadShapeRectangle( const QDomElement &e )
         // Read the fill style
         if( nodeName == "KivioFillStyle" )
         {
-            pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() );
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -564,33 +564,33 @@ KivioShape *KivioShape::loadShapeRectangle( const QDomElement &e )
 
 
 /**
- * Loads a shape of type round rectangle.
+ * Loads a tqshape of type round rectangle.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
  */
-KivioShape *KivioShape::loadShapeRoundRectangle( const QDomElement &e )
+KivioShape *KivioShape::loadShapeRoundRectangle( const TQDomElement &e )
 {
     KivioShape *pShape = NULL;
     KivioPoint *pPoint = NULL;
-    QDomNode node;
-    QString nodeName;
+    TQDomNode node;
+    TQString nodeName;
     
 
-    // Create the new shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstRoundRectangle;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstRoundRectangle;
+    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
 
-    pShape->m_shapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) );
-    pShape->m_shapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) );
+    pShape->m_tqshapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) );
+    pShape->m_tqshapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) );
     
     // Read and store the radii of the curves
     pPoint = new KivioPoint(0.0f, 0.0f);
     pPoint->set( XmlReadFloat( e, "r1", 1.0f ), XmlReadFloat( e, "r2", 1.0f ) );
-    pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
+    pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
     
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -601,11 +601,11 @@ KivioShape *KivioShape::loadShapeRoundRectangle( const QDomElement &e )
         // Read the fill style
         if( nodeName == "KivioFillStyle" )
         {
-            pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() );
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -616,31 +616,31 @@ KivioShape *KivioShape::loadShapeRoundRectangle( const QDomElement &e )
 
 
 /**
- * Loads a shape of type textbox.
+ * Loads a tqshape of type textbox.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
  */
-KivioShape *KivioShape::loadShapeTextBox( const QDomElement &e )
+KivioShape *KivioShape::loadShapeTextBox( const TQDomElement &e )
 {
     KivioShape *pShape = NULL;
-    QDomNode node;
-    QString nodeName;
+    TQDomNode node;
+    TQString nodeName;
     KivioTextStyle ts;
-    QString name;
+    TQString name;
 
 
-    // Create the new shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
 
     // Load the type and name
-    pShape->m_shapeData.setShapeType(KivioShapeData::kstTextBox);
-    pShape->m_shapeData.setName( XmlReadString( e, "name", "" ) );
-    pShape->m_shapeData.setTextColor(XmlReadColor(e,"color",QColor(0,0,0)));
+    pShape->m_tqshapeData.setShapeType(KivioShapeData::kstTextBox);
+    pShape->m_tqshapeData.setName( XmlReadString( e, "name", "" ) );
+    pShape->m_tqshapeData.setTextColor(XmlReadColor(e,"color",TQColor(0,0,0)));
 
-    pShape->m_shapeData.m_position.set( 
+    pShape->m_tqshapeData.m_position.set( 
        XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) );
-    pShape->m_shapeData.m_dimensions.set( 
+    pShape->m_tqshapeData.m_dimensions.set( 
        XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) );
 
     // Now look for the KivioTextStyle
@@ -651,13 +651,13 @@ KivioShape *KivioShape::loadShapeTextBox( const QDomElement &e )
        if( nodeName == "KivioTextStyle" )
        {
 	  ts.loadXML( node.toElement() );
-	  pShape->m_shapeData.setTextStyle( &ts );
+	  pShape->m_tqshapeData.setTextStyle( &ts );
        }
 
        node = node.nextSibling();
     }
-//    QString text = XmlReadString( e, "text", "" );
-//    pShape->m_shapeData.setText( text );
+//    TQString text = XmlReadString( e, "text", "" );
+//    pShape->m_tqshapeData.setText( text );
 
 
     return pShape;
diff --git a/kivio/kiviopart/kiviosdk/kivio_shape.h b/kivio/kiviopart/kiviosdk/kivio_shape.h
index 6ade18e8..c83607d7 100644
--- a/kivio/kiviopart/kiviosdk/kivio_shape.h
+++ b/kivio/kiviopart/kiviosdk/kivio_shape.h
@@ -20,13 +20,13 @@
 #define KIVIO_SHAPE_H
 
 #include "kivio_shape_data.h"
-#include <qdom.h>
+#include <tqdom.h>
 
 
 class KivioShape
 {
 protected:
-    KivioShapeData m_shapeData; // The data inside this shape
+    KivioShapeData m_tqshapeData; // The data inside this tqshape
 
 public:
     KivioShape();
@@ -36,25 +36,25 @@ public:
 
     void copyInto( KivioShape * ) const;
 
-    bool loadXML( const QDomElement & );
-    QDomElement saveXML( QDomDocument & );
-
-    KivioShapeData::KivioShapeType shapeType() { return m_shapeData.shapeType(); }
-
-    KivioShapeData *shapeData() { return &m_shapeData; }
-
-    static KivioShape *loadShapeArc( const QDomElement & );
-    static KivioShape *loadShapeClosedPath( const QDomElement & );
-    static KivioShape *loadShapeBezier( const QDomElement & );
-    static KivioShape *loadShapeEllipse( const QDomElement & );
-    static KivioShape *loadShapeLineArray( const QDomElement & );
-    static KivioShape *loadShapeOpenPath( const QDomElement & );
-    static KivioShape *loadShapePie( const QDomElement & );
-    static KivioShape *loadShapePolygon( const QDomElement & );
-    static KivioShape *loadShapePolyline( const QDomElement & );
-    static KivioShape *loadShapeRectangle( const QDomElement & );
-    static KivioShape *loadShapeRoundRectangle( const QDomElement & );
-    static KivioShape *loadShapeTextBox( const QDomElement & );
+    bool loadXML( const TQDomElement & );
+    TQDomElement saveXML( TQDomDocument & );
+
+    KivioShapeData::KivioShapeType tqshapeType() { return m_tqshapeData.tqshapeType(); }
+
+    KivioShapeData *tqshapeData() { return &m_tqshapeData; }
+
+    static KivioShape *loadShapeArc( const TQDomElement & );
+    static KivioShape *loadShapeClosedPath( const TQDomElement & );
+    static KivioShape *loadShapeBezier( const TQDomElement & );
+    static KivioShape *loadShapeEllipse( const TQDomElement & );
+    static KivioShape *loadShapeLineArray( const TQDomElement & );
+    static KivioShape *loadShapeOpenPath( const TQDomElement & );
+    static KivioShape *loadShapePie( const TQDomElement & );
+    static KivioShape *loadShapePolygon( const TQDomElement & );
+    static KivioShape *loadShapePolyline( const TQDomElement & );
+    static KivioShape *loadShapeRectangle( const TQDomElement & );
+    static KivioShape *loadShapeRoundRectangle( const TQDomElement & );
+    static KivioShape *loadShapeTextBox( const TQDomElement & );
 };
 
 #endif
diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_data.cpp b/kivio/kiviopart/kiviosdk/kivio_shape_data.cpp
index ed974871..5305fe13 100644
--- a/kivio/kiviopart/kiviosdk/kivio_shape_data.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_shape_data.cpp
@@ -23,11 +23,11 @@
 #include "kivio_shape_data.h"
 #include "kivio_text_style.h"
 
-#include <qpainter.h>
+#include <tqpainter.h>
 #include <kdebug.h>
 
 /*
- * Struct for holding information about a shape type
+ * Struct for holding information about a tqshape type
  */
 struct KivioShapeTypeInfo
 {
@@ -36,10 +36,10 @@ struct KivioShapeTypeInfo
 };
 
 /*
- * Array of shape info used for loading/saving.
+ * Array of tqshape info used for loading/saving.
  */
 static const int numShapeInfo = 12;
-static struct KivioShapeTypeInfo shapeInfo[] = {
+static struct KivioShapeTypeInfo tqshapeInfo[] = {
     { "Arc",        KivioShapeData::kstArc                  },
     { "Pie",        KivioShapeData::kstPie                  },
     { "LineArray",  KivioShapeData::kstLineArray            },
@@ -65,11 +65,11 @@ static struct KivioShapeTypeInfo shapeInfo[] = {
 KivioTextShapeData::KivioTextShapeData()
 {
     m_text = "";
-    m_textFont = QFont("Times");
-    m_textColor = QColor(0,0,0);
+    m_textFont = TQFont("Times");
+    m_textColor = TQColor(0,0,0);
     m_isHtml = false;
-    m_hTextAlign = Qt::AlignHCenter;
-    m_vTextAlign = Qt::AlignVCenter;
+    m_hTextAlign = TQt::AlignHCenter;
+    m_vTextAlign = TQt::AlignVCenter;
 }
 
 
@@ -77,14 +77,14 @@ KivioShapeData::KivioShapeData()
     : m_pOriginalPointList(NULL),
       m_pFillStyle(NULL)
 {
-    m_pOriginalPointList = new QPtrList<KivioPoint>;
+    m_pOriginalPointList = new TQPtrList<KivioPoint>;
     m_pOriginalPointList->setAutoDelete(true);
 
     m_pFillStyle = new KivioFillStyle();
     m_pLineStyle = new KivioLineStyle();
-//    m_fgColor = QColor( 0, 0, 0 );
+//    m_fgColor = TQColor( 0, 0, 0 );
 
-    m_shapeType = kstNone;
+    m_tqshapeType = kstNone;
     m_name = "";
 //    m_lineWidth = 1.0f;
 
@@ -100,7 +100,7 @@ KivioShapeData::KivioShapeData( const KivioShapeData &source )
 {
     // Allocate a new point list
     KivioPoint *pPoint;
-    m_pOriginalPointList = new QPtrList<KivioPoint>;
+    m_pOriginalPointList = new TQPtrList<KivioPoint>;
     m_pOriginalPointList->setAutoDelete(true);
 
     // Copy over the point list
@@ -119,16 +119,16 @@ KivioShapeData::KivioShapeData( const KivioShapeData &source )
     //m_fgColor = source.m_fgColor;
 
     // Copy the rest
-    m_shapeType = source.m_shapeType;
-    m_name      = QString(source.m_name);
+    m_tqshapeType = source.m_tqshapeType;
+    m_name      = TQString(source.m_name);
     //m_lineWidth = source.m_lineWidth;
 
     // Copy the position and size
     source.m_position.copyInto( &m_position );
     source.m_dimensions.copyInto( &m_dimensions );
 
-    // If this is a text shape, allocate a text data struct and copy the info
-    if( m_shapeType == kstTextBox )
+    // If this is a text tqshape, allocate a text data struct and copy the info
+    if( m_tqshapeType == kstTextBox )
     {
         m_pTextData = new KivioTextStyle();
 
@@ -191,7 +191,7 @@ void KivioShapeData::copyInto( KivioShapeData *pTarget ) const
     }
 
     // Create a new point list and copy it over
-    pTarget->m_pOriginalPointList = new QPtrList<KivioPoint>;
+    pTarget->m_pOriginalPointList = new TQPtrList<KivioPoint>;
     pTarget->m_pOriginalPointList->setAutoDelete(true);
     pPoint = m_pOriginalPointList->first();
     while( pPoint )
@@ -208,8 +208,8 @@ void KivioShapeData::copyInto( KivioShapeData *pTarget ) const
     //pTarget->m_fgColor = m_fgColor;
 
     // Copy the rest
-    pTarget->m_shapeType = m_shapeType;
-    pTarget->m_name = QString(m_name);
+    pTarget->m_tqshapeType = m_tqshapeType;
+    pTarget->m_name = TQString(m_name);
     //pTarget->m_lineWidth = m_lineWidth;
 
     m_position.copyInto( &(pTarget->m_position) );
@@ -217,7 +217,7 @@ void KivioShapeData::copyInto( KivioShapeData *pTarget ) const
 
 
     // If this is a textbox, allocate & copy
-    if( m_shapeType == kstTextBox )
+    if( m_tqshapeType == kstTextBox )
     {
         if( !pTarget->m_pTextData )
         {
@@ -233,10 +233,10 @@ void KivioShapeData::copyInto( KivioShapeData *pTarget ) const
 	   kdWarning(43000) << "KivioShapeData::copyInto() - Shape is of type text-box, but our text data doens't exist." << endl;
             pTarget->m_pTextData->setText("");
             pTarget->m_pTextData->setIsHtml(false);
-            pTarget->m_pTextData->setHTextAlign(Qt::AlignHCenter);
-            pTarget->m_pTextData->setVTextAlign(Qt::AlignVCenter);
-            pTarget->m_pTextData->setFont( QFont("Times",12) );
-            pTarget->m_pTextData->setColor( QColor(0,0,0) );
+            pTarget->m_pTextData->setHTextAlign(TQt::AlignHCenter);
+            pTarget->m_pTextData->setVTextAlign(TQt::AlignVCenter);
+            pTarget->m_pTextData->setFont( TQFont("Times",12) );
+            pTarget->m_pTextData->setColor( TQColor(0,0,0) );
         }
     }
     else
@@ -254,21 +254,21 @@ void KivioShapeData::copyInto( KivioShapeData *pTarget ) const
  * Load this object from an XML element
  *
  */
-bool KivioShapeData::loadXML( const QDomElement &e )
+bool KivioShapeData::loadXML( const TQDomElement &e )
 {
-    QDomNode node;
-    QDomElement ele;
+    TQDomNode node;
+    TQDomElement ele;
 
     // Maintain backwards compatibility with the eariler betas. They saved
     // fg color and line style in this node.
-    m_pLineStyle->setColor( XmlReadColor( e, "fgColor", QColor(0,0,0) ) );
+    m_pLineStyle->setColor( XmlReadColor( e, "fgColor", TQColor(0,0,0) ) );
     m_pLineStyle->setWidth( XmlReadFloat( e, "lineWidth", 1.0f ) );
 
 
     node = e.firstChild();
     while( !node.isNull() )
     {
-        QString nodeName = node.nodeName();
+        TQString nodeName = node.nodeName();
         ele = node.toElement();
 
         if( nodeName == "KivioLineStyle" )
@@ -283,7 +283,7 @@ bool KivioShapeData::loadXML( const QDomElement &e )
         {
 
             // First make sure we are a text box
-            if( m_shapeType == kstTextBox )
+            if( m_tqshapeType == kstTextBox )
             {
                 // If we don't have text data, allocate it
                 if( !m_pTextData )
@@ -291,27 +291,27 @@ bool KivioShapeData::loadXML( const QDomElement &e )
 
                 m_pTextData->loadXML( ele );
 
-            } // end if m_shapeType==kstTextBox
+            } // end if m_tqshapeType==kstTextBox
         }
         else if( nodeName == "KivioText" )
         {
             // First make sure we are a text box
-            if( m_shapeType == kstTextBox )
+            if( m_tqshapeType == kstTextBox )
             {
                 KivioTextShapeData *pData = new KivioTextShapeData;
 
                 pData->m_text = XmlReadString( ele, "text", "" );
                 pData->m_isHtml = (bool)XmlReadInt( ele, "isHtml", (int)false );
 
-                pData->m_hTextAlign = XmlReadInt( ele, "hTextAlign", Qt::AlignHCenter );
-                pData->m_vTextAlign = XmlReadInt( ele, "vTextAlign", Qt::AlignVCenter );
+                pData->m_hTextAlign = XmlReadInt( ele, "hTextAlign", TQt::AlignHCenter );
+                pData->m_vTextAlign = XmlReadInt( ele, "vTextAlign", TQt::AlignVCenter );
 
                 // Search for the font
-                QDomNode innerNode = ele.firstChild();
+                TQDomNode innerNode = ele.firstChild();
                 while( !innerNode.isNull() )
                 {
-                    QString innerName = innerNode.nodeName();
-                    QDomElement innerE = innerNode.toElement();
+                    TQString innerName = innerNode.nodeName();
+                    TQDomElement innerE = innerNode.toElement();
 
                     if( innerName == "TextFont" )
                     {
@@ -322,7 +322,7 @@ bool KivioShapeData::loadXML( const QDomElement &e )
                         pData->m_textFont.setUnderline( (bool)XmlReadInt( innerE, "underline", 12 ) );
                         pData->m_textFont.setStrikeOut( (bool)XmlReadInt( innerE, "strikeOut", 12 ) );
                         pData->m_textFont.setFixedPitch( (bool)XmlReadInt( innerE, "fixedPitch", false ) );
-                        pData->m_textColor = XmlReadColor( innerE, "color", QColor(0,0,0) );
+                        pData->m_textColor = XmlReadColor( innerE, "color", TQColor(0,0,0) );
                     }
 
                     innerNode = innerNode.nextSibling();
@@ -338,7 +338,7 @@ bool KivioShapeData::loadXML( const QDomElement &e )
                 m_pTextData->setFont( pData->m_textFont );
                 m_pTextData->setColor( pData->m_textColor );
 
-            } // end if m_shapeType==kstTextBox
+            } // end if m_tqshapeType==kstTextBox
             else
             {
 	       kdDebug(43000) << "KivioShapeData::loadXML() - Loading KivioText, but this is not a textbox!" << endl;
@@ -355,51 +355,51 @@ bool KivioShapeData::loadXML( const QDomElement &e )
  * Save this object to an XML element
  *
  */
-QDomElement KivioShapeData::saveXML( QDomDocument &doc )
+TQDomElement KivioShapeData::saveXML( TQDomDocument &doc )
 {
-    QDomElement e = doc.createElement("KivioShapeData");
+    TQDomElement e = doc.createElement("KivioShapeData");
 
     // FIXME: Do we need to save m_pOriginalPointList
 
     // We save all this, but we won't necessarily load it back.
 
     // The positions
-    QDomElement posE = doc.createElement("Position");
+    TQDomElement posE = doc.createElement("Position");
     XmlWriteFloat( posE, "x", m_position.x() );
     XmlWriteFloat( posE, "y", m_position.y() );
     e.appendChild( posE );
 
     // The dimensions
-    QDomElement dimE = doc.createElement("Dimension");
+    TQDomElement dimE = doc.createElement("Dimension");
     XmlWriteFloat( dimE, "w", m_dimensions.x() );
     XmlWriteFloat( dimE, "h", m_dimensions.y() );
     e.appendChild( dimE );
 
     // The FGColor
-//    QDomElement foreE = doc.createElement("Foreground");
+//    TQDomElement foreE = doc.createElement("Foreground");
 //    XmlWriteUInt( foreE, "color", m_fgColor.rgb() );
 //    XmlWriteFloat( foreE, "lineWidth", m_lineWidth );
 //    e.appendChild( foreE );
-    QDomElement foreE = m_pLineStyle->saveXML( doc );
+    TQDomElement foreE = m_pLineStyle->saveXML( doc );
     e.appendChild( foreE );
 
 
     // Save if we are a text box etc...
-    if( m_shapeType == kstTextBox )
+    if( m_tqshapeType == kstTextBox )
     {
         if( m_pTextData )
         {
             e.appendChild( m_pTextData->saveXML(doc) );
         /*
             // The text & formatting
-            QDomElement textE = doc.createElement("KivioText");
+            TQDomElement textE = doc.createElement("KivioText");
             XmlWriteString( textE, "text", m_pTextData->m_text );
             XmlWriteInt( textE, "isHtml", m_pTextData->m_isHtml );
             XmlWriteInt( textE, "hTextAlign", m_pTextData->m_hTextAlign );
             XmlWriteInt( textE, "vTextAlign", m_pTextData->m_vTextAlign );
 
             // Text font & color
-            QDomElement innerTextE = doc.createElement("TextFont");
+            TQDomElement innerTextE = doc.createElement("TextFont");
             XmlWriteString( innerTextE, "family", m_pTextData->m_textFont.family() );
             XmlWriteColor( innerTextE, "color", m_pTextData->m_textColor );
             XmlWriteInt( innerTextE, "size", m_pTextData->m_textFont.pointSize() );
@@ -420,21 +420,21 @@ QDomElement KivioShapeData::saveXML( QDomDocument &doc )
     // The BGFillStyle
     e.appendChild( m_pFillStyle->saveXML( doc ) );
 
-    // Shape type & name are stored in the shape node
-    //XmlWriteInt( e, "shapeType", m_shapeType );
+    // Shape type & name are stored in the tqshape node
+    //XmlWriteInt( e, "tqshapeType", m_tqshapeType );
     //XmlWriteString( e, "name", m_name );
 
     return e;
 }
 
 
-KivioShapeData::KivioShapeType KivioShapeData::shapeTypeFromString( const QString &str )
+KivioShapeData::KivioShapeType KivioShapeData::tqshapeTypeFromString( const TQString &str )
 {
 
     for( int i=0; i<numShapeInfo; i++ )
     {
-        if( str.compare( shapeInfo[i].name )==0 )
-            return shapeInfo[i].type;
+        if( str.compare( tqshapeInfo[i].name )==0 )
+            return tqshapeInfo[i].type;
     }
 
     return kstNone;
@@ -442,7 +442,7 @@ KivioShapeData::KivioShapeType KivioShapeData::shapeTypeFromString( const QStrin
 
 void KivioShapeData::setShapeType( KivioShapeType st )
 {
-    m_shapeType = st;
+    m_tqshapeType = st;
 
     // If it is a text box, make sure we have text data
     if( st == kstTextBox )
@@ -461,15 +461,15 @@ void KivioShapeData::setShapeType( KivioShapeType st )
 }
 
 
-QString KivioShapeData::text()
+TQString KivioShapeData::text()
 {
     if( m_pTextData )
         return m_pTextData->text();
 
-    return QString("");
+    return TQString("");
 }
 
-void KivioShapeData::setText( const QString &newText )
+void KivioShapeData::setText( const TQString &newText )
 {
     if( m_pTextData )
     {
@@ -496,7 +496,7 @@ int KivioShapeData::hTextAlign() const
     if( m_pTextData )
         return m_pTextData->hTextAlign();
 
-    return Qt::AlignHCenter;
+    return TQt::AlignHCenter;
 }
 
 void KivioShapeData::setHTextAlign( int i )
@@ -510,7 +510,7 @@ int KivioShapeData::vTextAlign() const
     if( m_pTextData )
         return m_pTextData->vTextAlign();
 
-    return Qt::AlignVCenter;
+    return TQt::AlignVCenter;
 }
 
 void KivioShapeData::setVTextAlign( int i )
@@ -519,29 +519,29 @@ void KivioShapeData::setVTextAlign( int i )
         m_pTextData->setVTextAlign(i);
 }
 
-QFont KivioShapeData::textFont()
+TQFont KivioShapeData::textFont()
 {
     if( m_pTextData )
         return m_pTextData->font();
 
-    return QFont("Times");
+    return TQFont("Times");
 }
 
-void KivioShapeData::setTextFont( const QFont &f )
+void KivioShapeData::setTextFont( const TQFont &f )
 {
     if( m_pTextData )
         m_pTextData->setFont(f);
 }
 
-QColor KivioShapeData::textColor()
+TQColor KivioShapeData::textColor()
 {
     if( m_pTextData )
         return m_pTextData->color();
 
-    return QColor(0,0,0);
+    return TQColor(0,0,0);
 }
 
-void KivioShapeData::setTextColor( QColor c )
+void KivioShapeData::setTextColor( TQColor c )
 {
     if( m_pTextData )
         m_pTextData->setColor(c);
diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_data.h b/kivio/kiviopart/kiviosdk/kivio_shape_data.h
index 1c386055..f97e5ec9 100644
--- a/kivio/kiviopart/kiviosdk/kivio_shape_data.h
+++ b/kivio/kiviopart/kiviosdk/kivio_shape_data.h
@@ -19,11 +19,11 @@
 #ifndef KIVIO_SHAPE_DATA_H
 #define KIVIO_SHAPE_DATA_H
 
-#include <qfont.h>
-#include <qcolor.h>
-#include <qdom.h>
-#include <qptrlist.h>
-#include <qstring.h>
+#include <tqfont.h>
+#include <tqcolor.h>
+#include <tqdom.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
 
 #include "kivio_point.h"
 
@@ -36,11 +36,11 @@ class KivioTextShapeData
 public:
     KivioTextShapeData();
 
-    QString m_text;                                 // The text inside this shape
-    QColor m_textColor;                             // The text color
-    QFont m_textFont;                               // The text font
+    TQString m_text;                                 // The text inside this tqshape
+    TQColor m_textColor;                             // The text color
+    TQFont m_textFont;                               // The text font
     bool m_isHtml;                                  // Is the text HTML formatted?
-    int m_hTextAlign, m_vTextAlign;                 // Horizontal and vertical text alignment flags
+    int m_hTextAlign, m_vTextAlign;                 //Qt::Horizontal and vertical text tqalignment flags
 };
 
 /**
@@ -52,7 +52,7 @@ class KivioShapeData
 {
 public:
     /**
-     * The possible shape types.
+     * The possible tqshape types.
      */
     typedef enum {
         kstNone = 0,
@@ -73,17 +73,17 @@ public:
 protected:
     friend class KivioShape;
 
-    QPtrList <KivioPoint> *m_pOriginalPointList;       // Original point list loaded from an SML file
+    TQPtrList <KivioPoint> *m_pOriginalPointList;       // Original point list loaded from an SML file
 
-    KivioShapeType m_shapeType;                     // The shape type
+    KivioShapeType m_tqshapeType;                     // The tqshape type
     KivioPoint m_position, m_dimensions;            // The position and dimensions
     KivioFillStyle *m_pFillStyle;                   // The fill style
 
-//    QColor m_fgColor;                               // The foreground color
+//    TQColor m_fgColor;                               // The foreground color
 //    float m_lineWidth;                              // The line width
     KivioLineStyle *m_pLineStyle;
 
-    QString m_name;                                 // The name of this shape
+    TQString m_name;                                 // The name of this tqshape
 
     KivioTextStyle *m_pTextData;                    // A pointer to text data (if applicable, e.g. TextBox)
 
@@ -94,24 +94,24 @@ public:
 
     virtual void copyInto( KivioShapeData *pTarget ) const;
 
-    virtual bool loadXML( const QDomElement & );
-    virtual QDomElement saveXML( QDomDocument & );
+    virtual bool loadXML( const TQDomElement & );
+    virtual TQDomElement saveXML( TQDomDocument & );
 
 
-    KivioShapeType shapeType() const { return m_shapeType; }
+    KivioShapeType tqshapeType() const { return m_tqshapeType; }
     void setShapeType( KivioShapeType st );
 
-    static KivioShapeType shapeTypeFromString( const QString & );
+    static KivioShapeType tqshapeTypeFromString( const TQString & );
 
-    QPtrList<KivioPoint> *pointList() { return m_pOriginalPointList; }
+    TQPtrList<KivioPoint> *pointList() { return m_pOriginalPointList; }
 
     KivioFillStyle *fillStyle() const { return m_pFillStyle; }
     KivioLineStyle *lineStyle() const { return m_pLineStyle; }
     void setLineStyle(KivioLineStyle ls);
 
 
-    const QString &name() const { return m_name; }
-    void setName( const QString &newName ) { m_name=newName; }
+    const TQString &name() const { return m_name; }
+    void setName( const TQString &newName ) { m_name=newName; }
 
 
     // Dimensions / Position
@@ -126,8 +126,8 @@ public:
 
 
     // Text functions
-    QString text();
-    void setText( const QString &newText );
+    TQString text();
+    void setText( const TQString &newText );
 
     bool isHtml() const;
     void setIsHtml( bool b );
@@ -138,11 +138,11 @@ public:
     int vTextAlign() const;
     void setVTextAlign( int i );
 
-    QFont textFont();
-    void setTextFont( const QFont &f );
+    TQFont textFont();
+    void setTextFont( const TQFont &f );
 
-    QColor textColor();
-    void setTextColor( QColor c );
+    TQColor textColor();
+    void setTextColor( TQColor c );
 
     void setTextStyle( KivioTextStyle * );
 };
diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp b/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp
index f0d446cc..fbdad979 100644
--- a/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp
@@ -8,13 +8,13 @@
 #include "kivio_shape_data.h"
 #include "kivio_shape_painter.h"
 
-#include <qcolor.h>
+#include <tqcolor.h>
 
 
 KivioShapePainter::KivioShapePainter( KivioPainter *p )
 {
     m_pPainter = p;
-    m_fgColor = QColor(255,255,255);
+    m_fgColor = TQColor(255,255,255);
     m_lineWidth = 1.0f;
     m_pShape = NULL;
 
@@ -37,9 +37,9 @@ void KivioShapePainter::drawShape( KivioShape *pShape, float x, float y, float w
 
     m_pShape = pShape;
 
-    pShapeData = pShape->shapeData();
+    pShapeData = pShape->tqshapeData();
 
-    switch( pShapeData->shapeType() )
+    switch( pShapeData->tqshapeType() )
     {
     case KivioShapeData::kstArc:
         drawArc();
diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_painter.h b/kivio/kiviopart/kiviosdk/kivio_shape_painter.h
index 5de938a9..a3947e04 100644
--- a/kivio/kiviopart/kiviosdk/kivio_shape_painter.h
+++ b/kivio/kiviopart/kiviosdk/kivio_shape_painter.h
@@ -16,7 +16,7 @@ protected:
     KivioFillStyle m_fillStyle;
     KivioPainter *m_pPainter;
     KivioShape *m_pShape;
-    QColor m_fgColor;
+    TQColor m_fgColor;
     float m_lineWidth;
 
     float m_x, m_y, m_w, m_h;
@@ -39,8 +39,8 @@ public:
     virtual ~KivioShapePainter();
 
 
-    void setFGColor( const QColor &c ) { m_fgColor = c; }
-    void setBGColor( const QColor &c ) { m_fillStyle.setColor(c); }
+    void setFGColor( const TQColor &c ) { m_fgColor = c; }
+    void setBGColor( const TQColor &c ) { m_fillStyle.setColor(c); }
     void setLineWidth( const float &f ) { m_lineWidth = f; }
 
     void drawShape( KivioShape *, float, float, float, float );
diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp
index b81ce81b..1046e9d8 100644
--- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp
@@ -35,13 +35,13 @@
 #include "kivio_stencil_spawner_info.h"
 #include "kivio_stencil_spawner_set.h"
 
-#include <qdom.h>
-#include <qpainter.h>
-#include <qbrush.h>
-#include <qcolor.h>
-#include <qpalette.h>
-#include <qrect.h>
-#include <qbitmap.h>
+#include <tqdom.h>
+#include <tqpainter.h>
+#include <tqbrush.h>
+#include <tqcolor.h>
+#include <tqpalette.h>
+#include <tqrect.h>
+#include <tqbitmap.h>
 #include <kdebug.h>
 #include <KoGlobal.h>
 #include <math.h>
@@ -50,7 +50,7 @@
 /**
  * Default constructor
  *
- * Allocates a new shape list, connector targets, and original connector targets.
+ * Allocates a new tqshape list, connector targets, and original connector targets.
  */
 KivioSMLStencil::KivioSMLStencil()
     : KivioStencil(),
@@ -58,10 +58,10 @@ KivioSMLStencil::KivioSMLStencil()
       m_pSubSelection(NULL),
       m_pConnectorTargets(NULL)
 {
-    m_pShapeList = new QPtrList<KivioShape>;
+    m_pShapeList = new TQPtrList<KivioShape>;
     m_pShapeList->setAutoDelete(true);
 
-    m_pConnectorTargets = new QPtrList<KivioConnectorTarget>;
+    m_pConnectorTargets = new TQPtrList<KivioConnectorTarget>;
     m_pConnectorTargets->setAutoDelete(true);
 }
 
@@ -86,16 +86,16 @@ KivioSMLStencil::~KivioSMLStencil()
 /**
  * Loads a KivioSMLStencil from an XML node.
  */
-bool KivioSMLStencil::loadXML( const QDomElement &e )
+bool KivioSMLStencil::loadXML( const TQDomElement &e )
 {
-    QDomNode node;
-    QDomElement ele;
+    TQDomNode node;
+    TQDomElement ele;
 
 
     node = e.firstChild();
     while( !node.isNull() )
     {
-        QString nodeName = node.nodeName();
+        TQString nodeName = node.nodeName();
 
         ele = node.toElement();
 
@@ -111,7 +111,7 @@ bool KivioSMLStencil::loadXML( const QDomElement &e )
         }
         else if( nodeName == "KivioShape" )
         {
-            // Locate the shape we are supposed to load into
+            // Locate the tqshape we are supposed to load into
             KivioShape *pShape = locateShape( XmlReadString( ele, "name", "" ) );
 
             if(pShape) {
@@ -131,11 +131,11 @@ bool KivioSMLStencil::loadXML( const QDomElement &e )
 /**
  * Help function for loading from an XML node.
  */
-void KivioSMLStencil::loadConnectorTargetListXML( const QDomElement &e )
+void KivioSMLStencil::loadConnectorTargetListXML( const TQDomElement &e )
 {
-  QDomNode node;
-  QDomElement ele;
-  QString nodeName;
+  TQDomNode node;
+  TQDomElement ele;
+  TQString nodeName;
   KivioConnectorTarget *pTarget;
 
   pTarget = m_pConnectorTargets->first();
@@ -173,9 +173,9 @@ void KivioSMLStencil::loadConnectorTargetListXML( const QDomElement &e )
 
 
 /**
- * Locates a shape in the shape list by name.
+ * Locates a tqshape in the tqshape list by name.
  */
-KivioShape *KivioSMLStencil::locateShape( const QString &name )
+KivioShape *KivioSMLStencil::locateShape( const TQString &name )
 {
     KivioShape *pShape;
 
@@ -185,7 +185,7 @@ KivioShape *KivioSMLStencil::locateShape( const QString &name )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->shapeData()->name() == name )
+        if( pShape->tqshapeData()->name() == name )
         {
             return pShape;
         }
@@ -200,29 +200,29 @@ KivioShape *KivioSMLStencil::locateShape( const QString &name )
 /**
  * Saves this object to an XMLELement
  */
-QDomElement KivioSMLStencil::saveXML( QDomDocument &doc )
+TQDomElement KivioSMLStencil::saveXML( TQDomDocument &doc )
 {
-    QDomElement e = doc.createElement("KivioSMLStencil");
+    TQDomElement e = doc.createElement("KivioSMLStencil");
 
     XmlWriteString( e, "id", m_pSpawner->info()->id() );
     XmlWriteString( e, "setId", m_pSpawner->set()->id() );
 
 
     // The positions
-    QDomElement posE = doc.createElement("Position");
+    TQDomElement posE = doc.createElement("Position");
     XmlWriteFloat( posE, "x", m_x );
     XmlWriteFloat( posE, "y", m_y );
     e.appendChild( posE );
 
     // The dimensions
-    QDomElement dimE = doc.createElement("Dimension");
+    TQDomElement dimE = doc.createElement("Dimension");
     XmlWriteFloat( dimE, "w", m_w );
     XmlWriteFloat( dimE, "h", m_h );
     e.appendChild( dimE );
 
     // Save the target list
-    QDomElement clE = doc.createElement("KivioConnectorTargetList");
-    QDomElement targetE;
+    TQDomElement clE = doc.createElement("KivioConnectorTargetList");
+    TQDomElement targetE;
     KivioConnectorTarget *pTarget = m_pConnectorTargets->first();
     while( pTarget )
     {
@@ -233,7 +233,7 @@ QDomElement KivioSMLStencil::saveXML( QDomDocument &doc )
     }
     e.appendChild( clE );
 
-    // The shape list
+    // The tqshape list
     KivioShape *pShape = m_pShapeList->first();
     while( pShape )
     {
@@ -268,7 +268,7 @@ KivioStencil *KivioSMLStencil::duplicate()
     pNewStencil->m_pSpawner = m_pSpawner;
 
 
-    // Copy the shape list
+    // Copy the tqshape list
     pShape = m_pShapeList->first();
     while( pShape )
     {
@@ -313,9 +313,9 @@ void KivioSMLStencil::paintOutline( KivioIntraStencilData *pData )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShapeData = pShape->shapeData();
+        pShapeData = pShape->tqshapeData();
 
-        switch( pShapeData->shapeType() )
+        switch( pShapeData->tqshapeType() )
         {
             case KivioShapeData::kstArc:
                 drawOutlineArc( pShape, pData );
@@ -396,7 +396,7 @@ void KivioSMLStencil::drawOutlineArc( KivioShape *pShape, KivioIntraStencilData
     KivioPoint *pPosition, *pDimensions;
     KivioPoint *pPoint;
 
-    pShapeData = pShape->shapeData();
+    pShapeData = pShape->tqshapeData();
     pPosition = pShapeData->position();
     pDimensions = pShapeData->dimensions();
 
@@ -420,18 +420,18 @@ void KivioSMLStencil::drawOutlineArc( KivioShape *pShape, KivioIntraStencilData
 void KivioSMLStencil::drawOutlineBezier( KivioShape *pShape, KivioIntraStencilData *pData )
 {
   KivioPainter *painter;
-  KivioShapeData *pShapeData = pShape->shapeData();
+  KivioShapeData *pShapeData = pShape->tqshapeData();
 
   double defWidth = m_pSpawner->defWidth();
   double defHeight = m_pSpawner->defHeight();
 
 
   painter = pData->painter;
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   KivioPoint *pPoint, *pPoint2, *pPoint3, *pPoint4;
-  QPtrList <KivioPoint> *pPointList = pShapeData->pointList();
-  QPointArray controlPoints( 4 );
+  TQPtrList <KivioPoint> *pPointList = pShapeData->pointList();
+  TQPointArray controlPoints( 4 );
 
 
   pPoint = pPointList->first();
@@ -456,14 +456,14 @@ void KivioSMLStencil::drawOutlineBezier( KivioShape *pShape, KivioIntraStencilDa
 void KivioSMLStencil::drawOutlineOpenPath( KivioShape *pShape, KivioIntraStencilData *pData )
 {
   KivioPainter *painter;
-  KivioShapeData *pShapeData = pShape->shapeData();
+  KivioShapeData *pShapeData = pShape->tqshapeData();
   KivioPoint *pPoint, *pNewPoint;
 
   double defWidth = m_pSpawner->defWidth();
   double defHeight = m_pSpawner->defHeight();
 
-  QPtrList <KivioPoint> *pPointList = pShapeData->pointList();
-  QPtrList <KivioPoint> *pNewPoints = new QPtrList<KivioPoint>;
+  TQPtrList <KivioPoint> *pPointList = pShapeData->pointList();
+  TQPtrList <KivioPoint> *pNewPoints = new TQPtrList<KivioPoint>;
   pNewPoints->setAutoDelete(true);
 
   pPoint = pPointList->first();
@@ -487,14 +487,14 @@ void KivioSMLStencil::drawOutlineOpenPath( KivioShape *pShape, KivioIntraStencil
 void KivioSMLStencil::drawOutlineClosedPath( KivioShape *pShape, KivioIntraStencilData *pData )
 {
   KivioPainter *painter;
-  KivioShapeData *pShapeData = pShape->shapeData();
+  KivioShapeData *pShapeData = pShape->tqshapeData();
   KivioPoint *pPoint, *pNewPoint;
 
   double defWidth = m_pSpawner->defWidth();
   double defHeight = m_pSpawner->defHeight();
 
-  QPtrList <KivioPoint> *pPointList = pShapeData->pointList();
-  QPtrList <KivioPoint> *pNewPoints = new QPtrList<KivioPoint>;
+  TQPtrList <KivioPoint> *pPointList = pShapeData->pointList();
+  TQPtrList <KivioPoint> *pNewPoints = new TQPtrList<KivioPoint>;
   pNewPoints->setAutoDelete(true);
 
   pPoint = pPointList->first();
@@ -521,7 +521,7 @@ void KivioSMLStencil::drawOutlineEllipse( KivioShape *pShape, KivioIntraStencilD
   KivioShapeData *pShapeData;
   KivioPoint *pPosition, *pDimensions;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -535,7 +535,7 @@ void KivioSMLStencil::drawOutlineEllipse( KivioShape *pShape, KivioIntraStencilD
 
 
   painter = pData->painter;
-  painter->setFGColor( QColor(0, 0, 0) );
+  painter->setFGColor( TQColor(0, 0, 0) );
   painter->drawEllipse( _x, _y, _w, _h );
 }
 
@@ -544,9 +544,9 @@ void KivioSMLStencil::drawOutlineLineArray( KivioShape *pShape, KivioIntraStenci
   double _x, _y, defWidth, defHeight;
   KivioPainter *painter;
   KivioShapeData *pShapeData;
-  QPtrList <KivioPoint> *pList;
+  TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -554,7 +554,7 @@ void KivioSMLStencil::drawOutlineLineArray( KivioShape *pShape, KivioIntraStenci
   pList = pShapeData->pointList();
 
 
-  QPointArray arr( pList->count() );
+  TQPointArray arr( pList->count() );
 
   KivioPoint *pPoint;
   int i=0;
@@ -582,7 +582,7 @@ void KivioSMLStencil::drawOutlineRectangle( KivioShape *pShape, KivioIntraStenci
   KivioShapeData *pShapeData;
   KivioPoint *pPosition, *pDimensions;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -595,7 +595,7 @@ void KivioSMLStencil::drawOutlineRectangle( KivioShape *pShape, KivioIntraStenci
   _h = m_zoomHandler->zoomItY((pDimensions->y() / defHeight) * m_h) + 1;
 
   painter = pData->painter;
-  painter->setFGColor( QColor(0, 0, 0) );
+  painter->setFGColor( TQColor(0, 0, 0) );
   painter->drawRect( _x, _y, _w, _h );
 }
 
@@ -606,7 +606,7 @@ void KivioSMLStencil::drawOutlineRoundRectangle( KivioShape *pShape, KivioIntraS
   KivioShapeData *pShapeData;
   KivioPoint *pPosition, *pDimensions;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -627,7 +627,7 @@ void KivioSMLStencil::drawOutlineRoundRectangle( KivioShape *pShape, KivioIntraS
 
 
   painter = pData->painter;
-  painter->setFGColor( QColor(0, 0, 0) );
+  painter->setFGColor( TQColor(0, 0, 0) );
   painter->drawRoundRect( _x, _y, _w, _h, _rx, _ry );
 }
 
@@ -641,9 +641,9 @@ void KivioSMLStencil::drawOutlinePolygon( KivioShape *pShape, KivioIntraStencilD
   double _x, _y, defWidth, defHeight;
   KivioPainter *painter;
   KivioShapeData *pShapeData;
-  QPtrList <KivioPoint> *pList;
+  TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -651,7 +651,7 @@ void KivioSMLStencil::drawOutlinePolygon( KivioShape *pShape, KivioIntraStencilD
   pList = pShapeData->pointList();
 
 
-  QPointArray arr( pList->count() );
+  TQPointArray arr( pList->count() );
 
   KivioPoint *pPoint;
   int i=0;
@@ -677,9 +677,9 @@ void KivioSMLStencil::drawOutlinePolyline( KivioShape *pShape, KivioIntraStencil
   double _x, _y, defWidth, defHeight;
   KivioPainter *painter;
   KivioShapeData *pShapeData;
-  QPtrList <KivioPoint> *pList;
+  TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -687,7 +687,7 @@ void KivioSMLStencil::drawOutlinePolyline( KivioShape *pShape, KivioIntraStencil
   pList = pShapeData->pointList();
 
 
-  QPointArray arr( pList->count() );
+  TQPointArray arr( pList->count() );
 
   KivioPoint *pPoint;
   int i=0;
@@ -714,7 +714,7 @@ void KivioSMLStencil::drawOutlineTextBox( KivioShape *pShape, KivioIntraStencilD
   double defWidth = m_pSpawner->defWidth();
   double defHeight = m_pSpawner->defHeight();
   int _x, _y, _w, _h;
-  KivioShapeData *pShapeData = pShape->shapeData();
+  KivioShapeData *pShapeData = pShape->tqshapeData();
   KivioPoint *pPosition = pShapeData->position();
   KivioPoint *pDimensions = pShapeData->dimensions();
   KivioPainter *painter = pData->painter;
@@ -731,19 +731,19 @@ void KivioSMLStencil::drawOutlineTextBox( KivioShape *pShape, KivioIntraStencilD
   _h = zoomHandler->zoomItY((pDimensions->y() / defHeight) * m_h) + 1;
 
 
-  QPixmap pix(_w, _h);
+  TQPixmap pix(_w, _h);
   pix.fill();
-  QPainter p(&pix);
+  TQPainter p(&pix);
   
-  QFont f = pShapeData->textFont();
+  TQFont f = pShapeData->textFont();
   f.setPointSizeFloat(f.pointSizeFloat() * (((float)zoomHandler->zoom()) / 100.0));
   p.setFont( f );
-  p.setPen( QColor(0, 0, 0) );
+  p.setPen( TQColor(0, 0, 0) );
   int tf = pShapeData->vTextAlign() | pShapeData->hTextAlign();
-  p.drawText( 0, 0, _w, _h, tf | Qt::WordBreak, pShapeData->text() );
-  QBitmap mask;
-  mask = pix;
-  pix.setMask(mask);
+  p.drawText( 0, 0, _w, _h, tf | TQt::WordBreak, pShapeData->text() );
+  TQBitmap tqmask;
+  tqmask = pix;
+  pix.setMask(tqmask);
   painter->drawPixmap(_x, _y, pix);
 }
 
@@ -765,9 +765,9 @@ void KivioSMLStencil::paint( KivioIntraStencilData *pData )
   pShape = m_pShapeList->first();
   while( pShape )
   {
-    pShapeData = pShape->shapeData();
+    pShapeData = pShape->tqshapeData();
 
-    switch( pShapeData->shapeType() )
+    switch( pShapeData->tqshapeType() )
     {
       case KivioShapeData::kstArc:
         drawArc( pShape, pData );
@@ -839,7 +839,7 @@ void KivioSMLStencil::paintConnectorTargets( KivioIntraStencilData *pData )
   //  return;
   //}
 
-  QPixmap targetPic;
+  TQPixmap targetPic;
   KivioPainter *painter;
   int x, y;
 
@@ -873,7 +873,7 @@ void KivioSMLStencil::drawArc( KivioShape *pShape, KivioIntraStencilData *pData
   KivioPoint *pPosition, *pDimensions;
   KivioPoint *pPoint;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -915,18 +915,18 @@ void KivioSMLStencil::drawArc( KivioShape *pShape, KivioIntraStencilData *pData
 void KivioSMLStencil::drawBezier( KivioShape *pShape, KivioIntraStencilData *pData )
 {
   KivioPainter *painter;
-  KivioShapeData *pShapeData = pShape->shapeData();
+  KivioShapeData *pShapeData = pShape->tqshapeData();
 
   double defWidth = m_pSpawner->defWidth();
   double defHeight = m_pSpawner->defHeight();
 
 
   painter = pData->painter;
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   KivioPoint *pPoint, *pPoint2, *pPoint3, *pPoint4;
-  QPtrList <KivioPoint> *pPointList = pShapeData->pointList();
-  QPointArray controlPoints( 4 );
+  TQPtrList <KivioPoint> *pPointList = pShapeData->pointList();
+  TQPointArray controlPoints( 4 );
 
 
   pPoint = pPointList->first();
@@ -954,14 +954,14 @@ void KivioSMLStencil::drawBezier( KivioShape *pShape, KivioIntraStencilData *pDa
 void KivioSMLStencil::drawOpenPath( KivioShape *pShape, KivioIntraStencilData *pData )
 {
   KivioPainter *painter;
-  KivioShapeData *pShapeData = pShape->shapeData();
+  KivioShapeData *pShapeData = pShape->tqshapeData();
   KivioPoint *pPoint, *pNewPoint;
 
   double defWidth = m_pSpawner->defWidth();
   double defHeight = m_pSpawner->defHeight();
 
-  QPtrList <KivioPoint> *pPointList = pShapeData->pointList();
-  QPtrList <KivioPoint> *pNewPoints = new QPtrList<KivioPoint>;
+  TQPtrList <KivioPoint> *pPointList = pShapeData->pointList();
+  TQPtrList <KivioPoint> *pNewPoints = new TQPtrList<KivioPoint>;
   pNewPoints->setAutoDelete(true);
 
   pPoint = pPointList->first();
@@ -988,14 +988,14 @@ void KivioSMLStencil::drawOpenPath( KivioShape *pShape, KivioIntraStencilData *p
 void KivioSMLStencil::drawClosedPath( KivioShape *pShape, KivioIntraStencilData *pData )
 {
   KivioPainter *painter;
-  KivioShapeData *pShapeData = pShape->shapeData();
+  KivioShapeData *pShapeData = pShape->tqshapeData();
   KivioPoint *pPoint, *pNewPoint;
 
   double defWidth = m_pSpawner->defWidth();
   double defHeight = m_pSpawner->defHeight();
 
-  QPtrList <KivioPoint> *pPointList = pShapeData->pointList();
-  QPtrList <KivioPoint> *pNewPoints = new QPtrList<KivioPoint>;
+  TQPtrList <KivioPoint> *pPointList = pShapeData->pointList();
+  TQPtrList <KivioPoint> *pNewPoints = new TQPtrList<KivioPoint>;
   pNewPoints->setAutoDelete(true);
 
   pPoint = pPointList->first();
@@ -1046,7 +1046,7 @@ void KivioSMLStencil::drawEllipse( KivioShape *pShape, KivioIntraStencilData *pD
   KivioShapeData *pShapeData;
   KivioPoint *pPosition, *pDimensions;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -1087,9 +1087,9 @@ void KivioSMLStencil::drawLineArray( KivioShape *pShape, KivioIntraStencilData *
   int _x, _y;
   KivioPainter *painter;
   KivioShapeData *pShapeData;
-  QPtrList <KivioPoint> *pList;
+  TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -1097,7 +1097,7 @@ void KivioSMLStencil::drawLineArray( KivioShape *pShape, KivioIntraStencilData *
   pList = pShapeData->pointList();
 
 
-  QPointArray arr( pList->count() );
+  TQPointArray arr( pList->count() );
 
   KivioPoint *pPoint;
   int i=0;
@@ -1130,7 +1130,7 @@ void KivioSMLStencil::drawRectangle( KivioShape *pShape, KivioIntraStencilData *
   KivioShapeData *pShapeData;
   KivioPoint *pPosition, *pDimensions;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -1174,7 +1174,7 @@ void KivioSMLStencil::drawRoundRectangle( KivioShape *pShape, KivioIntraStencilD
   KivioPoint *pPosition, *pDimensions;
   KivioPoint *pPoint;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -1219,9 +1219,9 @@ void KivioSMLStencil::drawPolygon( KivioShape *pShape, KivioIntraStencilData *pD
   int _x, _y;
   KivioPainter *painter;
   KivioShapeData *pShapeData;
-  QPtrList <KivioPoint> *pList;
+  TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -1229,7 +1229,7 @@ void KivioSMLStencil::drawPolygon( KivioShape *pShape, KivioIntraStencilData *pD
   pList = pShapeData->pointList();
 
 
-  QPointArray arr( pList->count() );
+  TQPointArray arr( pList->count() );
 
 
   KivioPoint *pPoint;
@@ -1278,9 +1278,9 @@ void KivioSMLStencil::drawPolyline( KivioShape *pShape, KivioIntraStencilData *p
   int _x, _y;
   KivioPainter *painter;
   KivioShapeData *pShapeData;
-  QPtrList <KivioPoint> *pList;
+  TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -1288,7 +1288,7 @@ void KivioSMLStencil::drawPolyline( KivioShape *pShape, KivioIntraStencilData *p
   pList = pShapeData->pointList();
 
 
-  QPointArray arr( pList->count() );
+  TQPointArray arr( pList->count() );
 
   KivioPoint *pPoint;
   int i=0;
@@ -1317,7 +1317,7 @@ void KivioSMLStencil::drawTextBox( KivioShape *pShape, KivioIntraStencilData *pD
 {
   double defWidth = m_pSpawner->defWidth();
   double defHeight = m_pSpawner->defHeight();
-  KivioShapeData *pShapeData = pShape->shapeData();
+  KivioShapeData *pShapeData = pShape->tqshapeData();
   KivioPoint *pPosition = pShapeData->position();
   KivioPoint *pDimensions = pShapeData->dimensions();
   KivioPainter *painter = pData->painter;
@@ -1334,13 +1334,13 @@ void KivioSMLStencil::drawTextBox( KivioShape *pShape, KivioIntraStencilData *pD
   int _h = zoomHandler->zoomItY((pDimensions->y() / defHeight) * m_h) + 1;
 
 
-  QFont f = pShapeData->textFont();
+  TQFont f = pShapeData->textFont();
   f.setPointSizeFloat(f.pointSizeFloat() * (((float)zoomHandler->zoom()) / 100.0));
   painter->setFont( f );
   painter->setTextColor( pShapeData->textColor() );
 
   int tf = pShapeData->vTextAlign() | pShapeData->hTextAlign();
-  painter->drawText( _x, _y, _w, _h, tf | Qt::WordBreak, pShapeData->text() );
+  painter->drawText( _x, _y, _w, _h, tf | TQt::WordBreak, pShapeData->text() );
   // TODO Implement richtext support
 }
 
@@ -1350,7 +1350,7 @@ void KivioSMLStencil::drawTextBox( KivioShape *pShape, KivioIntraStencilData *pD
 /**
  * Set the fg color of this stencil.
  */
-void KivioSMLStencil::setFGColor( QColor c )
+void KivioSMLStencil::setFGColor( TQColor c )
 {
     KivioShape *pShape;
 
@@ -1358,7 +1358,7 @@ void KivioSMLStencil::setFGColor( QColor c )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->shapeData()->lineStyle()->setColor( c );
+        pShape->tqshapeData()->lineStyle()->setColor( c );
 
         pShape = m_pShapeList->next();
     }
@@ -1368,14 +1368,14 @@ void KivioSMLStencil::setFGColor( QColor c )
 /**
  * Set the bg color of this stencil.
  */
-void KivioSMLStencil::setBGColor( QColor c )
+void KivioSMLStencil::setBGColor( TQColor c )
 {
     KivioShape *pShape;
 
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->shapeData()->fillStyle()->setColor( c );
+        pShape->tqshapeData()->fillStyle()->setColor( c );
 
         pShape = m_pShapeList->next();
     }
@@ -1388,7 +1388,7 @@ void KivioSMLStencil::setFillPattern(int p)
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->shapeData()->fillStyle()->setBrushStyle( static_cast<Qt::BrushStyle>(p) );
+        pShape->tqshapeData()->fillStyle()->setBrushStyle( static_cast<Qt::BrushStyle>(p) );
 
         pShape = m_pShapeList->next();
     }
@@ -1397,7 +1397,7 @@ void KivioSMLStencil::setFillPattern(int p)
 /**
  * Set the text color of this stencil.
  */
-void KivioSMLStencil::setTextColor( QColor c )
+void KivioSMLStencil::setTextColor( TQColor c )
 {
     KivioShape *pShape;
 
@@ -1405,7 +1405,7 @@ void KivioSMLStencil::setTextColor( QColor c )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->shapeData()->setTextColor( c );
+        pShape->tqshapeData()->setTextColor( c );
 
         pShape = m_pShapeList->next();
     }
@@ -1414,7 +1414,7 @@ void KivioSMLStencil::setTextColor( QColor c )
 /**
  * Set the text font of this stencil
  */
-void KivioSMLStencil::setTextFont( const QFont &f )
+void KivioSMLStencil::setTextFont( const TQFont &f )
 {
     KivioShape *pShape;
 
@@ -1422,7 +1422,7 @@ void KivioSMLStencil::setTextFont( const QFont &f )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->shapeData()->setTextFont( f );
+        pShape->tqshapeData()->setTextFont( f );
 
         pShape = m_pShapeList->next();
     }
@@ -1439,7 +1439,7 @@ void KivioSMLStencil::setLineWidth( double f )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->shapeData()->lineStyle()->setWidth( f );
+        pShape->tqshapeData()->lineStyle()->setWidth( f );
 
         pShape = m_pShapeList->next();
     }
@@ -1451,7 +1451,7 @@ void KivioSMLStencil::setLinePattern(int p)
 
     while( pShape )
     {
-        pShape->shapeData()->lineStyle()->setStyle( p );
+        pShape->tqshapeData()->lineStyle()->setStyle( p );
         pShape = m_pShapeList->next();
     }
 }
@@ -1550,7 +1550,7 @@ KivioConnectorTarget *KivioSMLStencil::connectToTarget( KivioConnectorPoint *p,
 
 
 /**
- * Updates the geometry of this stencil.
+ * Updates the tqgeometry of this stencil.
  *
  * This function rearranges the KivioConnectorTargets to reflect
  * that of the width/height/position.
@@ -1559,7 +1559,7 @@ void KivioSMLStencil::updateGeometry()
 {
   //kdDebug(43000) << "m_x = " << m_x << " m_y = " << m_y << endl;
 
-  QWMatrix m;
+  TQWMatrix m;
   m.translate(m_x, m_y);
   m.translate(m_w / 2.0, m_h / 2.0);
   m.rotate(m_rotation);
@@ -1583,41 +1583,41 @@ void KivioSMLStencil::updateGeometry()
 /**
  * Gets the font of this stencil
  */
-QFont KivioSMLStencil::textFont()
+TQFont KivioSMLStencil::textFont()
 {
     KivioShape *pShape;
 
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
+        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
         {
-            return pShape->shapeData()->textFont();
+            return pShape->tqshapeData()->textFont();
         }
 
         pShape = m_pShapeList->next();
     }
 
-    //return QFont("times",12);
+    //return TQFont("times",12);
     return KoGlobal::defaultFont();
 }
 
-QColor KivioSMLStencil::textColor()
+TQColor KivioSMLStencil::textColor()
 {
   KivioShape *pShape;
 
   pShape = m_pShapeList->first();
   while( pShape )
   {
-    if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
+    if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
     {
-      return pShape->shapeData()->textColor();
+      return pShape->tqshapeData()->textColor();
     }
 
     pShape = m_pShapeList->next();
   }
 
-  return QColor(0, 0, 0);
+  return TQColor(0, 0, 0);
 }
 
 /**
@@ -1631,8 +1631,8 @@ void KivioSMLStencil::setHTextAlign(int i)
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
-            pShape->shapeData()->setHTextAlign( i );
+        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
+            pShape->tqshapeData()->setHTextAlign( i );
 
         pShape = m_pShapeList->next();
     }
@@ -1640,7 +1640,7 @@ void KivioSMLStencil::setHTextAlign(int i)
 
 
 /**
- * Set the vertical alignment of this stencil
+ * Set the vertical tqalignment of this stencil
  */
 void KivioSMLStencil::setVTextAlign(int i)
 {
@@ -1650,8 +1650,8 @@ void KivioSMLStencil::setVTextAlign(int i)
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
-            pShape->shapeData()->setVTextAlign( i );
+        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
+            pShape->tqshapeData()->setVTextAlign( i );
 
         pShape = m_pShapeList->next();
     }
@@ -1659,7 +1659,7 @@ void KivioSMLStencil::setVTextAlign(int i)
 
 
 /**
- * Get the horizontal alignment of this stencil.
+ * Get the horizontal tqalignment of this stencil.
  */
 int KivioSMLStencil::hTextAlign()
 {
@@ -1668,9 +1668,9 @@ int KivioSMLStencil::hTextAlign()
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
+        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
         {
-            return pShape->shapeData()->hTextAlign();
+            return pShape->tqshapeData()->hTextAlign();
         }
 
         pShape = m_pShapeList->next();
@@ -1681,7 +1681,7 @@ int KivioSMLStencil::hTextAlign()
 
 
 /**
- * Get the vertical text alignment of this stencil.
+ * Get the vertical text tqalignment of this stencil.
  */
 int KivioSMLStencil::vTextAlign()
 {
@@ -1690,9 +1690,9 @@ int KivioSMLStencil::vTextAlign()
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
+        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
         {
-            return pShape->shapeData()->vTextAlign();
+            return pShape->tqshapeData()->vTextAlign();
         }
 
         pShape = m_pShapeList->next();
@@ -1705,38 +1705,38 @@ int KivioSMLStencil::vTextAlign()
 /**
  * Get the text of this stencil
  */
-QString KivioSMLStencil::text()
+TQString KivioSMLStencil::text()
 {
     KivioShape *pShape;
 
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
+        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
         {
-            return pShape->shapeData()->text();
+            return pShape->tqshapeData()->text();
         }
 
         pShape = m_pShapeList->next();
     }
 
-    return QString("");
+    return TQString("");
 }
 
 
 /**
  * Set the text of this stencil
  */
-void KivioSMLStencil::setText( const QString &t )
+void KivioSMLStencil::setText( const TQString &t )
 {
     KivioShape *pShape;
 
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
+        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
         {
-            pShape->shapeData()->setText(t);
+            pShape->tqshapeData()->setText(t);
         }
 
         pShape = m_pShapeList->next();
@@ -1753,7 +1753,7 @@ double KivioSMLStencil::lineWidth()
 
     pShape = m_pShapeList->first();
     if( pShape )
-        return pShape->shapeData()->lineStyle()->width();
+        return pShape->tqshapeData()->lineStyle()->width();
 
     return 1.0f;
 }
@@ -1763,7 +1763,7 @@ int KivioSMLStencil::linePattern()
     KivioShape *pShape = m_pShapeList->first();
 
     if( pShape )
-        return pShape->shapeData()->lineStyle()->style();
+        return pShape->tqshapeData()->lineStyle()->style();
 
     return 1;
 }
@@ -1771,30 +1771,30 @@ int KivioSMLStencil::linePattern()
 /**
  * Get the Fg color of a stencil
  */
-QColor KivioSMLStencil::fgColor()
+TQColor KivioSMLStencil::fgColor()
 {
     KivioShape *pShape;
 
     pShape = m_pShapeList->first();
     if( pShape )
-        return pShape->shapeData()->lineStyle()->color();
+        return pShape->tqshapeData()->lineStyle()->color();
 
-    return QColor(0,0,0);
+    return TQColor(0,0,0);
 }
 
 
 /**
  * Get the bg color of this stencil.
  */
-QColor KivioSMLStencil::bgColor()
+TQColor KivioSMLStencil::bgColor()
 {
     KivioShape *pShape;
 
     pShape = m_pShapeList->first();
     if( pShape )
-        return pShape->shapeData()->fillStyle()->color();
+        return pShape->tqshapeData()->fillStyle()->color();
 
-    return QColor(0,0,0);
+    return TQColor(0,0,0);
 }
 
 int KivioSMLStencil::fillPattern()
@@ -1803,7 +1803,7 @@ int KivioSMLStencil::fillPattern()
 
     pShape = m_pShapeList->first();
     if( pShape )
-        return pShape->shapeData()->fillStyle()->brushStyle();
+        return pShape->tqshapeData()->fillStyle()->brushStyle();
 
     return 1;
 }
@@ -1847,7 +1847,7 @@ KivioCollisionType KivioSMLStencil::checkForCollision( KoPoint *pPoint, double )
 {
   KivioCollisionType type = kctNone;
 
-  QWMatrix m;
+  TQWMatrix m;
   m.translate(m_x, m_y);
   m.translate(m_w / 2.0, m_h / 2.0);
   m.rotate(m_rotation);
@@ -1920,10 +1920,10 @@ bool KivioSMLStencil::checkCollisionPolygon( KivioShape *pShape, KoPoint *pCheck
 {
   double _x, _y, defWidth, defHeight;
   KivioShapeData *pShapeData;
-  QPtrList<KivioPoint> *pList;
+  TQPtrList<KivioPoint> *pList;
   KoPoint *pPoints;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -1976,24 +1976,24 @@ bool KivioSMLStencil::checkCollisionTextBox( KivioShape *, KoPoint * )
 int KivioSMLStencil::resizeHandlePositions()
 {
    // Calculate the resize handle positions
-   int mask = KIVIO_RESIZE_HANDLE_POSITION_ALL;
+   int tqmask = KIVIO_RESIZE_HANDLE_POSITION_ALL;
 
    if( m_pProtection->at( kpWidth ) )
    {
-      mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW);
+      tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW);
    }
 
    if( m_pProtection->at( kpHeight ) )
    {
-      mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS);
+      tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS);
    }
 
    if( m_pProtection->at( kpAspect ) )
    {
-      mask = KIVIO_RESIZE_HANDLE_POSITION_CORNERS;
+      tqmask = KIVIO_RESIZE_HANDLE_POSITION_CORNERS;
    }
 
-   return mask;
+   return tqmask;
 }
 
 KivioLineStyle KivioSMLStencil::lineStyle()
@@ -2001,7 +2001,7 @@ KivioLineStyle KivioSMLStencil::lineStyle()
     KivioShape *pShape = m_pShapeList->first();
 
     if( pShape )
-        return *(pShape->shapeData()->lineStyle());
+        return *(pShape->tqshapeData()->lineStyle());
 
     return KivioLineStyle();
 }
@@ -2012,19 +2012,19 @@ void KivioSMLStencil::setLineStyle(KivioLineStyle ls)
 
     while( pShape )
     {
-        pShape->shapeData()->setLineStyle(ls);;
+        pShape->tqshapeData()->setLineStyle(ls);;
         pShape = m_pShapeList->next();
     }
 }
 
-QString KivioSMLStencil::getTextBoxName(const KoPoint& p)
+TQString KivioSMLStencil::getTextBoxName(const KoPoint& p)
 {
   KivioShape* pShape = m_pShapeList->first();
   KivioShape* first = 0;
   KoPoint pos = p;
   
   // Calculate the rotation...
-  QWMatrix m;
+  TQWMatrix m;
   m.translate(m_x, m_y);
   m.translate(m_w / 2.0, m_h / 2.0);
   m.rotate(m_rotation);
@@ -2032,12 +2032,12 @@ QString KivioSMLStencil::getTextBoxName(const KoPoint& p)
   
   while(pShape)
   {
-    if(pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox)
+    if(pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox)
     {
-      double x = pShape->shapeData()->x();
-      double y = pShape->shapeData()->y();
-      double x2 = pShape->shapeData()->w() + x;
-      double y2 = pShape->shapeData()->h() + y;
+      double x = pShape->tqshapeData()->x();
+      double y = pShape->tqshapeData()->y();
+      double x2 = pShape->tqshapeData()->w() + x;
+      double y2 = pShape->tqshapeData()->h() + y;
       
       // Create the rotated rectangle
       KoPoint pPoints[4];
@@ -2051,7 +2051,7 @@ QString KivioSMLStencil::getTextBoxName(const KoPoint& p)
       pPoints[3].setY(x * m.m12() + y2 * m.m22() + m.dy());
     
       if(PointInPoly(pPoints, 4, &pos)) {
-        return pShape->shapeData()->name();
+        return pShape->tqshapeData()->name();
       }
       
       if(!first) {
@@ -2063,21 +2063,21 @@ QString KivioSMLStencil::getTextBoxName(const KoPoint& p)
   }
   
   if(first) {
-    return first->shapeData()->name();
+    return first->tqshapeData()->name();
   }
   
-  return QString::null;
+  return TQString();
 }
 
-void KivioSMLStencil::setText(const QString& text, const QString& name)
+void KivioSMLStencil::setText(const TQString& text, const TQString& name)
 {
   KivioShape* pShape = m_pShapeList->first();
   
   while(pShape)
   {
-    if(pShape->shapeData()->name() == name)
+    if(pShape->tqshapeData()->name() == name)
     {
-      pShape->shapeData()->setText(text);
+      pShape->tqshapeData()->setText(text);
       return;
     }
 
@@ -2085,21 +2085,21 @@ void KivioSMLStencil::setText(const QString& text, const QString& name)
   }
 }
 
-QString KivioSMLStencil::text(const QString& name)
+TQString KivioSMLStencil::text(const TQString& name)
 {
   KivioShape* pShape = m_pShapeList->first();
   
   while(pShape)
   {
-    if(pShape->shapeData()->name() == name)
+    if(pShape->tqshapeData()->name() == name)
     {
-      return pShape->shapeData()->text();
+      return pShape->tqshapeData()->text();
     }
 
     pShape = m_pShapeList->next();
   }
   
-  return QString::null;
+  return TQString();
 }
 
 void KivioSMLStencil::addConnectorTarget(const KoPoint& p)
@@ -2128,7 +2128,7 @@ bool KivioSMLStencil::hasTextBox() const
 {
   KivioShape* pShape = m_pShapeList->first();
   while(pShape) {
-    if(pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox) {
+    if(pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox) {
       return true;
     }
 
@@ -2138,91 +2138,91 @@ bool KivioSMLStencil::hasTextBox() const
   return false;
 }
 
-QColor KivioSMLStencil::textColor(const QString& textBoxName)
+TQColor KivioSMLStencil::textColor(const TQString& textBoxName)
 {
-  KivioShape* shape = locateShape(textBoxName);
+  KivioShape* tqshape = locateShape(textBoxName);
 
-  if(!shape)
+  if(!tqshape)
     return textColor();
 
-  return shape->shapeData()->textColor();
+  return tqshape->tqshapeData()->textColor();
 }
 
-void KivioSMLStencil::setTextColor(const QString& textBoxName, const QColor& color)
+void KivioSMLStencil::setTextColor(const TQString& textBoxName, const TQColor& color)
 {
-  KivioShape* shape = locateShape(textBoxName);
+  KivioShape* tqshape = locateShape(textBoxName);
 
-  // If we didn't find the shape set the color stencil wide
-  if(!shape) {
+  // If we didn't find the tqshape set the color stencil wide
+  if(!tqshape) {
     setTextColor(color);
     return;
   }
 
-  shape->shapeData()->setTextColor(color);
+  tqshape->tqshapeData()->setTextColor(color);
 }
 
-QFont KivioSMLStencil::textFont(const QString& textBoxName)
+TQFont KivioSMLStencil::textFont(const TQString& textBoxName)
 {
-  KivioShape* shape = locateShape(textBoxName);
+  KivioShape* tqshape = locateShape(textBoxName);
 
-  if(!shape)
+  if(!tqshape)
     return textFont();
 
-  return shape->shapeData()->textFont();
+  return tqshape->tqshapeData()->textFont();
 }
 
-void KivioSMLStencil::setTextFont(const QString& textBoxName, const QFont& font)
+void KivioSMLStencil::setTextFont(const TQString& textBoxName, const TQFont& font)
 {
-  KivioShape* shape = locateShape(textBoxName);
+  KivioShape* tqshape = locateShape(textBoxName);
 
-  if(!shape) {
+  if(!tqshape) {
     setTextFont(font);
     return;
   }
 
-  shape->shapeData()->setTextFont(font);
+  tqshape->tqshapeData()->setTextFont(font);
 }
 
-int KivioSMLStencil::hTextAlign(const QString& textBoxName)
+int KivioSMLStencil::hTextAlign(const TQString& textBoxName)
 {
-  KivioShape* shape = locateShape(textBoxName);
+  KivioShape* tqshape = locateShape(textBoxName);
 
-  if(!shape)
+  if(!tqshape)
     return hTextAlign();
 
-  return shape->shapeData()->hTextAlign();
+  return tqshape->tqshapeData()->hTextAlign();
 }
 
-int KivioSMLStencil::vTextAlign(const QString& textBoxName)
+int KivioSMLStencil::vTextAlign(const TQString& textBoxName)
 {
-  KivioShape* shape = locateShape(textBoxName);
+  KivioShape* tqshape = locateShape(textBoxName);
 
-  if(!shape)
+  if(!tqshape)
     return vTextAlign();
 
-  return shape->shapeData()->vTextAlign();
+  return tqshape->tqshapeData()->vTextAlign();
 }
 
-void KivioSMLStencil::setHTextAlign(const QString& textBoxName, int align)
+void KivioSMLStencil::setHTextAlign(const TQString& textBoxName, int align)
 {
-  KivioShape* shape = locateShape(textBoxName);
+  KivioShape* tqshape = locateShape(textBoxName);
 
-  if(!shape) {
+  if(!tqshape) {
     setHTextAlign(align);
     return;
   }
 
-  shape->shapeData()->setHTextAlign(align);
+  tqshape->tqshapeData()->setHTextAlign(align);
 }
 
-void KivioSMLStencil::setVTextAlign(const QString& textBoxName, int align)
+void KivioSMLStencil::setVTextAlign(const TQString& textBoxName, int align)
 {
-  KivioShape* shape = locateShape(textBoxName);
+  KivioShape* tqshape = locateShape(textBoxName);
 
-  if(!shape) {
+  if(!tqshape) {
     setVTextAlign(align);
     return;
   }
 
-  shape->shapeData()->setVTextAlign(align);
+  tqshape->tqshapeData()->setVTextAlign(align);
 }
diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h
index 240c99f6..30e53e93 100644
--- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h
+++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h
@@ -20,11 +20,11 @@
 #ifndef KIVIO_SML_STENCIL_H
 #define KIVIO_SML_STENCIL_H
 
-#include <qptrlist.h>
+#include <tqptrlist.h>
 
 #include "kivio_stencil.h"
-class QDomElement;
-class QColor;
+class TQDomElement;
+class TQColor;
 class KivioConnectorTarget;
 class KivioFillStyle;
 class KivioIntraStencilData;
@@ -38,9 +38,9 @@ class KivioSMLStencil : public KivioStencil
 protected:
     friend class KivioSMLStencilSpawner;
 
-    QPtrList<KivioShape> *m_pShapeList;
+    TQPtrList<KivioShape> *m_pShapeList;
     KivioShape *m_pSubSelection;
-    QPtrList<KivioConnectorTarget> *m_pConnectorTargets;
+    TQPtrList<KivioConnectorTarget> *m_pConnectorTargets;
 
     // Offsets and scale which get reused in between
     // various drawing routines.  To save time and
@@ -90,18 +90,18 @@ protected:
     bool checkCollisionTextBox( KivioShape *, KoPoint * );
 
 
-    KivioShape *locateShape( const QString & );
-    void loadConnectorTargetListXML( const QDomElement & );
+    KivioShape *locateShape( const TQString & );
+    void loadConnectorTargetListXML( const TQDomElement & );
 
 public:
     KivioSMLStencil();
     virtual ~KivioSMLStencil();
 
 
-    virtual bool loadXML( const QDomElement & );
-    virtual QDomElement saveXML( QDomDocument & );
+    virtual bool loadXML( const TQDomElement & );
+    virtual TQDomElement saveXML( TQDomDocument & );
 
-    virtual QPtrList<KivioShape> *shapeList() { return m_pShapeList; }
+    virtual TQPtrList<KivioShape> *tqshapeList() { return m_pShapeList; }
     virtual KivioShape *subSelection() { return m_pSubSelection; }
 
     virtual void paintOutline( KivioIntraStencilData * );
@@ -110,10 +110,10 @@ public:
 
     virtual KivioStencil *duplicate();
 
-    virtual QColor fgColor();
-    virtual QColor bgColor();
-    virtual void setFGColor(QColor);
-    virtual void setBGColor(QColor);
+    virtual TQColor fgColor();
+    virtual TQColor bgColor();
+    virtual void setFGColor(TQColor);
+    virtual void setBGColor(TQColor);
     virtual void setLineWidth(double);
     virtual double lineWidth();
     virtual void setLinePattern(int p);
@@ -121,8 +121,8 @@ public:
     virtual void setFillPattern(int p);
     virtual int fillPattern();
 
-    virtual void setTextColor( QColor );
-    virtual void setTextFont( const QFont & );
+    virtual void setTextColor( TQColor );
+    virtual void setTextFont( const TQFont & );
 
     virtual void setHTextAlign(int);
     virtual void setVTextAlign(int);
@@ -130,11 +130,11 @@ public:
     virtual int hTextAlign();
     virtual int vTextAlign();
 
-    virtual QString text();
-    virtual void setText( const QString & );
+    virtual TQString text();
+    virtual void setText( const TQString & );
 
-    virtual QFont textFont();
-    virtual QColor textColor();
+    virtual TQFont textFont();
+    virtual TQColor textColor();
 
     virtual KivioCollisionType checkForCollision( KoPoint *, double );
 
@@ -154,29 +154,29 @@ public:
 
     /**
       Returns the name of the text box that is at @param p.
-      If there exist no text box at @param p then it returns QString::null.
+      If there exist no text box at @param p then it returns TQString().
     */
-    virtual QString getTextBoxName(const KoPoint& p);
+    virtual TQString getTextBoxName(const KoPoint& p);
 
-    virtual void setText(const QString& text, const QString& name);
-    virtual QString text(const QString& name);
+    virtual void setText(const TQString& text, const TQString& name);
+    virtual TQString text(const TQString& name);
 
     virtual void addConnectorTarget(const KoPoint&);
     virtual void removeConnectorTarget(const KoPoint&);
 
     virtual bool hasTextBox() const;
 
-    virtual QColor textColor(const QString& textBoxName);
-    virtual void setTextColor(const QString& textBoxName, const QColor& color);
+    virtual TQColor textColor(const TQString& textBoxName);
+    virtual void setTextColor(const TQString& textBoxName, const TQColor& color);
 
-    virtual QFont textFont(const QString& textBoxName);
-    virtual void setTextFont(const QString& textBoxName, const QFont& font);
+    virtual TQFont textFont(const TQString& textBoxName);
+    virtual void setTextFont(const TQString& textBoxName, const TQFont& font);
 
-    virtual int hTextAlign(const QString& textBoxName);
-    virtual int vTextAlign(const QString& textBoxName);
+    virtual int hTextAlign(const TQString& textBoxName);
+    virtual int vTextAlign(const TQString& textBoxName);
 
-    virtual void setHTextAlign(const QString& textBoxName, int align);
-    virtual void setVTextAlign(const QString& textBoxName, int align);
+    virtual void setHTextAlign(const TQString& textBoxName, int align);
+    virtual void setVTextAlign(const TQString& textBoxName, int align);
 };
 
 #endif
diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.cpp
index e410d851..588a468e 100644
--- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.cpp
@@ -26,14 +26,14 @@
 #include "kivio_stencil_spawner.h"
 #include "kivio_stencil_spawner_info.h"
 
-#include <qdom.h>
-#include <qfile.h>
-#include <qiodevice.h>
-#include <qpainter.h>
-#include <qpoint.h>
-#include <qpixmap.h>
-#include <qrect.h>
-#include <qfileinfo.h>
+#include <tqdom.h>
+#include <tqfile.h>
+#include <tqiodevice.h>
+#include <tqpainter.h>
+#include <tqpoint.h>
+#include <tqpixmap.h>
+#include <tqrect.h>
+#include <tqfileinfo.h>
 
 #include <kdebug.h>
 
@@ -43,7 +43,7 @@ KivioSMLStencilSpawner::KivioSMLStencilSpawner( KivioStencilSpawnerSet *p )
 {
     m_pStencil = new KivioSMLStencil();
 
-    m_pTargets = new QPtrList<KivioConnectorTarget>;
+    m_pTargets = new TQPtrList<KivioConnectorTarget>;
     m_pTargets->setAutoDelete(true);
 }
 
@@ -64,21 +64,21 @@ KivioSMLStencilSpawner::~KivioSMLStencilSpawner()
     kdDebug(43000) << "* SMLStencilSpawner "<< m_pInfo->id() << " deleted" << endl;
 }
 
-QDomElement KivioSMLStencilSpawner::saveXML( QDomDocument &doc )
+TQDomElement KivioSMLStencilSpawner::saveXML( TQDomDocument &doc )
 {
-    QDomElement spawnE = doc.createElement("KivioSMLStencilSpawner");
+    TQDomElement spawnE = doc.createElement("KivioSMLStencilSpawner");
 
     XmlWriteString( spawnE, "id", m_pInfo->id() );
 
     return spawnE;
 }
 
-bool KivioSMLStencilSpawner::load( const QString &file )
+bool KivioSMLStencilSpawner::load( const TQString &file )
 {
-    QDomDocument d("test");
+    TQDomDocument d("test");
 
-    m_filename = QString(file);
-    QFile f(file);
+    m_filename = TQString(file);
+    TQFile f(file);
 
     if( f.open( IO_ReadOnly )==false )
     {
@@ -99,14 +99,14 @@ bool KivioSMLStencilSpawner::load( const QString &file )
     }
 }
 
-bool KivioSMLStencilSpawner::loadXML( const QString &file, QDomDocument &d )
+bool KivioSMLStencilSpawner::loadXML( const TQString &file, TQDomDocument &d )
 {
   KivioConnectorTarget *pTarget;
 
-  QDomElement root = d.documentElement();
-  QDomElement e;
-  QDomNode node = root.firstChild();
-  QString nodeName;
+  TQDomElement root = d.documentElement();
+  TQDomElement e;
+  TQDomNode node = root.firstChild();
+  TQString nodeName;
 
   while( !node.isNull() )
   {
@@ -114,7 +114,7 @@ bool KivioSMLStencilSpawner::loadXML( const QString &file, QDomDocument &d )
 
     if( nodeName.compare("KivioSMLStencilSpawnerInfo")==0 )
     {
-      m_pInfo->loadXML( (const QDomElement)node.toElement() );
+      m_pInfo->loadXML( (const TQDomElement)node.toElement() );
     }
     else if( nodeName.compare("KivioShape")==0 )
     {
@@ -130,7 +130,7 @@ bool KivioSMLStencilSpawner::loadXML( const QString &file, QDomDocument &d )
     else if( nodeName.compare("KivioConnectorTarget")==0 )
     {
       pTarget = new KivioConnectorTarget();
-      pTarget->loadXML( (const QDomElement)node.toElement() );
+      pTarget->loadXML( (const TQDomElement)node.toElement() );
 
       m_pStencil->m_pConnectorTargets->append( pTarget );
     }
@@ -151,11 +151,11 @@ bool KivioSMLStencilSpawner::loadXML( const QString &file, QDomDocument &d )
   }
 
   // Now load the xpm
-  QFileInfo finfo(file);
-  QString pixFile = finfo.dirPath(true) + "/" + finfo.baseName() + ".xpm";
+  TQFileInfo finfo(file);
+  TQString pixFile = finfo.dirPath(true) + "/" + finfo.baseName() + ".xpm";
 
   if(!m_icon.load( pixFile )) {
-    QString pixFile = finfo.dirPath(true) + "/" + finfo.baseName() + ".png";
+    TQString pixFile = finfo.dirPath(true) + "/" + finfo.baseName() + ".png";
     m_icon.load( pixFile );
   }
 
@@ -164,15 +164,15 @@ bool KivioSMLStencilSpawner::loadXML( const QString &file, QDomDocument &d )
 
 
 /**
- * Loads a shape from an XML node.
+ * Loads a tqshape from an XML node.
  */
-void KivioSMLStencilSpawner::loadShape( QDomNode &shapeNode )
+void KivioSMLStencilSpawner::loadShape( TQDomNode &tqshapeNode )
 {
     KivioShapeData::KivioShapeType t;
     KivioShape *pShape = NULL;
-    QDomElement shapeElement = shapeNode.toElement();
+    TQDomElement tqshapeElement = tqshapeNode.toElement();
 
-    t = KivioShapeData::shapeTypeFromString( XmlReadString( shapeElement, "type", "None" ) );
+    t = KivioShapeData::tqshapeTypeFromString( XmlReadString( tqshapeElement, "type", "None" ) );
 
     switch( t )
     {
@@ -180,51 +180,51 @@ void KivioSMLStencilSpawner::loadShape( QDomNode &shapeNode )
             break;
 
         case KivioShapeData::kstArc:
-            pShape = KivioShape::loadShapeArc( shapeElement );
+            pShape = KivioShape::loadShapeArc( tqshapeElement );
             break;
 
         case KivioShapeData::kstPie:
-            pShape = KivioShape::loadShapePie( shapeElement );
+            pShape = KivioShape::loadShapePie( tqshapeElement );
             break;
 
         case KivioShapeData::kstLineArray:
-            pShape = KivioShape::loadShapeLineArray( shapeElement );
+            pShape = KivioShape::loadShapeLineArray( tqshapeElement );
             break;
 
         case KivioShapeData::kstPolyline:
-            pShape = KivioShape::loadShapePolyline( shapeElement );
+            pShape = KivioShape::loadShapePolyline( tqshapeElement );
             break;
 
         case KivioShapeData::kstPolygon:
-            pShape = KivioShape::loadShapePolygon( shapeElement );
+            pShape = KivioShape::loadShapePolygon( tqshapeElement );
             break;
 
         case KivioShapeData::kstBezier:
-            pShape = KivioShape::loadShapeBezier( shapeElement );
+            pShape = KivioShape::loadShapeBezier( tqshapeElement );
             break;
 
         case KivioShapeData::kstRectangle:
-            pShape = KivioShape::loadShapeRectangle( shapeElement );
+            pShape = KivioShape::loadShapeRectangle( tqshapeElement );
             break;
 
         case KivioShapeData::kstRoundRectangle:
-            pShape = KivioShape::loadShapeRoundRectangle( shapeElement );
+            pShape = KivioShape::loadShapeRoundRectangle( tqshapeElement );
             break;
 
         case KivioShapeData::kstEllipse:
-            pShape = KivioShape::loadShapeEllipse( shapeElement );
+            pShape = KivioShape::loadShapeEllipse( tqshapeElement );
             break;
 
         case KivioShapeData::kstOpenPath:
-            pShape = KivioShape::loadShapeOpenPath( shapeElement );
+            pShape = KivioShape::loadShapeOpenPath( tqshapeElement );
             break;
 
         case KivioShapeData::kstClosedPath:
-            pShape = KivioShape::loadShapeClosedPath( shapeElement );
+            pShape = KivioShape::loadShapeClosedPath( tqshapeElement );
             break;
 
         case KivioShapeData::kstTextBox:
-            pShape = KivioShape::loadShapeTextBox( shapeElement );
+            pShape = KivioShape::loadShapeTextBox( tqshapeElement );
             break;
 
         default:
diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.h b/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.h
index bcc8024e..7dd09137 100644
--- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.h
+++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.h
@@ -19,9 +19,9 @@
 #ifndef KIVIO_SML_STENCIL_SPAWNER_H
 #define KIVIO_SML_STENCIL_SPAWNER_H
 
-#include <qdom.h>
-#include <qptrlist.h>
-#include <qstring.h>
+#include <tqdom.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
 
 #include "kivio_stencil_spawner.h"
 
@@ -29,37 +29,37 @@ class KivioStencilSpawnerSet;
 class KivioStencil;
 class KivioSMLStencil;
 class KivioConnectorTarget;
-class QPainter;
-class QPixmap;
-class QRect;
+class TQPainter;
+class TQPixmap;
+class TQRect;
 
 class KivioSMLStencilSpawner : public KivioStencilSpawner
 {
 protected:
     KivioSMLStencil *m_pStencil;
-    QString m_filename;
+    TQString m_filename;
 
     // Target list
-    QPtrList<KivioConnectorTarget>*m_pTargets;
+    TQPtrList<KivioConnectorTarget>*m_pTargets;
 
 protected:
-    void loadShape( QDomNode & );
-    QString readDesc( const QString & );
+    void loadShape( TQDomNode & );
+    TQString readDesc( const TQString & );
 
 public:
     KivioSMLStencilSpawner( KivioStencilSpawnerSet * );
     virtual ~KivioSMLStencilSpawner();
     
-    virtual bool load( const QString & );
-    virtual bool loadXML( const QString &, QDomDocument & );
+    virtual bool load( const TQString & );
+    virtual bool loadXML( const TQString &, TQDomDocument & );
 
-    virtual QDomElement saveXML( QDomDocument & );
+    virtual TQDomElement saveXML( TQDomDocument & );
 
-    virtual QString &filename() { return m_filename; }
+    virtual TQString &filename() { return m_filename; }
 
     virtual KivioStencil *newStencil();
 
-    QPtrList <KivioConnectorTarget> *targets() { return m_pTargets; }
+    TQPtrList <KivioConnectorTarget> *targets() { return m_pTargets; }
 };
 
 #endif
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil.cpp
index e94a9ea2..915df3bb 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil.cpp
@@ -40,8 +40,8 @@ KivioStencil::KivioStencil()
 
   m_selected = false;
 
-  m_pProtection = new QBitArray(NUM_PROTECTIONS);
-  m_pCanProtect = new QBitArray(NUM_PROTECTIONS);
+  m_pProtection = new TQBitArray(NUM_PROTECTIONS);
+  m_pCanProtect = new TQBitArray(NUM_PROTECTIONS);
 
   for( int i = 0; i < NUM_PROTECTIONS; i++ )
   {
@@ -73,12 +73,12 @@ KoRect KivioStencil::rect()
 }
 
 
-bool KivioStencil::loadXML( const QDomElement & )
+bool KivioStencil::loadXML( const TQDomElement & )
 {
     return false;
 }
 
-QDomElement KivioStencil::saveXML( QDomDocument &doc )
+TQDomElement KivioStencil::saveXML( TQDomDocument &doc )
 {
     return doc.createElement("");
 }
@@ -113,8 +113,8 @@ void KivioStencil::paintSelectionHandles( KivioIntraStencilData *pData )
 
   KivioPainter *painter = pData->painter;
 
-  newX = zoomHandler->zoomItX(m_x - qRound(lineWidth() / 2));
-  newY = zoomHandler->zoomItY(m_y - qRound(lineWidth() / 2));
+  newX = zoomHandler->zoomItX(m_x - tqRound(lineWidth() / 2));
+  newY = zoomHandler->zoomItY(m_y - tqRound(lineWidth() / 2));
   newW = zoomHandler->zoomItX(m_w + lineWidth() + 1);
   newH = zoomHandler->zoomItY(m_h + lineWidth() + 1);
 
@@ -122,7 +122,7 @@ void KivioStencil::paintSelectionHandles( KivioIntraStencilData *pData )
   painter->setTranslation(newX, newY);
   rotatePainter(pData);  // Rotate the painter if needed
 
-  painter->drawSelectionBox(QRect(0, 0, newW, newH));
+  painter->drawSelectionBox(TQRect(0, 0, newW, newH));
 
   // top left, top right, bottom left, bottom right
   if( m_pProtection->at( kpWidth ) ||
@@ -226,7 +226,7 @@ void KivioStencil::updateConnectorPoints(KivioConnectorPoint *, double, double)
 void KivioStencil::rotatePainter(KivioIntraStencilData *pData)
 {
   if(m_rotation != 0) {
-    QWMatrix m;
+    TQWMatrix m;
     m.translate(pData->zoomHandler->zoomItX(m_pinPoint.x()), pData->zoomHandler->zoomItY(m_pinPoint.y()));
     m.rotate(m_rotation);
     m.translate(pData->zoomHandler->zoomItX(-m_pinPoint.x()), pData->zoomHandler->zoomItY(-m_pinPoint.y()));
@@ -256,8 +256,8 @@ void KivioStencil::move(double xOffset, double yOffset)
 bool KivioStencil::isInRect(const KoRect& rect)
 {
   bool retVal;
-  retVal = rect.contains(m_x, m_y);
-  retVal = retVal && rect.contains(m_x + m_w, m_y + m_h);
+  retVal = rect.tqcontains(m_x, m_y);
+  retVal = retVal && rect.tqcontains(m_x + m_w, m_y + m_h);
 
   return retVal;
 }
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil.h b/kivio/kiviopart/kiviosdk/kivio_stencil.h
index 926993f8..ef056c3d 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil.h
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil.h
@@ -20,11 +20,11 @@
 #ifndef KIVIO_STENCIL_H
 #define KIVIO_STENCIL_H
 
-#include <qfont.h>
-#include <qcolor.h>
-#include <qdom.h>
-#include <qptrlist.h>
-#include <qbitarray.h>
+#include <tqfont.h>
+#include <tqcolor.h>
+#include <tqdom.h>
+#include <tqptrlist.h>
+#include <tqbitarray.h>
 #include <KoPoint.h>
 #include <kglobalsettings.h>
 #include <KoRect.h>
@@ -128,8 +128,8 @@ class KIVIO_EXPORT KivioStencil
     KivioStencilSpawner *m_pSpawner;
 
     // The protection bits of the stencil
-    QBitArray *m_pProtection;
-    QBitArray *m_pCanProtect;
+    TQBitArray *m_pProtection;
+    TQBitArray *m_pCanProtect;
 
     // The stemcil type
     KivioStencilType m_type;
@@ -175,11 +175,11 @@ class KIVIO_EXPORT KivioStencil
     virtual void setPosition( double f1, double f2 ) { m_x=f1; m_y=f2;  updateGeometry(); }
     virtual void setDimensions( double f1, double f2 ) { m_w=f1; m_h=f2;  updateGeometry(); }
 
-    virtual QColor fgColor() { return QColor(0,0,0); }
-    virtual void setFGColor( QColor ) { ; }
+    virtual TQColor fgColor() { return TQColor(0,0,0); }
+    virtual void setFGColor( TQColor ) { ; }
 
-    virtual void setBGColor( QColor ) { ; }
-    virtual QColor bgColor() { return QColor(0,0,0); }
+    virtual void setBGColor( TQColor ) { ; }
+    virtual TQColor bgColor() { return TQColor(0,0,0); }
     virtual void setFillPattern(int) { ; }
     virtual int fillPattern() { return 1; }
 
@@ -194,11 +194,11 @@ class KIVIO_EXPORT KivioStencil
     virtual int linePattern() { return 1; }
 
     // FOnt stuff
-    virtual QColor textColor() { return QColor(0,0,0); }
-    virtual void setTextColor( QColor ) {;}
+    virtual TQColor textColor() { return TQColor(0,0,0); }
+    virtual void setTextColor( TQColor ) {;}
 
-    virtual QFont textFont() { return KGlobalSettings::generalFont(); }
-    virtual void setTextFont( const QFont & ) {;}
+    virtual TQFont textFont() { return KGlobalSettings::generalFont(); }
+    virtual void setTextFont( const TQFont & ) {;}
 
     virtual int hTextAlign() { return -1; }
     virtual int vTextAlign() { return -1; }
@@ -206,8 +206,8 @@ class KIVIO_EXPORT KivioStencil
     virtual void setHTextAlign(int) { ; }
     virtual void setVTextAlign(int) { ; }
 
-    virtual void setText( const QString & ) { ; }
-    virtual QString text() { return QString(""); }
+    virtual void setText( const TQString & ) { ; }
+    virtual TQString text() { return TQString(""); }
 
     virtual void setRotation(int d);
     virtual int rotation() { return m_rotation; }
@@ -224,19 +224,19 @@ class KIVIO_EXPORT KivioStencil
     virtual void customDrag( KivioCustomDragData * );
 
 
-    virtual bool loadXML( const QDomElement & );
-    virtual QDomElement saveXML( QDomDocument & );
+    virtual bool loadXML( const TQDomElement & );
+    virtual TQDomElement saveXML( TQDomDocument & );
 
     virtual bool isSelected() { return m_selected; }
     virtual void select() { m_selected = true; }
     virtual void unselect() { m_selected = false; }
     virtual void subSelect( const double &, const double & ) { ; }
 
-    virtual QBitArray *protection() { return m_pProtection; }
-    virtual QBitArray *canProtect() { return m_pCanProtect; }
+    virtual TQBitArray *protection() { return m_pProtection; }
+    virtual TQBitArray *canProtect() { return m_pCanProtect; }
 
     virtual void addToGroup( KivioStencil * );
-    virtual QPtrList<KivioStencil>* groupList() { return NULL; }
+    virtual TQPtrList<KivioStencil>* groupList() { return NULL; }
 
     virtual void updateGeometry();
     virtual void updateConnectorPoints(KivioConnectorPoint *, double oldX, double oldY);
@@ -259,27 +259,27 @@ class KIVIO_EXPORT KivioStencil
     
     /**
       Returns the name of the text box that is at the specified point.
-      If there exist no text box at the specified point then it returns QString::null.
+      If there exist no text box at the specified point then it returns TQString().
     */
-    virtual QString getTextBoxName(const KoPoint& /*p*/) { return QString::null; }
+    virtual TQString getTextBoxName(const KoPoint& /*p*/) { return TQString(); }
 
-    virtual void setText(const QString& /*text*/, const QString& /*name*/) { ; }
-    virtual QString text(const QString& /*name*/) { return QString(""); }
+    virtual void setText(const TQString& /*text*/, const TQString& /*name*/) { ; }
+    virtual TQString text(const TQString& /*name*/) { return TQString(""); }
 
     /// Returns true if the stencil has a text box
     virtual bool hasTextBox() const { return false; }
 
-    virtual QColor textColor(const QString& /*textBoxName*/) { return QColor(); }
-    virtual void setTextColor(const QString& /*textBoxName*/, const QColor& /*color*/) {}
+    virtual TQColor textColor(const TQString& /*textBoxName*/) { return TQColor(); }
+    virtual void setTextColor(const TQString& /*textBoxName*/, const TQColor& /*color*/) {}
 
-    virtual QFont textFont(const QString& /*textBoxName*/) { return KGlobalSettings::generalFont(); }
-    virtual void setTextFont(const QString& /*textBoxName*/, const QFont& /*font*/) {}
+    virtual TQFont textFont(const TQString& /*textBoxName*/) { return KGlobalSettings::generalFont(); }
+    virtual void setTextFont(const TQString& /*textBoxName*/, const TQFont& /*font*/) {}
 
-    virtual int hTextAlign(const QString& /*textBoxName*/) { return -1; }
-    virtual int vTextAlign(const QString& /*textBoxName*/) { return -1; }
+    virtual int hTextAlign(const TQString& /*textBoxName*/) { return -1; }
+    virtual int vTextAlign(const TQString& /*textBoxName*/) { return -1; }
 
-    virtual void setHTextAlign(const QString& /*textBoxName*/, int /*align*/) {}
-    virtual void setVTextAlign(const QString& /*textBoxName*/, int /*align*/) {}
+    virtual void setHTextAlign(const TQString& /*textBoxName*/, int /*align*/) {}
+    virtual void setVTextAlign(const TQString& /*textBoxName*/, int /*align*/) {}
 
     virtual void setPinPoint(const KoPoint& p) { m_pinPoint = p; }
     virtual KoPoint pinPoint() const { return m_pinPoint; }
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner.cpp
index 70f5ff08..8c6f6ed4 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner.cpp
@@ -45,12 +45,12 @@ KivioStencilSpawner::~KivioStencilSpawner()
 }
 
 
-bool KivioStencilSpawner::load( const QString & )
+bool KivioStencilSpawner::load( const TQString & )
 {
     return false;
 }
 
-bool KivioStencilSpawner::loadXML( const QString &, QDomDocument & )
+bool KivioStencilSpawner::loadXML( const TQString &, TQDomDocument & )
 {
     return false;
 }
@@ -61,12 +61,12 @@ KivioStencil *KivioStencilSpawner::newStencil()
     return NULL;
 }
 
-KivioStencil *KivioStencilSpawner::newStencil(const QString& /*name*/)
+KivioStencil *KivioStencilSpawner::newStencil(const TQString& /*name*/)
 {
     return NULL;
 }
 
-QDomElement KivioStencilSpawner::saveXML( QDomDocument &doc )
+TQDomElement KivioStencilSpawner::saveXML( TQDomDocument &doc )
 {
     return doc.createElement("KivioStencilSpawner");
 }
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner.h b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner.h
index 7ef99993..436ffb2b 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner.h
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner.h
@@ -19,13 +19,13 @@
 #ifndef KIVIO_STENCIL_SPAWNER_H
 #define KIVIO_STENCIL_SPAWNER_H
 
-#include <qstring.h>
-#include <qpixmap.h>
-#include <qdom.h>
-#include <qobject.h>
+#include <tqstring.h>
+#include <tqpixmap.h>
+#include <tqdom.h>
+#include <tqobject.h>
 
-class QPainter;
-class QRect;
+class TQPainter;
+class TQRect;
 class KivioStencilSpawnerInfo;
 class KivioStencilSpawnerSet;
 class KivioStencil;
@@ -33,8 +33,8 @@ class KivioStencil;
 class KivioStencilSpawner
 {
 protected:
-    QString m_fileName;
-    QPixmap m_icon;
+    TQString m_fileName;
+    TQPixmap m_icon;
     KivioStencilSpawnerSet *m_pSet;
     KivioStencilSpawnerInfo *m_pInfo;
 
@@ -45,24 +45,24 @@ public:
     KivioStencilSpawner( KivioStencilSpawnerSet * );
     virtual ~KivioStencilSpawner();
 
-    virtual bool load( const QString & );
-    virtual bool loadXML( const QString &, QDomDocument & );
-    virtual QDomElement saveXML( QDomDocument & );
+    virtual bool load( const TQString & );
+    virtual bool loadXML( const TQString &, TQDomDocument & );
+    virtual TQDomElement saveXML( TQDomDocument & );
 
     virtual KivioStencil *newStencil();
-    virtual KivioStencil *newStencil(const QString& args);
+    virtual KivioStencil *newStencil(const TQString& args);
 
-    virtual QString fileName() { return m_fileName; }
+    virtual TQString fileName() { return m_fileName; }
     virtual KivioStencilSpawnerSet *set() { return m_pSet; }
     virtual KivioStencilSpawnerInfo *info() { return m_pInfo; }
 
     virtual float defWidth() { return m_defWidth; }
     virtual float defHeight() { return m_defHeight; }
 
-    virtual QPixmap *icon() { return &m_icon; }
+    virtual TQPixmap *icon() { return &m_icon; }
 
 
-//    virtual void drawIcon( QPainter *, QRect *, bool );
+//    virtual void drawIcon( TQPainter *, TQRect *, bool );
 };
 
 #endif
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.cpp
index 12a17919..730e07ca 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.cpp
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 #include "kivio_stencil_spawner_info.h"
-#include <qdom.h>
+#include <tqdom.h>
 
 #include <kglobal.h>
 #include <klocale.h>
@@ -38,8 +38,8 @@ KivioStencilSpawnerInfo::~KivioStencilSpawnerInfo()
 {
 }
 
-KivioStencilSpawnerInfo::KivioStencilSpawnerInfo( const QString &auth, const QString &tit, const QString &_id, const QString &des, const QString &ver, const QString &wb,
-                                            const QString &em, const QString &au )
+KivioStencilSpawnerInfo::KivioStencilSpawnerInfo( const TQString &auth, const TQString &tit, const TQString &_id, const TQString &des, const TQString &ver, const TQString &wb,
+                                            const TQString &em, const TQString &au )
 {
     m_author = auth;
     m_title = tit;
@@ -51,11 +51,11 @@ KivioStencilSpawnerInfo::KivioStencilSpawnerInfo( const QString &auth, const QSt
     m_autoUpdate = au;
 }
 
-bool KivioStencilSpawnerInfo::loadXML( const QDomElement &e )
+bool KivioStencilSpawnerInfo::loadXML( const TQDomElement &e )
 {
-  QDomNode node;
-  QDomElement nodeElement;
-  QString nodeName, origTitle, origDesc;
+  TQDomNode node;
+  TQDomElement nodeElement;
+  TQString nodeName, origTitle, origDesc;
   m_title = "";
   m_desc = "";
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.h b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.h
index 9c676d66..501d47bb 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.h
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.h
@@ -19,13 +19,13 @@
 #ifndef KIVIO_STENCIL_SPAWNER_INFO_H
 #define KIVIO_STENCIL_SPAWNER_INFO_H
 
-#include <qstring.h>
+#include <tqstring.h>
 #include <koffice_export.h>
-class QDomElement;
+class TQDomElement;
 class KIVIO_EXPORT KivioStencilSpawnerInfo
 {
 protected:
-    QString m_author,
+    TQString m_author,
        m_title,
        m_id,
        m_desc,
@@ -36,20 +36,20 @@ protected:
         
 public:
     KivioStencilSpawnerInfo();
-    KivioStencilSpawnerInfo( const QString &, const QString &, const QString &, const QString &, const QString &, const QString &, const QString &, const QString & );
+    KivioStencilSpawnerInfo( const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString & );
     virtual ~KivioStencilSpawnerInfo();
     
-    bool loadXML( const QDomElement & );
+    bool loadXML( const TQDomElement & );
     
     
-    QString author()        { return m_author; }
-    QString title()         { return m_title; }
-    QString id()            { return m_id; }
-    QString desc()          { return m_desc; }
-    QString version()       { return m_version; }
-    QString web()           { return m_web; }
-    QString email()         { return m_email; }
-    QString autoUpdate()    { return m_autoUpdate; }
+    TQString author()        { return m_author; }
+    TQString title()         { return m_title; }
+    TQString id()            { return m_id; }
+    TQString desc()          { return m_desc; }
+    TQString version()       { return m_version; }
+    TQString web()           { return m_web; }
+    TQString email()         { return m_email; }
+    TQString autoUpdate()    { return m_autoUpdate; }
     
 };
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp
index 66339a0e..64d5a7c9 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp
@@ -24,22 +24,22 @@
 #include "kivio_stencil_spawner.h"
 #include "kivio_stencil_spawner_set.h"
 
-#include <qdir.h>
-#include <qfile.h>
-#include <qstring.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqstring.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
 
-KivioStencilSpawnerSet::KivioStencilSpawnerSet(const QString& name)
+KivioStencilSpawnerSet::KivioStencilSpawnerSet(const TQString& name)
     : m_pSpawners(NULL),
       m_pSelected(NULL)
 {
   m_hidden = false;
   m_dir = "";
-  m_name = name.isEmpty() ? QString("Untitled") : name;
+  m_name = name.isEmpty() ? TQString("Untitled") : name;
 
-  m_pSpawners = new QPtrList<KivioStencilSpawner>;
+  m_pSpawners = new TQPtrList<KivioStencilSpawner>;
   m_pSpawners->setAutoDelete(true);
 }
 
@@ -54,31 +54,31 @@ KivioStencilSpawnerSet::~KivioStencilSpawnerSet()
 /**
  * Loads a stencil spawners from data defined in an XML file
  *
- * @param e The @ref QDomElement to load from
+ * @param e The @ref TQDomElement to load from
  *
  * This is a function that needs to be implemented by all descendant
  * classes.  It should search the known stencil-paths for the spawner
  * specified, and load it.
  */
-bool KivioStencilSpawnerSet::loadXML( const QDomElement & )
+bool KivioStencilSpawnerSet::loadXML( const TQDomElement & )
 {
   return false;
 }
 
 
 /**
- * Saves a spawner to a @ref QDomElement
+ * Saves a spawner to a @ref TQDomElement
  *
  * @param doc The document to save to
  *
  * All descendant classes should implement this function.  It should
- * save the necessary data to a @ref QDomElement such that when
+ * save the necessary data to a @ref TQDomElement such that when
  * it is loaded again, it can find the spawner and load it from
  * the local filesystem.
  */
-QDomElement KivioStencilSpawnerSet::saveXML( QDomDocument &doc )
+TQDomElement KivioStencilSpawnerSet::saveXML( TQDomDocument &doc )
 {
-  QDomElement spawnE = doc.createElement("KivioStencilSpawnerSet");
+  TQDomElement spawnE = doc.createElement("KivioStencilSpawnerSet");
 
   XmlWriteString( spawnE, "id", m_id );
   XmlWriteString(spawnE, "hidden", (m_hidden ? "true" : "false"));
@@ -95,22 +95,22 @@ QDomElement KivioStencilSpawnerSet::saveXML( QDomDocument &doc )
   return spawnE;
 }
 
-bool KivioStencilSpawnerSet::loadDir( const QString &dirName )
+bool KivioStencilSpawnerSet::loadDir( const TQString &dirName )
 {
-  QDir d(dirName);
-  QString fileName;
+  TQDir d(dirName);
+  TQString fileName;
 
   m_dir = dirName;
   m_name = readTitle( dirName );
   m_id = readId( dirName );
 
-  d.setNameFilter("*.so *.sml *.ksp *.spy *.shape");
+  d.setNameFilter("*.so *.sml *.ksp *.spy *.tqshape");
   m_files = d.entryList();
 
   return true;
 }
 
-KivioStencilSpawner* KivioStencilSpawnerSet::loadFile( const QString &fileName )
+KivioStencilSpawner* KivioStencilSpawnerSet::loadFile( const TQString &fileName )
 {
     for (KivioStencilSpawner* ss = m_pSpawners->first(); ss; ss = m_pSpawners->next() )
         if (ss->fileName() == fileName)
@@ -118,23 +118,23 @@ KivioStencilSpawner* KivioStencilSpawnerSet::loadFile( const QString &fileName )
 
     KivioStencilSpawner *pSpawner;
 
-    if( fileName.contains( ".sml", false ) )
+    if( fileName.tqcontains( ".sml", false ) )
     {
         pSpawner = new KivioSMLStencilSpawner(this);
     }
-    else if( fileName.contains( ".ksp", false ) )
+    else if( fileName.tqcontains( ".ksp", false ) )
     {
         pSpawner = new KivioPluginStencilSpawner(this);
     }
-    else if( fileName.contains( ".so", false ) )
+    else if( fileName.tqcontains( ".so", false ) )
     {
         pSpawner = new KivioPluginStencilSpawner(this);
     }
-    else if( fileName.contains( ".spy", false ) )
+    else if( fileName.tqcontains( ".spy", false ) )
     {
         pSpawner = new KivioPyStencilSpawner(this);
     }
-    else if( fileName.contains( ".shape", false ) )
+    else if( fileName.tqcontains( ".tqshape", false ) )
     {
 	pSpawner = new KivioDiaStencilSpawner(this);
     }
@@ -154,20 +154,20 @@ KivioStencilSpawner* KivioStencilSpawnerSet::loadFile( const QString &fileName )
     return pSpawner;
 }
 
-QString KivioStencilSpawnerSet::readTitle( const QString &dir )
+TQString KivioStencilSpawnerSet::readTitle( const TQString &dir )
 {
-  QDomDocument d("StencilSPawnerSet");
-  QDomElement root, nodeElement;
-  QDomNode node;
-  QString nodeName;
-  QString title, origTitle;
-  QFile f(dir+"/desc");
+  TQDomDocument d("StencilSPawnerSet");
+  TQDomElement root, nodeElement;
+  TQDomNode node;
+  TQString nodeName;
+  TQString title, origTitle;
+  TQFile f(dir+"/desc");
 
   if( f.open( IO_ReadOnly )==false )
   {
     kdDebug(43000) << "KivioStencilSpawnerSet::readTitle() - Error opening stencil set title: " <<
         dir << "/desc" << endl;
-    return dir.right(dir.length() - dir.findRev('/')-1);
+    return dir.right(dir.length() - dir.tqfindRev('/')-1);
   }
 
   d.setContent(&f);
@@ -201,14 +201,14 @@ QString KivioStencilSpawnerSet::readTitle( const QString &dir )
   return title;
 }
 
-QString KivioStencilSpawnerSet::readId( const QString &dir )
+TQString KivioStencilSpawnerSet::readId( const TQString &dir )
 {
-  QDomDocument d("StencilSPawnerSet");
-  QDomElement root;
-  QDomNode node;
-  QString nodeName;
-  QString theid;
-  QFile f(dir+"/desc");
+  TQDomDocument d("StencilSPawnerSet");
+  TQDomElement root;
+  TQDomNode node;
+  TQString nodeName;
+  TQString theid;
+  TQFile f(dir+"/desc");
 
   if( f.open( IO_ReadOnly )==false )
   {
@@ -241,13 +241,13 @@ QString KivioStencilSpawnerSet::readId( const QString &dir )
   return "";
 }
 
-QString KivioStencilSpawnerSet::readDescription(const QString& dir)
+TQString KivioStencilSpawnerSet::readDescription(const TQString& dir)
 {
-  QDomDocument d("StencilSPawnerSet");
-  QDomElement root, nodeElement;
-  QDomNode node;
-  QString nodeName;
-  QFile f(dir + "/desc");
+  TQDomDocument d("StencilSPawnerSet");
+  TQDomElement root, nodeElement;
+  TQDomNode node;
+  TQString nodeName;
+  TQFile f(dir + "/desc");
 
   if( f.open( IO_ReadOnly )==false )
   {
@@ -260,7 +260,7 @@ QString KivioStencilSpawnerSet::readDescription(const QString& dir)
 
   root = d.documentElement();
   node = root.firstChild();
-  QString description, origDesc;
+  TQString description, origDesc;
 
   while( !node.isNull() )
   {
@@ -289,7 +289,7 @@ QString KivioStencilSpawnerSet::readDescription(const QString& dir)
 }
 
 
-KivioStencilSpawner* KivioStencilSpawnerSet::find( const QString& id)
+KivioStencilSpawner* KivioStencilSpawnerSet::tqfind( const TQString& id)
 {
   if(!m_pSpawners || m_pSpawners->isEmpty()) {
     return 0;
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.h b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.h
index 717fdd72..9b215560 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.h
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.h
@@ -19,57 +19,57 @@
 #ifndef KIVIO_STENCIL_SPAWNER_SET_H
 #define KIVIO_STENCIL_SPAWNER_SET_H
 
-#include <qptrlist.h>
-#include <qdom.h>
+#include <tqptrlist.h>
+#include <tqdom.h>
 
 class KivioStencilSpawner;
-class QStringList;
+class TQStringList;
 
 class KivioStencilSpawnerSet
 {
   protected:
-    QString m_dir;
-    QString m_name;
-    QString m_id;
+    TQString m_dir;
+    TQString m_name;
+    TQString m_id;
 
-    QStringList m_files;
+    TQStringList m_files;
 
-    QPtrList<KivioStencilSpawner> *m_pSpawners;
+    TQPtrList<KivioStencilSpawner> *m_pSpawners;
     KivioStencilSpawner *m_pSelected;
 
     bool m_hidden;
 
   public:
-    KivioStencilSpawnerSet(const QString& name=QString::null);
+    KivioStencilSpawnerSet(const TQString& name=TQString());
     virtual ~KivioStencilSpawnerSet();
 
-    bool loadDir( const QString & );
-    KivioStencilSpawner* loadFile( const QString & );
+    bool loadDir( const TQString & );
+    KivioStencilSpawner* loadFile( const TQString & );
 
-    bool loadXML( const QDomElement & );
-    QDomElement saveXML( QDomDocument & );
+    bool loadXML( const TQDomElement & );
+    TQDomElement saveXML( TQDomDocument & );
 
-    QPtrList<KivioStencilSpawner> *spawners() { return m_pSpawners; }
+    TQPtrList<KivioStencilSpawner> *spawners() { return m_pSpawners; }
     KivioStencilSpawner *selected() { return m_pSelected; }
 
-    QString dir() { return m_dir; }
-    QString name() { return m_name; }
-    QString id() { return m_id; }
+    TQString dir() { return m_dir; }
+    TQString name() { return m_name; }
+    TQString id() { return m_id; }
 
-    void setDir( const QString &s ) { m_dir=s; }
-    void setName( const QString &s ) { m_name=s; }
-    void setId( const QString &s ) { m_id=s; }
+    void setDir( const TQString &s ) { m_dir=s; }
+    void setName( const TQString &s ) { m_name=s; }
+    void setId( const TQString &s ) { m_id=s; }
 
     KivioStencilSpawner *spawnerAt( int i ) { return m_pSpawners->at(i); }
-    KivioStencilSpawner *find( const QString& );
+    KivioStencilSpawner *tqfind( const TQString& );
 
     int count() { return m_pSpawners->count(); }
 
-    static QString readTitle( const QString & );
-    static QString readId( const QString & );
-    static QString readDescription(const QString&);
+    static TQString readTitle( const TQString & );
+    static TQString readId( const TQString & );
+    static TQString readDescription(const TQString&);
 
-    QStringList files() const { return m_files; }
+    TQStringList files() const { return m_files; }
 
     void addSpawner(KivioStencilSpawner* spawner);
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_text_style.cpp b/kivio/kiviopart/kiviosdk/kivio_text_style.cpp
index 75d975d5..28044f39 100644
--- a/kivio/kiviopart/kiviosdk/kivio_text_style.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_text_style.cpp
@@ -1,17 +1,17 @@
 #include "kivio_common.h"
 #include "kivio_text_style.h"
-#include <qdom.h>
-#include <qpainter.h>
+#include <tqdom.h>
+#include <tqpainter.h>
 #include <KoGlobal.h>
 
 KivioTextStyle::KivioTextStyle()
 {
     m_text = "";
-    m_color = QColor(0,0,0);
-    m_hTextAlign = Qt::AlignHCenter;
-    m_vTextAlign = Qt::AlignVCenter;
+    m_color = TQColor(0,0,0);
+    m_hTextAlign = TQt::AlignHCenter;
+    m_vTextAlign = TQt::AlignVCenter;
     m_isHtml = false;
-    //m_font = QFont("times",12);
+    //m_font = TQFont("times",12);
     m_font = KoGlobal::defaultFont();
 }
 
@@ -29,9 +29,9 @@ void KivioTextStyle::copyInto( KivioTextStyle *pTarget )
     pTarget->m_font = m_font;
 }
 
-QDomElement KivioTextStyle::saveXML( QDomDocument &doc )
+TQDomElement KivioTextStyle::saveXML( TQDomDocument &doc )
 {
-    QDomElement textE = doc.createElement("KivioTextStyle");
+    TQDomElement textE = doc.createElement("KivioTextStyle");
 
     XmlWriteString( textE, "text", m_text );
     XmlWriteInt( textE, "isHtml", m_isHtml );
@@ -39,7 +39,7 @@ QDomElement KivioTextStyle::saveXML( QDomDocument &doc )
     XmlWriteInt( textE, "vTextAlign", m_vTextAlign );
 
     // Text font & color
-    QDomElement innerTextE = doc.createElement("Font");
+    TQDomElement innerTextE = doc.createElement("Font");
     XmlWriteColor( innerTextE, "color",   m_color );
     XmlWriteString( innerTextE, "family", m_font.family() );
     XmlWriteInt( innerTextE, "size",      m_font.pointSize() );
@@ -54,20 +54,20 @@ QDomElement KivioTextStyle::saveXML( QDomDocument &doc )
     return textE;
 }
 
-bool KivioTextStyle::loadXML( const QDomElement &e )
+bool KivioTextStyle::loadXML( const TQDomElement &e )
 {
     m_text = XmlReadString( e, "text", "" );
     m_isHtml = (bool)XmlReadInt( e, "isHtml", (int)false );
 
-    m_hTextAlign = XmlReadInt( e, "hTextAlign", Qt::AlignHCenter );
-    m_vTextAlign = XmlReadInt( e, "vTextAlign", Qt::AlignVCenter );
+    m_hTextAlign = XmlReadInt( e, "hTextAlign", TQt::AlignHCenter );
+    m_vTextAlign = XmlReadInt( e, "vTextAlign", TQt::AlignVCenter );
 
     // Search for the font
-    QDomNode innerNode = e.firstChild();
+    TQDomNode innerNode = e.firstChild();
     while( !innerNode.isNull() )
     {
-        QString innerName = innerNode.nodeName();
-        QDomElement innerE = innerNode.toElement();
+        TQString innerName = innerNode.nodeName();
+        TQDomElement innerE = innerNode.toElement();
 
         if( innerName == "Font" )
         {
@@ -78,7 +78,7 @@ bool KivioTextStyle::loadXML( const QDomElement &e )
             m_font.setUnderline( (bool)XmlReadInt( innerE, "underline", 12 ) );
             m_font.setStrikeOut( (bool)XmlReadInt( innerE, "strikeOut", 12 ) );
             m_font.setFixedPitch( (bool)XmlReadInt( innerE, "fixedPitch", false ) );
-            m_color = XmlReadColor( innerE, "color", QColor(0,0,0) );
+            m_color = XmlReadColor( innerE, "color", TQColor(0,0,0) );
         }
 
         innerNode = innerNode.nextSibling();
diff --git a/kivio/kiviopart/kiviosdk/kivio_text_style.h b/kivio/kiviopart/kiviosdk/kivio_text_style.h
index 5ce3afe9..2a8ecd62 100644
--- a/kivio/kiviopart/kiviosdk/kivio_text_style.h
+++ b/kivio/kiviopart/kiviosdk/kivio_text_style.h
@@ -5,41 +5,41 @@
 #include <config.h>
 #endif
 
-#include <qfont.h>
+#include <tqfont.h>
 
-class QDomDocument;
-class QPainter;
+class TQDomDocument;
+class TQPainter;
 
 
 class KivioTextStyle
 {
 protected:
-    QString m_text;                                 // The text inside this shape
-    QColor m_color;                                 // The text color
-    QFont m_font;                                   // The text font
+    TQString m_text;                                 // The text inside this tqshape
+    TQColor m_color;                                 // The text color
+    TQFont m_font;                                   // The text font
     bool m_isHtml;                                  // Is the text HTML formatted?
-    int m_hTextAlign, m_vTextAlign;                 // Horizontal and vertical text alignment flags
+    int m_hTextAlign, m_vTextAlign;                 //Qt::Horizontal and vertical text tqalignment flags
 
 public:
     KivioTextStyle();
     virtual ~KivioTextStyle();
 
-    QDomElement saveXML( QDomDocument & );
-    bool loadXML( const QDomElement & );
+    TQDomElement saveXML( TQDomDocument & );
+    bool loadXML( const TQDomElement & );
 
     void copyInto( KivioTextStyle * );
 
 
 
 
-    inline QString text() { return m_text; }
-    inline void setText( QString s ) { m_text=s; }
+    inline TQString text() { return m_text; }
+    inline void setText( TQString s ) { m_text=s; }
 
-    inline QColor color() { return m_color; }
-    inline void setColor( QColor c ) { m_color=c; }
+    inline TQColor color() { return m_color; }
+    inline void setColor( TQColor c ) { m_color=c; }
 
-    inline QFont font() { return m_font; }
-    inline void setFont( QFont f ) { m_font=f; }
+    inline TQFont font() { return m_font; }
+    inline void setFont( TQFont f ) { m_font=f; }
 
     inline bool isHtml() { return m_isHtml; }
     inline void setIsHtml( bool b ) { m_isHtml=b; }
diff --git a/kivio/kiviopart/kiviosdk/kivio_wrap.cpp b/kivio/kiviopart/kiviosdk/kivio_wrap.cpp
index ede8a889..1dae0b53 100644
--- a/kivio/kiviopart/kiviosdk/kivio_wrap.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_wrap.cpp
@@ -1051,7 +1051,7 @@ static PyObject *_wrap_KivioStencil_setVTextAlign(PyObject *self, PyObject *args
     return _resultobj;
 }
 
-static void  KivioStencil_setText(KivioStencil *self,char * s) { self->setText( QString(s)); }
+static void  KivioStencil_setText(KivioStencil *self,char * s) { self->setText( TQString(s)); }
 static PyObject *_wrap_KivioStencil_setText(PyObject *self, PyObject *args) {
     PyObject  *_resultobj,*_argo0=0;
     KivioStencil  *_arg0;
@@ -1080,7 +1080,7 @@ static PyObject *_wrap_KivioStencil_text(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static char * KivioStencil_textColor(KivioStencil *self) { return (char*) self->textColor().name().latin1(); }
+static char * KivioStencil_textColor(KivioStencil *self) { return (char*) TQString(self->textColor().name()).latin1(); }
 static PyObject *_wrap_KivioStencil_textColor(PyObject *self, PyObject *args) {
     PyObject  *_resultobj,*_argo0=0;
     char  *_result;
@@ -1094,7 +1094,7 @@ static PyObject *_wrap_KivioStencil_textColor(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static void  KivioStencil_setTextColor(KivioStencil *self,char * color) {  self->setTextColor(QColor(color)); }
+static void  KivioStencil_setTextColor(KivioStencil *self,char * color) {  self->setTextColor(TQColor(color)); }
 static PyObject *_wrap_KivioStencil_setTextColor(PyObject *self, PyObject *args) {
     PyObject  *_resultobj,*_argo0=0;
     KivioStencil  *_arg0;
@@ -1109,7 +1109,7 @@ static PyObject *_wrap_KivioStencil_setTextColor(PyObject *self, PyObject *args)
     return _resultobj;
 }
 
-static char * KivioStencil_fgColor(KivioStencil *self) { return (char*) self->fgColor().name().latin1(); }
+static char * KivioStencil_fgColor(KivioStencil *self) { return (char*) TQString(self->fgColor().name()).latin1(); }
 static PyObject *_wrap_KivioStencil_fgColor(PyObject *self, PyObject *args) {
     PyObject  *_resultobj,*_argo0=0;
     char  *_result;
@@ -1123,7 +1123,7 @@ static PyObject *_wrap_KivioStencil_fgColor(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static void  KivioStencil_setFGColor(KivioStencil *self,char * color) {  self->setFGColor(QColor(color)); }
+static void  KivioStencil_setFGColor(KivioStencil *self,char * color) {  self->setFGColor(TQColor(color)); }
 static PyObject *_wrap_KivioStencil_setFGColor(PyObject *self, PyObject *args) {
     PyObject  *_resultobj,*_argo0=0;
     KivioStencil  *_arg0;
@@ -1138,7 +1138,7 @@ static PyObject *_wrap_KivioStencil_setFGColor(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static char * KivioStencil_bgColor(KivioStencil *self) { return (char*) self->bgColor().name().latin1(); }
+static char * KivioStencil_bgColor(KivioStencil *self) { return (char*) TQString(self->bgColor().name()).latin1(); }
 static PyObject *_wrap_KivioStencil_bgColor(PyObject *self, PyObject *args) {
     PyObject  *_resultobj,*_argo0=0;
     char  *_result;
@@ -1152,7 +1152,7 @@ static PyObject *_wrap_KivioStencil_bgColor(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static void  KivioStencil_setBGColor(KivioStencil *self,char * color) {  self->setBGColor(QColor(color)); }
+static void  KivioStencil_setBGColor(KivioStencil *self,char * color) {  self->setBGColor(TQColor(color)); }
 static PyObject *_wrap_KivioStencil_setBGColor(PyObject *self, PyObject *args) {
     PyObject  *_resultobj,*_argo0=0;
     KivioStencil  *_arg0;
diff --git a/kivio/kiviopart/kiviosdk/kiviopolylineconnector.cpp b/kivio/kiviopart/kiviosdk/kiviopolylineconnector.cpp
index 9afe2f9e..71910eff 100644
--- a/kivio/kiviopart/kiviosdk/kiviopolylineconnector.cpp
+++ b/kivio/kiviopart/kiviosdk/kiviopolylineconnector.cpp
@@ -79,10 +79,10 @@ namespace Kivio {
     return connector;
   }
 
-  bool PolyLineConnector::loadCustom(const QDomElement& e)
+  bool PolyLineConnector::loadCustom(const TQDomElement& e)
   {
-    QDomNode node = e.firstChild();
-    QString nodeName;
+    TQDomNode node = e.firstChild();
+    TQString nodeName;
     m_points.clear();
 
     while(!node.isNull()) {
@@ -91,8 +91,8 @@ namespace Kivio {
       if(nodeName == "KivioArrowHeads") {
         loadArrowHeads(node.toElement());
       } else if(nodeName == "KivioGeometryPoints") {
-        QDomNode pointsNode = node.firstChild();
-        QDomElement el;
+        TQDomNode pointsNode = node.firstChild();
+        TQDomElement el;
 
         while(!pointsNode.isNull()) {
           if(pointsNode.nodeName() == "KivioPoint") {
@@ -113,14 +113,14 @@ namespace Kivio {
     return true;
   }
 
-  bool PolyLineConnector::saveCustom(QDomElement& e, QDomDocument& doc)
+  bool PolyLineConnector::saveCustom(TQDomElement& e, TQDomDocument& doc)
   {
     e.appendChild(saveArrowHeads(doc));
-    QDomElement pointsElement = doc.createElement("KivioGeometryPoints");
+    TQDomElement pointsElement = doc.createElement("KivioGeometryPoints");
 
-    for(QValueList<KoPoint>::iterator it = m_points.begin(); it != m_points.end(); ++it) {
+    for(TQValueList<KoPoint>::iterator it = m_points.begin(); it != m_points.end(); ++it) {
       KoPoint p = (*it);
-      QDomElement el = doc.createElement("KivioPoint");
+      TQDomElement el = doc.createElement("KivioPoint");
       XmlWriteFloat(el, "x", p.x());
       XmlWriteFloat(el, "y", p.y());
       pointsElement.appendChild(el);
@@ -182,8 +182,8 @@ namespace Kivio {
     painter->setLineStyle(m_pLineStyle);
     painter->setLineWidth(zoom->zoomItY(m_pLineStyle->width()));
 
-    QPointArray pa(m_points.count());
-    QValueList<KoPoint>::iterator it;
+    TQPointArray pa(m_points.count());
+    TQValueList<KoPoint>::iterator it;
     int i = 0;
 
     for(it = m_points.begin(); it != m_points.end(); ++it) {
@@ -199,17 +199,17 @@ namespace Kivio {
     if(startLen) {
       startVec.setX(startVec.x() / startLen);
       startVec.setY(startVec.y() / startLen);
-      QPoint p = pa[0];
-      p.setX(p.x() + qRound(startVec.x() * zoom->zoomItX(m_startArrow->cut())));
-      p.setY(p.y() + qRound(startVec.y() * zoom->zoomItY(m_startArrow->cut())));
+      TQPoint p = pa[0];
+      p.setX(p.x() + tqRound(startVec.x() * zoom->zoomItX(m_startArrow->cut())));
+      p.setY(p.y() + tqRound(startVec.y() * zoom->zoomItY(m_startArrow->cut())));
     }
 
     if(endLen) {
       endVec.setX(endVec.x() / endLen);
       endVec.setY(endVec.y() / endLen);
-      QPoint p = pa[m_points.count() - 1];
-      p.setX(p.x() + qRound(endVec.x() * zoom->zoomItX(m_endArrow->cut())));
-      p.setY(p.y() + qRound(endVec.y() * zoom->zoomItY(m_endArrow->cut())));
+      TQPoint p = pa[m_points.count() - 1];
+      p.setX(p.x() + tqRound(endVec.x() * zoom->zoomItX(m_endArrow->cut())));
+      p.setY(p.y() + tqRound(endVec.y() * zoom->zoomItY(m_endArrow->cut())));
     }
 
     painter->drawPolyline(pa);
@@ -233,7 +233,7 @@ namespace Kivio {
   {
     KivioPainter* painter = data->painter;
     KoZoomHandler* zoomHandler = data->zoomHandler;
-    QValueList<KoPoint>::Iterator it;
+    TQValueList<KoPoint>::Iterator it;
     int x, y, flag;
     x = y = flag = 0;
 
@@ -384,15 +384,15 @@ namespace Kivio {
   {
     KoPoint p = m_points.first();
     KoPoint topLeft(p.x(), p.y()), bottomRight;
-    QValueList<KoPoint>::iterator it;
-    QValueList<KoPoint>::iterator itEnd = m_points.end();
+    TQValueList<KoPoint>::iterator it;
+    TQValueList<KoPoint>::iterator itEnd = m_points.end();
 
     for(it = m_points.begin(); it != itEnd; ++it) {
       p = (*it);
-      topLeft.setX(QMIN(p.x(), topLeft.x()));
-      topLeft.setY(QMIN(p.y(), topLeft.y()));
-      bottomRight.setX(QMAX(p.x(), bottomRight.x()));
-      bottomRight.setY(QMAX(p.y(), bottomRight.y()));
+      topLeft.setX(TQMIN(p.x(), topLeft.x()));
+      topLeft.setY(TQMIN(p.y(), topLeft.y()));
+      bottomRight.setX(TQMAX(p.x(), bottomRight.x()));
+      bottomRight.setY(TQMAX(p.y(), bottomRight.y()));
     }
 
     KoRect rect;
@@ -404,20 +404,20 @@ namespace Kivio {
 
   bool PolyLineConnector::isInRect(const KoRect& rect)
   {
-    QValueList<KoPoint>::Iterator it;
+    TQValueList<KoPoint>::Iterator it;
     bool retVal = true;
 
     for(it = m_points.begin(); it != m_points.end(); ++it) {
-      retVal = retVal && rect.contains((*it));
+      retVal = retVal && rect.tqcontains((*it));
     }
 
     return retVal;
   }
 
-  bool PolyLineConnector::loadArrowHeads(const QDomElement& e)
+  bool PolyLineConnector::loadArrowHeads(const TQDomElement& e)
   {
     bool first = true;
-    QDomNode node = e.firstChild();
+    TQDomNode node = e.firstChild();
 
     while(!node.isNull()) {
       if(node.nodeName() == "KivioArrowHead") {
@@ -435,9 +435,9 @@ namespace Kivio {
     return true;
   }
 
-  QDomElement PolyLineConnector::saveArrowHeads(QDomDocument& doc)
+  TQDomElement PolyLineConnector::saveArrowHeads(TQDomDocument& doc)
   {
-    QDomElement e = doc.createElement("KivioArrowHeads");
+    TQDomElement e = doc.createElement("KivioArrowHeads");
 
     e.appendChild( m_startArrow->saveXML(doc) );
     e.appendChild( m_endArrow->saveXML(doc) );
diff --git a/kivio/kiviopart/kiviosdk/kiviopolylineconnector.h b/kivio/kiviopart/kiviosdk/kiviopolylineconnector.h
index 26878690..fcae1841 100644
--- a/kivio/kiviopart/kiviosdk/kiviopolylineconnector.h
+++ b/kivio/kiviopart/kiviosdk/kiviopolylineconnector.h
@@ -20,7 +20,7 @@
 #ifndef KIVIOKIVIOPOLYLINECONNECTOR_H
 #define KIVIOKIVIOPOLYLINECONNECTOR_H
 
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
 
 #include <KoPoint.h>
 #include <KoRect.h>
@@ -41,8 +41,8 @@ namespace Kivio {
       
       virtual KivioStencil* duplicate();
       
-      virtual bool loadCustom(const QDomElement& e);
-      virtual bool saveCustom(QDomElement& e, QDomDocument& doc);
+      virtual bool loadCustom(const TQDomElement& e);
+      virtual bool saveCustom(TQDomElement& e, TQDomDocument& doc);
       
       virtual KivioCollisionType checkForCollision(KoPoint* p, double threshold);
   
@@ -112,14 +112,14 @@ namespace Kivio {
     protected:
       void checkForConnection(KivioConnectorPoint* cp, KivioPage* page);
   
-      bool loadArrowHeads(const QDomElement& e);
-      QDomElement saveArrowHeads(QDomDocument& doc);
+      bool loadArrowHeads(const TQDomElement& e);
+      TQDomElement saveArrowHeads(TQDomDocument& doc);
 
     private:
       KivioArrowHead* m_startArrow; // Arrow head for the first point.
       KivioArrowHead* m_endArrow; // Arrow head for the last point.
       
-      QValueList<KoPoint> m_points;
+      TQValueList<KoPoint> m_points;
   };
 }
 
diff --git a/kivio/kiviopart/kiviosdk/kiviostencilfactory.h b/kivio/kiviopart/kiviosdk/kiviostencilfactory.h
index b037c1bf..5a00560c 100644
--- a/kivio/kiviopart/kiviosdk/kiviostencilfactory.h
+++ b/kivio/kiviopart/kiviosdk/kiviostencilfactory.h
@@ -21,21 +21,22 @@
 
 class KivioStencil;
 class KivioStencilSpawnerInfo;
-class QPixmap;
+class TQPixmap;
 
-#include <qstring.h>
-#include <qobject.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
 #include <koffice_export.h>
-class KIVIO_EXPORT KivioStencilFactory : public QObject
+class KIVIO_EXPORT KivioStencilFactory : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KivioStencilFactory(QObject *parent=0, const char*name=0, const QStringList& args = QStringList())
-      : QObject(parent, name) { Q_UNUSED(args) }
-    virtual KivioStencil *NewStencil(const QString& name) =0;
+    KivioStencilFactory(TQObject *tqparent=0, const char*name=0, const TQStringList& args = TQStringList())
+      : TQObject(tqparent, name) { Q_UNUSED(args) }
+    virtual KivioStencil *NewStencil(const TQString& name) =0;
     virtual KivioStencil *NewStencil()=0;
-    virtual QPixmap *GetIcon()=0;
+    virtual TQPixmap *GetIcon()=0;
     virtual KivioStencilSpawnerInfo *GetSpawnerInfo()=0;
 };
 #endif
diff --git a/kivio/kiviopart/kiviosdk/polylineconnectorspawner.cpp b/kivio/kiviopart/kiviosdk/polylineconnectorspawner.cpp
index f8563b5e..241b8278 100644
--- a/kivio/kiviopart/kiviosdk/polylineconnectorspawner.cpp
+++ b/kivio/kiviopart/kiviosdk/polylineconnectorspawner.cpp
@@ -33,14 +33,14 @@ PolyLineConnectorSpawner::~PolyLineConnectorSpawner()
 {
 }
 
-bool PolyLineConnectorSpawner::load(const QString&)
+bool PolyLineConnectorSpawner::load(const TQString&)
 {
   return true;
 }
 
-QDomElement PolyLineConnectorSpawner::saveXML(QDomDocument& /*doc*/)
+TQDomElement PolyLineConnectorSpawner::saveXML(TQDomDocument& /*doc*/)
 {
-  return QDomElement();
+  return TQDomElement();
 }
 
 KivioStencil* PolyLineConnectorSpawner::newStencil()
@@ -51,7 +51,7 @@ KivioStencil* PolyLineConnectorSpawner::newStencil()
   return connector;
 }
 
-KivioStencil* PolyLineConnectorSpawner::newStencil(const QString& /*arg*/)
+KivioStencil* PolyLineConnectorSpawner::newStencil(const TQString& /*arg*/)
 {
   PolyLineConnector* connector = new PolyLineConnector();
   connector->setSpawner(this);
diff --git a/kivio/kiviopart/kiviosdk/polylineconnectorspawner.h b/kivio/kiviopart/kiviosdk/polylineconnectorspawner.h
index 85160387..12436d6c 100644
--- a/kivio/kiviopart/kiviosdk/polylineconnectorspawner.h
+++ b/kivio/kiviopart/kiviosdk/polylineconnectorspawner.h
@@ -30,17 +30,17 @@ class PolyLineConnectorSpawner : public KivioStencilSpawner
     PolyLineConnectorSpawner(KivioStencilSpawnerSet* spawnerSet);
     ~PolyLineConnectorSpawner();
 
-    virtual bool load(const QString& );
-    virtual QDomElement saveXML(QDomDocument& doc);
+    virtual bool load(const TQString& );
+    virtual TQDomElement saveXML(TQDomDocument& doc);
 
     virtual KivioStencil* newStencil();
-    virtual KivioStencil* newStencil(const QString& arg);
+    virtual KivioStencil* newStencil(const TQString& arg);
     virtual KivioStencilSpawnerInfo* info() { return &m_info; }
 
-    virtual QPixmap* icon() { return &m_icon; }
+    virtual TQPixmap* icon() { return &m_icon; }
 
   private:
-    QPixmap m_icon;
+    TQPixmap m_icon;
     KivioStencilSpawnerInfo m_info;
 };
 
diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp
index 16cfcd86..b12d157f 100644
--- a/kivio/kiviopart/kiviostencilsetaction.cpp
+++ b/kivio/kiviopart/kiviostencilsetaction.cpp
@@ -29,13 +29,13 @@
 #include <kiconloader.h>
 #include <klocale.h>
 
-#include <qfile.h>
-#include <qdir.h>
-#include <qpixmap.h>
-#include <qwhatsthis.h>
-#include <qmenubar.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
+#include <tqfile.h>
+#include <tqdir.h>
+#include <tqpixmap.h>
+#include <tqwhatsthis.h>
+#include <tqmenubar.h>
+#include <tqstringlist.h>
+#include <tqvaluelist.h>
 
 #include "kivio_stencil_spawner_set.h"
 
@@ -63,9 +63,9 @@ static const char * default_plug_xpm[] = {
 " ..............#",
 "  ##############"};
 
-KivioStencilSetAction::KivioStencilSetAction(const QString &text, const QString &pix,
-  KActionCollection *parent, const char *name)
-  : KAction(text, pix, 0, parent, name)
+KivioStencilSetAction::KivioStencilSetAction(const TQString &text, const TQString &pix,
+  KActionCollection *tqparent, const char *name)
+  : KAction(text, pix, 0, tqparent, name)
 {
   setShortcutConfigurable( false );
 
@@ -87,20 +87,20 @@ KPopupMenu* KivioStencilSetAction::popupMenu() const
   return m_popup;
 }
 
-void KivioStencilSetAction::popup( const QPoint& global )
+void KivioStencilSetAction::popup( const TQPoint& global )
 {
   popupMenu()->popup(global);
 }
 
-int KivioStencilSetAction::plug( QWidget* widget, int index)
+int KivioStencilSetAction::plug( TQWidget* widget, int index)
 {
   // This function is copied from KActionMenu::plug
   if (kapp && !kapp->authorizeKAction(name()))
     return -1;
   kdDebug(129) << "KAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
-  if ( widget->inherits("QPopupMenu") )
+  if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
   {
-    QPopupMenu* menu = static_cast<QPopupMenu*>( widget );
+    TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
     int id;
 
     if ( hasIconSet() )
@@ -113,7 +113,7 @@ int KivioStencilSetAction::plug( QWidget* widget, int index)
       menu->setItemEnabled( id, false );
 
     addContainer( menu, id );
-    connect( menu, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) );
+    connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -124,8 +124,8 @@ int KivioStencilSetAction::plug( QWidget* widget, int index)
     int id_ = KAction::getToolButtonID();
 
     if ( icon().isEmpty() && !iconSet().isNull() )
-      bar->insertButton( iconSet().pixmap(), id_, SIGNAL( clicked() ), this,
-                          SLOT( slotActivated() ), isEnabled(), plainText(),
+      bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this,
+                          TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
                           index );
     else
     {
@@ -136,25 +136,25 @@ int KivioStencilSetAction::plug( QWidget* widget, int index)
       else
         instance = KGlobal::instance();
 
-      bar->insertButton( icon(), id_, SIGNAL( clicked() ), this,
-                          SLOT( slotActivated() ), isEnabled(), plainText(),
+      bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
+                          TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
                           index, instance );
     }
 
     addContainer( bar, id_ );
 
     if (!whatsThis().isEmpty())
-      QWhatsThis::add( bar->getButton(id_), whatsThis() );
+      TQWhatsThis::add( bar->getButton(id_), whatsThis() );
 
-    connect( bar, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) );
+    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
 
     bar->getButton(id_)->setPopup(popupMenu(), true );
 
     return containerCount() - 1;
   }
-  else if ( widget->inherits( "QMenuBar" ) )
+  else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) )
   {
-    QMenuBar *bar = static_cast<QMenuBar *>( widget );
+    TQMenuBar *bar = static_cast<TQMenuBar *>( widget );
 
     int id;
 
@@ -164,7 +164,7 @@ int KivioStencilSetAction::plug( QWidget* widget, int index)
       bar->setItemEnabled( id, false );
 
     addContainer( bar, id );
-    connect( bar, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) );
+    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -177,7 +177,7 @@ void KivioStencilSetAction::updateMenu()
   m_ssId = 0;
   m_popup->clear();
 
-  m_popup->insertItem(i18n("Show Stencil Set Chooser"), this, SIGNAL(showDialog()));
+  m_popup->insertItem(i18n("Show Stencil Set Chooser"), this, TQT_SIGNAL(showDialog()));
   m_popup->insertSeparator();
 
   m_pathList.clear();
@@ -185,27 +185,27 @@ void KivioStencilSetAction::updateMenu()
   clearCollectionMenuList();
 
   KStandardDirs *dirs = KGlobal::dirs();
-  QStringList dirList = dirs->findDirs("data", "kivio/stencils");
+  TQStringList dirList = dirs->findDirs("data", "kivio/stencils");
   dirList.sort();
 
-  for( QStringList::Iterator it = dirList.begin(); it != dirList.end(); ++it )
+  for( TQStringList::Iterator it = dirList.begin(); it != dirList.end(); ++it )
   {
-    QString dir = (*it);
+    TQString dir = (*it);
     loadCollections(dir);
   }
 }
 
-void KivioStencilSetAction::loadCollections( const QString& rootDirStr )
+void KivioStencilSetAction::loadCollections( const TQString& rootDirStr )
 {
-  QDir rootDir( rootDirStr );
+  TQDir rootDir( rootDirStr );
 
-  rootDir.setFilter( QDir::Dirs );
-  rootDir.setSorting( QDir::Name );
+  rootDir.setFilter( TQDir::Dirs );
+  rootDir.setSorting( TQDir::Name );
 
-  const QFileInfoList *colList = rootDir.entryInfoList();
-  QFileInfoListIterator colIt( *colList );
-  QFileInfo *colFInfo;
-  QString cId;
+  const TQFileInfoList *colList = rootDir.entryInfoList();
+  TQFileInfoListIterator colIt( *colList );
+  TQFileInfo *colFInfo;
+  TQString cId;
 
   while((colFInfo = colIt.current()))
   {
@@ -213,12 +213,12 @@ void KivioStencilSetAction::loadCollections( const QString& rootDirStr )
     {
       cId = KivioStencilSpawnerSet::readId(colFInfo->absFilePath());
       KPopupMenu* ch;
-      int index = m_collectionIdList.findIndex(cId);
+      int index = m_collectionIdList.tqfindIndex(cId);
       
       if(index < 0) {
         ch = new KPopupMenu;
-        connect(ch,SIGNAL(activated(int)),SLOT(slotActivated(int)));
-        m_popup->insertItem(QIconSet(dirtPixmap(colFInfo->absFilePath())),
+        connect(ch,TQT_SIGNAL(activated(int)),TQT_SLOT(slotActivated(int)));
+        m_popup->insertItem(TQIconSet(dirtPixmap(colFInfo->absFilePath())),
           KivioStencilSpawnerSet::readTitle(colFInfo->absFilePath()),ch);
         m_collectionIdList.append(cId);
         m_collectionMenuList.append(ch);
@@ -233,45 +233,45 @@ void KivioStencilSetAction::loadCollections( const QString& rootDirStr )
   }
 }
 
-void KivioStencilSetAction::loadSet( KPopupMenu* menu, const QString& rootDirStr )
+void KivioStencilSetAction::loadSet( KPopupMenu* menu, const TQString& rootDirStr )
 {
-  QDir rootDir( rootDirStr );
+  TQDir rootDir( rootDirStr );
 
-  rootDir.setFilter( QDir::Dirs );
-  rootDir.setSorting( QDir::Name );
+  rootDir.setFilter( TQDir::Dirs );
+  rootDir.setSorting( TQDir::Name );
 
-  const QFileInfoList *setList = rootDir.entryInfoList();
-  QFileInfoListIterator setIt( *setList );
-  QFileInfo *setFInfo;
+  const TQFileInfoList *setList = rootDir.entryInfoList();
+  TQFileInfoListIterator setIt( *setList );
+  TQFileInfo *setFInfo;
 
   while( (setFInfo = setIt.current()) )
   {
     if( setFInfo->fileName() != ".." && setFInfo->fileName() != "." )
     {
-      menu->insertItem(QIconSet(dirtPixmap(setFInfo->absFilePath())),
+      menu->insertItem(TQIconSet(dirtPixmap(setFInfo->absFilePath())),
         KivioStencilSpawnerSet::readTitle(setFInfo->absFilePath()),m_ssId);
-      m_pathList.insert( m_ssId, new QString(rootDirStr + "/" + setFInfo->fileName()) );
+      m_pathList.insert( m_ssId, new TQString(rootDirStr + "/" + setFInfo->fileName()) );
       m_ssId++;
     }
     ++setIt;
   }
 }
 
-QPixmap KivioStencilSetAction::dirtPixmap( const QString& dir )
+TQPixmap KivioStencilSetAction::dirtPixmap( const TQString& dir )
 {
-    QString fs;
+    TQString fs;
 
-    if( QFile::exists(dir + "/icon.xpm") ) {
+    if( TQFile::exists(dir + "/icon.xpm") ) {
       fs = dir + "/icon.xpm";
-    } else if( QFile::exists(dir + "/icon.png") ) {
+    } else if( TQFile::exists(dir + "/icon.png") ) {
       fs = dir + "/icon.png";
     } else {
-      return QPixmap( (const char **)default_plug_xpm );
+      return TQPixmap( (const char **)default_plug_xpm );
     }
 
-    QFile file( fs );
-    QFileInfo finfo( file );
-    return QPixmap( finfo.absFilePath() );
+    TQFile file( fs );
+    TQFileInfo finfo( file );
+    return TQPixmap( finfo.absFilePath() );
 }
 
 void KivioStencilSetAction::slotActivated(int id)
@@ -279,14 +279,14 @@ void KivioStencilSetAction::slotActivated(int id)
   if (id < 0 || !m_pathList.at((uint)id))
     return;
 
-  QString path = *m_pathList.at((uint)id);
+  TQString path = *m_pathList.at((uint)id);
 
   emit activated(path);
 }
 
 void KivioStencilSetAction::clearCollectionMenuList()
 {
-  QValueList<KPopupMenu*>::Iterator it;
+  TQValueList<KPopupMenu*>::Iterator it;
   
   for(it = m_collectionMenuList.begin(); it != m_collectionMenuList.end(); ++it) {
     KPopupMenu* m = (*it);
diff --git a/kivio/kiviopart/kiviostencilsetaction.h b/kivio/kiviopart/kiviostencilsetaction.h
index 8e0e91c4..13cb9efe 100644
--- a/kivio/kiviopart/kiviostencilsetaction.h
+++ b/kivio/kiviopart/kiviostencilsetaction.h
@@ -24,26 +24,27 @@
 
 #include <kaction.h>
 
-#include <qptrlist.h>
-#include <qvaluelist.h>
-#include <qstringlist.h>
+#include <tqptrlist.h>
+#include <tqvaluelist.h>
+#include <tqstringlist.h>
 
 class KPopupMenu;
-class QPixmap;
+class TQPixmap;
 
 class KivioStencilSetAction : public KAction
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KivioStencilSetAction(const QString &text, const QString &pix,
-      KActionCollection *parent, const char *name);
+    KivioStencilSetAction(const TQString &text, const TQString &pix,
+      KActionCollection *tqparent, const char *name);
 
     virtual ~KivioStencilSetAction();
 
     KPopupMenu* popupMenu() const;
-    void popup( const QPoint& global );
+    void popup( const TQPoint& global );
 
-    virtual int plug( QWidget* widget, int index = -1 );
+    virtual int plug( TQWidget* widget, int index = -1 );
 
   public slots:
     void updateMenu();
@@ -52,21 +53,21 @@ class KivioStencilSetAction : public KAction
     void slotActivated(int);
 
   signals:
-    void activated( const QString& );
+    void activated( const TQString& );
     void showDialog();
 
   protected:
-    QPixmap dirtPixmap( const QString& dir );
-    void loadCollections( const QString& rootDirStr );
-    void loadSet( KPopupMenu* menu, const QString& rootDirStr );
+    TQPixmap dirtPixmap( const TQString& dir );
+    void loadCollections( const TQString& rootDirStr );
+    void loadSet( KPopupMenu* menu, const TQString& rootDirStr );
     void clearCollectionMenuList();
 
   protected:
     KPopupMenu* m_popup;
     uint m_ssId;
-    QPtrList<QString> m_pathList;
-    QStringList m_collectionIdList;
-    QValueList<KPopupMenu*> m_collectionMenuList;
+    TQPtrList<TQString> m_pathList;
+    TQStringList m_collectionIdList;
+    TQValueList<KPopupMenu*> m_collectionMenuList;
 };
 
 #endif
diff --git a/kivio/kiviopart/kiviostencilsetinstaller.cpp b/kivio/kiviopart/kiviostencilsetinstaller.cpp
index ba4c836a..3983644c 100644
--- a/kivio/kiviopart/kiviostencilsetinstaller.cpp
+++ b/kivio/kiviopart/kiviostencilsetinstaller.cpp
@@ -23,10 +23,10 @@
 
 #include "kiviostencilsetinstaller.h"
 
-#include <qframe.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qstringlist.h>
+#include <tqframe.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqstringlist.h>
 
 #include <klocale.h>
 #include <kurlrequester.h>
@@ -40,18 +40,18 @@
 #include <klineedit.h>
 
 namespace Kivio {
-  StencilSetInstaller::StencilSetInstaller(QWidget *parent, const char *name)
-    : KDialogBase(KDialogBase::Plain, i18n("Install Stencil Set"), Ok|Cancel, Ok, parent, name)
+  StencilSetInstaller::StencilSetInstaller(TQWidget *tqparent, const char *name)
+    : KDialogBase(KDialogBase::Plain, i18n("Install Stencil Set"), Ok|Cancel, Ok, tqparent, name)
   {
-    QFrame* page = plainPage();
-    QVBoxLayout* l = new QVBoxLayout(page);
+    TQFrame* page = plainPage();
+    TQVBoxLayout* l = new TQVBoxLayout(page);
     l->setAutoAdd(true);
 
     m_url = new KURLRequester(page);
 
     setButtonOK(KGuiItem(i18n("&Install"), "button_ok"));
     resize(400, 10);
-    connect( m_url->lineEdit(), SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotUrlChanged( const QString & ) ) );
+    connect( m_url->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotUrlChanged( const TQString & ) ) );
     slotUrlChanged( m_url->lineEdit()->text() );
     m_url->setFocus();
   }
@@ -60,21 +60,21 @@ namespace Kivio {
   {
   }
 
-    void StencilSetInstaller::slotUrlChanged( const QString &text )
+    void StencilSetInstaller::slotUrlChanged( const TQString &text )
     {
         enableButtonOK( !text.isEmpty() );
     }
 
-  void StencilSetInstaller::install(const QString& urlString)
+  void StencilSetInstaller::install(const TQString& urlString)
   {
     KURL url(urlString);
 
     if(url.isEmpty()) return;
 
-    QString tmpFile;
+    TQString tmpFile;
 
     if(!KIO::NetAccess::download(url, tmpFile, this)) {
-      KMessageBox::error(this, i18n("Could not find the stencil set archive %1.").arg(url.prettyURL()));
+      KMessageBox::error(this, i18n("Could not find the stencil set archive %1.").tqarg(url.prettyURL()));
       return;
     }
 
@@ -82,7 +82,7 @@ namespace Kivio {
     archive.open(IO_ReadOnly);
     const KArchiveDirectory* rootDir = archive.directory();
 
-    QStringList dirs = checkDirs(rootDir);
+    TQStringList dirs = checkDirs(rootDir);
 
     if(dirs.isEmpty()) {
       KMessageBox::error(this, i18n("The file is not a valid stencil set archive."));
@@ -101,16 +101,16 @@ namespace Kivio {
     KIO::NetAccess::removeTempFile(tmpFile);
   }
 
-  QStringList StencilSetInstaller::checkDirs(const KArchiveDirectory* rootDir)
+  TQStringList StencilSetInstaller::checkDirs(const KArchiveDirectory* rootDir)
   {
-    QStringList dirs;
+    TQStringList dirs;
 
     const KArchiveEntry* possibleDir = 0;
     const KArchiveDirectory* subDir = 0;
 
-    QStringList entries = rootDir->entries();
+    TQStringList entries = rootDir->entries();
 
-    for (QStringList::Iterator it = entries.begin(); it != entries.end(); ++it) {
+    for (TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it) {
       possibleDir = rootDir->entry(*it);
 
       if (possibleDir->isDirectory()) {
@@ -125,14 +125,14 @@ namespace Kivio {
     return dirs;
   }
 
-  bool StencilSetInstaller::installStencilSets(const KArchiveDirectory* rootDir, const QStringList& dirs)
+  bool StencilSetInstaller::installStencilSets(const KArchiveDirectory* rootDir, const TQStringList& dirs)
   {
-    QString installDir = locateLocal("data", "kivio/stencils");
+    TQString installDir = locateLocal("data", "kivio/stencils");
     KStandardDirs::makeDir(installDir);
     const KArchiveDirectory* currentDir = 0;
     bool ok = true;
 
-    for (QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) {
+    for (TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) {
       currentDir = dynamic_cast<const KArchiveDirectory*>(rootDir->entry(*it));
 
       if(!currentDir) {
diff --git a/kivio/kiviopart/kiviostencilsetinstaller.h b/kivio/kiviopart/kiviostencilsetinstaller.h
index a0e3f79e..80e1b25b 100644
--- a/kivio/kiviopart/kiviostencilsetinstaller.h
+++ b/kivio/kiviopart/kiviostencilsetinstaller.h
@@ -21,8 +21,8 @@
 
 #include <kdialogbase.h>
 
-class QCheckBox;
-class QStringList;
+class TQCheckBox;
+class TQStringList;
 class KArchiveDirectory;
 class KURLRequester;
 
@@ -30,20 +30,21 @@ namespace Kivio {
   class StencilSetInstaller : public KDialogBase
   {
     Q_OBJECT
+  TQ_OBJECT
     public:
-      StencilSetInstaller(QWidget *parent = 0, const char *name = 0);
+      StencilSetInstaller(TQWidget *tqparent = 0, const char *name = 0);
       ~StencilSetInstaller();
 
     public slots:
-      void install(const QString& urlString);
+      void install(const TQString& urlString);
 
     protected slots:
       virtual void slotOk();
-      void slotUrlChanged( const QString & );
+      void slotUrlChanged( const TQString & );
 
     protected:
-      QStringList checkDirs(const KArchiveDirectory* rootDir);
-      bool installStencilSets(const KArchiveDirectory* rootDir, const QStringList& dirs);
+      TQStringList checkDirs(const KArchiveDirectory* rootDir);
+      bool installStencilSets(const KArchiveDirectory* rootDir, const TQStringList& dirs);
 
     private:
       KURLRequester* m_url;
diff --git a/kivio/kiviopart/stencilbarbutton.cpp b/kivio/kiviopart/stencilbarbutton.cpp
index 98d71e64..67d6c079 100644
--- a/kivio/kiviopart/stencilbarbutton.cpp
+++ b/kivio/kiviopart/stencilbarbutton.cpp
@@ -20,18 +20,18 @@
 
 #include <kiconloader.h>
 #include <kstringhandler.h>
-#include <qapplication.h>
-#include <qstyle.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qtooltip.h>
+#include <tqapplication.h>
+#include <tqstyle.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqtooltip.h>
 #include <kdebug.h>
-#include "qdrawutil.h"
+#include "tqdrawutil.h"
 
 using namespace Kivio;
 
-DragBarButton::DragBarButton( const QString& text, QWidget* parent, const char* name )
-: QPushButton(text,parent,name)
+DragBarButton::DragBarButton( const TQString& text, TQWidget* tqparent, const char* name )
+: TQPushButton(text,tqparent,name)
 {
   m_pIcon = 0L;
   m_bPressed = false;
@@ -74,11 +74,11 @@ DragBarButton::DragBarButton( const QString& text, QWidget* parent, const char*
 
   setPixmap(stencil_xpm);
 
-  const QColorGroup& g = colorGroup();
-  QColor c = g.buttonText();
+  const TQColorGroup& g = tqcolorGroup();
+  TQColor c = g.buttonText();
 
   int cr, cg, cb;
-  QString line;
+  TQString line;
   c.rgb( &cr, &cg, &cb );
   line.sprintf(". c #%02X%02X%02X",cr,cg,cb);
 
@@ -94,9 +94,9 @@ DragBarButton::DragBarButton( const QString& text, QWidget* parent, const char*
   "x..xx..x",
   "xxxxxxxx"
   };
-  m_pClosePix = new QPixmap(close_xpm);
+  m_pClosePix = new TQPixmap(close_xpm);
 
-  QToolTip::add(this, text);
+  TQToolTip::add(this, text);
 }
 
 DragBarButton::~DragBarButton()
@@ -107,22 +107,22 @@ DragBarButton::~DragBarButton()
   kdDebug(43000) << "DragBarButton - AHHHHHH I'M DYING!" << endl;
 }
 
-void DragBarButton::drawButton( QPainter* paint )
+void DragBarButton::drawButton( TQPainter* paint )
 {
-  QSize pixSize;
+  TQSize pixSize;
 
   if(m_orientation == Qt::Vertical) {
-    pixSize = QSize(width(), height());
+    pixSize = TQSize(width(), height());
   } else {
-    pixSize = QSize(height(), width());
+    pixSize = TQSize(height(), width());
   }
 
-  QPixmap pix(pixSize.width(), pixSize.height());
+  TQPixmap pix(pixSize.width(), pixSize.height());
   pix.fill(eraseColor());
-  QPainter pixPainter(&pix);
+  TQPainter pixPainter(&pix);
 
-  const QColorGroup& g = colorGroup();
-  style().drawControl( QStyle::CE_PushButton, &pixPainter, this, QRect(0, 0, pixSize.width(), pixSize.height()), colorGroup() );
+  const TQColorGroup& g = tqcolorGroup();
+  tqstyle().tqdrawControl( TQStyle::CE_PushButton, &pixPainter, this, TQRect(0, 0, pixSize.width(), pixSize.height()), tqcolorGroup() );
 
   int m = 3;
   int tw = 0;
@@ -130,34 +130,34 @@ void DragBarButton::drawButton( QPainter* paint )
 
   if ( m_pIcon ) {
     pw = m_pIcon->width();
-    style().drawItem( &pixPainter, QRect( m, 0, pw, pixSize.height() ),
+    tqstyle().drawItem( &pixPainter, TQRect( m, 0, pw, pixSize.height() ),
                       AlignLeft | AlignVCenter,
-                      colorGroup(), isEnabled(),
-                      m_pIcon, QString::null, -1,
+                      tqcolorGroup(), isEnabled(),
+                      m_pIcon, TQString(), -1,
                       &g.buttonText());
   }
 
   if ( !text().isEmpty() ) {
-    QFontMetrics fm = fontMetrics();
-    QSize sz = fm.size( ShowPrefix, text() );
+    TQFontMetrics fm = fontMetrics();
+    TQSize sz = fm.size( ShowPrefix, text() );
     tw = sz.width();
     int x = m + pw + (tw!=0 && pw!=0 ?m:0);
-    QString t = KStringHandler::rPixelSqueeze(text(), fm, pixSize.width() - (x + m + 22));
+    TQString t = KStringHandler::rPixelSqueeze(text(), fm, pixSize.width() - (x + m + 22));
 
-    style().drawItem( &pixPainter, QRect( x, 0, tw, pixSize.height() ),
+    tqstyle().drawItem( &pixPainter, TQRect( x, 0, tw, pixSize.height() ),
                       AlignLeft | AlignVCenter|ShowPrefix,
-                      colorGroup(), isEnabled(),
+                      tqcolorGroup(), isEnabled(),
                       0L, t, -1,
                       &g.buttonText());
   }
 
 
-  QPoint p1(pixSize.width() - 10, 0);
-  QPoint p2(pixSize.width() - 10, pixSize.height());
+  TQPoint p1(pixSize.width() - 10, 0);
+  TQPoint p2(pixSize.width() - 10, pixSize.height());
   qDrawShadeLine( &pixPainter, p1, p2, g, true, 0, 1 );
 
-  p1 += QPoint(2, 0);
-  p2 += QPoint(2, 0);
+  p1 += TQPoint(2, 0);
+  p2 += TQPoint(2, 0);
   qDrawShadeLine( &pixPainter, p1, p2, g, true, 0, 1 );
 
   if (m_bMouseOn) {
@@ -173,17 +173,17 @@ void DragBarButton::drawButton( QPainter* paint )
   }
 }
 
-void DragBarButton::setIcon( const QString& name )
+void DragBarButton::setIcon( const TQString& name )
 {
-  m_pIcon = new QPixmap(BarIcon(name));
+  m_pIcon = new TQPixmap(BarIcon(name));
 }
 
-void DragBarButton::setPixmap( const QPixmap& pixmap )
+void DragBarButton::setPixmap( const TQPixmap& pixmap )
 {
-  m_pIcon = new QPixmap(pixmap);
+  m_pIcon = new TQPixmap(pixmap);
 }
 
-QSize DragBarButton::sizeHint() const
+TQSize DragBarButton::tqsizeHint() const
 {
   constPolish();
   int m = 3;
@@ -193,8 +193,8 @@ QSize DragBarButton::sizeHint() const
   int ph = 0;
 
   if ( !text().isEmpty() ) {
-    QFontMetrics fm = fontMetrics();
-    QSize sz = fm.size( ShowPrefix, text() );
+    TQFontMetrics fm = fontMetrics();
+    TQSize sz = fm.size( ShowPrefix, text() );
     tw = 64; // Minimum size
     th = sz.height();
   }
@@ -204,24 +204,24 @@ QSize DragBarButton::sizeHint() const
     ph = m_pIcon->height();
   }
 
-  int h = QMAX(ph,th)+2*m;
+  int h = TQMAX(ph,th)+2*m;
   int w = m + pw + (tw!=0 && pw!=0 ?m:0) + tw + m + 22;
 
-  QSize size;
+  TQSize size;
   
   if(m_orientation == Qt::Vertical) {
-    size = QSize(w, h).expandedTo(QApplication::globalStrut());
+    size = TQSize(w, h).expandedTo(TQApplication::globalStrut());
   } else {
-    size = QSize(h, w).expandedTo(QApplication::globalStrut());
+    size = TQSize(h, w).expandedTo(TQApplication::globalStrut());
   }
   
   return size;
 }
 
-void DragBarButton::mousePressEvent( QMouseEvent* ev )
+void DragBarButton::mousePressEvent( TQMouseEvent* ev )
 {
   m_bClose = false;
-  QRect closeRect;
+  TQRect closeRect;
 
   if(m_orientation == Qt::Vertical) {
     closeRect.setRect(width() - 20, 0, m_pClosePix->width(), height());
@@ -229,9 +229,9 @@ void DragBarButton::mousePressEvent( QMouseEvent* ev )
     closeRect.setRect(0, 20 - m_pClosePix->width(), width(), m_pClosePix->width());
   }
 
-  if ( closeRect.contains(ev->pos())) {
+  if ( closeRect.tqcontains(ev->pos())) {
     m_bClose = true;
-    repaint();
+    tqrepaint();
     return;
   }
 
@@ -239,12 +239,12 @@ void DragBarButton::mousePressEvent( QMouseEvent* ev )
   m_ppoint = ev->pos();
 }
 
-void DragBarButton::mouseReleaseEvent( QMouseEvent* ev )
+void DragBarButton::mouseReleaseEvent( TQMouseEvent* ev )
 {
   if ( m_bClose ) {
     m_bClose = false;
-    repaint();
-    QRect closeRect;
+    tqrepaint();
+    TQRect closeRect;
 
     if(m_orientation == Qt::Vertical) {
       closeRect.setRect(width() - 20, 0, m_pClosePix->width(), height());
@@ -252,7 +252,7 @@ void DragBarButton::mouseReleaseEvent( QMouseEvent* ev )
       closeRect.setRect(0, 20 - m_pClosePix->width(), width(), m_pClosePix->width());
     }
 
-    if ( closeRect.contains(ev->pos()))
+    if ( closeRect.tqcontains(ev->pos()))
     {
        kdDebug(43000) << "DragBarButton::mouseReleaseEvent() - Emitting closeRequest" << endl;
         emit closeRequired(this);
@@ -269,10 +269,10 @@ void DragBarButton::mouseReleaseEvent( QMouseEvent* ev )
   }
 }
 
-void DragBarButton::mouseMoveEvent( QMouseEvent* ev )
+void DragBarButton::mouseMoveEvent( TQMouseEvent* ev )
 {
   if (m_bPressed) {
-    QPoint p = m_ppoint;
+    TQPoint p = m_ppoint;
     p -= ev->pos();
     if (p.manhattanLength() > 2 && !m_bDragged ) {
       m_bDragged = true;
@@ -281,28 +281,28 @@ void DragBarButton::mouseMoveEvent( QMouseEvent* ev )
   }
 }
 
-void DragBarButton::enterEvent( QEvent* ev )
+void DragBarButton::enterEvent( TQEvent* ev )
 {
-  QPushButton::enterEvent(ev);
+  TQPushButton::enterEvent(ev);
   m_bMouseOn = true;
-  repaint(false);
+  tqrepaint(false);
 }
 
-void DragBarButton::leaveEvent( QEvent* ev )
+void DragBarButton::leaveEvent( TQEvent* ev )
 {
-  QPushButton::leaveEvent(ev);
+  TQPushButton::leaveEvent(ev);
   m_bMouseOn = false;
-  repaint();
+  tqrepaint();
 }
 
-void DragBarButton::setOrientation(Orientation orientation)
+void DragBarButton::setOrientation(Qt::Orientation orientation)
 {
   m_orientation = orientation;
   
   if(m_orientation == Qt::Vertical) {
-    setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+    tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
   } else {
-    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
+    tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
   }
 }
 
diff --git a/kivio/kiviopart/stencilbarbutton.h b/kivio/kiviopart/stencilbarbutton.h
index 3227c744..88bfe60b 100644
--- a/kivio/kiviopart/stencilbarbutton.h
+++ b/kivio/kiviopart/stencilbarbutton.h
@@ -19,22 +19,23 @@
 #ifndef STENCILBARBUTTON_H
 #define STENCILBARBUTTON_H
 
-#include <qpushbutton.h>
+#include <tqpushbutton.h>
 
-class QPixmap;
+class TQPixmap;
 namespace Kivio {
 
-class DragBarButton : public QPushButton
+class DragBarButton : public TQPushButton
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    DragBarButton( const QString&, QWidget* parent, const char* name = 0 );
+    DragBarButton( const TQString&, TQWidget* tqparent, const char* name = 0 );
     ~DragBarButton();
   
-    void setIcon( const QString& );
-    void setPixmap( const QPixmap& );
+    void setIcon( const TQString& );
+    void setPixmap( const TQPixmap& );
   
-    QSize sizeHint() const;
+    TQSize tqsizeHint() const;
     
     Qt::Orientation orientation() const { return m_orientation; }
   
@@ -44,25 +45,25 @@ class DragBarButton : public QPushButton
     void closeRequired(DragBarButton *);
   
   public slots:
-    void setOrientation(Orientation orientation);
+    void setOrientation(Qt::Orientation orientation);
   
   protected:
-    void drawButton( QPainter* );
-    void mousePressEvent( QMouseEvent* );
-    void mouseReleaseEvent( QMouseEvent* );
-    void mouseMoveEvent( QMouseEvent* );
+    void drawButton( TQPainter* );
+    void mousePressEvent( TQMouseEvent* );
+    void mouseReleaseEvent( TQMouseEvent* );
+    void mouseMoveEvent( TQMouseEvent* );
   
-    void enterEvent( QEvent* );
-    void leaveEvent( QEvent* );
+    void enterEvent( TQEvent* );
+    void leaveEvent( TQEvent* );
   
   private:
-    QPixmap* m_pClosePix;
-    QPixmap* m_pIcon;
+    TQPixmap* m_pClosePix;
+    TQPixmap* m_pIcon;
     bool m_bPressed;
     bool m_bDragged;
     bool m_bMouseOn;
     bool m_bClose;
-    QPoint m_ppoint;
+    TQPoint m_ppoint;
     Qt::Orientation m_orientation;
 };
 
diff --git a/kivio/kiviopart/stencilbardockmanager.cpp b/kivio/kiviopart/stencilbardockmanager.cpp
index 73061ad1..606c6a93 100644
--- a/kivio/kiviopart/stencilbardockmanager.cpp
+++ b/kivio/kiviopart/stencilbardockmanager.cpp
@@ -22,35 +22,35 @@
 #include "kivio_stackbar.h"
 #include "kivio_view.h"
 
-#include <qcursor.h>
-#include <qvaluelist.h>
-#include <qapplication.h>
-#include <qwindowdefs.h>
-#include <qtimer.h>
-#include <qrect.h>
-#include <qframe.h>
-#include <qpainter.h>
+#include <tqcursor.h>
+#include <tqvaluelist.h>
+#include <tqapplication.h>
+#include <tqwindowdefs.h>
+#include <tqtimer.h>
+#include <tqrect.h>
+#include <tqframe.h>
+#include <tqpainter.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 
-StencilBarDockManager::StencilBarDockManager( KivioView* parent, const char* name )
-: QWidget(parent,name)
+StencilBarDockManager::StencilBarDockManager( KivioView* tqparent, const char* name )
+: TQWidget(tqparent,name)
 {
   dragButton = 0L;
   dragWidget = 0L;
-  m_pView = parent;
+  m_pView = tqparent;
   m_destinationBar = 0L;
   dragPos = OnDesktop;
 
   m_pBars.setAutoDelete(true);
 
   m_pDoc = m_pView->doc();
-  connect(m_pDoc, SIGNAL(sig_deleteStencilSet(DragBarButton*, QWidget*, KivioStackBar*)), this,
-          SLOT(slotDeleteStencilSet(DragBarButton*, QWidget*, KivioStackBar*)));
+  connect(m_pDoc, TQT_SIGNAL(sig_deleteStencilSet(DragBarButton*, TQWidget*, KivioStackBar*)), this,
+          TQT_SLOT(slotDeleteStencilSet(DragBarButton*, TQWidget*, KivioStackBar*)));
 
   moveManager = new KoToolDockMoveManager();
-  connect(moveManager,SIGNAL(positionChanged()),SLOT(slotMoving()));
+  connect(moveManager,TQT_SIGNAL(positionChanged()),TQT_SLOT(slotMoving()));
 }
 
 StencilBarDockManager::~StencilBarDockManager()
@@ -58,15 +58,15 @@ StencilBarDockManager::~StencilBarDockManager()
   delete moveManager;
 }
 
-void StencilBarDockManager::insertStencilSet( QWidget* w, const QString& caption,
-                                              BarPos pos, QRect /*r*/, KivioStackBar* destinationBar )
+void StencilBarDockManager::insertStencilSet( TQWidget* w, const TQString& caption,
+                                              BarPos pos, TQRect /*r*/, KivioStackBar* destinationBar )
 {
   KivioStackBar* bar = 0L;
   
   if(destinationBar) {
     bar = destinationBar;
   } else {
-    Qt::Dock position = Qt::DockLeft;
+    TQt::Dock position = TQt::DockLeft;
 
     if ( pos == AutoSelect ) {
       pos = Left;
@@ -74,66 +74,66 @@ void StencilBarDockManager::insertStencilSet( QWidget* w, const QString& caption
 
     switch (pos) {
       case OnDesktop:
-        position = Qt::DockTornOff;
+        position = TQt::DockTornOff;
         break;
       case Left:
       {
-        QPtrList<QDockWindow> dockList = m_pView->mainWindow()->dockWindows(Qt::DockLeft);
+        TQPtrList<TQDockWindow> dockList = m_pView->mainWindow()->dockWindows(TQt::DockLeft);
         
-        for(QDockWindow* dock = dockList.first(); dock; dock = dockList.next()) {
-          if(::qt_cast<KivioStackBar*>(dock) && (static_cast<KivioStackBar*>(dock)->view() == m_pView)) {
+        for(TQDockWindow* dock = dockList.first(); dock; dock = dockList.next()) {
+          if(::tqqt_cast<KivioStackBar*>(dock) && (static_cast<KivioStackBar*>(dock)->view() == m_pView)) {
             bar = static_cast<KivioStackBar*>(dock);
             break;
           }
         }
 
-        position = Qt::DockLeft;
+        position = TQt::DockLeft;
         break;
       }
       case Top:
       {
-        QPtrList<QDockWindow> dockList = m_pView->mainWindow()->dockWindows(Qt::DockTop);
+        TQPtrList<TQDockWindow> dockList = m_pView->mainWindow()->dockWindows(TQt::DockTop);
         
-        for(QDockWindow* dock = dockList.first(); dock; dock = dockList.next()) {
-          if(::qt_cast<KivioStackBar*>(dock) && (static_cast<KivioStackBar*>(dock)->view() == m_pView)) {
+        for(TQDockWindow* dock = dockList.first(); dock; dock = dockList.next()) {
+          if(::tqqt_cast<KivioStackBar*>(dock) && (static_cast<KivioStackBar*>(dock)->view() == m_pView)) {
             bar = static_cast<KivioStackBar*>(dock);
             break;
           }
         }
 
-        position = Qt::DockTop;
+        position = TQt::DockTop;
         break;
       }
       case Right:
       {
-        QPtrList<QDockWindow> dockList = m_pView->mainWindow()->dockWindows(Qt::DockRight);
+        TQPtrList<TQDockWindow> dockList = m_pView->mainWindow()->dockWindows(TQt::DockRight);
         
-        for(QDockWindow* dock = dockList.first(); dock; dock = dockList.next()) {
-          if(::qt_cast<KivioStackBar*>(dock) && (static_cast<KivioStackBar*>(dock)->view() == m_pView)) {
+        for(TQDockWindow* dock = dockList.first(); dock; dock = dockList.next()) {
+          if(::tqqt_cast<KivioStackBar*>(dock) && (static_cast<KivioStackBar*>(dock)->view() == m_pView)) {
             bar = static_cast<KivioStackBar*>(dock);
             break;
           }
         }
 
-        position = Qt::DockRight;
+        position = TQt::DockRight;
         break;
       }
       case Bottom:
       {
-        QPtrList<QDockWindow> dockList = m_pView->mainWindow()->dockWindows(Qt::DockBottom);
+        TQPtrList<TQDockWindow> dockList = m_pView->mainWindow()->dockWindows(TQt::DockBottom);
         
-        for(QDockWindow* dock = dockList.first(); dock; dock = dockList.next()) {
-          if(::qt_cast<KivioStackBar*>(dock) && (static_cast<KivioStackBar*>(dock)->view() == m_pView)) {
+        for(TQDockWindow* dock = dockList.first(); dock; dock = dockList.next()) {
+          if(::tqqt_cast<KivioStackBar*>(dock) && (static_cast<KivioStackBar*>(dock)->view() == m_pView)) {
             bar = static_cast<KivioStackBar*>(dock);
             break;
           }
         }
 
-        position = Qt::DockBottom;
+        position = TQt::DockBottom;
         break;
       }
       case OnTopLevelBar: // hmm this shouldn't happen :)
-        position = Qt::DockTornOff;
+        position = TQt::DockTornOff;
         break;
       default:
         break;
@@ -143,10 +143,10 @@ void StencilBarDockManager::insertStencilSet( QWidget* w, const QString& caption
       bar = new KivioStackBar(m_pView, m_pView->mainWindow());
       m_pView->mainWindow()->moveDockWindow(bar, position);
       m_pBars.append(bar);
-      connect(bar,SIGNAL(beginDragPage(DragBarButton*)),SLOT(slotBeginDragPage(DragBarButton*)));
-      connect(bar,SIGNAL(finishDragPage(DragBarButton*)),SLOT(slotFinishDragPage(DragBarButton*)));
-      connect(bar,SIGNAL(deleteButton(DragBarButton*,QWidget*,KivioStackBar*)),
-              m_pDoc, SLOT(slotDeleteStencilSet(DragBarButton*,QWidget*,KivioStackBar*)));
+      connect(bar,TQT_SIGNAL(beginDragPage(DragBarButton*)),TQT_SLOT(slotBeginDragPage(DragBarButton*)));
+      connect(bar,TQT_SIGNAL(finishDragPage(DragBarButton*)),TQT_SLOT(slotFinishDragPage(DragBarButton*)));
+      connect(bar,TQT_SIGNAL(deleteButton(DragBarButton*,TQWidget*,KivioStackBar*)),
+              m_pDoc, TQT_SLOT(slotDeleteStencilSet(DragBarButton*,TQWidget*,KivioStackBar*)));
     }
   }
 
@@ -175,15 +175,15 @@ void StencilBarDockManager::slotFinishDragPage( DragBarButton* )
   dragWidget->setUpdatesEnabled(true);
   dragWidget->update();
 
-  QString caption(dragButton->text());
+  TQString caption(dragButton->text());
   KivioStackBar* bar = (KivioStackBar*)sender();
   bar->removePage(dragWidget);
 
-  insertStencilSet(dragWidget,caption,dragPos,moveManager->geometry(),m_destinationBar);
+  insertStencilSet(dragWidget,caption,dragPos,moveManager->tqgeometry(),m_destinationBar);
 
   // remove KivioStackBar if no more pages
   if (!bar->visiblePage()) {
-    int k = m_pBars.findRef(bar);
+    int k = m_pBars.tqfindRef(bar);
 
     if ( k!= -1 ) {
       m_pBars.remove(k);
@@ -200,18 +200,18 @@ void StencilBarDockManager::slotFinishDragPage( DragBarButton* )
 void StencilBarDockManager::slotMoving()
 {
   m_destinationBar = 0L;
-  QPoint p = QCursor::pos();
-  QPoint globalPos;
+  TQPoint p = TQCursor::pos();
+  TQPoint globalPos;
 
   // check existing bars
   for ( KivioStackBar* bar = m_pBars.first(); bar; bar = m_pBars.next() ) {
-    if ( bar->geometry().contains(p) ) {
-      if(bar->place() == QDockWindow::OutsideDock) {
+    if ( bar->tqgeometry().tqcontains(p) ) {
+      if(bar->place() == TQDockWindow::OutsideDock) {
         dragPos = OnTopLevelBar;
-        globalPos = bar->geometry().topLeft();
+        globalPos = bar->tqgeometry().topLeft();
       } else {
         dragPos = AutoSelect;
-        globalPos = bar->mapToGlobal(bar->geometry().topLeft());
+        globalPos = bar->mapToGlobal(bar->tqgeometry().topLeft());
       }
       
       m_destinationBar = bar;
@@ -219,18 +219,18 @@ void StencilBarDockManager::slotMoving()
       moveManager->setGeometry(globalPos.x(),
                                moveManager->y(),
                                bar->width(),
-                               moveManager->getWidget()->sizeHint().height());
+                               moveManager->getWidget()->tqsizeHint().height());
       return;
     }
   }
 
   // check "on mainView"
-  QRect mr(m_pView->mapToGlobal(QPoint(0,0)),m_pView->size());
+  TQRect mr(m_pView->mapToGlobal(TQPoint(0,0)),m_pView->size());
 
-  if ( mr.contains(p) ) {
-    QRect r(mr);
+  if ( mr.tqcontains(p) ) {
+    TQRect r(mr);
     r.setWidth(r.width()/4);
-    if ( r.contains(p) && !m_pBars.at(Left) ) {
+    if ( r.tqcontains(p) && !m_pBars.at(Left) ) {
       moveManager->movePause();
       moveManager->setGeometry(r);
       dragPos = Left;
@@ -239,17 +239,17 @@ void StencilBarDockManager::slotMoving()
 
     r.moveBy(r.width()*3,0);
 
-    if ( r.contains(p) && !m_pBars.at(Right) ) {
+    if ( r.tqcontains(p) && !m_pBars.at(Right) ) {
       moveManager->movePause();
       moveManager->setGeometry(r);
       dragPos = Right;
       return;
     }
 
-    QRect t(mr);
+    TQRect t(mr);
 
     t.setHeight(t.height()/4);
-    if ( t.contains(p) && !m_pBars.at(Top) ) {
+    if ( t.tqcontains(p) && !m_pBars.at(Top) ) {
       moveManager->movePause();
       moveManager->setGeometry(t);
       dragPos = Top;
@@ -258,7 +258,7 @@ void StencilBarDockManager::slotMoving()
 
     t.moveBy(0,t.height()*3);
 
-    if ( t.contains(p) && !m_pBars.at(Bottom) ) {
+    if ( t.tqcontains(p) && !m_pBars.at(Bottom) ) {
       moveManager->movePause();
       moveManager->setGeometry(t);
       dragPos = Bottom;
@@ -272,13 +272,13 @@ void StencilBarDockManager::slotMoving()
   dragPos = OnDesktop;
 }
 
-void StencilBarDockManager::slotDeleteStencilSet( DragBarButton* pBtn, QWidget *, KivioStackBar *pBar )
+void StencilBarDockManager::slotDeleteStencilSet( DragBarButton* pBtn, TQWidget *, KivioStackBar *pBar )
 {
   pBar->deletePageAndButton(pBtn);
 
   // remove KivioStackBar if no more pages
   if (!pBar->visiblePage()) {
-    int k = m_pBars.findRef(pBar);
+    int k = m_pBars.tqfindRef(pBar);
 
     if ( k!= -1 ) {
       m_pBars.remove(k);
@@ -306,16 +306,16 @@ void StencilBarDockManager::setAllStackBarsShown(bool shown)
 //
 
 KoToolDockMoveManager::KoToolDockMoveManager()
-  : QObject()
+  : TQObject()
 {
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
     XGCValues gv;
 #endif
 
     working=false;
     noLast=true;
 
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
     scr = qt_xscreen();
     root = qt_xrootwin();
 
@@ -323,11 +323,11 @@ KoToolDockMoveManager::KoToolDockMoveManager()
     gv.line_width = 2;
     gv.foreground = WhitePixel(qt_xdisplay(), scr)^BlackPixel(qt_xdisplay(), scr);
     gv.subwindow_mode = IncludeInferiors;
-    long mask = GCForeground | GCFunction | GCLineWidth | GCSubwindowMode;
-    rootgc = XCreateGC(qt_xdisplay(), qt_xrootwin(), mask, &gv);
+    long tqmask = GCForeground | GCFunction | GCLineWidth | GCSubwindowMode;
+    rootgc = XCreateGC(qt_xdisplay(), qt_xrootwin(), tqmask, &gv);
 #endif
 
-    timer = new QTimer(this);
+    timer = new TQTimer(this);
 }
 
 KoToolDockMoveManager::~KoToolDockMoveManager()
@@ -336,7 +336,7 @@ KoToolDockMoveManager::~KoToolDockMoveManager()
   delete timer;
 }
 
-void KoToolDockMoveManager::doMove( QWidget* _w )
+void KoToolDockMoveManager::doMove( TQWidget* _w )
 {
   if (working)
     return;
@@ -356,14 +356,14 @@ void KoToolDockMoveManager::doMove( QWidget* _w )
   orig_w = w;
   orig_h = h;
 
-  QApplication::setOverrideCursor(QCursor(sizeAllCursor));
+  TQApplication::setOverrideCursor(TQCursor(sizeAllCursor));
 
   movePause(false,false);
 
   drawRectangle(xp, yp, w, h);
 
   timer->disconnect();
-  connect(timer,SIGNAL(timeout()),SLOT(doMoveInternal()));
+  connect(timer,TQT_SIGNAL(timeout()),TQT_SLOT(doMoveInternal()));
   timer->start(0);
 }
 
@@ -373,10 +373,10 @@ void KoToolDockMoveManager::doMoveInternal()
     return;
 
   if (!pauseMoveX)
-    rx = QCursor::pos().x();
+    rx = TQCursor::pos().x();
 
   if (!pauseMoveY)
-    ry = QCursor::pos().y();
+    ry = TQCursor::pos().y();
 
   xp = rx - offX;
   yp = ry - offY;
@@ -386,7 +386,7 @@ void KoToolDockMoveManager::doMoveInternal()
   if (check(xp, yp, w, h)) {
     paintProcess(false,xp, yp, w, h);
 
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
         XFlush(qt_xdisplay());
         XSync(qt_xdisplay(),false);
 #endif
@@ -399,17 +399,17 @@ void KoToolDockMoveManager::stop()
     return;
 
   timer->stop();
-  QApplication::restoreOverrideCursor();
+  TQApplication::restoreOverrideCursor();
 
   paintProcess();
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
     XFlush(qt_xdisplay());
 #endif
 
     working = false;
 }
 
-void KoToolDockMoveManager::setGeometry( const QRect& r )
+void KoToolDockMoveManager::setGeometry( const TQRect& r )
 {
   setGeometry(r.x(),r.y(),r.width(),r.height());
 }
@@ -424,7 +424,7 @@ void KoToolDockMoveManager::setGeometry(int _x, int _y, int _w, int _h)
   check(_x, _y, _w, _h, true);
   paintProcess(false,_x, _y, _w, _h);
 
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
     XFlush(qt_xdisplay());
     XSync(qt_xdisplay(),false);
 #endif
@@ -440,7 +440,7 @@ void KoToolDockMoveManager::drawRectangle( int _x, int _y, int _w, int _h)
   ow = _w;
   oh = _h;
 
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
     XDrawRectangle(qt_xdisplay(), root, rootgc, _x, _y, _w, _h);
 #endif
     noLast = false;
@@ -454,7 +454,7 @@ void KoToolDockMoveManager::paintProcess( bool onlyDelete, int _x, int _y, int _
   if ( ox == _x && oy == _y && ow ==_w && oh == _h )
     return;
 
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
     XDrawRectangle(qt_xdisplay(), root, rootgc, ox, oy, ow, oh);
 #endif
     noLast = true;
@@ -474,7 +474,7 @@ void KoToolDockMoveManager::moveContinue()
   pauseMoveY = false;
 }
 
-void KoToolDockMoveManager::doXResize( QWidget* w, bool mirror )
+void KoToolDockMoveManager::doXResize( TQWidget* w, bool mirror )
 {
   if (working)
     return;
@@ -488,7 +488,7 @@ void KoToolDockMoveManager::doXResize( QWidget* w, bool mirror )
   doResize(w);
 }
 
-void KoToolDockMoveManager::doYResize( QWidget* w, bool mirror )
+void KoToolDockMoveManager::doYResize( TQWidget* w, bool mirror )
 {
   if (working)
     return;
@@ -502,7 +502,7 @@ void KoToolDockMoveManager::doYResize( QWidget* w, bool mirror )
   doResize(w);
 }
 
-void KoToolDockMoveManager::doXYResize( QWidget* w, bool _mirrorX, bool _mirrorY )
+void KoToolDockMoveManager::doXYResize( TQWidget* w, bool _mirrorX, bool _mirrorY )
 {
   if (working)
     return;
@@ -519,10 +519,10 @@ void KoToolDockMoveManager::doXYResize( QWidget* w, bool _mirrorX, bool _mirrorY
 void KoToolDockMoveManager::doResizeInternal()
 {
   if (!yOnly)
-    rx = QCursor::pos().x();
+    rx = TQCursor::pos().x();
 
   if (!xOnly)
-    ry = QCursor::pos().y();
+    ry = TQCursor::pos().y();
 
   int dx = rx - sx;
   int dy = ry - sy;
@@ -546,20 +546,20 @@ void KoToolDockMoveManager::doResizeInternal()
   if (check(xp, yp, w, h)) {
     paintProcess(false,xp, yp, w, h);
 
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
         XFlush(qt_xdisplay());
         XSync(qt_xdisplay(),false);
 #endif
   }
 }
 
-void KoToolDockMoveManager::setWidget( QWidget* _w )
+void KoToolDockMoveManager::setWidget( TQWidget* _w )
 {
   widget = _w;
-  minSize = widget->minimumSize();
-  maxSize = widget->maximumSize();
+  minSize = widget->tqminimumSize();
+  maxSize = widget->tqmaximumSize();
 
-  rr = QRect(widget->mapToGlobal(QPoint(0,0)),widget->size());
+  rr = TQRect(widget->mapToGlobal(TQPoint(0,0)),widget->size());
   p =  rr.topLeft();
 
   xp = rr.x();
@@ -567,18 +567,18 @@ void KoToolDockMoveManager::setWidget( QWidget* _w )
   w  = rr.width();
   h  = rr.height();
 
-  rx = QCursor::pos().x();
-  ry = QCursor::pos().y();
+  rx = TQCursor::pos().x();
+  ry = TQCursor::pos().y();
 }
 
-void KoToolDockMoveManager::doResize( QWidget* _w )
+void KoToolDockMoveManager::doResize( TQWidget* _w )
 {
   setWidget(_w);
 
   working=true;
   isDoMove = false;
 
-  QPoint curPos = QCursor::pos();
+  TQPoint curPos = TQCursor::pos();
   sx = curPos.x();
   sy = curPos.y();
 
@@ -588,15 +588,15 @@ void KoToolDockMoveManager::doResize( QWidget* _w )
   drawRectangle(xp, yp, w, h);
 
   timer->disconnect();
-  connect(timer,SIGNAL(timeout()),SLOT(doResizeInternal()));
+  connect(timer,TQT_SIGNAL(timeout()),TQT_SLOT(doResizeInternal()));
   timer->start(0);
 }
 
 bool KoToolDockMoveManager::check(int& x, int& y, int& w, int& h, bool change)
 {
 
-  int w1 = QMIN(QMAX(minSize.width(), w), maxSize.width());
-  int h1 = QMIN(QMAX(minSize.height(), h), maxSize.height());
+  int w1 = TQMIN(TQMAX(minSize.width(), w), maxSize.width());
+  int h1 = TQMIN(TQMAX(minSize.height(), h), maxSize.height());
 
   bool f1 = (w1-w)+(h1-h) == 0;
 
@@ -631,7 +631,7 @@ bool KoToolDockMoveManager::check(int& x, int& y, int& w, int& h, bool change)
   return f1&&f2;
 }
 
-QRect KoToolDockMoveManager::geometry()
+TQRect KoToolDockMoveManager::tqgeometry()
 {
   int x0 = xp;
   int y0 = yp;
@@ -639,7 +639,7 @@ QRect KoToolDockMoveManager::geometry()
   int h0 = h;
   check(x0,y0,w0,h0,true);
 
-  return QRect(x0,y0,w0,h0);
+  return TQRect(x0,y0,w0,h0);
 }
 
 #include "stencilbardockmanager.moc"
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
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape
index 8ff02c32..7d7cb3cb 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Block Arrow - Chevron</name><!-- Block Arrow - Chevron, as seen in PowerPoint 97 -->
   <icon>arrow-chevron.png</icon>
@@ -32,4 +32,4 @@
     <svg:polygon style="fill: default" points="0,0 2,0 3,1 2,2 0,2 1,1 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,0 2,0 3,1 2,2 0,2 1,1 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape
index 6e1388fe..b0e44553 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Down Arrow</name>
   <icon>arrow-down.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: default" points="1,0 1,2 0,2 2,4 4,2 3,2 3,0 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 1,2 0,2 2,4 4,2 3,2 3,0 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape
index a4f20839..d536a6b6 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Notched Left Arrow</name>
   <icon>arrow-left-notched.png</icon>
@@ -40,4 +40,4 @@
     <svg:polygon style="fill: default" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 3,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 3,2 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape
index 54babdd8..d2579d6d 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Left-Right-Up Arrow</name>
   <icon>arrow-left-right-up.png</icon>
@@ -76,4 +76,4 @@
     <svg:polygon style="fill: default" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 8,6 8,7 10,5 8,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 8,6 8,7 10,5 8,3 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape
index 03b7787c..b2e85882 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Left-Right Arrow</name>
   <icon>arrow-left-right.png</icon>
@@ -48,4 +48,4 @@
     <svg:polygon style="fill: default" points="6,1 2,1 2,0 0,2 2,4 2,3 6,3 6,4 8,2 6,0 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,1 2,1 2,0 0,2 2,4 2,3 6,3 6,4 8,2 6,0 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape
index e3c0c008..e70c0d2a 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Assorted - Left-Up Arrow</name>
   <icon>arrow-left-up.png</icon>
@@ -56,4 +56,4 @@
     <svg:polygon style="fill: #ffffff" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 6,6 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 6,6 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape
index 8eb15cd4..e2e513af 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Left Arrow</name>
   <icon>arrow-left.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: default" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape
index ef0f7f47..b99c3461 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Block Arrow - Pentagon</name><!-- Arrow Pentagon as seen in Powerpoint 97 -->
   <icon>arrow-pentagon.png</icon>
@@ -28,4 +28,4 @@
     <svg:polygon style="fill: default" points="0,0 2,0 3,1 2,2 0,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,0 2,0 3,1 2,2 0,2 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape
index 6351e8dd..1886293b 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Quad Arrow</name>
   <icon>arrow-quad.png</icon>
@@ -57,4 +57,4 @@
     <svg:polygon style="fill: default" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 6,6 8,6 8,7 10,5 8,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 6,6 8,6 8,7 10,5 8,3 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape
index 17d670fc..8738ffea 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Notched Right Arrow</name>
   <icon>arrow-right-notched.png</icon>
@@ -40,4 +40,4 @@
     <svg:polygon style="fill: default" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 1,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 1,2 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape
index 8e9fea1d..be5bf79c 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Right Arrow</name>
   <icon>arrow-right.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: default" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape
index 8d418022..0549dbe8 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Up-Down-Left Arrow</name>
   <icon>arrow-up-down-left.png</icon>
@@ -76,4 +76,4 @@
     <svg:polygon style="fill: default" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape
index e94d2d17..f0f8623e 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Up-Down Arrow</name>
   <icon>arrow-up-down.png</icon>
@@ -48,4 +48,4 @@
     <svg:polygon style="fill: default" points="1,6 1,2 0,2 2,0 4,2 3,2 3,6 4,6 2,8 0,6 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,6 1,2 0,2 2,0 4,2 3,2 3,6 4,6 2,8 0,6 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape
index 791f8a78..83222aa8 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Up Arrow</name>
   <icon>arrow-up.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: default" points="1,4 1,2 0,2 2,0 4,2 3,2 3,4 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,4 1,2 0,2 2,0 4,2 3,2 3,4 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/circle.shape b/kivio/kiviopart/stencils/Dia/Assorted/circle.shape
index 26647def..ae10097e 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/circle.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/circle.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Perfect Circle</name>
   <icon>circle.png</icon>
@@ -18,4 +18,4 @@
     <svg:ellipse style="fill: default" cx="1.5" cy="2" rx="1" ry="1"/>
     <svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="1.5" cy="2" rx="1" ry="1"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape b/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape
index 2bc02249..2b6a598c 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Maltese Cross</name><!-- St. John's Ambulance -->
   <icon>cross-maltese.png</icon>
@@ -41,4 +41,4 @@
     <svg:polygon style="fill: default" points="7,6 7.5,5 7,4 9,5 8,3 9,3.5 10,3 9,5 11,4 10.5,5 11,6 9,5 10,7 9,6.5 8,7 9,5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="7,6 7.5,5 7,4 9,5 8,3 9,3.5 10,3 9,5 11,4 10.5,5 11,6 9,5 10,7 9,6.5 8,7 9,5 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape b/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape
index 2aeef611..88d86baa 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Swiss Cross</name>
   <!-- Swiss flag has a white cross on red -->
@@ -59,4 +59,4 @@
     <svg:polygon style="fill: default" points="2.55,3.05 2.55,2.55 3.05,2.55 3.05,2.05 3.55,2.05 3.55,2.55 4.05,2.55 4.05,3.05 3.55,3.05 3.55,3.55 3.05,3.55 3.05,3.05 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="2.55,3.05 2.55,2.55 3.05,2.55 3.05,2.05 3.55,2.05 3.55,2.55 4.05,2.55 4.05,3.05 3.55,3.05 3.55,3.55 3.05,3.55 3.05,3.05 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape b/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape
index 88948942..a031d369 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Diamond</name>
   <icon>diamond.png</icon>
@@ -18,4 +18,4 @@
     <svg:polygon style="fill: default" points="1,0 2,1 1,2 0,1 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 2,1 1,2 0,1 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape
index ea2c2400..ecfac8e2 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Heptagon</name>
   <icon>heptagon.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: #ffffff" points="0,6 0.5,2 5,0 9.5,2 10,6 7.5,9.5 2.5,9.5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,6 0.5,2 5,0 9.5,2 10,6 7.5,9.5 2.5,9.5 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape
index a21aa220..71bedc8d 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Hexagon</name>
   <icon>hexagon.png</icon>
@@ -32,4 +32,4 @@
     <svg:polygon style="fill: default" points="1.5,1 3,1 4,2.5 3,4 1.5,4 0.5,2.5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1.5,1 3,1 4,2.5 3,4 1.5,4 0.5,2.5 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape
index c0dceb97..794cd4b8 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Octagon</name>
   <icon>octagon.png</icon>
@@ -25,4 +25,4 @@
     <svg:polygon style="fill: default" points="3.55,2.05 5.05,2.05 6.05,3.05 6.05,4.55 5.05,5.55 3.55,5.55 2.55,4.55 2.55,3.05 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="3.55,2.05 5.05,2.05 6.05,3.05 6.05,4.55 5.05,5.55 3.55,5.55 2.55,4.55 2.55,3.05 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape
index 582a970e..b85fa737 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
-  <name>Geometric - Horizontal Parallelogram</name>
+  <name>Geometric -Qt::Horizontal Parallelogram</name>
   <icon>parallelogram-horizontal.png</icon>
   <connections>
     <point x="1" y="0"/>
@@ -24,4 +24,4 @@
     <svg:polygon style="fill: default" points="1,0 2,0 1,1 0,1 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 2,0 1,1 0,1 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape
index 57c6bada..d5794080 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
-  <name>Geometric - Vertical Parallelogram</name>
+  <name>Geometric -Qt::Vertical Parallelogram</name>
   <icon>parallelogram-vertical.png</icon>
   <connections>
     <point x="0" y="1"/>
@@ -24,4 +24,4 @@
     <svg:polygon style="fill: default" points="0,1 1,0 1,1 0,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 1,0 1,1 0,2 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape
index 89db85e7..a3941127 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Pentagon</name>
   <icon>pentagon.png</icon>
@@ -28,4 +28,4 @@
     <svg:polygon style="fill: default" points="0,1.5 2,0 4,1.5 3,3.5 1,3.5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1.5 2,0 4,1.5 3,3.5 1,3.5 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/square.shape b/kivio/kiviopart/stencils/Dia/Assorted/square.shape
index 67d58bf4..e7be1a89 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/square.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/square.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Perfect Square</name>
   <icon>square.png</icon>
@@ -26,4 +26,4 @@
     <svg:rect style="fill: default" x="4.5" y="2.45" width="1.5" height="1.55"/>
     <svg:rect style="stroke-width: 0.1; stroke: #000000" x="4.5" y="2.45" width="1.5" height="1.55"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star4.shape b/kivio/kiviopart/stencils/Dia/Assorted/star4.shape
index d57432a9..5d66851c 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star4.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star4.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Four Point Star</name>
   <icon>star4.png</icon>
@@ -25,4 +25,4 @@
     <svg:polygon style="fill: default" points="0,2.5 1.5,2 2,0.5 2.5,2 4,2.5 2.5,3 2,4.5 1.5,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,2.5 1.5,2 2,0.5 2.5,2 4,2.5 2.5,3 2,4.5 1.5,3 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star5.shape b/kivio/kiviopart/stencils/Dia/Assorted/star5.shape
index 20d55b99..379b74c6 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star5.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star5.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Five Point Star</name>
   <!-- Eventually decided that it was better to get these done than worry about them being perfect -->
@@ -50,5 +50,5 @@
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,4.5 5,4.5 7,0 9,4.5 14,4.5 10,7.5 12,12.5 7,9 2,12.5 4,7.5 "/>
   </svg:svg>
   <!-- Alan Horkan was here 2002 -->
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star6.shape b/kivio/kiviopart/stencils/Dia/Assorted/star6.shape
index bbaf2853..2c2f5cac 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star6.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star6.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Six Point Star</name><!-- aka Star of David -->
   <icon>star6.png</icon>
@@ -56,4 +56,4 @@
     <svg:polygon style="fill: default" points="0,1 1,1 1.5,0 2,1 3,1 2.5,2 3,3 2,3 1.5,4 1,3 0,3 0.5,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 1,1 1.5,0 2,1 3,1 2.5,2 3,3 2,3 1.5,4 1,3 0,3 0.5,2 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star7.shape b/kivio/kiviopart/stencils/Dia/Assorted/star7.shape
index cb008f12..adef753f 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star7.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star7.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Seven Point Star</name>
   <!-- It may not be a perfect Heptagon, but it looks good and it is at least Symmetrical.  -->
@@ -65,4 +65,4 @@
     <svg:polygon style="fill: default" points="5,0 6.5,2 9,2 8.5,4.5 10,6.5 8,7 7.5,9.5 5,8 2.5,9.5 2,7 0,6.5 1.5,4.5 1,2 3.5,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="5,0 6.5,2 9,2 8.5,4.5 10,6.5 8,7 7.5,9.5 5,8 2.5,9.5 2,7 0,6.5 1.5,4.5 1,2 3.5,2 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star8.shape b/kivio/kiviopart/stencils/Dia/Assorted/star8.shape
index b67bdb42..80664b5f 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star8.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star8.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Eight Point Star</name>
   <!-- The points all have Nintey Degree Angles -->
@@ -74,4 +74,4 @@
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,3.5 1,2.5 1,1 2.5,1 3.5,0 4.5,1 6,1 6,2.5 7,3.5 6,4.5 6,6 4.5,6 3.5,7 2.5,6 1,6 1,4.5 "/>
   </svg:svg>
   <!-- Alan Horkan, 2002, horkana@tcd.ie -->
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape b/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape
index c68e257c..1e97b53b 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Sharp Eight Point Star</name>
   <!-- Angles in this Star are much sharper, about Thirty degrees -->
@@ -73,5 +73,5 @@
     <svg:polygon style="fill: default" points="0,7.5 5,6.5 2.5,2.5 6.5,5 7.5,0 8.5,5 12.5,2.5 10,6.5 15,7.5 10,8.5 12.5,12.5 8.5,10 7.5,15 6.5,10 2.5,12.5 5,8.5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,7.5 5,6.5 2.5,2.5 6.5,5 7.5,0 8.5,5 12.5,2.5 10,6.5 15,7.5 10,8.5 12.5,12.5 8.5,10 7.5,15 6.5,10 2.5,12.5 5,8.5 "/>
   </svg:svg>
-</shape>
+</tqshape>
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/sun.shape b/kivio/kiviopart/stencils/Dia/Assorted/sun.shape
index 48ae7b4e..b638e315 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/sun.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/sun.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Assorted - Sun</name>
   <icon>sun.png</icon>
@@ -94,7 +94,7 @@
     <point x="1.25" y="5.5"/>
   </connections>
   <aspectratio type="fixed"/>
-  <!-- I orignally used a nice warm gold colour #ffcc00, but shape files 
+  <!-- I orignally used a nice warm gold colour #ffcc00, but tqshape files 
 have to use default if you want to allow the user to change the fill colour -->
   <svg:svg>
     <svg:polygon style="fill: default" points="3.5,0 4,1 3,1 "/>
@@ -116,5 +116,5 @@ have to use default if you want to allow the user to change the fill colour -->
     <svg:polygon style="fill: default" points="2,5.5 1.5,5 1,6 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="2,5.5 1.5,5 1,6 "/>
   </svg:svg>
-</shape>
+</tqshape>
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape b/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape
index fb971a58..474317f5 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Trapezoid</name>
   <icon>trapezoid.png</icon>
@@ -18,4 +18,4 @@
     <svg:polygon style="fill: #ffffff" points="1,0 3,0 4,2 0,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 3,0 4,2 0,2 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape b/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape
index 2708c5c0..74245a0c 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Isosceles Triangle</name><!-- Triangle with two sides of equal length -->
   <icon>triangle-isoceles.png</icon>
@@ -20,4 +20,4 @@
     <svg:polygon style="fill: default" points="5.5,4 6.5,6 4.5,6 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="5.5,4 6.5,6 4.5,6 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape b/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape
index 3d7097ac..5d38874a 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Right Angle Triangle</name>
   <icon>triangle-rightangle.png</icon>
@@ -18,5 +18,5 @@
     <svg:polygon style="fill: #ffffff" points="0,2 2,2 0,0 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,2 2,2 0,0 "/>
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Circuit/npn.shape b/kivio/kiviopart/stencils/Dia/Circuit/npn.shape
index d0636820..d57fe166 100644
--- a/kivio/kiviopart/stencils/Dia/Circuit/npn.shape
+++ b/kivio/kiviopart/stencils/Dia/Circuit/npn.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Circuit - NPN Transistor</name>
   <!--
@@ -24,5 +24,5 @@
 
     <svg:polyline points="5,4 6,4 5.6154,3.0769" />
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape b/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape
index f6e83ce1..756cf865 100644
--- a/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape
+++ b/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Circuit - Op Amp</name>
   <description>An operational amplifier</description>
@@ -22,5 +22,5 @@
     <svg:line x1="1.2" y1="1" x2="2" y2="1" />
     <svg:line x1="4.5" y1="0" x2="5.5" y2="0" />
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape b/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape
index 3e0e59ef..c89b7832 100644
--- a/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape
+++ b/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Circuit - PNP Transistor</name>
   <!--
@@ -24,5 +24,5 @@
 
     <svg:polyline points="4,2 3,2 3.3846,2.9231" />
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape
index 9032094b..66f3b1ba 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Right Arrow</name>
 
@@ -78,5 +78,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:polygon style="stroke-width: 1; stroke: foreground"
     points="0,0.5 1.5,0.5 2,0.5 2,0 3,1 2,2 2,1.5 0,1.5 " />
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape
index b1a15619..2053db21 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Up Arrow</name>
 
@@ -76,5 +76,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:polygon style="stroke-width: 1; stroke: foreground"
     points="0.5,3 0.5,1 0,1 1,0 1,0 2,1 1.5,1 1.5,3 " />
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape
index 9168966d..5abe7185 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Backflow Preventer</name>
 
@@ -55,5 +55,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:line style="stroke-width: 1; stroke: #000000" x1="0.2"
     y1="0.8" x2="0.8" y2="0.2" />
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape
index ea4d47a9..0d7c4231 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Basin</name>
 
@@ -74,5 +74,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:polygon style="stroke-width: 1; stroke: #000000"
     points="0,0 0.2,0 0.2,2.8 4.8,2.8 4.8,0 5,0 5,3 0,3 " />
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape
index 84a2002f..5add8f35 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Final-Settling Basin</name>
 
@@ -106,5 +106,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     style="stroke-width: 1; stroke: foreground; fill: background"
     points="0,0 0.3,0 0.3,1.9 1.4,3.7 1.6,3.7 2.7,1.9 2.7,0 3,0 3,2 1.8,4 1.2,4 0,2 " />
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape
index ac143720..bdfcb107 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Frequency Converter</name>
 
@@ -57,5 +57,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:line style="stroke-width: 1; stroke: #000000" x1="0" y1="2"
     x2="3" y2="0" />
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape
index 428b8805..bbe4d3dc 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
-  <name>Civil - Horizontal Valve</name>
+  <name>Civil -Qt::Horizontal Valve</name>
 
   <icon>civil_horizontal_valve.xpm</icon>
 
@@ -62,5 +62,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:polygon style="stroke-width: 1; stroke: foreground"
     points="0,1 0,0 0.5,0.5 1,0 1,1 0.5,0.5 " />
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape
index 270628be..beec8aa1 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Motor</name>
 
@@ -53,5 +53,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:polyline style="stroke-width: 1; stroke: #000000"
     points="0.3,0.7 0.3,0.3 0.5,0.5 0.7,0.3 0.7,0.7 " />
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape
index 36c4f89b..c78f62f0 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Preliminary Clarification Tank</name>
 
@@ -257,5 +257,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:line style="stroke-width: 0.5; stroke: #000000" x1="3.4"
     y1="0.4" x2="5.8" y2="0.4" />
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape
index 4f0f98df..a721ed0e 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Rotor</name>
 
@@ -104,5 +104,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:line style="stroke-width: 1; stroke: #000000" x1="2.20711"
     y1="0.792893" x2="2.56066" y2="0.43934" />
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape
index a658df14..03f859e5 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Soil</name>
 
@@ -71,5 +71,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:line style="stroke-width: 0.8; stroke: foreground"
     x1="2.36192" y1="0" x2="1.75837" y2="1" />
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_if.shape b/kivio/kiviopart/stencils/Dia/Contact/c_if.shape
index 57cdbdb7..43b9495f 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/c_if.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/c_if.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Contact - if</name> <!-- XXX - OBSOLETE -->
   <description>if</description>
@@ -18,6 +18,6 @@
     <svg:polyline points="-2,0 -.75,0" />
     <svg:polyline points="-1,1 1,0 2,0 "/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape b/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape
index d8ae4d62..667e75f6 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Contact - ifnot</name> <!-- XXX - OBSOLETE -->
   <description>if not</description>
@@ -20,6 +20,6 @@
     <svg:line x1="-.5" y1="-2.2" x2=".5" y2="-2.2" 
 	      svg:style="stroke-width:.05"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape b/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape
index 15cc5257..1e3d1042 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Contact - lamp</name> <!-- XXX OBSOLETE -->
   <description>lamp</description>
@@ -20,6 +20,6 @@
     <svg:polyline points="-.707,-.707 .707,.707"/>
     <svg:polyline points="-.707,.707 .707,-.707"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape b/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape
index f933cf5b..4016df10 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Contact - relay</name> <!-- XXX OBSOLETE -->
   <description>relay</description>
@@ -21,6 +21,6 @@
     <svg:rect x="-1" y="-1" width="2" height="2"/>
     <svg:polyline points="-1,.5 1,-.5"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape
index a58db432..1a7fd4e7 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - ifnot</name>
   <description>if not</description>
@@ -23,4 +23,4 @@
     <svg:line x1="-.5" y1="-2.2" x2=".5" y2="-2.2" 
 	      svg:style="stroke-width:.05"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_out.shape b/kivio/kiviopart/stencils/Dia/Contact/l_out.shape
index f595cb6a..124c3069 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_out.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_out.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - out</name>
   <description>out</description>
@@ -22,6 +22,6 @@
     <svg:path d="M .5,.75 C .75,.5 .75,.25 .75,0
 	      C .75,-.25 .75,-.5 .5,-.75" />
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape
index 427fd724..49060cdf 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - outj</name>
   <description>out jump</description>
@@ -25,6 +25,6 @@
 	         C .25,.5 .5,.5 .5,.25
 	         L .5,-.5"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape
index 15c078bd..5a360fc5 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - outnot</name>
   <description>outnot</description>
@@ -23,6 +23,6 @@
 	      C .75,-.25 .75,-.5 .5,-.75" />
     <svg:polyline points="-.5,.5 .5,-.5"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape
index 830eaae1..94761257 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - outr</name>
   <description>out reset</description>
@@ -28,6 +28,6 @@
     <svg:polyline points="-.5,0 0,0" />
     <svg:path d="M -.25,0 C 0,.25 0,.25 .5,.5"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape
index 03cf0f4f..2ef92bd0 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - outs</name>
   <description>out set</description>
@@ -28,6 +28,6 @@
                  C .5,.5 .25,.5 0,.5
                  C -.25,.5 -.5,.5 -.5,.25"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape b/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape
index 6635c317..db9a6228 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - sout</name>
   <description>ps out</description>
@@ -28,7 +28,7 @@
     <svg:path d="M 1.25,-1.125
 	      C 1.375,-1 1.625,-1 1.75,-1.125"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape
index 45fc49a4..5a2f6f18 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - soutnot</name>
   <description>ps outnot</description>
@@ -29,6 +29,6 @@
     <svg:path d="M 1.25,-1.125
 	      C 1.375,-1 1.625,-1 1.75,-1.125"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape b/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape
index f2c48f8f..8d54e7be 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - soutr</name>
   <description>ps out reset</description>
@@ -34,7 +34,7 @@
     <svg:path d="M 1.25,-1.125
 	      C 1.375,-1 1.625,-1 1.75,-1.125"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape b/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape
index 32520cae..0cd35bbb 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - souts</name>
   <description>ps out set</description>
@@ -34,6 +34,6 @@
     <svg:path d="M 1.25,-1.125
 	      C 1.375,-1 1.625,-1 1.75,-1.125"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/command.shape b/kivio/kiviopart/stencils/Dia/Electric/command.shape
index b76f2aa9..7ea6d2b8 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/command.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/command.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - command</name>
   <description>command</description>
@@ -18,7 +18,7 @@
     <svg:line x1="0" y1=".5" x2="1" y2=".5"/>
     <svg:rect x=".3" y=".2" width=".4" height=".6" svg:style="fill:background"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape b/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape
index 43208f14..31057db1 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - contact_f</name>
   <description>contact_f</description>
@@ -18,6 +18,6 @@
     <svg:polyline points="0,.5 .3,.5 .3,.3"/>
     <svg:polyline points="1,.5 .7,.5 .25,.275"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape b/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape
index d2bea36d..ee1b2787 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - contact_o</name>
   <description>contact_o</description>
@@ -17,6 +17,6 @@
     <svg:line x1="0" y1=".5" x2=".3" y2=".5"/>
     <svg:polyline points="1,.5 .7,.5 .3,.7"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape b/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape
index 87aa6861..081ae768 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - intpos_f</name>
   <description>intpos_f</description>
@@ -20,6 +20,6 @@
     <svg:polyline points="1,.5 .7,.5 .25,.275"/>
     <svg:polyline points=".6,.45 .35,.45 .4,.35"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape b/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape
index ceb72cb5..086de61b 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - intpos_o</name>
   <description>intpos_o</description>
@@ -19,6 +19,6 @@
     <svg:polyline points="1,.5 .7,.5 .3,.7"/>
     <svg:polyline points=".6,.55 .45,.75 .4,.65"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/relay.shape b/kivio/kiviopart/stencils/Dia/Electric/relay.shape
index 0d506ff9..0a9461fb 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/relay.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/relay.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - relay</name>
   <description>relay</description>
@@ -19,7 +19,7 @@
     <svg:rect x=".3" y=".2" width=".4" height=".6" svg:style="fill:background"/>
     <svg:line x1=".3" y1=".6" x2=".7" y2=".4"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape b/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape
index ea8ee9bf..4f8d788c 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Demultiplexer</name>
   <description>Demultiplexer</description>
@@ -24,4 +24,4 @@
     <svg:line x1="10" y1="5" x2="0" y2="10"/>
     <svg:line x1="0" y1="0" x2="0" y2="10"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape b/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape
index 364565ff..96f90015 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Large Extension Node</name>
   <description>Large Extension Node</description>
@@ -26,5 +26,5 @@
     <svg:line x1="1" y1="1" x2="1" y2="5"/>
     <svg:line x1="7" y1="1" x2="7" y2="5"/>
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape b/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape
index 371eef0d..9483a7df 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Multiplexer</name>
   <description>Multiplexer</description>
@@ -24,4 +24,4 @@
     <svg:line x1="0" y1="5" x2="10" y2="10"/>
     <svg:line x1="10" y1="0" x2="10" y2="10"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/MSE/node_center.shape b/kivio/kiviopart/stencils/Dia/MSE/node_center.shape
index 31a84511..3f59d4ca 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/node_center.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/node_center.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Node Center</name>
   <description>Node Center</description>
@@ -22,4 +22,4 @@
     <svg:line x1="5" y1="10" x2="9.330126" y2="2.5"/>
     <svg:line x1="0.669874" y1="2.5" x2="9.330126" y2="2.5"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape b/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape
index 19a8b68e..1513e25b 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Small Extension Node</name>
   <description>Small Extension Node</description>
@@ -21,5 +21,5 @@
     <svg:line x1="0" y1="0" x2="0" y2="6"/>
     <svg:line x1="8" y1="0" x2="8" y2="6"/>
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape b/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape
index 2964a28b..411bd80a 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Tactical Satellite Communications Terminal</name>
   <description>Tactical Satellite Communications Terminal</description>
@@ -24,4 +24,4 @@
 
     <svg:path d="M 3,0 C 0.5,2.5 8.5,10.5 11,8"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/dat_external.shape b/kivio/kiviopart/stencils/Dia/Network/dat_external.shape
index 39d6a058..c768f038 100644
--- a/kivio/kiviopart/stencils/Dia/Network/dat_external.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/dat_external.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - An external DAT drive</name>
   <icon>dat_external.xpm</icon>
@@ -33,4 +33,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="13.5" y1="6" x2="1.5" y2="6"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="1.5" y1="6.5" x2="13.5" y2="6.5"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape b/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape
index 0b7f7ded..7b2b8e22 100644
--- a/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - Digitizing Board</name>
   <icon>digitizing_board.png</icon>
   <connections>
@@ -30,4 +30,4 @@
     <svg:rect style="fill: #4c4c4c" x="10" y="9" width="3" height="0.5"/>
     <svg:rect style="stroke-width: 0.1; stroke: foreground" x="10" y="9" width="3" height="0.5"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/diskette.shape b/kivio/kiviopart/stencils/Dia/Network/diskette.shape
index 904760e0..280da134 100644
--- a/kivio/kiviopart/stencils/Dia/Network/diskette.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/diskette.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Diskette</name>
   <icon>diskette.xpm</icon>
@@ -35,4 +35,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="3" y1="6" x2="13" y2="6"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="13" y1="8" x2="3" y2="8"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/firewall.shape b/kivio/kiviopart/stencils/Dia/Network/firewall.shape
index ea128a59..53734fbc 100644
--- a/kivio/kiviopart/stencils/Dia/Network/firewall.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/firewall.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - Firewall</name>
   <icon>firewall.xpm</icon>
@@ -78,4 +78,4 @@
     <svg:polyline style="stroke:foreground; stroke-width:.5"
     points="0,0 .125,-.125 1.125,-.125,1.125,1.875 1,2 0,2 0,0"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/hub.shape b/kivio/kiviopart/stencils/Dia/Network/hub.shape
index 62c624f1..b2faadbb 100644
--- a/kivio/kiviopart/stencils/Dia/Network/hub.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/hub.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - Hub</name>
   <icon>hub.xpm</icon>
@@ -37,5 +37,5 @@
     <svg:rect style="stroke:none; fill:foreground"
      x="4" y=".75" width=".25" height=".24"/>
   </svg:svg>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape b/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape
index ba006a8f..431c5efd 100644
--- a/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Mobile Phone</name>
   <icon>mobile_phone.xpm</icon>
@@ -59,4 +59,4 @@
     <svg:rect style="fill: #d0f4e5" x="5.5" y="11.5" width="2" height="2"/>
     <svg:rect style="stroke-width: 0.1; stroke: #000000" x="5.5" y="11.5" width="2" height="2"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/monitor.shape b/kivio/kiviopart/stencils/Dia/Network/monitor.shape
index 66fc1734..fcc21c3a 100644
--- a/kivio/kiviopart/stencils/Dia/Network/monitor.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/monitor.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Workstation Monitor</name>
   <icon>monitor.xpm</icon>
@@ -28,4 +28,4 @@
     <svg:rect style="fill: #d9d9cd" x="3" y="17" width="12" height="1"/>
     <svg:rect style="stroke-width: 0.1; stroke: #000000" x="3" y="17" width="12" height="1"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape
index 639f4b7a..2b2025ea 100644
--- a/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Bigtower PC</name>
   <icon>pc_bigtower.xpm</icon>
@@ -63,4 +63,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2.5" y1="23.5" x2="11.5" y2="23.5"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="23" x2="2.5" y2="23"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape b/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape
index 5847b063..7a3c7455 100644
--- a/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Desktop PC</name>
   <icon>pc_desktop.xpm</icon>
@@ -49,4 +49,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="5.5" x2="11.5" y2="5"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="1.5" x2="11.5" y2="1"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape
index daed926e..409c6e12 100644
--- a/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Midi-tower PC</name>
   <icon>pc_miditower.xpm</icon>
@@ -54,4 +54,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2.5" y1="17" x2="11.5" y2="17"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="16.5" x2="2.5" y2="16.5"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape
index 683e4ee1..6b33ec5f 100644
--- a/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Minitower PC</name>
   <icon>pc_minitower.xpm</icon>
@@ -52,4 +52,4 @@
    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2" y1="8" x2="2.5" y2="8"/>
    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="6" y1="8" x2="6.5" y2="8"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/plotter.shape b/kivio/kiviopart/stencils/Dia/Network/plotter.shape
index ed64d2eb..3c0cc737 100644
--- a/kivio/kiviopart/stencils/Dia/Network/plotter.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/plotter.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - Plotter</name>
   <icon>plotter.png</icon>
   <connections>
@@ -41,4 +41,4 @@
     <svg:polyline style="stroke-width: 0.1; stroke: foreground" points="12.5,10.5 12.5,7.5 13.5,7.5 13.5,10.5 "/>
     <svg:polyline style="stroke-width: 0.1; stroke: foreground" points="14,10.5 14,7.5 15,7.5 15,10.5 "/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/workstation.shape b/kivio/kiviopart/stencils/Dia/Network/workstation.shape
index 109a0651..19003b8e 100644
--- a/kivio/kiviopart/stencils/Dia/Network/workstation.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/workstation.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Workstation</name>
   <icon>workstation.xpm</icon>
@@ -56,4 +56,4 @@
     <svg:rect style="fill: #cdcdcd" x="5" y="2" width="9" height="1"/>
     <svg:rect style="stroke-width: 0.1; stroke: #000000" x="5" y="2" width="9" height="1"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape b/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape
index c071d1ca..e317f3e1 100644
--- a/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A ZIP Disk</name>
   <icon>zip-disk.xpm</icon>
@@ -46,4 +46,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2" y1="4.375" x2="2" y2="9.875"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="7.75" y1="4.375" x2="7.75" y2="9.85"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape
index 25a05e72..fe6bc807 100644
--- a/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape
+++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Pneum - DEJack</name>
   <description>dejack</description>
@@ -25,6 +25,6 @@
     <svg:rect x=".4" y=".2" width="2.6" height=".8" 
 	      svg:style="stroke-width: 1.0"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape
index f0fd67e2..0f484add 100644
--- a/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape
+++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Pneum - dist32</name>
   <description>dist32</description>
@@ -34,6 +34,6 @@
     <svg:polygon points="1.8,.8 1.8,1 1.6,.9" 
 		 svg:style="stroke:none; fill:foreground"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape
index b2f38fc7..04e644eb 100644
--- a/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape
+++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Pneum - dist42</name>
   <description>dist42</description>
@@ -35,6 +35,6 @@
     <svg:polygon points="1.8,0 1.8,.2 1.6,.1"
 		 svg:style="stroke:none; fill:foreground"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape
index c1902669..021db07e 100644
--- a/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape
+++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Pneum - dist52</name>
   <description>dist52</description>
@@ -44,6 +44,6 @@
     <svg:polygon points=".750,1 .830,.80 .650,.84"
 		 svg:style="stroke:none; fill:foreground"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/SDL/block.shape b/kivio/kiviopart/stencils/Dia/SDL/block.shape
index 4e18f2f5..c697400d 100644
--- a/kivio/kiviopart/stencils/Dia/SDL/block.shape
+++ b/kivio/kiviopart/stencils/Dia/SDL/block.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>SDL - Block</name>
   <description>Block Type Reference</description>
@@ -16,4 +16,4 @@
     <svg:polygon points="0,0 2.5,0 2.5,2 0,2" style="fill: default" />
     <svg:polygon points="0.15,0.15 2.35,0.15 2.35,1.85 0.15,1.85" style="fill: default" />
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/SDL/decision.shape b/kivio/kiviopart/stencils/Dia/SDL/decision.shape
index 2c2ce44f..6cb1fba7 100644
--- a/kivio/kiviopart/stencils/Dia/SDL/decision.shape
+++ b/kivio/kiviopart/stencils/Dia/SDL/decision.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>SDL - Decision</name>
   <description>Decision</description>
@@ -15,4 +15,4 @@
   <svg:svg width="2.5" height="2.5">
     <svg:polygon points="1.25,0 2.5,1.25 1.25,2.5 0,1.25" style="fill: default" />
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/SDL/process.shape b/kivio/kiviopart/stencils/Dia/SDL/process.shape
index 0a8512f5..95028b58 100644
--- a/kivio/kiviopart/stencils/Dia/SDL/process.shape
+++ b/kivio/kiviopart/stencils/Dia/SDL/process.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>SDL - Process</name>
   <description>Process Type Reference</description>
@@ -16,4 +16,4 @@
     <svg:polygon points="0.3,0 2.2,0 2.5,0.3 2.5,1.7 2.2,2 0.3,2 0,1.7 0,0.3" style="fill: default" />
     <svg:polygon points="0.3,0.15 2.2,0.15 2.35,0.3 2.35,1.7 2.2,1.85 0.3,1.85 0.15,1.7 0.15,0.3" style="fill: default" />
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/SDL/service.shape b/kivio/kiviopart/stencils/Dia/SDL/service.shape
index 3223741f..fd4936e7 100644
--- a/kivio/kiviopart/stencils/Dia/SDL/service.shape
+++ b/kivio/kiviopart/stencils/Dia/SDL/service.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>SDL - Service</name>
   <description>Service Type Reference</description>
@@ -17,4 +17,4 @@
                  h -0.25  c -0.75,-0.4 -1.125,-0.6 -1.125,-1 c 0,-0.4 0.25,-0.6 1.125,-1 z"
               style="fill: default"/>
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Sybase/client.shape b/kivio/kiviopart/stencils/Dia/Sybase/client.shape
index 4d3f913f..81ff9f03 100644
--- a/kivio/kiviopart/stencils/Dia/Sybase/client.shape
+++ b/kivio/kiviopart/stencils/Dia/Sybase/client.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Sybase - Client Application</name>
   <icon>client.xpm</icon>
@@ -21,5 +21,5 @@
     <svg:path style="stroke:foreground; stroke-width: 0.5" 
     d="M1.2,.8 L1.2,1.2 L1.6,1 L1.2,.8"/>
   </svg:svg>
-</shape>   
+</tqshape>   
 
diff --git a/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape b/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape
index 49cce15d..85340990 100644
--- a/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape
+++ b/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Sybase - Dataserver</name>
   <icon>dataserver.xpm</icon>
@@ -19,7 +19,7 @@
     M 0.0706,0.66667 L 1.5,0.66667 M 0,1 L 1.5,1 M 0.0706,1.33333 L
   1.5,1.33333 M 0.24,1.66667 L 1.5,1.66667" /> 
   </svg:svg>
-</shape>
+</tqshape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape b/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape
index 1df9b7fc..508b64bf 100644
--- a/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape
+++ b/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Sybase - Log Transfer Manager/Rep Agent</name>
   <icon>ltm.xpm</icon>
@@ -28,4 +28,4 @@
     d="M 1.4,1 L 1.8,1"/>
     
   </svg:svg>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape b/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape
index 946603b1..bef14946 100644
--- a/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape
+++ b/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Sybase - Replication Server</name>
   <icon>repserver.xpm</icon>
@@ -26,6 +26,6 @@
     points="1,1 .7,.85 .7,1.15"/>
     <svg:circle style="stroke:none; fill:foreground" cx="1" cy="1" r=".5"/>
   </svg:svg>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml
index 704e66b0..707882e9 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Card"/>
 		<Id data="Card"/>
-		<Description data="Basic flowcharting card shape"/>
+		<Description data="Basic flowcharting card tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml
index 2fa28f24..a052fc1c 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml
@@ -4,7 +4,7 @@
 		<Author data="Dave Marotti"/>
 		<Title data="Data"/>
 		<Id data="Data"/>
-		<Description data="Data shape for flowcharting"/>
+		<Description data="Data tqshape for flowcharting"/>
 		<Version data="1.0"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml
index e069d4ac..2e83ee8e 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Decision"/>
 		<Id data="Decision"/>
-		<Description data="Basic flowcharting decision shape"/>
+		<Description data="Basic flowcharting decision tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml
index 21661b74..df9d3a5f 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Direct Data"/>
 		<Id data="Direct Data"/>
-		<Description data="Basic flowcharting direct data shape"/>
+		<Description data="Basic flowcharting direct data tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml
index f07580d2..9634593e 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Display"/>
 		<Id data="Display"/>
-		<Description data="Basic flowcharting display shape"/>
+		<Description data="Basic flowcharting display tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml
index 3a7a50ae..d4051189 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Internal Storage"/>
 		<Id data="Internal Storage"/>
-		<Description data="Internal storage shape"/>
+		<Description data="Internal storage tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml
index 199072a6..b409c57a 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Loop Limit"/>
 		<Id data="Loop Limit"/>
-		<Description data="Basic flowcharting loop limit shape"/>
+		<Description data="Basic flowcharting loop limit tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml
index d6104506..17691486 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Manual Input"/>
 		<Id data="Manual Input"/>
-		<Description data="Basic flowcharting manual input shape"/>
+		<Description data="Basic flowcharting manual input tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml
index bc452400..2536f822 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Manual Operation"/>
 		<Id data="Manual Operation"/>
-		<Description data="Basic flowcharting manual operation shape"/>
+		<Description data="Basic flowcharting manual operation tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml
index 452e048a..e1f80367 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Predefined Process"/>
 		<Id data="Predefined Process"/>
-		<Description data="Predefined process shape"/>
+		<Description data="Predefined process tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml
index f79d2a51..b935d273 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Preparation"/>
 		<Id data="Preperation"/>
-		<Description data="Basic flowcharting preparation shape"/>
+		<Description data="Basic flowcharting preparation tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml
index 94d129ac..60a00732 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Process"/>
 		<Id data="Process"/>
-		<Description data="Basic flowcharting process shape"/>
+		<Description data="Basic flowcharting process tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy
index fc01b542..aa11f970 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy
@@ -4,7 +4,7 @@
         <Author data="Dmitry Poplavsky"/>
         <Title data="Python"/>
         <Id data="Python"/>
-        <Description data="Basic flowcharting card shape"/>
+        <Description data="Basic flowcharting card tqshape"/>
         <Version data="0.1"/>
         <Web data="www.thekompany.com"/>
         <Email data="dima@kde.org"/>
@@ -40,7 +40,7 @@ connector_targets = [ { "x":x+2,  "y":y-2 },
                     ]
 
 
-shapes = {
+tqshapes = {
           "rect" :{
                    "type"  : "Rectangle",
                    "fillstyle" : "solid",
@@ -96,12 +96,12 @@ connector_targets = [ { "x":x+2,  "y":y-2 },
                             { "x":(x+x2)/2, "y":y }
                           ]
 
-shapes["rect2"]["x"] = x+w-35
-shapes["rect2"]["y"] = y+h-35
-shapes["rect2"]["w"] = 20
-shapes["rect2"]["h"] = 20
+tqshapes["rect2"]["x"] = x+w-35
+tqshapes["rect2"]["y"] = y+h-35
+tqshapes["rect2"]["w"] = 20
+tqshapes["rect2"]["h"] = 20
 
-if ( shapes["text"]["text"] == "1" ):
+if ( tqshapes["text"]["text"] == "1" ):
     stencil = curLayer().firstStencil()
     stencil.setText( "x:"+str(x)+"  y:"+str(y) )
 
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml
index 6a727990..98ba2016 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Stored Data"/>
 		<Id data="Stored Data"/>
-		<Description data="Basic flowcharting stored data shape"/>
+		<Description data="Basic flowcharting stored data tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml
index 769d1f5d..a998b6ca 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Terminator"/>
 		<Id data="Terminator"/>
-		<Description data="Terminator shape"/>
+		<Description data="Terminator tqshape"/>
 		<Version data="0.1"/>
 		<Web data="kivio.sourceforge.net"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml
index c96361ce..445fef79 100644
--- a/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Data Store"/>
 		<Id data="Data Store"/>
-		<Description data="Data Store shape"/>
+		<Description data="Data Store tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml
index b1d1a835..622b0205 100644
--- a/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Database"/>
 		<Id data="database"/>
-		<Description data="Database shape"/>
+		<Description data="Database tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml
index 57229b1a..fa1824de 100644
--- a/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Process"/>
 		<Id data="Process"/>
-		<Description data="Process shape"/>
+		<Description data="Process tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml
index c68f8a79..e3f53b8f 100644
--- a/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Source or Sink"/>
 		<Id data="Source or Sink"/>
-		<Description data="Source or Sink shape"/>
+		<Description data="Source or Sink tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml b/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml
index 34c0b640..b3ecbefc 100644
--- a/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml
+++ b/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Floppy Disk"/>
 		<Id data="Floppy Disk"/>
-		<Description data="Floppy Disk shape"/>
+		<Description data="Floppy Disk tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml b/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml
index a03ce9cb..aa34fe08 100644
--- a/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml
+++ b/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Key"/>
 		<Id data="Key"/>
-		<Description data="Key shape"/>
+		<Description data="Key tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml
index 6470beb0..a9013398 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Arrow"/>
 		<Id data="Arrow"/>
-		<Description data="Arrow shape"/>
+		<Description data="Arrow tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml
index 909e814c..72a5cfd3 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Multiple Arrow 1"/>
 		<Id data="Multiple arrow 1"/>
-		<Description data="Multiple Arrow shape 1"/>
+		<Description data="Multiple Arrow tqshape 1"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml
index 16599b33..296f55fb 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Multiple Arrow 2"/>
 		<Id data="Multiple arrow 2"/>
-		<Description data="Multiple Arrow shape 2"/>
+		<Description data="Multiple Arrow tqshape 2"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml
index b0243201..13fe1905 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Multiple Arrow 3"/>
 		<Id data="Multiple arrow 3"/>
-		<Description data="Multiple Arrow shape 3"/>
+		<Description data="Multiple Arrow tqshape 3"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml
index 7cfdc307..07bdf483 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Sun Arrow"/>
 		<Id data="Sun arrow"/>
-		<Description data="Sun Arrow shape"/>
+		<Description data="Sun Arrow tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml b/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml
index 8ff9b029..7d8390db 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Factory"/>
 		<Id data="Factory"/>
-		<Description data="Factory shape"/>
+		<Description data="Factory tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml b/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml
index 95075972..9e1193cf 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="House"/>
 		<Id data="House"/>
-		<Description data="House shape"/>
+		<Description data="House tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml
index 88e06fdb..af310f33 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml
@@ -3,7 +3,7 @@
     <Title data="Attribute"/>
     <Id data="ER-Attribute"/>
     <Version data="1.0"/>
-    <Description data="Attribute shape used in ER diagrams"/>
+    <Description data="Attribute tqshape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="psn@linux.se"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml
index 8c325c32..5c2e4f74 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml
@@ -3,7 +3,7 @@
     <Title data="Derived Attribute"/>
     <Id data="ER-DerivedAttribute"/>
     <Version data="1.0"/>
-    <Description data="Derived Attribute shape used in ER diagrams"/>
+    <Description data="Derived Attribute tqshape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="psn@linux.se"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml
index 6eaed85a..2b22e32a 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml
@@ -4,7 +4,7 @@
     <Title data="Entity"/>
     <Id data="ER-Entity"/>
     <Version data="1.0"/>
-    <Description data="Entity shape used in ER diagrams"/>
+    <Description data="Entity tqshape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="psn@linux.se"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml
index baef5b76..56329cf1 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml
@@ -3,7 +3,7 @@
     <Title data="Multivalued Attribute"/>
     <Id data="ER-MultivaluedAttribute"/>
     <Version data="1.0"/>
-    <Description data="Multivalued Attribute shape used in ER diagrams"/>
+    <Description data="Multivalued Attribute tqshape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="psn@linux.se"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml
index bd6c93ea..dbcad720 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml
@@ -4,7 +4,7 @@
     <Title data="Relationship"/>
     <Id data="ER-Relationship"/>
     <Version data="1.0"/>
-    <Description data="Relationship shape used in ER diagrams"/>
+    <Description data="Relationship tqshape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="psn@linux.se"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml
index b81da1e9..02547ca0 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml
@@ -4,7 +4,7 @@
     <Title data="Weak Entity"/>
     <Id data="ER-WeakEntity"/>
     <Version data="1.0"/>
-    <Description data="Weak Entity shape used in ER diagrams"/>
+    <Description data="Weak Entity tqshape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="psn@linux.se"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml
index ac102000..1e30e26d 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml
@@ -4,7 +4,7 @@
     <Title data="Relationship"/>
     <Id data="ER-Relationship"/>
     <Version data="1.0"/>
-    <Description data="Relationship shape used in ER diagrams"/>
+    <Description data="Relationship tqshape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="psn@linux.se"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml
index eb1650e7..27c487ea 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Bad"/>
 		<Id data="Bad"/>
-		<Description data="Bad shape"/>
+		<Description data="Bad tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml
index 8cb5b46d..88ff54e8 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Good"/>
 		<Id data="Good"/>
-		<Description data="Good shape"/>
+		<Description data="Good tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml
index 13c5b46c..0656c2a7 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Man"/>
 		<Id data="Man"/>
-		<Description data="Man shape"/>
+		<Description data="Man tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml
index e1c4aabc..9f903a1f 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Woman"/>
 		<Id data="Woman"/>
-		<Description data="Woman shape"/>
+		<Description data="Woman tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml
index 36e87464..6bd7f849 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Woman Shape"/>
 		<Id data="Woman Shape"/>
-		<Description data="Woman shape"/>
+		<Description data="Woman tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml b/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml
index f7f6d666..d8e01658 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Truck"/>
 		<Id data="Truck"/>
-		<Description data="Truck shape"/>
+		<Description data="Truck tqshape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/tools/kivio_mousetool.cpp b/kivio/kiviopart/tools/kivio_mousetool.cpp
index cc84c799..77b55d01 100644
--- a/kivio/kiviopart/tools/kivio_mousetool.cpp
+++ b/kivio/kiviopart/tools/kivio_mousetool.cpp
@@ -21,9 +21,9 @@
 #include "kivio_pluginmanager.h"
 
 namespace Kivio {
-  MouseTool::MouseTool(KivioView* parent, const char* name) : Kivio::Plugin(parent, name)
+  MouseTool::MouseTool(KivioView* tqparent, const char* name) : Kivio::Plugin(tqparent, name)
   {
-    connect(this, SIGNAL(activated(Kivio::MouseTool*)), view()->pluginManager(), SLOT(activate(Kivio::MouseTool*)));
+    connect(this, TQT_SIGNAL(activated(Kivio::MouseTool*)), view()->pluginManager(), TQT_SLOT(activate(Kivio::MouseTool*)));
   }
   
   MouseTool::~MouseTool()
diff --git a/kivio/kiviopart/tools/kivio_mousetool.h b/kivio/kiviopart/tools/kivio_mousetool.h
index 3b5a3539..7bffaf33 100644
--- a/kivio/kiviopart/tools/kivio_mousetool.h
+++ b/kivio/kiviopart/tools/kivio_mousetool.h
@@ -21,7 +21,7 @@
 
 #include "kivio_plugin.h"
 
-#include <qptrlist.h>
+#include <tqptrlist.h>
 #include <koffice_export.h>
 class KivioStencil;
 class KoPoint;
@@ -32,18 +32,19 @@ namespace Kivio {
   class KIVIO_EXPORT MouseTool : public Kivio::Plugin
   {
     Q_OBJECT
+  TQ_OBJECT
     public:
-      MouseTool(KivioView* parent = 0, const char* name = 0);
+      MouseTool(KivioView* tqparent = 0, const char* name = 0);
       ~MouseTool();
     
-      virtual bool processEvent(QEvent* e) = 0;
+      virtual bool processEvent(TQEvent* e) = 0;
       
     public slots:
       virtual void setActivated(bool) = 0;
       /** This function should apply a change to @p stencils
        * done by the tool.
        */
-      virtual void applyToolAction(QPtrList<KivioStencil>* stencils) { Q_UNUSED(stencils); };
+      virtual void applyToolAction(TQPtrList<KivioStencil>* stencils) { Q_UNUSED(stencils); };
       virtual void applyToolAction(KivioStencil* /*stencil*/, const KoPoint& /*pos*/) {};
     
     signals:
diff --git a/kivio/kiviopart/tools/kivio_plugin.cpp b/kivio/kiviopart/tools/kivio_plugin.cpp
index 01e06906..12128f60 100644
--- a/kivio/kiviopart/tools/kivio_plugin.cpp
+++ b/kivio/kiviopart/tools/kivio_plugin.cpp
@@ -21,7 +21,7 @@
 #include "kivio_factory.h"
 
 namespace Kivio {
-  Plugin::Plugin(KivioView* parent, const char* name) : KParts::Plugin(parent, name)
+  Plugin::Plugin(KivioView* tqparent, const char* name) : KParts::Plugin(TQT_TQOBJECT(tqparent), name)
   {
     setInstance(KivioFactory::global());
   }
diff --git a/kivio/kiviopart/tools/kivio_plugin.h b/kivio/kiviopart/tools/kivio_plugin.h
index 8db99552..944742d3 100644
--- a/kivio/kiviopart/tools/kivio_plugin.h
+++ b/kivio/kiviopart/tools/kivio_plugin.h
@@ -30,11 +30,12 @@ namespace Kivio {
   class KIVIO_EXPORT Plugin : public KParts::Plugin
   {
     Q_OBJECT
+  TQ_OBJECT
     public:
-      Plugin(KivioView* parent = 0, const char* name = 0);
+      Plugin(KivioView* tqparent = 0, const char* name = 0);
       ~Plugin();
       
-      KivioView* view() { return static_cast<KivioView*>(parent()); }
+      KivioView* view() { return static_cast<KivioView*>(TQT_TQWIDGET(tqparent())); }
   };
 }
 
diff --git a/kivio/kiviopart/tools/kivio_pluginmanager.cpp b/kivio/kiviopart/tools/kivio_pluginmanager.cpp
index a718a9ee..89f7f0a7 100644
--- a/kivio/kiviopart/tools/kivio_pluginmanager.cpp
+++ b/kivio/kiviopart/tools/kivio_pluginmanager.cpp
@@ -24,7 +24,7 @@
 #include "kivio_plugin.h"
 
 namespace Kivio {
-  PluginManager::PluginManager(KivioView* parent, const char* name) : QObject(parent, name)
+  PluginManager::PluginManager(KivioView* tqparent, const char* name) : TQObject(tqparent, name)
   {
     m_activeTool = 0;
     m_defaultTool = 0;
@@ -35,7 +35,7 @@ namespace Kivio {
   {
   }
   
-  bool PluginManager::delegateEvent(QEvent* e)
+  bool PluginManager::delegateEvent(TQEvent* e)
   {
     if(activeTool() && m_delegateEvents) {
       return activeTool()->processEvent(e);
@@ -81,9 +81,9 @@ namespace Kivio {
     kdDebug(43000) << "New default tool: " << tool->name() << endl;
   }
 
-  Kivio::Plugin* PluginManager::findPlugin(const QString& name)
+  Kivio::Plugin* PluginManager::findPlugin(const TQString& name)
   {
-    QPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(parent());
+    TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(tqparent());
     KParts::Plugin* p = plugins.first();
     bool found = false;
     
diff --git a/kivio/kiviopart/tools/kivio_pluginmanager.h b/kivio/kiviopart/tools/kivio_pluginmanager.h
index d8914b50..a0ac51fe 100644
--- a/kivio/kiviopart/tools/kivio_pluginmanager.h
+++ b/kivio/kiviopart/tools/kivio_pluginmanager.h
@@ -19,7 +19,7 @@
 #ifndef KIVIO_PLUGINMANAGER_H
 #define KIVIO_PLUGINMANAGER_H
 
-#include <qobject.h>
+#include <tqobject.h>
 #include "kivio_mousetool.h"
 #include <koffice_export.h>
 
@@ -28,13 +28,14 @@ namespace Kivio {
   
   /**
   This class manages the plugins*/
-  class KIVIO_EXPORT PluginManager : public QObject {
+  class KIVIO_EXPORT PluginManager : public TQObject {
     Q_OBJECT
+  TQ_OBJECT
     public:
-      PluginManager(KivioView* parent, const char* name = 0);
+      PluginManager(KivioView* tqparent, const char* name = 0);
       ~PluginManager();
 
-      bool delegateEvent(QEvent* e);
+      bool delegateEvent(TQEvent* e);
       
       void setEventDelegationEnabled(bool enabled) { m_delegateEvents = enabled; }
       bool eventDelegationEnabled() const { return m_delegateEvents; }
@@ -44,7 +45,7 @@ namespace Kivio {
       /** Returns the default tool. */
       Kivio::MouseTool* defaultTool();
       
-      Kivio::Plugin* findPlugin(const QString& name);
+      Kivio::Plugin* findPlugin(const TQString& name);
     
     public slots:
       /** Makes the default tool active. */
diff --git a/kivio/kiviopart/tools/mousetoolaction.cpp b/kivio/kiviopart/tools/mousetoolaction.cpp
index 546c5634..26238213 100644
--- a/kivio/kiviopart/tools/mousetoolaction.cpp
+++ b/kivio/kiviopart/tools/mousetoolaction.cpp
@@ -24,51 +24,51 @@
 
 namespace Kivio {
 
-MouseToolAction::MouseToolAction(const QString& text, const KShortcut& cut,
-                            QObject* parent, const char* name)
-  : KRadioAction(text, cut, parent, name)
+MouseToolAction::MouseToolAction(const TQString& text, const KShortcut& cut,
+                            TQObject* tqparent, const char* name)
+  : KRadioAction(text, cut, tqparent, name)
 {
 }
 
-MouseToolAction::MouseToolAction(const QString& text, const KShortcut& cut,
-                            const QObject* receiver, const char* slot,
-                            QObject* parent, const char* name)
-  : KRadioAction(text, cut, receiver, slot, parent, name)
+MouseToolAction::MouseToolAction(const TQString& text, const KShortcut& cut,
+                            const TQObject* receiver, const char* slot,
+                            TQObject* tqparent, const char* name)
+  : KRadioAction(text, cut, receiver, slot, tqparent, name)
 {
 }
 
-MouseToolAction::MouseToolAction(const QString& text, const QIconSet& pix,
+MouseToolAction::MouseToolAction(const TQString& text, const TQIconSet& pix,
                             const KShortcut& cut,
-                            QObject* parent, const char* name)
-  : KRadioAction(text, pix, cut, parent, name)
+                            TQObject* tqparent, const char* name)
+  : KRadioAction(text, pix, cut, tqparent, name)
 {
 }
 
-MouseToolAction::MouseToolAction(const QString& text, const QString& pix,
+MouseToolAction::MouseToolAction(const TQString& text, const TQString& pix,
                             const KShortcut& cut,
-                            QObject* parent, const char* name)
-  : KRadioAction(text, pix, cut, parent, name)
+                            TQObject* tqparent, const char* name)
+  : KRadioAction(text, pix, cut, tqparent, name)
 {
 }
 
-MouseToolAction::MouseToolAction(const QString& text, const QIconSet& pix,
+MouseToolAction::MouseToolAction(const TQString& text, const TQIconSet& pix,
                             const KShortcut& cut,
-                            const QObject* receiver, const char* slot,
-                            QObject* parent, const char* name)
-  : KRadioAction(text, pix, cut, receiver, slot, parent, name)
+                            const TQObject* receiver, const char* slot,
+                            TQObject* tqparent, const char* name)
+  : KRadioAction(text, pix, cut, receiver, slot, tqparent, name)
 {
 }
 
-MouseToolAction::MouseToolAction(const QString& text, const QString& pix,
+MouseToolAction::MouseToolAction(const TQString& text, const TQString& pix,
                             const KShortcut& cut,
-                            const QObject* receiver, const char* slot,
-                            QObject* parent, const char* name)
-  : KRadioAction(text, pix, cut, receiver, slot, parent, name)
+                            const TQObject* receiver, const char* slot,
+                            TQObject* tqparent, const char* name)
+  : KRadioAction(text, pix, cut, receiver, slot, tqparent, name)
 {
 }
 
-MouseToolAction::MouseToolAction(QObject* parent, const char* name)
-  : KRadioAction(parent, name)
+MouseToolAction::MouseToolAction(TQObject* tqparent, const char* name)
+  : KRadioAction(tqparent, name)
 {
 }
 
@@ -76,7 +76,7 @@ MouseToolAction::~MouseToolAction()
 {
 }
 
-int MouseToolAction::plug(QWidget* widget, int index)
+int MouseToolAction::plug(TQWidget* widget, int index)
 {
   int usedIndex = KRadioAction::plug(widget, index);
   
@@ -84,10 +84,10 @@ int MouseToolAction::plug(QWidget* widget, int index)
     return usedIndex;
   }
   
-  if(::qt_cast<KToolBar*>(widget)) {
+  if(::tqqt_cast<KToolBar*>(widget)) {
     KToolBar* toolBar = static_cast<KToolBar*>(widget);
     KToolBarButton* button = toolBar->getButton(itemId(usedIndex));
-    connect(button, SIGNAL(doubleClicked(int)), this, SIGNAL(doubleClicked()));
+    connect(button, TQT_SIGNAL(doubleClicked(int)), this, TQT_SIGNAL(doubleClicked()));
   }
   
   return usedIndex;
diff --git a/kivio/kiviopart/tools/mousetoolaction.h b/kivio/kiviopart/tools/mousetoolaction.h
index fd172f68..0e528578 100644
--- a/kivio/kiviopart/tools/mousetoolaction.h
+++ b/kivio/kiviopart/tools/mousetoolaction.h
@@ -27,6 +27,7 @@ namespace Kivio {
 class KIVIO_EXPORT MouseToolAction : public KRadioAction
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     /**
     * Constructs a mouse tool action with text and potential keyboard
@@ -35,72 +36,72 @@ class KIVIO_EXPORT MouseToolAction : public KRadioAction
     *
     * @param text The text that will be displayed.
     * @param cut The corresponding keyboard accelerator (shortcut).
-    * @param parent This action's parent.
+    * @param tqparent This action's tqparent.
     * @param name An internal name for this action.
       */
-    MouseToolAction(const QString& text, const KShortcut& cut = KShortcut(), QObject* parent = 0, const char* name = 0);
+    MouseToolAction(const TQString& text, const KShortcut& cut = KShortcut(), TQObject* tqparent = 0, const char* name = 0);
   
     /**
       *  @param text The text that will be displayed.
       *  @param cut The corresponding keyboard accelerator (shortcut).
-      *  @param receiver The SLOT's parent.
-      *  @param slot The SLOT to invoke to execute this action.
-      *  @param parent This action's parent.
+      *  @param receiver The SLOT's tqparent.
+      *  @param slot The TQT_SLOT to invoke to execute this action.
+      *  @param tqparent This action's tqparent.
       *  @param name An internal name for this action.
       */
-    MouseToolAction(const QString& text, const KShortcut& cut,
-                  const QObject* receiver, const char* slot, QObject* parent, const char* name = 0);
+    MouseToolAction(const TQString& text, const KShortcut& cut,
+                  const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0);
   
     /**
       *  @param text The text that will be displayed.
       *  @param pix The icons that go with this action.
       *  @param cut The corresponding keyboard accelerator (shortcut).
-      *  @param parent This action's parent.
+      *  @param tqparent This action's tqparent.
       *  @param name An internal name for this action.
       */
-    MouseToolAction(const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
-                  QObject* parent = 0, const char* name = 0);
+    MouseToolAction(const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(),
+                  TQObject* tqparent = 0, const char* name = 0);
   
     /**
       *  @param text The text that will be displayed.
       *  @param pix The dynamically loaded icon that goes with this action.
       *  @param cut The corresponding keyboard accelerator (shortcut).
-      *  @param parent This action's parent.
+      *  @param tqparent This action's tqparent.
       *  @param name An internal name for this action.
       */
-    MouseToolAction(const QString& text, const QString& pix, const KShortcut& cut = KShortcut(),
-                  QObject* parent = 0, const char* name = 0);
+    MouseToolAction(const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(),
+                  TQObject* tqparent = 0, const char* name = 0);
   
     /**
       *  @param text The text that will be displayed.
       *  @param pix The icons that go with this action.
       *  @param cut The corresponding keyboard accelerator (shortcut).
-      *  @param receiver The SLOT's parent.
-      *  @param slot The SLOT to invoke to execute this action.
-      *  @param parent This action's parent.
+      *  @param receiver The SLOT's tqparent.
+      *  @param slot The TQT_SLOT to invoke to execute this action.
+      *  @param tqparent This action's tqparent.
       *  @param name An internal name for this action.
       */
-    MouseToolAction(const QString& text, const QIconSet& pix, const KShortcut& cut,
-                  const QObject* receiver, const char* slot, QObject* parent, const char* name = 0);
+    MouseToolAction(const TQString& text, const TQIconSet& pix, const KShortcut& cut,
+                  const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0);
   
     /**
       *  @param text The text that will be displayed.
       *  @param pix The dynamically loaded icon that goes with this action.
       *  @param cut The corresponding keyboard accelerator (shortcut).
-      *  @param receiver The SLOT's parent.
-      *  @param slot The SLOT to invoke to execute this action.
-      *  @param parent This action's parent.
+      *  @param receiver The SLOT's tqparent.
+      *  @param slot The TQT_SLOT to invoke to execute this action.
+      *  @param tqparent This action's tqparent.
       *  @param name An internal name for this action.
       */
-    MouseToolAction(const QString& text, const QString& pix, const KShortcut& cut,
-                  const QObject* receiver, const char* slot,
-                  QObject* parent, const char* name = 0);
+    MouseToolAction(const TQString& text, const TQString& pix, const KShortcut& cut,
+                  const TQObject* receiver, const char* slot,
+                  TQObject* tqparent, const char* name = 0);
   
     /**
-      *  @param parent This action's parent.
+      *  @param tqparent This action's tqparent.
       *  @param name An internal name for this action.
       */
-    MouseToolAction(QObject* parent = 0, const char* name = 0);
+    MouseToolAction(TQObject* tqparent = 0, const char* name = 0);
 
     ~MouseToolAction();
 
@@ -115,7 +116,7 @@ class KIVIO_EXPORT MouseToolAction : public KRadioAction
      *  @param widget The GUI element to display this action.
      *  @param index  The index of the item.
      */
-    virtual int plug(QWidget* widget, int index = -1);
+    virtual int plug(TQWidget* widget, int index = -1);
   
   signals:
     void doubleClicked();
diff --git a/kivio/kiviopart/ui/addstencilsetdialog.cpp b/kivio/kiviopart/ui/addstencilsetdialog.cpp
index a6386521..68336367 100644
--- a/kivio/kiviopart/ui/addstencilsetdialog.cpp
+++ b/kivio/kiviopart/ui/addstencilsetdialog.cpp
@@ -24,14 +24,14 @@
 
 namespace Kivio {
 
-AddStencilSetDialog::AddStencilSetDialog(QWidget *parent, const char *name)
-  : KDialogBase(parent, name, false, i18n("Stencil Sets"), KDialogBase::Close)
+AddStencilSetDialog::AddStencilSetDialog(TQWidget *tqparent, const char *name)
+  : KDialogBase(tqparent, name, false, i18n("Stencil Sets"), KDialogBase::Close)
 {
   m_mainWidget = new AddStencilSetPanel(this);
   setMainWidget(m_mainWidget);
-  setInitialSize(QSize(600, 450));
+  setInitialSize(TQSize(600, 450));
 
-  connect(m_mainWidget, SIGNAL(addStencilSet(const QString&)), this, SIGNAL(addStencilSet(const QString&)));
+  connect(m_mainWidget, TQT_SIGNAL(addStencilSet(const TQString&)), this, TQT_SIGNAL(addStencilSet(const TQString&)));
 }
 
 AddStencilSetDialog::~AddStencilSetDialog()
diff --git a/kivio/kiviopart/ui/addstencilsetdialog.h b/kivio/kiviopart/ui/addstencilsetdialog.h
index 458b409b..0f23d919 100644
--- a/kivio/kiviopart/ui/addstencilsetdialog.h
+++ b/kivio/kiviopart/ui/addstencilsetdialog.h
@@ -28,15 +28,16 @@ class AddStencilSetPanel;
 class AddStencilSetDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    AddStencilSetDialog(QWidget *parent = 0, const char *name = 0);
+    AddStencilSetDialog(TQWidget *tqparent = 0, const char *name = 0);
     ~AddStencilSetDialog();
 
   public slots:
     void updateList();
 
   signals:
-    void addStencilSet(const QString&);
+    void addStencilSet(const TQString&);
 
   private:
     AddStencilSetPanel* m_mainWidget;
diff --git a/kivio/kiviopart/ui/aligndialog.ui b/kivio/kiviopart/ui/aligndialog.ui
index cb18d91c..80041d21 100644
--- a/kivio/kiviopart/ui/aligndialog.ui
+++ b/kivio/kiviopart/ui/aligndialog.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>KivioAlignDialogWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KivioAlignDialogWidget</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tab</cstring>
             </property>
@@ -28,9 +28,9 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="layoutMargin" stdset="0">
+            <property name="tqlayoutMargin" stdset="0">
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>align</cstring>
                 </property>
@@ -41,14 +41,14 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QButtonGroup" row="0" column="1">
+                    <widget class="TQButtonGroup" row="0" column="1">
                         <property name="name">
                             <cstring>hAlignBox</cstring>
                         </property>
                         <property name="title">
                             <string>Horizontal</string>
                         </property>
-                        <property name="layoutMargin" stdset="0">
+                        <property name="tqlayoutMargin" stdset="0">
                         </property>
                         <grid>
                             <property name="name">
@@ -60,7 +60,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>PixmapLabel3_2_2</cstring>
                                 </property>
@@ -68,7 +68,7 @@
                                     <pixmap>image0</pixmap>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="2">
+                            <widget class="TQLabel" row="0" column="2">
                                 <property name="name">
                                     <cstring>PixmapLabel2_2_2</cstring>
                                 </property>
@@ -76,7 +76,7 @@
                                     <pixmap>image1</pixmap>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="4">
+                            <widget class="TQLabel" row="0" column="4">
                                 <property name="name">
                                     <cstring>PixmapLabel1_2_2</cstring>
                                 </property>
@@ -97,7 +97,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -114,14 +114,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
+                            <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>ahleft</cstring>
                                 </property>
@@ -129,7 +129,7 @@
                                     <string>&amp;Left</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="1" column="2" rowspan="1" colspan="2">
+                            <widget class="TQRadioButton" row="1" column="2" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>ahcenter</cstring>
                                 </property>
@@ -137,7 +137,7 @@
                                     <string>Ce&amp;nter</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="2" column="2" rowspan="1" colspan="2">
+                            <widget class="TQRadioButton" row="2" column="2" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>ahnone</cstring>
                                 </property>
@@ -158,7 +158,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>41</width>
                                         <height>20</height>
@@ -175,14 +175,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QRadioButton" row="1" column="4" rowspan="1" colspan="2">
+                            <widget class="TQRadioButton" row="1" column="4" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>ahright</cstring>
                                 </property>
@@ -200,7 +200,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>51</width>
                                         <height>20</height>
@@ -209,7 +209,7 @@
                             </spacer>
                         </grid>
                     </widget>
-                    <widget class="QCheckBox" row="1" column="1">
+                    <widget class="TQCheckBox" row="1" column="1">
                         <property name="name">
                             <cstring>aCenterPage</cstring>
                         </property>
@@ -217,14 +217,14 @@
                             <string>Center of &amp;page</string>
                         </property>
                     </widget>
-                    <widget class="QButtonGroup" row="0" column="0" rowspan="3" colspan="1">
+                    <widget class="TQButtonGroup" row="0" column="0" rowspan="3" colspan="1">
                         <property name="name">
                             <cstring>vAlignBox</cstring>
                         </property>
                         <property name="title">
                             <string>Vertical</string>
                         </property>
-                        <property name="layoutMargin" stdset="0">
+                        <property name="tqlayoutMargin" stdset="0">
                         </property>
                         <grid>
                             <property name="name">
@@ -236,20 +236,20 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>PixmapLabel6_2</cstring>
                                 </property>
                                 <property name="pixmap">
                                     <pixmap>image3</pixmap>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop|AlignLeft</set>
                                 </property>
                                 <property name="vAlign" stdset="0">
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="0" column="1">
+                            <widget class="TQRadioButton" row="0" column="1">
                                 <property name="name">
                                     <cstring>avtop</cstring>
                                 </property>
@@ -257,7 +257,7 @@
                                     <string>&amp;Top</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>PixmapLabel5_2</cstring>
                                 </property>
@@ -265,7 +265,7 @@
                                     <pixmap>image4</pixmap>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="1" column="1">
+                            <widget class="TQRadioButton" row="1" column="1">
                                 <property name="name">
                                     <cstring>avcenter</cstring>
                                 </property>
@@ -273,20 +273,20 @@
                                     <string>C&amp;enter</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>PixmapLabel4_2</cstring>
                                 </property>
                                 <property name="pixmap">
                                     <pixmap>image5</pixmap>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignBottom|AlignLeft</set>
                                 </property>
                                 <property name="vAlign" stdset="0">
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="3" column="1">
+                            <widget class="TQRadioButton" row="3" column="1">
                                 <property name="name">
                                     <cstring>avnone</cstring>
                                 </property>
@@ -297,7 +297,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="2" column="1">
+                            <widget class="TQRadioButton" row="2" column="1">
                                 <property name="name">
                                     <cstring>avbottom</cstring>
                                 </property>
@@ -317,7 +317,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -326,7 +326,7 @@
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>distribute</cstring>
                 </property>
@@ -337,7 +337,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QButtonGroup" row="1" column="1">
+                    <widget class="TQButtonGroup" row="1" column="1">
                         <property name="name">
                             <cstring>ButtonGroup9</cstring>
                         </property>
@@ -347,9 +347,9 @@
                         <property name="title">
                             <string></string>
                         </property>
-                        <property name="layoutMargin" stdset="0">
+                        <property name="tqlayoutMargin" stdset="0">
                         </property>
-                        <property name="layoutSpacing" stdset="0">
+                        <property name="tqlayoutSpacing" stdset="0">
                         </property>
                         <vbox>
                             <property name="name">
@@ -361,7 +361,7 @@
                             <property name="spacing">
                                 <number>0</number>
                             </property>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>dselection</cstring>
                                 </property>
@@ -372,7 +372,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>dpage</cstring>
                                 </property>
@@ -382,14 +382,14 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QButtonGroup" row="0" column="0" rowspan="2" colspan="1">
+                    <widget class="TQButtonGroup" row="0" column="0" rowspan="2" colspan="1">
                         <property name="name">
                             <cstring>vDistBox</cstring>
                         </property>
                         <property name="title">
                             <string>Vertical</string>
                         </property>
-                        <property name="layoutMargin" stdset="0">
+                        <property name="tqlayoutMargin" stdset="0">
                         </property>
                         <grid>
                             <property name="name">
@@ -401,7 +401,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>PixmapLabel8_2</cstring>
                                 </property>
@@ -409,7 +409,7 @@
                                     <pixmap>image6</pixmap>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="0" column="1">
+                            <widget class="TQRadioButton" row="0" column="1">
                                 <property name="name">
                                     <cstring>dvtop</cstring>
                                 </property>
@@ -417,7 +417,7 @@
                                     <string>&amp;Top</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="1" column="1">
+                            <widget class="TQRadioButton" row="1" column="1">
                                 <property name="name">
                                     <cstring>dvcenter</cstring>
                                 </property>
@@ -425,7 +425,7 @@
                                     <string>C&amp;enter</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>PixmapLabel8_3</cstring>
                                 </property>
@@ -433,7 +433,7 @@
                                     <pixmap>image7</pixmap>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="4" column="1">
+                            <widget class="TQRadioButton" row="4" column="1">
                                 <property name="name">
                                     <cstring>dvnone</cstring>
                                 </property>
@@ -444,7 +444,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="2" column="1">
+                            <widget class="TQRadioButton" row="2" column="1">
                                 <property name="name">
                                     <cstring>dvspacing</cstring>
                                 </property>
@@ -452,7 +452,7 @@
                                     <string>&amp;Spacing</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>PixmapLabel8_4</cstring>
                                 </property>
@@ -460,7 +460,7 @@
                                     <pixmap>image8</pixmap>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="3" column="1">
+                            <widget class="TQRadioButton" row="3" column="1">
                                 <property name="name">
                                     <cstring>dvbottom</cstring>
                                 </property>
@@ -468,7 +468,7 @@
                                     <string>&amp;Bottom</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="3" column="0">
+                            <widget class="TQLabel" row="3" column="0">
                                 <property name="name">
                                     <cstring>PixmapLabel8_5</cstring>
                                 </property>
@@ -478,14 +478,14 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QButtonGroup" row="0" column="1">
+                    <widget class="TQButtonGroup" row="0" column="1">
                         <property name="name">
                             <cstring>hDistBox</cstring>
                         </property>
                         <property name="title">
                             <string>Horizontal</string>
                         </property>
-                        <property name="layoutMargin" stdset="0">
+                        <property name="tqlayoutMargin" stdset="0">
                         </property>
                         <grid>
                             <property name="name">
@@ -497,7 +497,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>PixmapLabel10_2</cstring>
                                 </property>
@@ -505,7 +505,7 @@
                                     <pixmap>image10</pixmap>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="3">
+                            <widget class="TQLabel" row="0" column="3">
                                 <property name="name">
                                     <cstring>PixmapLabel7_2</cstring>
                                 </property>
@@ -513,7 +513,7 @@
                                     <pixmap>image11</pixmap>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="1">
+                            <widget class="TQLabel" row="0" column="1">
                                 <property name="name">
                                     <cstring>PixmapLabel9_2</cstring>
                                 </property>
@@ -521,7 +521,7 @@
                                     <pixmap>image12</pixmap>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="2">
+                            <widget class="TQLabel" row="0" column="2">
                                 <property name="name">
                                     <cstring>PixmapLabel8_6</cstring>
                                 </property>
@@ -529,7 +529,7 @@
                                     <pixmap>image13</pixmap>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="1" column="0">
+                            <widget class="TQRadioButton" row="1" column="0">
                                 <property name="name">
                                     <cstring>dhleft</cstring>
                                 </property>
@@ -537,7 +537,7 @@
                                     <string>&amp;Left</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="1" column="2">
+                            <widget class="TQRadioButton" row="1" column="2">
                                 <property name="name">
                                     <cstring>dhspacing</cstring>
                                 </property>
@@ -545,7 +545,7 @@
                                     <string>S&amp;pacing</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="1" column="3">
+                            <widget class="TQRadioButton" row="1" column="3">
                                 <property name="name">
                                     <cstring>dhright</cstring>
                                 </property>
@@ -553,7 +553,7 @@
                                     <string>&amp;Right</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="1" column="1">
+                            <widget class="TQRadioButton" row="1" column="1">
                                 <property name="name">
                                     <cstring>dhcenter</cstring>
                                 </property>
@@ -561,7 +561,7 @@
                                     <string>Ce&amp;nter</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="2" column="1" rowspan="1" colspan="2">
+                            <widget class="TQRadioButton" row="2" column="1" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>dhnone</cstring>
                                 </property>
@@ -627,6 +627,6 @@
      <include location="global" impldecl="in implementation">kdialog.h</include>
  </includes>
 
- <layoutdefaults spacing="6" margin="11"/>
- <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <tqlayoutdefaults spacing="6" margin="11"/>
+ <tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kivio/kiviopart/ui/export_page_dialog.cpp b/kivio/kiviopart/ui/export_page_dialog.cpp
index 941bd87a..94feb142 100644
--- a/kivio/kiviopart/ui/export_page_dialog.cpp
+++ b/kivio/kiviopart/ui/export_page_dialog.cpp
@@ -1,16 +1,16 @@
 #include "export_page_dialog.h"
 
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qspinbox.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqspinbox.h>
 
 #include <klocale.h>
 
 #include "export_page_dialog_base.h"
 #include "kivio_config.h"
 
-ExportPageDialog::ExportPageDialog( QWidget *parent, const char *name )
-   : KDialogBase(parent, name, true, i18n("Export Page"), Ok|Cancel, Ok)
+ExportPageDialog::ExportPageDialog( TQWidget *tqparent, const char *name )
+   : KDialogBase(tqparent, name, true, i18n("Export Page"), Ok|Cancel, Ok)
 {
   m_view = new ExportPageDialogBase(this);
   setMainWidget(m_view);
diff --git a/kivio/kiviopart/ui/export_page_dialog.h b/kivio/kiviopart/ui/export_page_dialog.h
index 9584950e..0384b0ba 100644
--- a/kivio/kiviopart/ui/export_page_dialog.h
+++ b/kivio/kiviopart/ui/export_page_dialog.h
@@ -8,8 +8,9 @@ class ExportPageDialogBase;
 class ExportPageDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    ExportPageDialog(QWidget* parent=0, const char* name=0);
+    ExportPageDialog(TQWidget* tqparent=0, const char* name=0);
 
     int quality();
     int border();
diff --git a/kivio/kiviopart/ui/export_page_dialog_base.ui b/kivio/kiviopart/ui/export_page_dialog_base.ui
index da964922..0935d1bf 100644
--- a/kivio/kiviopart/ui/export_page_dialog_base.ui
+++ b/kivio/kiviopart/ui/export_page_dialog_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>ExportPageDialogBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ExportPageDialogBase</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QButtonGroup" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQButtonGroup" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>ButtonGroup1</cstring>
             </property>
@@ -31,7 +31,7 @@
             <property name="title">
                 <string>Export</string>
             </property>
-            <widget class="QRadioButton">
+            <widget class="TQRadioButton">
                 <property name="name">
                     <cstring>m_radioSelectedStencils</cstring>
                 </property>
@@ -54,7 +54,7 @@
 Export only the selected stencils to file.</string>
                 </property>
             </widget>
-            <widget class="QRadioButton">
+            <widget class="TQRadioButton">
                 <property name="name">
                     <cstring>m_radioFullPage</cstring>
                 </property>
@@ -83,7 +83,7 @@ Export only the selected stencils to file.</string>
 This will cause the entire page to be exported to the file. This means that &lt;i&gt;all&lt;/i&gt; stencils will be exported.</string>
                 </property>
             </widget>
-            <widget class="QCheckBox">
+            <widget class="TQCheckBox">
                 <property name="name">
                     <cstring>m_checkCrop</cstring>
                 </property>
@@ -106,11 +106,11 @@ This will cause the entire page to be exported to the file. This means that &lt;
                 </property>
                 <property name="whatsThis" stdset="0">
                     <string>&lt;b&gt;Crop picture to edges&lt;/b&gt;&lt;br&gt;
-This will eliminate all blank portions of the drawing. The picture will only be as large as the stencils it contains. If your stencils are located in the upper right corner of the page, then only the upper right corner will be exported.</string>
+This will eliminate all blank portions of the drawing. The picture will only be as large as the stencils it tqcontains. If your stencils are located in the upper right corner of the page, then only the upper right corner will be exported.</string>
                 </property>
             </widget>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -121,7 +121,7 @@ This will eliminate all blank portions of the drawing. The picture will only be
                 <cstring>m_spinQuality</cstring>
             </property>
         </widget>
-        <widget class="QSpinBox" row="1" column="1">
+        <widget class="TQSpinBox" row="1" column="1">
             <property name="name">
                 <cstring>m_spinQuality</cstring>
             </property>
@@ -139,7 +139,7 @@ This will eliminate all blank portions of the drawing. The picture will only be
 Not all file formats use this. But for those that do, this affects the quality of the image that gets exported. 100 is the maximum quality. The higher the number, the better the picture looks. The downside is the higher the number, the larger the filesize.</string>
             </property>
         </widget>
-        <widget class="QSpinBox" row="2" column="1">
+        <widget class="TQSpinBox" row="2" column="1">
             <property name="name">
                 <cstring>m_spinBorder</cstring>
             </property>
@@ -154,7 +154,7 @@ Not all file formats use this. But for those that do, this affects the quality o
 Places a blank border around the edges of the image. This can be used if for one reason or another, the stencils don't fit into the export page with a 0-pixel border (default).</string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
@@ -170,6 +170,6 @@ Places a blank border around the edges of the image. This can be used if for one
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
index 6d8b8355..55b88d82 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
@@ -18,32 +18,32 @@
 #include <kiconloader.h>
 #include <kapplication.h>
 
-#include <qpixmap.h>
-#include <qslider.h>
-#include <qspinbox.h>
-#include <qframe.h>
-#include <qcursor.h>
-#include <qtoolbutton.h>
+#include <tqpixmap.h>
+#include <tqslider.h>
+#include <tqspinbox.h>
+#include <tqframe.h>
+#include <tqcursor.h>
+#include <tqtoolbutton.h>
 
 #define TOGGLE_ACTION(X) ((KToggleAction*)child(X))
 
-KivioBirdEyePanel::KivioBirdEyePanel(KivioView* view, QWidget* parent, const char* name)
-: KivioBirdEyePanelBase(parent, name), m_pView(view), m_pCanvas(view->canvasWidget()), m_pDoc(view->doc())
+KivioBirdEyePanel::KivioBirdEyePanel(KivioView* view, TQWidget* tqparent, const char* name)
+: KivioBirdEyePanelBase(tqparent, name), m_pView(view), m_pCanvas(view->canvasWidget()), m_pDoc(view->doc())
 {
   handlePress = false;
-  m_buffer = new QPixmap();
+  m_buffer = new TQPixmap();
   canvas->installEventFilter(this);
   m_zoomHandler = new KoZoomHandler;
 
-  connect( m_pDoc, SIGNAL( sig_updateView(KivioPage*)), SLOT(slotUpdateView(KivioPage*)) );
-  connect( m_pView, SIGNAL(zoomChanged(int)), SLOT(canvasZoomChanged(int)));
-  connect( m_pCanvas, SIGNAL(visibleAreaChanged()), SLOT(updateView()));
+  connect( m_pDoc, TQT_SIGNAL( sig_updateView(KivioPage*)), TQT_SLOT(slotUpdateView(KivioPage*)) );
+  connect( m_pView, TQT_SIGNAL(zoomChanged(int)), TQT_SLOT(canvasZoomChanged(int)));
+  connect( m_pCanvas, TQT_SIGNAL(visibleAreaChanged()), TQT_SLOT(updateView()));
 
   m_zoomOutButton->setIconSet(SmallIconSet("viewmag-", 16));
   m_zoomInButton->setIconSet(SmallIconSet("viewmag+", 16));
-  connect(m_zoomOutButton, SIGNAL(clicked()), this, SLOT(zoomMinus()));
-  connect(m_zoomInButton, SIGNAL(clicked()), this, SLOT(zoomPlus()));
-  connect(m_zoomSlider, SIGNAL(valueChanged(int)), m_pView, SLOT(viewZoom(int)));
+  connect(m_zoomOutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomMinus()));
+  connect(m_zoomInButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomPlus()));
+  connect(m_zoomSlider, TQT_SIGNAL(valueChanged(int)), m_pView, TQT_SLOT(viewZoom(int)));
 
   canvasZoomChanged(m_pView->zoomHandler()->zoom());
 }
@@ -56,12 +56,12 @@ KivioBirdEyePanel::~KivioBirdEyePanel()
 
 void KivioBirdEyePanel::zoomMinus()
 {
-  m_pCanvas->zoomOut(QPoint(m_pCanvas->width() / 2, m_pCanvas->height() / 2));
+  m_pCanvas->zoomOut(TQPoint(m_pCanvas->width() / 2, m_pCanvas->height() / 2));
 }
 
 void KivioBirdEyePanel::zoomPlus()
 {
-  m_pCanvas->zoomIn(QPoint(m_pCanvas->width() / 2, m_pCanvas->height() / 2));
+  m_pCanvas->zoomIn(TQPoint(m_pCanvas->width() / 2, m_pCanvas->height() / 2));
 }
 
 void KivioBirdEyePanel::canvasZoomChanged(int zoom)
@@ -82,25 +82,25 @@ void KivioBirdEyePanel::slotUpdateView(KivioPage* page)
   updateView();
 }
 
-bool KivioBirdEyePanel::eventFilter(QObject* o, QEvent* ev)
+bool KivioBirdEyePanel::eventFilter(TQObject* o, TQEvent* ev)
 {
-  if (o == canvas && ev->type() == QEvent::Show) {
+  if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::Show) {
     updateView();
   }
 
-  if (o == canvas && ev->type() == QEvent::Resize) {
+  if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::Resize) {
     m_buffer->resize(canvas->size());
     slotUpdateView(m_pView->activePage());
   }
 
-  if (o == canvas && ev->type() == QEvent::Paint) {
+  if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::Paint) {
     updateView();
     return true;
   }
 
-  if (o == canvas && ev->type() == QEvent::MouseMove) {
-    QMouseEvent* me = (QMouseEvent*)ev;
-    if (me->state() == LeftButton)
+  if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::MouseMove) {
+    TQMouseEvent* me = TQT_TQMOUSEEVENT(ev);
+    if (me->state() == Qt::LeftButton)
       handleMouseMoveAction(me->pos());
     else
       handleMouseMove(me->pos());
@@ -109,9 +109,9 @@ bool KivioBirdEyePanel::eventFilter(QObject* o, QEvent* ev)
     return true;
   }
 
-  if (o == canvas && ev->type() == QEvent::MouseButtonPress) {
-    QMouseEvent* me = (QMouseEvent*)ev;
-    if (me->button() == LeftButton)
+  if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::MouseButtonPress) {
+    TQMouseEvent* me = TQT_TQMOUSEEVENT(ev);
+    if (me->button() == Qt::LeftButton)
       handleMousePress(me->pos());
 
     return true;
@@ -130,14 +130,14 @@ void KivioBirdEyePanel::updateView()
 
   int pw = m_zoomHandler->zoomItX(pl.ptWidth);
   int ph = m_zoomHandler->zoomItY(pl.ptHeight);
-  QSize s2 = QSize(pw,ph);
-  QSize s1 = canvas->size();
+  TQSize s2 = TQSize(pw,ph);
+  TQSize s1 = canvas->size();
 
   double zx = (double)s1.width()/(double)s2.width();
   double zy = (double)s1.height()/(double)s2.height();
-  double zxy = QMIN(zx,zy);
+  double zxy = TQMIN(zx,zy);
 
-  m_zoomHandler->setZoomAndResolution(qRound(zxy * 100), KoGlobal::dpiX(),
+  m_zoomHandler->setZoomAndResolution(tqRound(zxy * 100), KoGlobal::dpiX(),
     KoGlobal::dpiY());
 
   pw = m_zoomHandler->zoomItX(pl.ptWidth);
@@ -145,13 +145,13 @@ void KivioBirdEyePanel::updateView()
   int px0 = (s1.width()-pw)/2;
   int py0 = (s1.height()-ph)/2;
 
-  QPoint p0 = QPoint(px0,py0);
+  TQPoint p0 = TQPoint(px0,py0);
 
-  QRect rect(QPoint(0,0),s1);
+  TQRect rect(TQPoint(0,0),s1);
 
   KivioScreenPainter kpainter;
-  kpainter.start(m_buffer);
-  kpainter.painter()->fillRect(rect, KApplication::palette().active().brush(QColorGroup::Mid));
+  kpainter.start(TQT_TQPAINTDEVICE(m_buffer));
+  kpainter.painter()->fillRect(rect, KApplication::tqpalette().active().brush(TQColorGroup::Mid));
 
   kpainter.painter()->fillRect(px0, py0, pw, ph, white);
 
@@ -176,39 +176,39 @@ void KivioBirdEyePanel::updateView()
   bitBlt(canvas,0,0,m_buffer);
 }
 
-void KivioBirdEyePanel::handleMouseMove(QPoint p)
+void KivioBirdEyePanel::handleMouseMove(TQPoint p)
 {
   handlePress = true;
 
-  QRect r1 = QRect(varea.x()-1, varea.y()-1, 3, varea.height()+2);
-  if (r1.contains(p)) {
+  TQRect r1 = TQRect(varea.x()-1, varea.y()-1, 3, varea.height()+2);
+  if (r1.tqcontains(p)) {
     canvas->setCursor(sizeHorCursor);
     apos = AlignLeft;
     return;
   }
 
   r1.moveBy(varea.width(),0);
-  if (r1.contains(p)) {
+  if (r1.tqcontains(p)) {
     canvas->setCursor(sizeHorCursor);
     apos = AlignRight;
     return;
   }
 
-  QRect r2 = QRect(varea.x()-1, varea.y()-1, varea.width()+2, 3);
-  if (r2.contains(p)) {
+  TQRect r2 = TQRect(varea.x()-1, varea.y()-1, varea.width()+2, 3);
+  if (r2.tqcontains(p)) {
     canvas->setCursor(sizeVerCursor);
     apos = AlignTop;
     return;
   }
 
   r2.moveBy(0, varea.height());
-  if (r2.contains(p)) {
+  if (r2.tqcontains(p)) {
     canvas->setCursor(sizeVerCursor);
     apos = AlignBottom;
     return;
   }
 
-  if (varea.contains(p)) {
+  if (varea.tqcontains(p)) {
     canvas->setCursor(sizeAllCursor);
     apos = AlignCenter;
     return;
@@ -218,7 +218,7 @@ void KivioBirdEyePanel::handleMouseMove(QPoint p)
   handlePress = false;
 }
 
-void KivioBirdEyePanel::handleMouseMoveAction(QPoint p)
+void KivioBirdEyePanel::handleMouseMoveAction(TQPoint p)
 {
   if (!handlePress)
     return;
@@ -240,31 +240,31 @@ void KivioBirdEyePanel::handleMouseMoveAction(QPoint p)
 
   KoRect vr = m_pCanvas->visibleArea();
   if (apos == AlignRight) {
-    vr.setWidth(QMAX(10.0, vr.width() + dx));
+    vr.setWidth(TQMAX(10.0, vr.width() + dx));
     m_pCanvas->setVisibleAreaByWidth(vr);
   }
   else if (apos == AlignLeft) {
     vr.setX(vr.x() + dx);
-    vr.setWidth(QMAX(10.0, vr.width() - dx));
+    vr.setWidth(TQMAX(10.0, vr.width() - dx));
     m_pCanvas->setVisibleAreaByWidth(vr);
   }
   else if (apos == AlignTop) {
     vr.setY(vr.y() + dy);
-    vr.setHeight(QMAX(10.0 ,vr.height() - dy));
+    vr.setHeight(TQMAX(10.0 ,vr.height() - dy));
     m_pCanvas->setVisibleAreaByHeight(vr);
   }
   else if (apos == AlignBottom) {
-    vr.setHeight(QMAX(10.0 ,vr.height() + dy));
+    vr.setHeight(TQMAX(10.0 ,vr.height() + dy));
     m_pCanvas->setVisibleAreaByHeight(vr);
   }
 }
 
-void KivioBirdEyePanel::handleMousePress(QPoint p)
+void KivioBirdEyePanel::handleMousePress(TQPoint p)
 {
   if (handlePress)
     return;
 
-  QSize s1 = canvas->size();
+  TQSize s1 = canvas->size();
   KoPageLayout pl = m_pView->activePage()->paperLayout();
   int pw = m_zoomHandler->zoomItX(pl.ptWidth);
   int ph = m_zoomHandler->zoomItY(pl.ptHeight);
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.h b/kivio/kiviopart/ui/kivio_birdeye_panel.h
index 6a17fd85..1138663c 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel.h
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel.h
@@ -21,7 +21,7 @@
 #define KIVIOBIRDEYEPANEL_H
 #include "kivio_birdeye_panel_base.h"
 
-class QPixmap;
+class TQPixmap;
 
 class KivioView;
 class KivioCanvas;
@@ -32,11 +32,12 @@ class KoZoomHandler;
 
 class KivioBirdEyePanel : public KivioBirdEyePanelBase
 { Q_OBJECT
+  TQ_OBJECT
 public:
-  KivioBirdEyePanel(KivioView* view, QWidget* parent=0, const char* name=0);
+  KivioBirdEyePanel(KivioView* view, TQWidget* tqparent=0, const char* name=0);
   ~KivioBirdEyePanel();
 
-  bool eventFilter(QObject*, QEvent*);
+  bool eventFilter(TQObject*, TQEvent*);
 
 public slots:
   void zoomMinus();
@@ -48,9 +49,9 @@ protected slots:
   void slotUpdateView(KivioPage*);
 
 protected:
-  void handleMouseMove(QPoint);
-  void handleMouseMoveAction(QPoint);
-  void handleMousePress(QPoint);
+  void handleMouseMove(TQPoint);
+  void handleMouseMoveAction(TQPoint);
+  void handleMousePress(TQPoint);
 
 private:
   KivioView* m_pView;
@@ -59,12 +60,12 @@ private:
 
   KAction* zoomIn;
   KAction* zoomOut;
-  QPixmap* m_buffer;
+  TQPixmap* m_buffer;
 
-  QRect varea;
+  TQRect varea;
   AlignmentFlags apos;
   bool handlePress;
-  QPoint lastPos;
+  TQPoint lastPos;
   KoZoomHandler* m_zoomHandler;
 };
 
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui b/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui
index e3e22772..5ede3845 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KivioBirdEyePanelBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KivioBirdEyePanelBase</cstring>
     </property>
@@ -20,9 +20,9 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="layoutMargin" stdset="0">
+    <property name="tqlayoutMargin" stdset="0">
     </property>
-    <property name="layoutSpacing" stdset="0">
+    <property name="tqlayoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
@@ -34,7 +34,7 @@
         <property name="spacing">
             <number>3</number>
         </property>
-        <widget class="QFrame" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQFrame" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>canvas</cstring>
             </property>
@@ -48,7 +48,7 @@
                 <enum>Raised</enum>
             </property>
         </widget>
-        <widget class="QToolButton" row="1" column="2">
+        <widget class="TQToolButton" row="1" column="2">
             <property name="name">
                 <cstring>m_zoomInButton</cstring>
             </property>
@@ -59,7 +59,7 @@
                 <string>Zoom In 25%</string>
             </property>
         </widget>
-        <widget class="QToolButton" row="1" column="0">
+        <widget class="TQToolButton" row="1" column="0">
             <property name="name">
                 <cstring>m_zoomOutButton</cstring>
             </property>
@@ -70,7 +70,7 @@
                 <string>Zoom Out 25%</string>
             </property>
         </widget>
-        <widget class="QSlider" row="1" column="1">
+        <widget class="TQSlider" row="1" column="1">
             <property name="name">
                 <cstring>m_zoomSlider</cstring>
             </property>
@@ -98,11 +98,11 @@
 <includes>
     <include location="local" impldecl="in declaration">kiconloader.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>zoomChanged(int)</slot>
     <slot>zoomMinus()</slot>
     <slot>zoomPlus()</slot>
-</slots>
+</Q_SLOTS>
 <pixmapfunction>BarIcon</pixmapfunction>
-<layoutdefaults spacing="2" margin="0"/>
+<tqlayoutdefaults spacing="2" margin="0"/>
 </UI>
diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp
index 481a5644..92161ba3 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp
@@ -26,8 +26,8 @@
 #include "kivio_command.h"
 #include "layerlisttooltip.h"
 
-#include <qheader.h>
-#include <qlayout.h>
+#include <tqheader.h>
+#include <tqlayout.h>
 
 #include <ktoolbar.h>
 #include <klocale.h>
@@ -35,11 +35,11 @@
 #include <kiconloader.h>
 #include <kinputdialog.h>
 
-KivioLayerItem::KivioLayerItem(QListView* parent, KivioLayer* d, int id)
-: QListViewItem(parent), data(d)
+KivioLayerItem::KivioLayerItem(TQListView* tqparent, KivioLayer* d, int id)
+: TQListViewItem(tqparent), data(d)
 {
-  QString ids;
-  QString space;
+  TQString ids;
+  TQString space;
   ids.setNum(id);
   space.fill(' ',10-ids.length());
   ids.prepend(space);
@@ -63,8 +63,8 @@ void KivioLayerItem::update()
 
 
 /*********************************************************/
-KivioLayerPanel::KivioLayerPanel(KivioView* view, QWidget* parent, const char* name)
-: KivioLayerPanelBase(parent, name), m_pView(view)
+KivioLayerPanel::KivioLayerPanel(KivioView* view, TQWidget* tqparent, const char* name)
+: KivioLayerPanelBase(tqparent, name), m_pView(view)
 {
   list->header()->hide();
   list->addColumn(i18n("View"),15);
@@ -75,11 +75,11 @@ KivioLayerPanel::KivioLayerPanel(KivioView* view, QWidget* parent, const char* n
   list->setSorting(5, false);
   list->installEventFilter(this);
 
-  actNew = new KAction( i18n("New Layer"), BarIcon("layer_add",KivioFactory::global()), 0, this, SLOT(addItem()), this);
-  actDel = new KAction( i18n("Remove Layer"), BarIcon("layer_remove",KivioFactory::global()), 0, this, SLOT(removeItem()), this);
-  actRename = new KAction( i18n("Rename Layer"), BarIcon("item_rename",KivioFactory::global()), 0, this, SLOT(renameItem()), this);
-  actUp = new KAction( i18n("Move Layer Up"), "up", 0, this, SLOT(upItem()), this);
-  actDown = new KAction( i18n("Move Layer Down"), "down", 0, this, SLOT(downItem()), this);
+  actNew = new KAction( i18n("New Layer"), BarIcon("layer_add",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(addItem()), TQT_TQOBJECT(this));
+  actDel = new KAction( i18n("Remove Layer"), BarIcon("layer_remove",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(removeItem()), TQT_TQOBJECT(this));
+  actRename = new KAction( i18n("Rename Layer"), BarIcon("item_rename",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(renameItem()), TQT_TQOBJECT(this));
+  actUp = new KAction( i18n("Move Layer Up"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT(upItem()), TQT_TQOBJECT(this));
+  actDown = new KAction( i18n("Move Layer Down"), "down", 0, TQT_TQOBJECT(this), TQT_SLOT(downItem()), TQT_TQOBJECT(this));
 
   actNew->plug(bar);
   actDel->plug(bar);
@@ -96,9 +96,9 @@ KivioLayerPanel::~KivioLayerPanel()
 {
 }
 
-bool KivioLayerPanel::eventFilter(QObject* o, QEvent* ev)
+bool KivioLayerPanel::eventFilter(TQObject* o, TQEvent* ev)
 {
-  if (o == list && (ev->type() == QEvent::LayoutHint || ev->type() == QEvent::Resize)) {
+  if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(list) && (ev->type() == TQEvent::LayoutHint || ev->type() == TQEvent::Resize)) {
     int s = list->width() - 2*(list->margin() + list->lineWidth());
     s -= list->header()->sectionSize(0);
     s -= list->header()->sectionSize(1);
@@ -108,7 +108,7 @@ bool KivioLayerPanel::eventFilter(QObject* o, QEvent* ev)
     list->triggerUpdate();
   }
 
-  return QWidget::eventFilter(o, ev);
+  return TQWidget::eventFilter(o, ev);
 }
 
 void KivioLayerPanel::addItem()
@@ -118,7 +118,7 @@ void KivioLayerPanel::addItem()
 
   // Set the layer name to something a bit different. This isn't
   // guaranteed to be unique, but it's better than "Untitled"
-  layer->setName(i18n("Layer %1").arg(id));
+  layer->setName(i18n("Layer %1").tqarg(id));
   page->addLayer(layer);
   page->setCurLayer(layer);
 
@@ -153,10 +153,10 @@ void KivioLayerPanel::renameItem()
     return;
 
   KivioLayer* layer = i->data;
-  QString oldText = layer->name();
+  TQString oldText = layer->name();
 
   bool ok=false;
-  QString newName = KInputDialog::getText(i18n("Rename Layer"),
+  TQString newName = KInputDialog::getText(i18n("Rename Layer"),
     i18n("Layer name:"), oldText, &ok, this);
 
   if (ok) {
@@ -174,14 +174,14 @@ void KivioLayerPanel::upItem()
   if (!item)
     return;
 
-  QListViewItem* above = item->itemAbove();
+  TQListViewItem* above = item->itemAbove();
   if (!above)
     return;
 
   KivioPage* page = m_pView->activePage();
   KivioLayer* layer = item->data;
 
-  int pos = page->layers()->find(layer);
+  int pos = page->layers()->tqfind(layer);
   // It's already the top layer... return
   if(pos == (static_cast<int>(page->layers()->count()) - 1))
     return;
@@ -192,7 +192,7 @@ void KivioLayerPanel::upItem()
 
   page->layers()->insert(pos + 1, layer);
 
-  QString t = above->text(5);
+  TQString t = above->text(5);
   above->setText(5,item->text(5));
   item->setText(5,t);
 
@@ -210,14 +210,14 @@ void KivioLayerPanel::downItem()
   if (!item)
     return;
 
-  QListViewItem* below = item->itemBelow();
+  TQListViewItem* below = item->itemBelow();
   if (!below)
     return;
 
   KivioPage* page = m_pView->activePage();
   KivioLayer* layer = item->data;
 
-  int pos = page->layers()->find(layer);
+  int pos = page->layers()->tqfind(layer);
   // It's already the bottom layer... return
   if (pos == 0)
     return;
@@ -228,7 +228,7 @@ void KivioLayerPanel::downItem()
 
   page->layers()->insert(pos - 1, layer);
 
-  QString t = below->text(5);
+  TQString t = below->text(5);
   below->setText(5,item->text(5));
   item->setText(5,t);
 
@@ -240,7 +240,7 @@ void KivioLayerPanel::downItem()
   m_pView->doc()->updateView(page);
 }
 
-void KivioLayerPanel::updateButtons(QListViewItem* i)
+void KivioLayerPanel::updateButtons(TQListViewItem* i)
 {
   if (!i) {
     actDel->setEnabled(false);
@@ -260,7 +260,7 @@ void KivioLayerPanel::updateButtons(QListViewItem* i)
   }
 }
 
-void KivioLayerPanel::itemClicked(QListViewItem* i, const QPoint&, int c)
+void KivioLayerPanel::itemClicked(TQListViewItem* i, const TQPoint&, int c)
 {
   if(!i) {
     return;
@@ -291,7 +291,7 @@ void KivioLayerPanel::itemClicked(QListViewItem* i, const QPoint&, int c)
   m_pView->doc()->updateView(m_pView->activePage());
 }
 
-void KivioLayerPanel::itemActivated(QListViewItem* i)
+void KivioLayerPanel::itemActivated(TQListViewItem* i)
 {
   if (!i)
     return;
@@ -320,7 +320,7 @@ void KivioLayerPanel::reset()
 
   KivioPage* page = m_pView->activePage();
   KivioLayer* layer = page->firstLayer();
-  QListViewItem* ci = 0;
+  TQListViewItem* ci = 0;
 
   while (layer) {
     KivioLayerItem* i = new KivioLayerItem(list, layer, id++);
diff --git a/kivio/kiviopart/ui/kivio_layer_panel.h b/kivio/kiviopart/ui/kivio_layer_panel.h
index 4f781313..55a908c2 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel.h
+++ b/kivio/kiviopart/ui/kivio_layer_panel.h
@@ -24,15 +24,15 @@ class KAction;
 class KivioView;
 class KivioLayer;
 
-#include <qlistview.h>
+#include <tqlistview.h>
 
 #include "kivio_layer_panel_base.h"
 
-class KivioLayerItem: public QListViewItem
+class KivioLayerItem: public TQListViewItem
 {
   friend class KivioLayerPanel;
   public:
-    KivioLayerItem(QListView* parent, KivioLayer*, int id);
+    KivioLayerItem(TQListView* tqparent, KivioLayer*, int id);
     ~KivioLayerItem();
 
     KivioLayer* layer() const { return data; }
@@ -49,11 +49,12 @@ class KivioLayerItem: public QListViewItem
 class KivioLayerPanel : public KivioLayerPanelBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KivioLayerPanel(KivioView* view, QWidget* parent=0, const char* name=0);
+    KivioLayerPanel(KivioView* view, TQWidget* tqparent=0, const char* name=0);
     ~KivioLayerPanel();
 
-    bool eventFilter(QObject*, QEvent*);
+    bool eventFilter(TQObject*, TQEvent*);
 
   public slots:
     void reset();
@@ -65,9 +66,9 @@ class KivioLayerPanel : public KivioLayerPanelBase
     void upItem();
     void downItem();
 
-    void itemClicked(QListViewItem*, const QPoint&, int);
-    void itemActivated(QListViewItem*);
-    void updateButtons(QListViewItem*);
+    void itemClicked(TQListViewItem*, const TQPoint&, int);
+    void itemActivated(TQListViewItem*);
+    void updateButtons(TQListViewItem*);
 
   private:
     KivioView* m_pView;
diff --git a/kivio/kiviopart/ui/kivio_layer_panel_base.ui b/kivio/kiviopart/ui/kivio_layer_panel_base.ui
index 86733819..f6e73ae8 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel_base.ui
+++ b/kivio/kiviopart/ui/kivio_layer_panel_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KivioLayerPanelBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KivioLayerPanelBase</cstring>
     </property>
@@ -12,9 +12,9 @@
             <height>268</height>
         </rect>
     </property>
-    <property name="layoutMargin" stdset="0">
+    <property name="tqlayoutMargin" stdset="0">
     </property>
-    <property name="layoutSpacing" stdset="0">
+    <property name="tqlayoutSpacing" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -31,7 +31,7 @@
                 <cstring>bar</cstring>
             </property>
         </widget>
-        <widget class="QListView">
+        <widget class="TQListView">
             <property name="name">
                 <cstring>list</cstring>
             </property>
@@ -70,29 +70,29 @@
 <connections>
     <connection>
         <sender>list</sender>
-        <signal>currentChanged(QListViewItem*)</signal>
+        <signal>currentChanged(TQListViewItem*)</signal>
         <receiver>KivioLayerPanelBase</receiver>
-        <slot>updateButtons(QListViewItem*)</slot>
+        <slot>updateButtons(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>list</sender>
-        <signal>currentChanged(QListViewItem*)</signal>
+        <signal>currentChanged(TQListViewItem*)</signal>
         <receiver>KivioLayerPanelBase</receiver>
-        <slot>itemActivated(QListViewItem*)</slot>
+        <slot>itemActivated(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>list</sender>
-        <signal>clicked(QListViewItem*,const QPoint&amp;,int)</signal>
+        <signal>clicked(TQListViewItem*,const QPoint&amp;,int)</signal>
         <receiver>KivioLayerPanelBase</receiver>
-        <slot>itemClicked(QListViewItem*,const QPoint&amp;,int)</slot>
+        <slot>itemClicked(TQListViewItem*,const QPoint&amp;,int)</slot>
     </connection>
 </connections>
-<slots>
-    <slot access="protected">itemActivated(QListViewItem*)</slot>
-    <slot access="protected">itemClicked(QListViewItem*,const QPoint&amp;,int)</slot>
-    <slot access="protected">updateButtons(QListViewItem*)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+<Q_SLOTS>
+    <slot access="protected">itemActivated(TQListViewItem*)</slot>
+    <slot access="protected">itemClicked(TQListViewItem*,const QPoint&amp;,int)</slot>
+    <slot access="protected">updateButtons(TQListViewItem*)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktoolbar.h</includehint>
 </includehints>
diff --git a/kivio/kiviopart/ui/kivio_protection_panel.cpp b/kivio/kiviopart/ui/kivio_protection_panel.cpp
index 29ac5794..f9521151 100644
--- a/kivio/kiviopart/ui/kivio_protection_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_protection_panel.cpp
@@ -26,21 +26,21 @@
 #include "kivio_view.h"
 #include "kivio_command.h"
 
-#include <qbitarray.h>
-#include <qcheckbox.h>
+#include <tqbitarray.h>
+#include <tqcheckbox.h>
 #include <kaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 
-KivioProtectionPanel::KivioProtectionPanel( KivioView *view, QWidget *parent, const char *name )
-   : KivioProtectionPanelBase(parent, name), m_pView(view)
+KivioProtectionPanel::KivioProtectionPanel( KivioView *view, TQWidget *tqparent, const char *name )
+   : KivioProtectionPanelBase(tqparent, name), m_pView(view)
 {
-   QObject::connect( m_checkWidth, SIGNAL(toggled(bool)), this, SLOT(togWidth(bool)) );
-   QObject::connect( m_checkHeight, SIGNAL(toggled(bool)), this, SLOT(togHeight(bool)) );
-   QObject::connect( m_checkAspect, SIGNAL(toggled(bool)), this, SLOT(togAspect(bool)) );
-   QObject::connect( m_checkDeletion, SIGNAL(toggled(bool)), this, SLOT(togDelete(bool)) );
-   QObject::connect( m_checkXPosition, SIGNAL(toggled(bool)), this, SLOT(togX(bool)) );
-   QObject::connect( m_checkYPosition, SIGNAL(toggled(bool)), this, SLOT(togY(bool)) );
+   TQObject::connect( m_checkWidth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togWidth(bool)) );
+   TQObject::connect( m_checkHeight, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togHeight(bool)) );
+   TQObject::connect( m_checkAspect, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togAspect(bool)) );
+   TQObject::connect( m_checkDeletion, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togDelete(bool)) );
+   TQObject::connect( m_checkXPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togX(bool)) );
+   TQObject::connect( m_checkYPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togY(bool)) );
 }
 
 KivioProtectionPanel::~KivioProtectionPanel()
@@ -233,7 +233,7 @@ void KivioProtectionPanel::updateCheckBoxes()
     return;
   }
 
-  QBitArray bits( NUM_PROTECTIONS );
+  TQBitArray bits( NUM_PROTECTIONS );
   int i;
 
   // Assume all protections are valid by default
@@ -257,12 +257,12 @@ void KivioProtectionPanel::updateCheckBoxes()
     pStencil = m_pView->activePage()->selectedStencils()->next();
   }
 
-  QObject::disconnect(m_checkWidth, SIGNAL(toggled(bool)), this, SLOT(togWidth(bool)));
-  QObject::disconnect(m_checkHeight, SIGNAL(toggled(bool)), this, SLOT(togHeight(bool)));
-  QObject::disconnect(m_checkAspect, SIGNAL(toggled(bool)), this, SLOT(togAspect(bool)));
-  QObject::disconnect(m_checkDeletion, SIGNAL(toggled(bool)), this, SLOT(togDelete(bool)));
-  QObject::disconnect(m_checkXPosition, SIGNAL(toggled(bool)), this, SLOT(togX(bool)));
-  QObject::disconnect(m_checkYPosition, SIGNAL(toggled(bool)), this, SLOT(togY(bool)));
+  TQObject::disconnect(m_checkWidth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togWidth(bool)));
+  TQObject::disconnect(m_checkHeight, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togHeight(bool)));
+  TQObject::disconnect(m_checkAspect, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togAspect(bool)));
+  TQObject::disconnect(m_checkDeletion, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togDelete(bool)));
+  TQObject::disconnect(m_checkXPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togX(bool)));
+  TQObject::disconnect(m_checkYPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togY(bool)));
 
   // Enable and disable the check boxes based on what protections are available
   for(i = 0; i < NUM_PROTECTIONS; i++) {
@@ -319,10 +319,10 @@ void KivioProtectionPanel::updateCheckBoxes()
     m_checkHeight->setChecked( pStencil->protection()->at(kpHeight) );
   }
 
-  QObject::connect(m_checkWidth, SIGNAL(toggled(bool)), this, SLOT(togWidth(bool)));
-  QObject::connect(m_checkHeight, SIGNAL(toggled(bool)), this, SLOT(togHeight(bool)));
-  QObject::connect(m_checkAspect, SIGNAL(toggled(bool)), this, SLOT(togAspect(bool)));
-  QObject::connect(m_checkDeletion, SIGNAL(toggled(bool)), this, SLOT(togDelete(bool)));
-  QObject::connect(m_checkXPosition, SIGNAL(toggled(bool)), this, SLOT(togX(bool)));
-  QObject::connect(m_checkYPosition, SIGNAL(toggled(bool)), this, SLOT(togY(bool)));
+  TQObject::connect(m_checkWidth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togWidth(bool)));
+  TQObject::connect(m_checkHeight, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togHeight(bool)));
+  TQObject::connect(m_checkAspect, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togAspect(bool)));
+  TQObject::connect(m_checkDeletion, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togDelete(bool)));
+  TQObject::connect(m_checkXPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togX(bool)));
+  TQObject::connect(m_checkYPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togY(bool)));
 }
diff --git a/kivio/kiviopart/ui/kivio_protection_panel.h b/kivio/kiviopart/ui/kivio_protection_panel.h
index b8ea9d00..3fd80695 100644
--- a/kivio/kiviopart/ui/kivio_protection_panel.h
+++ b/kivio/kiviopart/ui/kivio_protection_panel.h
@@ -28,9 +28,10 @@ class KivioLayer;
 class KivioProtectionPanel : public KivioProtectionPanelBase
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KivioProtectionPanel( KivioView *view, QWidget *parent=0, const char *name=0 );
+    KivioProtectionPanel( KivioView *view, TQWidget *tqparent=0, const char *name=0 );
     virtual ~KivioProtectionPanel();
 
 public slots:
diff --git a/kivio/kiviopart/ui/kivio_protection_panel_base.ui b/kivio/kiviopart/ui/kivio_protection_panel_base.ui
index 6d15aa7e..19bd2a6e 100644
--- a/kivio/kiviopart/ui/kivio_protection_panel_base.ui
+++ b/kivio/kiviopart/ui/kivio_protection_panel_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KivioProtectionPanelBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KivioProtectionPanelBase</cstring>
     </property>
@@ -12,13 +12,13 @@
             <height>147</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
         </size>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -31,7 +31,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>m_checkWidth</cstring>
             </property>
@@ -42,7 +42,7 @@
                 <string>Toggles the ability to change the width of the selected stencils</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>m_checkHeight</cstring>
             </property>
@@ -53,7 +53,7 @@
                 <string>Toggles the ability to change the height of the selected stencils</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>m_checkAspect</cstring>
             </property>
@@ -64,7 +64,7 @@
                 <string>Toggles the ability to change the aspect ratio of the selected stencils</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>m_checkXPosition</cstring>
             </property>
@@ -75,7 +75,7 @@
                 <string>Toggles the ability to protect the x position of the selected stencils</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>m_checkYPosition</cstring>
             </property>
@@ -86,7 +86,7 @@
                 <string>Toggles the ability to protect the y position of the selected stencils</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>m_checkDeletion</cstring>
             </property>
@@ -107,7 +107,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>281</height>
@@ -124,5 +124,5 @@
     <tabstop>m_checkYPosition</tabstop>
     <tabstop>m_checkDeletion</tabstop>
 </tabstops>
-<layoutdefaults spacing="2" margin="0"/>
+<tqlayoutdefaults spacing="2" margin="0"/>
 </UI>
diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
index da7e6685..acc2e63a 100644
--- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
+++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
@@ -18,14 +18,14 @@
 */
 #include "kivioaddstencilsetpanel.h"
 
-#include <qfile.h>
-#include <qdir.h>
-#include <qstringlist.h>
-#include <qiconview.h>
-#include <qgroupbox.h>
-#include <qpushbutton.h>
-#include <qtextbrowser.h>
-#include <qsplitter.h>
+#include <tqfile.h>
+#include <tqdir.h>
+#include <tqstringlist.h>
+#include <tqiconview.h>
+#include <tqgroupbox.h>
+#include <tqpushbutton.h>
+#include <tqtextbrowser.h>
+#include <tqsplitter.h>
 
 #include <kstandarddirs.h>
 #include <kglobal.h>
@@ -38,19 +38,19 @@
 #include "kivioglobal.h"
 
 namespace Kivio {
-  AddStencilSetPanel::AddStencilSetPanel(QWidget *parent, const char *name)
-    : KivioStencilSetWidget(parent, name)
+  AddStencilSetPanel::AddStencilSetPanel(TQWidget *tqparent, const char *name)
+    : KivioStencilSetWidget(tqparent, name)
   {
     int height = m_stencilsetGBox->height() / 2;
-    QValueList<int> sizes;
+    TQValueList<int> sizes;
     sizes << height << height;
     m_stencilSetSplitter->setSizes(sizes);
     updateList();
 
-    connect(m_stencilSetLView, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(changeStencilSet(QListViewItem*)));
-    connect(m_addToDocBtn, SIGNAL(clicked()), this, SLOT(addToDocument()));
+    connect(m_stencilSetLView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(changeStencilSet(TQListViewItem*)));
+    connect(m_addToDocBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(addToDocument()));
 
-    QListViewItem* tmp = m_stencilSetLView->firstChild();
+    TQListViewItem* tmp = m_stencilSetLView->firstChild();
 
     if(tmp) {
       tmp = tmp->firstChild();
@@ -73,35 +73,35 @@ namespace Kivio {
   void AddStencilSetPanel::updateList()
   {
     KStandardDirs *dirs = KGlobal::dirs();
-    QStringList dirList = dirs->findDirs("data", "kivio/stencils");
+    TQStringList dirList = dirs->findDirs("data", "kivio/stencils");
     dirList.sort();
     m_stencilSetLView->clear();
     
-    for(QStringList::Iterator it = dirList.begin(); it != dirList.end(); ++it)
+    for(TQStringList::Iterator it = dirList.begin(); it != dirList.end(); ++it)
     {
-      QString dir = (*it);
+      TQString dir = (*it);
       loadCollections(dir);
     }
   }
 
-  void AddStencilSetPanel::loadCollections(const QString& dir)
+  void AddStencilSetPanel::loadCollections(const TQString& dir)
   {
-    QDir rootDir( dir );
+    TQDir rootDir( dir );
   
-    rootDir.setFilter( QDir::Dirs );
-    rootDir.setSorting( QDir::Name );
+    rootDir.setFilter( TQDir::Dirs );
+    rootDir.setSorting( TQDir::Name );
   
-    const QFileInfoList *colList = rootDir.entryInfoList();
-    QFileInfoListIterator colIt( *colList );
-    QFileInfo *colFInfo;
-    QString cId;
+    const TQFileInfoList *colList = rootDir.entryInfoList();
+    TQFileInfoListIterator colIt( *colList );
+    TQFileInfo *colFInfo;
+    TQString cId;
   
     while((colFInfo = colIt.current()))
     {
       if((colFInfo->fileName() != "..") && (colFInfo->fileName() != "."))
       {
         cId = KivioStencilSpawnerSet::readId(colFInfo->absFilePath());
-        QListViewItem* li = m_stencilSetLView->firstChild();
+        TQListViewItem* li = m_stencilSetLView->firstChild();
         
         while(li) {
           if(li->text(1) == cId) {
@@ -125,16 +125,16 @@ namespace Kivio {
     }
   }
   
-  void AddStencilSetPanel::loadStencilSet(QListViewItem* li, const QString& dir)
+  void AddStencilSetPanel::loadStencilSet(TQListViewItem* li, const TQString& dir)
   {
-    QDir rootDir( dir );
+    TQDir rootDir( dir );
   
-    rootDir.setFilter( QDir::Dirs );
-    rootDir.setSorting( QDir::Name );
+    rootDir.setFilter( TQDir::Dirs );
+    rootDir.setSorting( TQDir::Name );
   
-    const QFileInfoList *setList = rootDir.entryInfoList();
-    QFileInfoListIterator setIt( *setList );
-    QFileInfo *setFInfo;
+    const TQFileInfoList *setList = rootDir.entryInfoList();
+    TQFileInfoListIterator setIt( *setList );
+    TQFileInfo *setFInfo;
   
     while( (setFInfo = setIt.current()) )
     {
@@ -154,24 +154,24 @@ namespace Kivio {
     }
   }
 
-  QPixmap AddStencilSetPanel::loadIcon(const QString& name, const QString& dir)
+  TQPixmap AddStencilSetPanel::loadIcon(const TQString& name, const TQString& dir)
   {
-    QString fs;
+    TQString fs;
 
-    if( QFile::exists(dir + "/" + name + ".xpm") ) {
+    if( TQFile::exists(dir + "/" + name + ".xpm") ) {
       fs = dir + "/" + name + ".xpm";
-    } else if( QFile::exists(dir + "/" + name + ".png") ) {
+    } else if( TQFile::exists(dir + "/" + name + ".png") ) {
       fs = dir + "/" + name + ".png";
     } else {
-      return QPixmap();
+      return TQPixmap();
     }
 
-    return QPixmap( fs );
+    return TQPixmap( fs );
   }
 
-  void AddStencilSetPanel::changeStencilSet(QListViewItem* li)
+  void AddStencilSetPanel::changeStencilSet(TQListViewItem* li)
   {
-    if(!li || !li->parent()) {
+    if(!li || !li->tqparent()) {
       return;
     }
     
@@ -181,7 +181,7 @@ namespace Kivio {
     // Load the stencil icons
     m_currentDir = li->text(1);
     spawnerSet->loadDir(m_currentDir);
-    QStringList files = spawnerSet->files();
+    TQStringList files = spawnerSet->files();
 
     // Remove the old icons
     m_stencilIView->clear();
@@ -189,7 +189,7 @@ namespace Kivio {
     KivioStencil* stencil = 0;
     int count = 0;
 
-    for(QStringList::Iterator it = files.begin(); it != files.end(); ++it)
+    for(TQStringList::Iterator it = files.begin(); it != files.end(); ++it)
     {
       spawner = spawnerSet->loadFile(m_currentDir + "/" + (*it));
 
@@ -197,7 +197,7 @@ namespace Kivio {
         stencil = spawner->newStencil();
 
         if(stencil) {
-          (void) new QIconViewItem(m_stencilIView, spawner->info()->title(), Kivio::generatePixmapFromStencil(32, 32, stencil));
+          (void) new TQIconViewItem(m_stencilIView, spawner->info()->title(), Kivio::generatePixmapFromStencil(32, 32, stencil));
           delete stencil;
           count++;
         }
diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.h b/kivio/kiviopart/ui/kivioaddstencilsetpanel.h
index c4e1cf10..802c54da 100644
--- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.h
+++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.h
@@ -21,35 +21,36 @@
 
 #include "kiviostencilsetwidget.h"
 
-#include <qpixmap.h>
+#include <tqpixmap.h>
 
-class QListViewItem;
+class TQListViewItem;
 
 namespace Kivio {
   class AddStencilSetPanel : public KivioStencilSetWidget
   {
     Q_OBJECT
+  TQ_OBJECT
     public:
-      AddStencilSetPanel(QWidget *parent = 0, const char *name = 0);
+      AddStencilSetPanel(TQWidget *tqparent = 0, const char *name = 0);
       ~AddStencilSetPanel();
     
     public slots:
       void updateList();
       
     signals:
-      void addStencilSet(const QString&);
+      void addStencilSet(const TQString&);
       
     protected slots:
-      void changeStencilSet(QListViewItem* li);
+      void changeStencilSet(TQListViewItem* li);
       void addToDocument();
     
     protected:
-      void loadCollections(const QString& dir);
-      void loadStencilSet(QListViewItem* li, const QString& dir);
-      QPixmap loadIcon(const QString& name, const QString& dir);
+      void loadCollections(const TQString& dir);
+      void loadStencilSet(TQListViewItem* li, const TQString& dir);
+      TQPixmap loadIcon(const TQString& name, const TQString& dir);
     
     private:
-      QString m_currentDir;
+      TQString m_currentDir;
   };
 }
 
diff --git a/kivio/kiviopart/ui/kivioaligndialog.cpp b/kivio/kiviopart/ui/kivioaligndialog.cpp
index f7224074..03f0ac3a 100644
--- a/kivio/kiviopart/ui/kivioaligndialog.cpp
+++ b/kivio/kiviopart/ui/kivioaligndialog.cpp
@@ -20,16 +20,16 @@
 #include "kivioaligndialog.h"
 #include "kivioaligndialog.moc"
 
-#include <qradiobutton.h>
-#include <qcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqcheckbox.h>
 
 #include <klocale.h>
 
 #include "kivio_page.h"
 #include "aligndialog.h"
 
-KivioAlignDialog::KivioAlignDialog(QWidget* parent, const char* name)
- : KDialogBase(parent, name, true, i18n("Align & Distribute"), Ok|Cancel, Ok)
+KivioAlignDialog::KivioAlignDialog(TQWidget* tqparent, const char* name)
+ : KDialogBase(tqparent, name, true, i18n("Align & Distribute"), Ok|Cancel, Ok)
 {
   m_view = new KivioAlignDialogWidget(this);
   setMainWidget(m_view);
diff --git a/kivio/kiviopart/ui/kivioaligndialog.h b/kivio/kiviopart/ui/kivioaligndialog.h
index f15a017e..18808b2c 100644
--- a/kivio/kiviopart/ui/kivioaligndialog.h
+++ b/kivio/kiviopart/ui/kivioaligndialog.h
@@ -29,8 +29,9 @@ struct DistributeData;
 class KivioAlignDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KivioAlignDialog(QWidget* parent = 0, const char* name = 0);
+    KivioAlignDialog(TQWidget* tqparent = 0, const char* name = 0);
 
     AlignData align();
 
diff --git a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp
index 04429587..69312faf 100644
--- a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp
+++ b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp
@@ -19,13 +19,13 @@
 
 #include "kivioarrowheadformatdlg.h"
 
-#include <qlabel.h>
-#include <qgroupbox.h>
-#include <qlayout.h>
-#include <qbitmap.h>
-#include <qpixmap.h>
-#include <qpainter.h>
-#include <qframe.h>
+#include <tqlabel.h>
+#include <tqgroupbox.h>
+#include <tqlayout.h>
+#include <tqbitmap.h>
+#include <tqpixmap.h>
+#include <tqpainter.h>
+#include <tqframe.h>
 
 #include <kcombobox.h>
 #include <klocale.h>
@@ -36,8 +36,8 @@
 #include "kivio_view.h"
 #include "kivioglobal.h"
 
-KivioArrowHeadFormatDlg::KivioArrowHeadFormatDlg(KivioView* parent, const char* name)
-  : KDialogBase(parent, name, true, i18n("Arrowhead Format"), Ok|Cancel|Default, Ok)
+KivioArrowHeadFormatDlg::KivioArrowHeadFormatDlg(KivioView* tqparent, const char* name)
+  : KDialogBase(tqparent, name, true, i18n("Arrowhead Format"), Ok|Cancel|Default, Ok)
 {
   m_unit = KoUnit::U_PT;
   init();
@@ -45,42 +45,42 @@ KivioArrowHeadFormatDlg::KivioArrowHeadFormatDlg(KivioView* parent, const char*
 
 void KivioArrowHeadFormatDlg::init()
 {
-  QWidget* mainWidget = new QWidget(this);
+  TQWidget* mainWidget = new TQWidget(this);
   setMainWidget(mainWidget);
-  QGridLayout* gl = new QGridLayout(mainWidget, 2, 1, 0, KDialog::spacingHint());
+  TQGridLayout* gl = new TQGridLayout(mainWidget, 2, 1, 0, KDialog::spacingHint());
 
-  QLabel* startAHHeaderIcon = new QLabel(mainWidget);
+  TQLabel* startAHHeaderIcon = new TQLabel(mainWidget);
   startAHHeaderIcon->setPixmap(SmallIcon("start_arrowhead", 16));
   startAHHeaderIcon->setFixedSize(16, 16);
-  QLabel* startAHHeaderLabel = new QLabel(i18n("<b>Arrowhead at Origin</b>"), mainWidget);
-  QFont font = startAHHeaderLabel->font();
-  QFrame* startAHHeaderLine = new QFrame(mainWidget);
-  startAHHeaderLine->setFrameStyle(QFrame::HLine|QFrame::Plain);
-  QLabel* startAHTypeLbl = new QLabel(i18n("&Type:"), mainWidget);
+  TQLabel* startAHHeaderLabel = new TQLabel(i18n("<b>Arrowhead at Origin</b>"), mainWidget);
+  TQFont font = startAHHeaderLabel->font();
+  TQFrame* startAHHeaderLine = new TQFrame(mainWidget);
+  startAHHeaderLine->setFrameStyle(TQFrame::HLine|TQFrame::Plain);
+  TQLabel* startAHTypeLbl = new TQLabel(i18n("&Type:"), mainWidget);
   m_startAHTypeCBox = new KComboBox(mainWidget);
   loadArrowHeads(m_startAHTypeCBox);
   startAHTypeLbl->setBuddy(m_startAHTypeCBox);
-  QLabel* startAHWidthLbl = new QLabel(i18n("&Width:"), mainWidget);
+  TQLabel* startAHWidthLbl = new TQLabel(i18n("&Width:"), mainWidget);
   m_startAHWidthUSBox = new KoUnitDoubleSpinBox(mainWidget, 0.0, 1000.0, 0.1, 1.0, m_unit, 2);
   startAHWidthLbl->setBuddy(m_startAHWidthUSBox);
-  QLabel* startAHHeightLbl = new QLabel(i18n("&Length:"), mainWidget);
+  TQLabel* startAHHeightLbl = new TQLabel(i18n("&Length:"), mainWidget);
   m_startAHHeightUSBox = new KoUnitDoubleSpinBox(mainWidget, 0.0, 1000.0, 0.1, 1.0, m_unit, 2);
   startAHHeightLbl->setBuddy(m_startAHHeightUSBox);
 
-  QLabel* endAHHeaderIcon = new QLabel(mainWidget);
+  TQLabel* endAHHeaderIcon = new TQLabel(mainWidget);
   endAHHeaderIcon->setPixmap(SmallIcon("end_arrowhead", 16));
   endAHHeaderIcon->setFixedSize(16, 16);
-  QLabel* endAHHeaderLabel = new QLabel(i18n("<b>Arrowhead at End</b>"), mainWidget);
-  QFrame* endAHHeaderLine = new QFrame(mainWidget);
-  endAHHeaderLine->setFrameStyle(QFrame::HLine|QFrame::Plain);
-  QLabel* endAHTypeLbl = new QLabel(i18n("T&ype:"), mainWidget);
+  TQLabel* endAHHeaderLabel = new TQLabel(i18n("<b>Arrowhead at End</b>"), mainWidget);
+  TQFrame* endAHHeaderLine = new TQFrame(mainWidget);
+  endAHHeaderLine->setFrameStyle(TQFrame::HLine|TQFrame::Plain);
+  TQLabel* endAHTypeLbl = new TQLabel(i18n("T&ype:"), mainWidget);
   m_endAHTypeCBox = new KComboBox(mainWidget);
   loadArrowHeads(m_endAHTypeCBox);
   endAHTypeLbl->setBuddy(m_endAHTypeCBox);
-  QLabel* endAHWidthLbl = new QLabel(i18n("W&idth:"), mainWidget);
+  TQLabel* endAHWidthLbl = new TQLabel(i18n("W&idth:"), mainWidget);
   m_endAHWidthUSBox = new KoUnitDoubleSpinBox(mainWidget, 0.0, 1000.0, 0.1, 1.0, m_unit, 2);
   endAHWidthLbl->setBuddy(m_endAHWidthUSBox);
-  QLabel* endAHHeightLbl = new QLabel(i18n("L&ength:"), mainWidget);
+  TQLabel* endAHHeightLbl = new TQLabel(i18n("L&ength:"), mainWidget);
   m_endAHHeightUSBox = new KoUnitDoubleSpinBox(mainWidget, 0.0, 1000.0, 0.1, 1.0, m_unit, 2);
   endAHHeightLbl->setBuddy(m_endAHHeightUSBox);
 
@@ -94,8 +94,8 @@ void KivioArrowHeadFormatDlg::init()
   gl->addMultiCellWidget(startAHHeightLbl, 4, 4, 0, 1);
   gl->addWidget(m_startAHHeightUSBox, 4, 2);
 
-  gl->addMultiCell(new QSpacerItem(KDialog::marginHint(), KDialog::marginHint(),
-                   QSizePolicy::Minimum, QSizePolicy::Fixed), 5, 5, 0, 2);
+  gl->addMultiCell(new TQSpacerItem(KDialog::marginHint(), KDialog::marginHint(),
+                   TQSizePolicy::Minimum, TQSizePolicy::Fixed), 5, 5, 0, 2);
 
   gl->addWidget(endAHHeaderIcon, 6, 0);
   gl->addMultiCellWidget(endAHHeaderLabel, 6, 6, 1, 2);
@@ -111,10 +111,10 @@ void KivioArrowHeadFormatDlg::init()
 
 void KivioArrowHeadFormatDlg::loadArrowHeads(KComboBox* combo)
 {
-  QBitmap mask;
-  QPixmap pixAll = Kivio::arrowHeadPixmap();
-  QPixmap pix(pixAll.width(), 17);
-  QPainter p(&pix, combo);
+  TQBitmap tqmask;
+  TQPixmap pixAll = Kivio::arrowHeadPixmap();
+  TQPixmap pix(pixAll.width(), 17);
+  TQPainter p(&pix, combo);
   int cindex = 0;
 
   // insert item "None"
diff --git a/kivio/kiviopart/ui/kivioarrowheadformatdlg.h b/kivio/kiviopart/ui/kivioarrowheadformatdlg.h
index 6105b14c..49912798 100644
--- a/kivio/kiviopart/ui/kivioarrowheadformatdlg.h
+++ b/kivio/kiviopart/ui/kivioarrowheadformatdlg.h
@@ -31,8 +31,9 @@ class KivioView;
 class KivioArrowHeadFormatDlg : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KivioArrowHeadFormatDlg(KivioView* parent, const char* name = 0);
+    KivioArrowHeadFormatDlg(KivioView* tqparent, const char* name = 0);
 
     int startAHType();
     double startAHWidth();
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
index d19dce6d..f6950f13 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
@@ -39,21 +39,21 @@
 #include <kdebug.h>
 #include <kfontdialog.h>
 
-#include <qlabel.h>
-#include <qbuttongroup.h>
-#include <qgroupbox.h>
-#include <qcombobox.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qlayout.h>
-#include <qtabwidget.h>
-
-// GuidesListViewItem::GuidesListViewItem(QListView* parent, KivioGuideLineData *gd, KoUnit::Unit u)
-// : KListViewItem(parent), m_data(gd)
+#include <tqlabel.h>
+#include <tqbuttongroup.h>
+#include <tqgroupbox.h>
+#include <tqcombobox.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqlayout.h>
+#include <tqtabwidget.h>
+
+// GuidesListViewItem::GuidesListViewItem(TQListView* tqparent, KivioGuideLineData *gd, KoUnit::Unit u)
+// : KListViewItem(tqparent), m_data(gd)
 // {
 //   setPixmap(0, BarIcon(m_data->orientation() == Qt::Vertical ?
 //     "guides_vertical":"guides_horizontal"));
-//   QString s = KGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2);
+//   TQString s = KGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2);
 //   s += " " + KoUnit::unitName(u);
 //   setText(1, s);
 // }
@@ -65,7 +65,7 @@
 // 
 // void GuidesListViewItem::setUnit(KoUnit::Unit u)
 // {
-//   QString s = KGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2);
+//   TQString s = KGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2);
 //   s += " " + KoUnit::unitName(u);
 //   setText(1, s);
 // }
@@ -73,7 +73,7 @@
 // void GuidesListViewItem::setPosition(double p, KoUnit::Unit u)
 // {
 //   m_data->setPosition(KoUnit::fromUserValue(p, u));
-//   QString s = KGlobal::_locale->formatNumber(p, 2);
+//   TQString s = KGlobal::_locale->formatNumber(p, 2);
 //   s += " " + KoUnit::unitName(u);
 //   setText(1, s);
 // }
@@ -87,79 +87,79 @@
 
 /*****************************************************************************/
 
-KivioOptionsDialog::KivioOptionsDialog(KivioView* parent, const char* name)
-  : KDialogBase(IconList, i18n("Settings"), Ok|Cancel|Apply|Default, Ok, parent, name)
+KivioOptionsDialog::KivioOptionsDialog(KivioView* tqparent, const char* name)
+  : KDialogBase(IconList, i18n("Settings"), Ok|Cancel|Apply|Default, Ok, tqparent, name)
 {
   initPage();
   initGrid();
-  unitChanged(parent->doc()->unit());
+  unitChanged(tqparent->doc()->unit());
 }
 
 void KivioOptionsDialog::initPage()
 {
-  QFrame* page = addPage(i18n("Page"), i18n("Page Settings"),
+  TQFrame* page = addPage(i18n("Page"), i18n("Page Settings"),
     kapp->iconLoader()->loadIcon("empty", KIcon::Toolbar, 32));
   m_pageIndex = pageIndex(page);
 
-  KivioView* view = static_cast<KivioView*>(parent());
+  KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(tqparent()));
   KoUnit::Unit unit = KoUnit::unit(Kivio::Config::unit());
   m_layout = Kivio::Config::defaultPageLayout();
   m_font = Kivio::Config::font();
 
-  QLabel* unitLbl = new QLabel(i18n("Default &units:"), page);
-  m_unitCombo = new QComboBox(page);
+  TQLabel* unitLbl = new TQLabel(i18n("Default &units:"), page);
+  m_unitCombo = new TQComboBox(page);
   m_unitCombo->insertStringList(KoUnit::listOfUnitName());
   m_unitCombo->setCurrentItem(unit);
   unitLbl->setBuddy(m_unitCombo);
-  QLabel* layoutLbl = new QLabel(i18n("Default layout:"), page);
-  m_layoutTxtLbl = new QLabel(page);
-  m_layoutTxtLbl->setFrameStyle(QFrame::LineEditPanel | QFrame::Sunken);
-  m_layoutTxtLbl->setSizePolicy(QSizePolicy(
-    QSizePolicy::Minimum, QSizePolicy::Fixed));
+  TQLabel* tqlayoutLbl = new TQLabel(i18n("Default tqlayout:"), page);
+  m_layoutTxtLbl = new TQLabel(page);
+  m_layoutTxtLbl->setFrameStyle(TQFrame::LineEditPanel | TQFrame::Sunken);
+  m_layoutTxtLbl->tqsetSizePolicy(TQSizePolicy(
+    TQSizePolicy::Minimum, TQSizePolicy::Fixed));
   setLayoutText(m_layout);
-  KPushButton* layoutBtn = new KPushButton(i18n("Change..."), page);
-  layoutBtn->setSizePolicy(QSizePolicy(
-    QSizePolicy::Fixed, QSizePolicy::Fixed));
-  QLabel* fontLbl = new QLabel(i18n("Default font:"), page);
-  m_fontTxtLbl = new QLabel(page);
-  m_fontTxtLbl->setFrameStyle(QFrame::LineEditPanel | QFrame::Sunken);
-  m_fontTxtLbl->setSizePolicy(QSizePolicy(
-    QSizePolicy::Minimum, QSizePolicy::Fixed));
+  KPushButton* tqlayoutBtn = new KPushButton(i18n("Change..."), page);
+  tqlayoutBtn->tqsetSizePolicy(TQSizePolicy(
+    TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+  TQLabel* fontLbl = new TQLabel(i18n("Default font:"), page);
+  m_fontTxtLbl = new TQLabel(page);
+  m_fontTxtLbl->setFrameStyle(TQFrame::LineEditPanel | TQFrame::Sunken);
+  m_fontTxtLbl->tqsetSizePolicy(TQSizePolicy(
+    TQSizePolicy::Minimum, TQSizePolicy::Fixed));
   setFontText(m_font);
   KPushButton* fontBtn = new KPushButton(i18n("Change..."), page);
-  layoutBtn->setSizePolicy(QSizePolicy(
-    QSizePolicy::Fixed, QSizePolicy::Fixed));
-  m_marginsChBox = new QCheckBox(i18n("Show page &margins"), page);
+  tqlayoutBtn->tqsetSizePolicy(TQSizePolicy(
+    TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+  m_marginsChBox = new TQCheckBox(i18n("Show page &margins"), page);
   m_marginsChBox->setChecked(view->isShowPageMargins());
-  m_rulersChBox = new QCheckBox(i18n("Show page &rulers"), page);
+  m_rulersChBox = new TQCheckBox(i18n("Show page &rulers"), page);
   m_rulersChBox->setChecked(view->isShowRulers());
 
-  QGridLayout* gl = new QGridLayout(page);
+  TQGridLayout* gl = new TQGridLayout(page);
   gl->setSpacing(KDialog::spacingHint());
   gl->addWidget(unitLbl, 0, 0);
   gl->addMultiCellWidget(m_unitCombo, 0, 0, 1, 2);
-  gl->addWidget(layoutLbl, 1, 0);
+  gl->addWidget(tqlayoutLbl, 1, 0);
   gl->addWidget(m_layoutTxtLbl, 1, 1);
-  gl->addWidget(layoutBtn, 1, 2);
+  gl->addWidget(tqlayoutBtn, 1, 2);
   gl->addWidget(fontLbl, 2, 0);
   gl->addWidget(m_fontTxtLbl, 2, 1);
   gl->addWidget(fontBtn, 2, 2);
   gl->addMultiCellWidget(m_marginsChBox, 3, 3, 0, 2);
   gl->addMultiCellWidget(m_rulersChBox, 4, 4, 0, 2);
-  gl->addMultiCell(new QSpacerItem(0, 0), 5, 5, 0, 2);
+  gl->addMultiCell(new TQSpacerItem(0, 0), 5, 5, 0, 2);
 
-  connect(layoutBtn, SIGNAL(clicked()), SLOT(pageLayoutDlg()));
-  connect(fontBtn, SIGNAL(clicked()), SLOT(fontDlg()));
-  connect(m_unitCombo, SIGNAL(activated(int)), SLOT(unitChanged(int)));
+  connect(tqlayoutBtn, TQT_SIGNAL(clicked()), TQT_SLOT(pageLayoutDlg()));
+  connect(fontBtn, TQT_SIGNAL(clicked()), TQT_SLOT(fontDlg()));
+  connect(m_unitCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(unitChanged(int)));
 }
 
 void KivioOptionsDialog::initGrid()
 {
-  QFrame* page = addPage(i18n("Grid"), i18n("Grid Settings"), BarIcon( "grid", KIcon::SizeMedium ));
+  TQFrame* page = addPage(i18n("Grid"), i18n("Grid Settings"), BarIcon( "grid", KIcon::SizeMedium ));
   m_gridIndex = pageIndex(page);
 
-  KoUnit::Unit unit = static_cast<KivioView*>(parent())->doc()->unit();
-  KivioGridData d = static_cast<KivioView*>(parent())->doc()->grid();
+  KoUnit::Unit unit = static_cast<KivioView*>(TQT_TQWIDGET(tqparent()))->doc()->unit();
+  KivioGridData d = static_cast<KivioView*>(TQT_TQWIDGET(tqparent()))->doc()->grid();
   double pgw = m_layout.ptWidth;
   double pgh = m_layout.ptHeight;
   double fw = Kivio::Config::gridXSpacing();
@@ -167,50 +167,50 @@ void KivioOptionsDialog::initGrid()
   double sw = Kivio::Config::gridXSnap();
   double sh = Kivio::Config::gridYSnap();
 
-  m_gridChBox = new QCheckBox(i18n("Show &grid"), page);
+  m_gridChBox = new TQCheckBox(i18n("Show &grid"), page);
   m_gridChBox->setChecked(Kivio::Config::showGrid());
-  m_snapChBox = new QCheckBox(i18n("Snap to g&rid"), page);
+  m_snapChBox = new TQCheckBox(i18n("Snap to g&rid"), page);
   m_snapChBox->setChecked(Kivio::Config::snapGrid());
-  QLabel* gridColorLbl = new QLabel(i18n("Grid &color:"), page);
+  TQLabel* gridColorLbl = new TQLabel(i18n("Grid &color:"), page);
   m_gridColorBtn = new KColorButton(Kivio::Config::gridColor(), page);
   gridColorLbl->setBuddy(m_gridColorBtn);
-  QGroupBox* spacingGrp = new QGroupBox(2, Qt::Horizontal, i18n("Spacing"), page);
-  QLabel* spaceHorizLbl = new QLabel(i18n("&Horizontal:"), spacingGrp);
+  TQGroupBox* spacingGrp = new TQGroupBox(2, Qt::Horizontal, i18n("Spacing"), page);
+  TQLabel* spaceHorizLbl = new TQLabel(i18n("&Horizontal:"), spacingGrp);
   m_spaceHorizUSpin = new KoUnitDoubleSpinBox(spacingGrp, 0.0, pgw, 0.1,
     fw, unit);
   spaceHorizLbl->setBuddy(m_spaceHorizUSpin);
-  QLabel* spaceVertLbl = new QLabel(i18n("&Vertical:"), spacingGrp);
+  TQLabel* spaceVertLbl = new TQLabel(i18n("&Vertical:"), spacingGrp);
   m_spaceVertUSpin = new KoUnitDoubleSpinBox(spacingGrp, 0.0, pgh, 0.1,
     fh, unit);
   spaceVertLbl->setBuddy(m_spaceVertUSpin);
-  QGroupBox* snapGrp = new QGroupBox(2, Qt::Horizontal, i18n("Snap Distance"), page);
-  QLabel* snapHorizLbl = new QLabel(i18n("H&orizontal:"), snapGrp);
+  TQGroupBox* snapGrp = new TQGroupBox(2, Qt::Horizontal, i18n("Snap Distance"), page);
+  TQLabel* snapHorizLbl = new TQLabel(i18n("H&orizontal:"), snapGrp);
   m_snapHorizUSpin = new KoUnitDoubleSpinBox(snapGrp, 0.0, fw, 0.1,
     sw, unit);
   snapHorizLbl->setBuddy(m_snapHorizUSpin);
-  QLabel* snapVertLbl = new QLabel(i18n("V&ertical:"), snapGrp);
+  TQLabel* snapVertLbl = new TQLabel(i18n("V&ertical:"), snapGrp);
   m_snapVertUSpin = new KoUnitDoubleSpinBox(snapGrp, 0.0, fh, 0.1,
     sh, unit);
   snapVertLbl->setBuddy(m_snapVertUSpin);
 
-  QGridLayout* gl = new QGridLayout(page);
+  TQGridLayout* gl = new TQGridLayout(page);
   gl->setSpacing(KDialog::spacingHint());
   gl->addMultiCellWidget(m_gridChBox, 0, 0, 0, 2);
   gl->addMultiCellWidget(m_snapChBox, 1, 1, 0, 2);
   gl->addWidget(gridColorLbl, 2, 0);
   gl->addWidget(m_gridColorBtn, 2, 1);
-  gl->addItem(new QSpacerItem(0, 0), 2, 2);
+  gl->addItem(new TQSpacerItem(0, 0), 2, 2);
   gl->addMultiCellWidget(spacingGrp, 3, 3, 0, 2);
   gl->addMultiCellWidget(snapGrp, 4, 4, 0, 2);
-  gl->addMultiCell(new QSpacerItem(0, 0), 5, 5, 0, 2);
+  gl->addMultiCell(new TQSpacerItem(0, 0), 5, 5, 0, 2);
 
-  connect(m_spaceHorizUSpin, SIGNAL(valueChanged(double)), SLOT(setMaxHorizSnap(double)));
-  connect(m_spaceVertUSpin, SIGNAL(valueChanged(double)), SLOT(setMaxVertSnap(double)));
+  connect(m_spaceHorizUSpin, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(setMaxHorizSnap(double)));
+  connect(m_spaceVertUSpin, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(setMaxVertSnap(double)));
 }
 
 void KivioOptionsDialog::applyPage()
 {
-  KivioView* view = static_cast<KivioView*>(parent());
+  KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(tqparent()));
   view->doc()->setUnit(static_cast<KoUnit::Unit>(m_unitCombo->currentItem()));
   Kivio::Config::setUnit(KoUnit::unitName(view->doc()->unit()));
   Kivio::Config::setDefaultPageLayout(m_layout);
@@ -230,7 +230,7 @@ void KivioOptionsDialog::applyGrid()
   Kivio::Config::setShowGrid(m_gridChBox->isChecked());
   Kivio::Config::setSnapGrid(m_snapChBox->isChecked());
   Kivio::Config::setGridColor(m_gridColorBtn->color());
-  KivioView* view = static_cast<KivioView*>(parent());
+  KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(tqparent()));
   view->doc()->updateView(0);
 }
 
@@ -260,9 +260,9 @@ void KivioOptionsDialog::defaultGrid()
 void KivioOptionsDialog::setLayoutText(const KoPageLayout& l)
 {
   KoUnit::Unit unit = static_cast<KoUnit::Unit>(m_unitCombo->currentItem());
-  QString txt = i18n("Format: %1, Width: %2 %4, Height: %3 %5").arg(
-    KoPageFormat::formatString(l.format)).arg(KoUnit::toUserValue(l.ptWidth, unit))
-    .arg(KoUnit::toUserValue(l.ptHeight, unit)).arg(KoUnit::unitName(unit)).arg(
+  TQString txt = i18n("Format: %1, Width: %2 %4, Height: %3 %5").tqarg(
+    KoPageFormat::formatString(l.format)).tqarg(KoUnit::toUserValue(l.ptWidth, unit))
+    .tqarg(KoUnit::toUserValue(l.ptHeight, unit)).tqarg(KoUnit::unitName(unit)).tqarg(
     KoUnit::unitName(unit));
   m_layoutTxtLbl->setText(txt);
 }
@@ -322,15 +322,15 @@ void KivioOptionsDialog::setMaxVertSnap(double v)
   m_snapVertUSpin->setMaxValue(KoUnit::fromUserValue(v, unit));
 }
 
-void KivioOptionsDialog::setFontText(const QFont& f)
+void KivioOptionsDialog::setFontText(const TQFont& f)
 {
-  QString txt = f.family() + " " + QString::number(f.pointSize());
+  TQString txt = f.family() + " " + TQString::number(f.pointSize());
   m_fontTxtLbl->setText(txt);
 }
 
 void KivioOptionsDialog::fontDlg()
 {
-  if(KFontDialog::getFont(m_font, false, this) == QDialog::Accepted) {
+  if(KFontDialog::getFont(m_font, false, this) == TQDialog::Accepted) {
     setFontText(m_font);
   }
 }
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.h b/kivio/kiviopart/ui/kiviooptionsdialog.h
index 1fbb209f..c1516748 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.h
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.h
@@ -26,21 +26,21 @@
 #include <klistview.h>
 
 class KivioView;
-class QComboBox;
-class QCheckBox;
-class QLabel;
-class QRadioButton;
+class TQComboBox;
+class TQCheckBox;
+class TQLabel;
+class TQRadioButton;
 class KColorButton;
 class KURLRequester;
 class KoUnitDoubleSpinBox;
 class KivioGuideLineData;
-class QGroupBox;
-class QFont;
+class TQGroupBox;
+class TQFont;
 
 // class GuidesListViewItem : public KListViewItem
 // {
 //   public:
-//     GuidesListViewItem(QListView* parent, KivioGuideLineData *gd, KoUnit::Unit u);
+//     GuidesListViewItem(TQListView* tqparent, KivioGuideLineData *gd, KoUnit::Unit u);
 //     ~GuidesListViewItem();
 // 
 //     void setUnit(KoUnit::Unit u);
@@ -57,8 +57,9 @@ class QFont;
 class KivioOptionsDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KivioOptionsDialog(KivioView* parent, const char* name = 0);
+    KivioOptionsDialog(KivioView* tqparent, const char* name = 0);
 
   protected:
     void initPage();
@@ -71,7 +72,7 @@ class KivioOptionsDialog : public KDialogBase
     void defaultGrid();
 
     void setLayoutText(const KoPageLayout& l);
-    void setFontText(const QFont& f);
+    void setFontText(const TQFont& f);
 
   protected slots:
     void pageLayoutDlg();
@@ -88,19 +89,19 @@ class KivioOptionsDialog : public KDialogBase
     int m_pageIndex;
     int m_gridIndex;
 
-    QComboBox* m_unitCombo;
-    QCheckBox* m_marginsChBox;
-    QCheckBox* m_rulersChBox;
-    QLabel* m_layoutTxtLbl;
+    TQComboBox* m_unitCombo;
+    TQCheckBox* m_marginsChBox;
+    TQCheckBox* m_rulersChBox;
+    TQLabel* m_layoutTxtLbl;
     KoPageLayout m_layout;
-    QLabel* m_fontTxtLbl;
-    QFont m_font;
+    TQLabel* m_fontTxtLbl;
+    TQFont m_font;
     KoUnitDoubleSpinBox* m_spaceHorizUSpin;
     KoUnitDoubleSpinBox* m_spaceVertUSpin;
     KoUnitDoubleSpinBox* m_snapHorizUSpin;
     KoUnitDoubleSpinBox* m_snapVertUSpin;
-    QCheckBox* m_gridChBox;
-    QCheckBox* m_snapChBox;
+    TQCheckBox* m_gridChBox;
+    TQCheckBox* m_snapChBox;
     KColorButton* m_gridColorBtn;
 };
 
diff --git a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp
index c51e3e00..359381de 100644
--- a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp
+++ b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp
@@ -19,11 +19,11 @@
 
 #include "kiviostencilformatdlg.h"
 
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qbitmap.h>
-#include <qpixmap.h>
-#include <qpainter.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqbitmap.h>
+#include <tqpixmap.h>
+#include <tqpainter.h>
 
 #include <kcolorbutton.h>
 #include <klocale.h>
@@ -32,8 +32,8 @@
 
 #include "kivio_view.h"
 
-KivioStencilFormatDlg::KivioStencilFormatDlg(KivioView* parent, const char* name)
-  : KDialogBase(parent, name, true, i18n("Stencil & Connector Format"), Ok|Cancel|Default, Ok)
+KivioStencilFormatDlg::KivioStencilFormatDlg(KivioView* tqparent, const char* name)
+  : KDialogBase(tqparent, name, true, i18n("Stencil & Connector Format"), Ok|Cancel|Default, Ok)
 {
   m_unit = KoUnit::U_PT;
   init();
@@ -41,28 +41,28 @@ KivioStencilFormatDlg::KivioStencilFormatDlg(KivioView* parent, const char* name
 
 void KivioStencilFormatDlg::init()
 {
-  QWidget* mainWidget = new QWidget(this);
+  TQWidget* mainWidget = new TQWidget(this);
   setMainWidget(mainWidget);
-  QGridLayout* gl = new QGridLayout(mainWidget, 3, 2, KDialog::marginHint(), KDialog::spacingHint());
+  TQGridLayout* gl = new TQGridLayout(mainWidget, 3, 2, KDialog::marginHint(), KDialog::spacingHint());
 
-  QLabel* lineWidthLbl = new QLabel(i18n("Line &width:"), mainWidget);
+  TQLabel* lineWidthLbl = new TQLabel(i18n("Line &width:"), mainWidget);
   m_lineWidthUSBox = new KoUnitDoubleSpinBox(mainWidget, 0.0, 1000.0, 0.1, 1.0, m_unit, 2);
   lineWidthLbl->setBuddy(m_lineWidthUSBox);
-  QLabel* lineColorLbl = new QLabel(i18n("Line &color:"), mainWidget);
+  TQLabel* lineColorLbl = new TQLabel(i18n("Line &color:"), mainWidget);
   m_lineCBtn = new KColorButton(mainWidget);
   lineColorLbl->setBuddy(m_lineCBtn);
-  QLabel* patternLbl = new QLabel(i18n("Line &style:"), mainWidget);
+  TQLabel* patternLbl = new TQLabel(i18n("Line &style:"), mainWidget);
   m_patternCBox = new KComboBox(mainWidget);
   patternLbl->setBuddy(m_patternCBox);
   initLinePatterns();
-  QLabel* lineEndStyleLbl = new QLabel(i18n("Line &end style:"), mainWidget);
+  TQLabel* lineEndStyleLbl = new TQLabel(i18n("Line &end style:"), mainWidget);
   m_lineEndStyleCBox = new KComboBox(mainWidget);
   lineEndStyleLbl->setBuddy(m_lineEndStyleCBox);
   initLineEndStyles();
-  QLabel* fillColorLbl = new QLabel(i18n("&Fill color:"), mainWidget);
+  TQLabel* fillColorLbl = new TQLabel(i18n("&Fill color:"), mainWidget);
   m_fillCBtn = new KColorButton(mainWidget);
   fillColorLbl->setBuddy(m_fillCBtn);
-  QLabel* fillPatternLbl = new QLabel(i18n("F&ill style:"), mainWidget);
+  TQLabel* fillPatternLbl = new TQLabel(i18n("F&ill style:"), mainWidget);
   m_fillPatternCBox = new KComboBox(mainWidget);
   fillPatternLbl->setBuddy(m_fillPatternCBox);
   initFillPatterns();
@@ -83,21 +83,21 @@ void KivioStencilFormatDlg::init()
 
 void KivioStencilFormatDlg::initLinePatterns()
 {
-  QBitmap mask;
-  QPixmap pix(m_patternCBox->width(), 17);
-  QPainter p(&pix, m_patternCBox);
-  QPen pen;
-  pen.setColor(QColor(0, 0, 0));
+  TQBitmap tqmask;
+  TQPixmap pix(m_patternCBox->width(), 17);
+  TQPainter p(&pix, m_patternCBox);
+  TQPen pen;
+  pen.setColor(TQColor(0, 0, 0));
   pen.setWidth(3);
 
   for (int i = NoPen; i <= DashDotDotLine ; i++ ) {
     pix.fill(white);
-    pen.setStyle(static_cast<PenStyle>(i));
+    pen.setStyle(static_cast<Qt::PenStyle>(i));
     p.setPen(pen);
     p.drawLine(0, 8, pix.width(), 8);
 
-    mask = pix;
-    pix.setMask(mask);
+    tqmask = pix;
+    pix.setMask(tqmask);
     m_patternCBox->insertItem(pix, i);
   }
 
@@ -106,15 +106,15 @@ void KivioStencilFormatDlg::initLinePatterns()
 
 void KivioStencilFormatDlg::initFillPatterns()
 {
-  QBitmap mask;
-  QPixmap pix(m_fillPatternCBox->width(), m_fillPatternCBox->fontMetrics().height() + 4);
-  QPainter p(&pix, m_fillPatternCBox);
-  QBrush brush;
-  brush.setColor(QColor(0, 0, 0));
+  TQBitmap tqmask;
+  TQPixmap pix(m_fillPatternCBox->width(), m_fillPatternCBox->fontMetrics().height() + 4);
+  TQPainter p(&pix, m_fillPatternCBox);
+  TQBrush brush;
+  brush.setColor(TQColor(0, 0, 0));
 
   for (int i = NoBrush; i <= DiagCrossPattern; i++ ) {
     pix.fill(white);
-    brush.setStyle(static_cast<BrushStyle>(i));
+    brush.setStyle(static_cast<Qt::BrushStyle>(i));
     p.setBrush(brush);
     p.fillRect(0, 0, pix.width(), pix.height(), brush);
 
@@ -126,24 +126,24 @@ void KivioStencilFormatDlg::initFillPatterns()
 
 void KivioStencilFormatDlg::initLineEndStyles()
 {
-  QBitmap mask;
-  QPixmap pix(m_lineEndStyleCBox->width(), 17);
-  QPainter p(&pix, m_lineEndStyleCBox);
-  QPen pen;
-  pen.setColor(QColor(0, 0, 0));
+  TQBitmap tqmask;
+  TQPixmap pix(m_lineEndStyleCBox->width(), 17);
+  TQPainter p(&pix, m_lineEndStyleCBox);
+  TQPen pen;
+  pen.setColor(TQColor(0, 0, 0));
   pen.setWidth(4);
-  pen.setStyle(SolidLine);
-  pen.setJoinStyle(RoundJoin);
+  pen.setStyle(Qt::SolidLine);
+  pen.setJoinStyle(Qt::RoundJoin);
   p.setBrush(white);
 
   for (int i = 0; i < 3; i++) {
     pix.fill(white);
-    pen.setCapStyle(static_cast<PenCapStyle>(i * 0x10));
+    pen.setCapStyle(static_cast<Qt::PenCapStyle>(i * 0x10));
     p.setPen(pen);
     p.drawLine(6, 8, pix.width() - 12, 8);
 
-    mask = pix;
-    pix.setMask(mask);
+    tqmask = pix;
+    pix.setMask(tqmask);
     m_lineEndStyleCBox->insertItem(pix, i);
   }
 
@@ -155,7 +155,7 @@ double KivioStencilFormatDlg::lineWidth()
   return m_lineWidthUSBox->value();
 }
 
-QColor KivioStencilFormatDlg::lineColor()
+TQColor KivioStencilFormatDlg::lineColor()
 {
   return m_lineCBtn->color();
 }
@@ -165,7 +165,7 @@ int KivioStencilFormatDlg::linePattern()
   return m_patternCBox->currentItem();
 }
 
-QColor KivioStencilFormatDlg::fillColor()
+TQColor KivioStencilFormatDlg::fillColor()
 {
   return m_fillCBtn->color();
 }
@@ -187,7 +187,7 @@ void KivioStencilFormatDlg::setLineWidth(double w, KoUnit::Unit u)
   m_lineWidthUSBox->setValue(KoUnit::toUserValue(w, u));
 }
 
-void KivioStencilFormatDlg::setLineColor(QColor c)
+void KivioStencilFormatDlg::setLineColor(TQColor c)
 {
   m_lineCBtn->setColor(c);
 }
@@ -197,7 +197,7 @@ void KivioStencilFormatDlg::setLinePattern(int p)
   m_patternCBox->setCurrentItem(p);
 }
 
-void KivioStencilFormatDlg::setFillColor(QColor c)
+void KivioStencilFormatDlg::setFillColor(TQColor c)
 {
   m_fillCBtn->setColor(c);
 }
@@ -215,9 +215,9 @@ void KivioStencilFormatDlg::setLineEndStyle(int s)
 void KivioStencilFormatDlg::slotDefault()
 {
   setLineWidth(1.0, m_unit);
-  setLineColor(QColor(0, 0, 0));
+  setLineColor(TQColor(0, 0, 0));
   setLinePattern(1);
-  setFillColor(QColor(255, 255, 255));
+  setFillColor(TQColor(255, 255, 255));
   setFillPattern(1);
 }
 
diff --git a/kivio/kiviopart/ui/kiviostencilformatdlg.h b/kivio/kiviopart/ui/kiviostencilformatdlg.h
index 940bdf09..6d45d4e2 100644
--- a/kivio/kiviopart/ui/kiviostencilformatdlg.h
+++ b/kivio/kiviopart/ui/kiviostencilformatdlg.h
@@ -28,26 +28,27 @@ class KoUnitDoubleSpinBox;
 class KColorButton;
 class KComboBox;
 class KivioView;
-class QColor;
+class TQColor;
 
 class KivioStencilFormatDlg : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KivioStencilFormatDlg(KivioView* parent, const char* name = 0);
+    KivioStencilFormatDlg(KivioView* tqparent, const char* name = 0);
 
     double lineWidth();
-    QColor lineColor();
+    TQColor lineColor();
     int linePattern();
-    QColor fillColor();
+    TQColor fillColor();
     int fillPattern();
     int lineEndStyle();
 
   public slots:
     void setLineWidth(double w, KoUnit::Unit u);
-    void setLineColor(QColor c);
+    void setLineColor(TQColor c);
     void setLinePattern(int p);
-    void setFillColor(QColor c);
+    void setFillColor(TQColor c);
     void setFillPattern(int p);
     void setLineEndStyle(int s);
 
diff --git a/kivio/kiviopart/ui/kiviostencilsetwidget.ui b/kivio/kiviopart/ui/kiviostencilsetwidget.ui
index fb7a79b3..63467798 100644
--- a/kivio/kiviopart/ui/kiviostencilsetwidget.ui
+++ b/kivio/kiviopart/ui/kiviostencilsetwidget.ui
@@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 </comment>
 <author>(C) 2004-2005 Peter Simonsson</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KivioStencilSetWidget</cstring>
     </property>
@@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QSplitter" row="0" column="0">
+        <widget class="TQSplitter" row="0" column="0">
             <property name="name">
                 <cstring>splitter1</cstring>
             </property>
@@ -75,7 +75,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                     <bool>false</bool>
                 </property>
             </widget>
-            <widget class="QGroupBox">
+            <widget class="TQGroupBox">
                 <property name="name">
                     <cstring>m_stencilsetGBox</cstring>
                 </property>
@@ -86,14 +86,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QSplitter" row="0" column="0">
+                    <widget class="TQSplitter" row="0" column="0">
                         <property name="name">
                             <cstring>m_stencilSetSplitter</cstring>
                         </property>
                         <property name="orientation">
                             <enum>Vertical</enum>
                         </property>
-                        <widget class="QIconView">
+                        <widget class="TQIconView">
                             <property name="name">
                                 <cstring>m_stencilIView</cstring>
                             </property>
@@ -122,7 +122,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                                 <string>This is a preview of the stencils contained in the set</string>
                             </property>
                         </widget>
-                        <widget class="QTextBrowser">
+                        <widget class="TQTextBrowser">
                             <property name="name">
                                 <cstring>m_descriptionBrowser</cstring>
                             </property>
@@ -136,7 +136,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                             </property>
                         </widget>
                     </widget>
-                    <widget class="QPushButton" row="1" column="0">
+                    <widget class="TQPushButton" row="1" column="0">
                         <property name="name">
                             <cstring>m_addToDocBtn</cstring>
                         </property>
@@ -157,8 +157,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
index 7d02f643..43f783e1 100644
--- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp
+++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
@@ -19,10 +19,10 @@
 
 #include "kiviotextformatdlg.h"
 
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qbuttongroup.h>
-#include <qradiobutton.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqbuttongroup.h>
+#include <tqradiobutton.h>
 
 #include <kfontdialog.h>
 #include <kcolorbutton.h>
@@ -31,22 +31,22 @@
 #include "kivio_view.h"
 #include "kivio_doc.h"
 
-KivioTextFormatDlg::KivioTextFormatDlg(KivioView* parent, const char* name)
-  : KDialogBase(Tabbed, i18n("Text Format"), Ok|Cancel|Default, Ok, parent, name)
+KivioTextFormatDlg::KivioTextFormatDlg(KivioView* tqparent, const char* name)
+  : KDialogBase(Tabbed, i18n("Text Format"), Ok|Cancel|Default, Ok, tqparent, name)
 {
-  m_valign = Qt::AlignVCenter;
-  m_halign = Qt::AlignHCenter;
+  m_valign = TQt::AlignVCenter;
+  m_halign = TQt::AlignHCenter;
   initFontTab();
   initPositionTab();
 }
 
 void KivioTextFormatDlg::initFontTab()
 {
-  QFrame* tab = addPage(i18n("Font"));
+  TQFrame* tab = addPage(i18n("Font"));
   m_fontChooser = new KFontChooser(tab);
-  QLabel* textColorLbl = new QLabel(i18n("Text color:"), tab);
+  TQLabel* textColorLbl = new TQLabel(i18n("Text color:"), tab);
   m_textCBtn = new KColorButton(tab);
-  QGridLayout* gl = new QGridLayout(tab);
+  TQGridLayout* gl = new TQGridLayout(tab);
   gl->setSpacing(KDialog::spacingHint());
   gl->addMultiCellWidget(m_fontChooser, 0, 0, 0, 1);
   gl->addWidget(textColorLbl, 1, 0);
@@ -55,21 +55,21 @@ void KivioTextFormatDlg::initFontTab()
 
 void KivioTextFormatDlg::initPositionTab()
 {
-  QFrame* tab = addPage(i18n("Position"));
-  m_valignBGrp = new QButtonGroup(1, Qt::Horizontal, i18n("Vertical"), tab);
-  (void) new QRadioButton(i18n("&Top"), m_valignBGrp);
-  (void) new QRadioButton(i18n("&Center"), m_valignBGrp);
-  (void) new QRadioButton(i18n("&Bottom"), m_valignBGrp);
+  TQFrame* tab = addPage(i18n("Position"));
+  m_valignBGrp = new TQButtonGroup(1, Qt::Horizontal, i18n("Vertical"), tab);
+  (void) new TQRadioButton(i18n("&Top"), m_valignBGrp);
+  (void) new TQRadioButton(i18n("&Center"), m_valignBGrp);
+  (void) new TQRadioButton(i18n("&Bottom"), m_valignBGrp);
   m_valignBGrp->setButton(1);
-  m_halignBGrp = new QButtonGroup(1, Qt::Vertical, i18n("Horizontal"), tab);
-  (void) new QRadioButton(i18n("&Left"), m_halignBGrp);
-  (void) new QRadioButton(i18n("C&enter"), m_halignBGrp);
-  (void) new QRadioButton(i18n("&Right"), m_halignBGrp);
+  m_halignBGrp = new TQButtonGroup(1, Qt::Vertical, i18n("Horizontal"), tab);
+  (void) new TQRadioButton(i18n("&Left"), m_halignBGrp);
+  (void) new TQRadioButton(i18n("C&enter"), m_halignBGrp);
+  (void) new TQRadioButton(i18n("&Right"), m_halignBGrp);
   m_halignBGrp->setButton(1);
-  m_preview = new QLabel(i18n("Preview"), tab);
-  m_preview->setFrameStyle(QFrame::Box | QFrame::Sunken);
-  m_preview->setAlignment(m_valign | m_halign);
-  QGridLayout* gl = new QGridLayout(tab);
+  m_preview = new TQLabel(i18n("Preview"), tab);
+  m_preview->setFrameStyle(TQFrame::Box | TQFrame::Sunken);
+  m_preview->tqsetAlignment(m_valign | m_halign);
+  TQGridLayout* gl = new TQGridLayout(tab);
   gl->setSpacing(KDialog::spacingHint());
   gl->setRowStretch(0, 10);
   gl->setColStretch(1, 10);
@@ -77,42 +77,42 @@ void KivioTextFormatDlg::initPositionTab()
   gl->addWidget(m_preview, 0, 1);
   gl->addWidget(m_halignBGrp, 1, 1);
 
-  connect(m_valignBGrp, SIGNAL(clicked(int)), SLOT(updateVAlign(int)));
-  connect(m_halignBGrp, SIGNAL(clicked(int)), SLOT(updateHAlign(int)));
+  connect(m_valignBGrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(updateVAlign(int)));
+  connect(m_halignBGrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(updateHAlign(int)));
 }
 
 void KivioTextFormatDlg::updateVAlign(int i)
 {
   switch(i) {
     case 0:
-      m_valign = Qt::AlignTop;
+      m_valign = TQt::AlignTop;
       break;
     case 1:
-      m_valign = Qt::AlignVCenter;
+      m_valign = TQt::AlignVCenter;
       break;
     case 2:
-      m_valign = Qt::AlignBottom;
+      m_valign = TQt::AlignBottom;
       break;
   }
 
-  m_preview->setAlignment(m_valign | m_halign);
+  m_preview->tqsetAlignment(m_valign | m_halign);
 }
 
 void KivioTextFormatDlg::updateHAlign(int i)
 {
   switch(i) {
     case 0:
-      m_halign = Qt::AlignLeft;
+      m_halign = TQt::AlignLeft;
       break;
     case 1:
-      m_halign = Qt::AlignHCenter;
+      m_halign = TQt::AlignHCenter;
       break;
     case 2:
-      m_halign = Qt::AlignRight;
+      m_halign = TQt::AlignRight;
       break;
   }
 
-  m_preview->setAlignment(m_valign | m_halign);
+  m_preview->tqsetAlignment(m_valign | m_halign);
 }
 
 int KivioTextFormatDlg::valign()
@@ -125,12 +125,12 @@ int KivioTextFormatDlg::halign()
   return m_halign;
 }
 
-QFont KivioTextFormatDlg::font()
+TQFont KivioTextFormatDlg::font()
 {
   return m_fontChooser->font();
 }
 
-QColor KivioTextFormatDlg::textColor()
+TQColor KivioTextFormatDlg::textColor()
 {
   return m_textCBtn->color();
 }
@@ -138,55 +138,55 @@ QColor KivioTextFormatDlg::textColor()
 void KivioTextFormatDlg::setVAlign(int i)
 {
   switch(i) {
-    case Qt::AlignTop:
+    case TQt::AlignTop:
       m_valignBGrp->setButton(0);
       break;
-    case Qt::AlignVCenter:
+    case TQt::AlignVCenter:
       m_valignBGrp->setButton(1);
       break;
-    case Qt::AlignBottom:
+    case TQt::AlignBottom:
       m_valignBGrp->setButton(2);
       break;
   }
 
-  m_valign = static_cast<Qt::AlignmentFlags>(i);
-  m_preview->setAlignment(m_valign | m_halign);
+  m_valign = static_cast<TQt::AlignmentFlags>(i);
+  m_preview->tqsetAlignment(m_valign | m_halign);
 }
 
 void KivioTextFormatDlg::setHAlign(int i)
 {
   switch(i) {
-    case Qt::AlignLeft:
+    case TQt::AlignLeft:
       m_halignBGrp->setButton(0);
       break;
-    case Qt::AlignHCenter:
+    case TQt::AlignHCenter:
       m_halignBGrp->setButton(1);
       break;
-    case Qt::AlignRight:
+    case TQt::AlignRight:
       m_halignBGrp->setButton(2);
       break;
   }
 
-  m_halign = static_cast<Qt::AlignmentFlags>(i);
-  m_preview->setAlignment(m_valign | m_halign);
+  m_halign = static_cast<TQt::AlignmentFlags>(i);
+  m_preview->tqsetAlignment(m_valign | m_halign);
 }
 
-void KivioTextFormatDlg::setFont(QFont f)
+void KivioTextFormatDlg::setFont(TQFont f)
 {
   m_fontChooser->setFont(f);
 }
 
-void KivioTextFormatDlg::setTextColor(QColor c)
+void KivioTextFormatDlg::setTextColor(TQColor c)
 {
   m_textCBtn->setColor(c);
 }
 
 void KivioTextFormatDlg::slotDefault()
 {
-  setFont((static_cast<KivioView*>(parent()))->doc()->defaultFont());
-  setTextColor(QColor(0, 0, 0));
-  setHAlign(Qt::AlignHCenter);
-  setVAlign(Qt::AlignVCenter);
+  setFont((static_cast<KivioView*>(TQT_TQWIDGET(tqparent())))->doc()->defaultFont());
+  setTextColor(TQColor(0, 0, 0));
+  setHAlign(TQt::AlignHCenter);
+  setVAlign(TQt::AlignVCenter);
 }
 
 #include "kiviotextformatdlg.moc"
diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.h b/kivio/kiviopart/ui/kiviotextformatdlg.h
index 58ce2ad4..6792f3f3 100644
--- a/kivio/kiviopart/ui/kiviotextformatdlg.h
+++ b/kivio/kiviopart/ui/kiviotextformatdlg.h
@@ -25,27 +25,28 @@
 class KivioView;
 class KFontChooser;
 class KColorButton;
-class QButtonGroup;
-class QLabel;
-class QFont;
-class QColor;
+class TQButtonGroup;
+class TQLabel;
+class TQFont;
+class TQColor;
 
 class KivioTextFormatDlg : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KivioTextFormatDlg(KivioView* parent, const char* name = 0);
+    KivioTextFormatDlg(KivioView* tqparent, const char* name = 0);
 
     int valign();
     int halign();
-    QFont font();
-    QColor textColor();
+    TQFont font();
+    TQColor textColor();
 
   public slots:
     void setVAlign(int i);
     void setHAlign(int i);
-    void setFont(QFont f);
-    void setTextColor(QColor c);
+    void setFont(TQFont f);
+    void setTextColor(TQColor c);
 
   protected:
     void initFontTab();
@@ -59,9 +60,9 @@ class KivioTextFormatDlg : public KDialogBase
   protected:
     KFontChooser* m_fontChooser;
     KColorButton* m_textCBtn;
-    QButtonGroup* m_halignBGrp;
-    QButtonGroup* m_valignBGrp;
-    QLabel* m_preview;
+    TQButtonGroup* m_halignBGrp;
+    TQButtonGroup* m_valignBGrp;
+    TQLabel* m_preview;
     int m_valign;
     int m_halign;
 };
diff --git a/kivio/kiviopart/ui/layerlisttooltip.cpp b/kivio/kiviopart/ui/layerlisttooltip.cpp
index 13ecd770..eabc8723 100644
--- a/kivio/kiviopart/ui/layerlisttooltip.cpp
+++ b/kivio/kiviopart/ui/layerlisttooltip.cpp
@@ -18,7 +18,7 @@
  */
 #include "layerlisttooltip.h"
 
-#include <qheader.h>
+#include <tqheader.h>
 
 #include <klocale.h>
 
@@ -27,8 +27,8 @@
 
 namespace Kivio {
 
-LayerListToolTip::LayerListToolTip(QWidget* parent, QListView* listView)
- : QToolTip(parent)
+LayerListToolTip::LayerListToolTip(TQWidget* tqparent, TQListView* listView)
+ : TQToolTip(tqparent)
 {
   m_listView = listView;
 }
@@ -37,7 +37,7 @@ LayerListToolTip::~LayerListToolTip()
 {
 }
 
-void LayerListToolTip::maybeTip(const QPoint& pos)
+void LayerListToolTip::maybeTip(const TQPoint& pos)
 {
   if(!m_listView) {
     return;
@@ -49,13 +49,13 @@ void LayerListToolTip::maybeTip(const QPoint& pos)
     return;
   }
 
-  QRect itemRect = m_listView->itemRect(item);
-  QString toolTip = "<b>" + item->layer()->name() + "</b><br>";
+  TQRect tqitemRect = m_listView->tqitemRect(item);
+  TQString toolTip = "<b>" + item->layer()->name() + "</b><br>";
   toolTip += i18n("Visible: ") + (item->layer()->visible() ? i18n("Yes") : i18n("No")) + "<br>";
   toolTip += i18n("Printable: ") + (item->layer()->printable() ? i18n("Yes") : i18n("No")) + "<br>";
   toolTip += i18n("Editable: ") + (item->layer()->editable() ? i18n("Yes") : i18n("No")) + "<br>";
   toolTip += i18n("Connectable: ") + (item->layer()->connectable() ? i18n("Yes") : i18n("No"));
-  tip(itemRect, toolTip);
+  tip(tqitemRect, toolTip);
 }
 
 }
diff --git a/kivio/kiviopart/ui/layerlisttooltip.h b/kivio/kiviopart/ui/layerlisttooltip.h
index 9f8fd41c..29bbabe6 100644
--- a/kivio/kiviopart/ui/layerlisttooltip.h
+++ b/kivio/kiviopart/ui/layerlisttooltip.h
@@ -19,24 +19,24 @@
 #ifndef KIVIOLAYERLISTTOOLTIP_H
 #define KIVIOLAYERLISTTOOLTIP_H
 
-#include <qtooltip.h>
-#include <qlistview.h>
+#include <tqtooltip.h>
+#include <tqlistview.h>
 
 namespace Kivio {
 
 /**
  * Shows the tooltips in the layer list
  */
-class LayerListToolTip : public QToolTip
+class LayerListToolTip : public TQToolTip
 {
   public:
-    LayerListToolTip(QWidget* parent, QListView* listView);
+    LayerListToolTip(TQWidget* tqparent, TQListView* listView);
     ~LayerListToolTip();
 
-    void maybeTip(const QPoint& pos);
+    void maybeTip(const TQPoint& pos);
 
   protected:
-    QListView* m_listView;
+    TQListView* m_listView;
 };
 
 }
diff --git a/kivio/kiviopart/ui/objectlistpalette.cpp b/kivio/kiviopart/ui/objectlistpalette.cpp
index 721f84ca..28793807 100644
--- a/kivio/kiviopart/ui/objectlistpalette.cpp
+++ b/kivio/kiviopart/ui/objectlistpalette.cpp
@@ -18,9 +18,9 @@
  */
 #include "objectlistpalette.h"
 
-#include <qlayout.h>
-#include <qheader.h>
-#include <qptrlist.h>
+#include <tqlayout.h>
+#include <tqheader.h>
+#include <tqptrlist.h>
 
 #include <klistview.h>
 #include <kdebug.h>
@@ -40,14 +40,14 @@ namespace Kivio {
 class ObjectListItem : public KListViewItem
 {
   public:
-    ObjectListItem(KListView* parent, KivioStencil* _stencil)
-      : KListViewItem(parent, "")
+    ObjectListItem(KListView* tqparent, KivioStencil* _stencil)
+      : KListViewItem(tqparent, "")
     {
       m_stencil = _stencil;
       setPixmap(0, Kivio::generatePixmapFromStencil(22, 22, m_stencil));
 
-      QString type;
-      QString name;
+      TQString type;
+      TQString name;
 
       switch(m_stencil->type()) {
         case kstGroup:
@@ -80,24 +80,24 @@ class ObjectListItem : public KListViewItem
     KivioStencil* m_stencil;
 };
 
-ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name)
-  : QWidget(parent, name), m_view(parent)
+ObjectListPalette::ObjectListPalette(KivioView* tqparent, const char* name)
+  : TQWidget(tqparent, name), m_view(tqparent)
 {
   m_blockUpdate = false;
 
-  QVBoxLayout* layout = new QVBoxLayout(this, 0, 2);
+  TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, 2);
 
   m_objectList = new KListView(this);
   m_objectList->setFullWidth(true);
   m_objectList->setAllColumnsShowFocus(true);
   m_objectList->setSorting(-1);
-  m_objectList->setSelectionMode(QListView::Extended);
+  m_objectList->setSelectionMode(TQListView::Extended);
   m_objectList->addColumn(i18n("Name"));
   m_objectList->addColumn(i18n("Type"));
 
-  layout->addWidget(m_objectList);
+  tqlayout->addWidget(m_objectList);
 
-  connect(m_objectList, SIGNAL(selectionChanged()), this, SLOT(updateSelection()));
+  connect(m_objectList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateSelection()));
 }
 
 ObjectListPalette::~ObjectListPalette()
@@ -118,7 +118,7 @@ void ObjectListPalette::updateObjectList()
 
   m_objectList->clear();
 
-  QPtrList<KivioLayer>* layers = page->layers();
+  TQPtrList<KivioLayer>* layers = page->layers();
 
   KivioLayer* layer = layers->first();
   KivioStencil* stencil;
@@ -147,8 +147,8 @@ void ObjectListPalette::updateSelection()
 
   page->unselectAllStencils();
 
-  QPtrList<QListViewItem> selectedItems = m_objectList->selectedItems();
-  QPtrListIterator<QListViewItem> it(selectedItems);
+  TQPtrList<TQListViewItem> selectedItems = m_objectList->selectedItems();
+  TQPtrListIterator<TQListViewItem> it(selectedItems);
   ObjectListItem* item = 0;
 
   while((item = static_cast<ObjectListItem*>(it.current())) != 0) {
diff --git a/kivio/kiviopart/ui/objectlistpalette.h b/kivio/kiviopart/ui/objectlistpalette.h
index 027154c3..17fbd0f4 100644
--- a/kivio/kiviopart/ui/objectlistpalette.h
+++ b/kivio/kiviopart/ui/objectlistpalette.h
@@ -19,7 +19,7 @@
 #ifndef KIVIOOBJECTLISTPALETTE_H
 #define KIVIOOBJECTLISTPALETTE_H
 
-#include <qwidget.h>
+#include <tqwidget.h>
 
 class KListView;
 class KivioView;
@@ -29,11 +29,12 @@ namespace Kivio {
 /**
  * Palette showing a list of all objects on the page
  */
-class ObjectListPalette : public QWidget
+class ObjectListPalette : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    ObjectListPalette(KivioView* parent = 0, const char* name = 0);
+    ObjectListPalette(KivioView* tqparent = 0, const char* name = 0);
     ~ObjectListPalette();
 
     void updateObjectList();