Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 108 insertions, 108 deletions

diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp
index 035ede78..6f00df1a 100644
--- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp
@@ -37,9 +37,9 @@
 
 #include <tqdom.h>
 #include <tqpainter.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqcolor.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqrect.h>
 #include <tqbitmap.h>
 #include <kdebug.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(),
@@ -111,7 +111,7 @@ bool KivioSMLStencil::loadXML( const TQDomElement &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) {
@@ -173,7 +173,7 @@ void KivioSMLStencil::loadConnectorTargetListXML( const TQDomElement &e )
 
 
 /**
- * Locates a shape in the shape list by name.
+ * Locates a tqshape in the tqshape list by name.
  */
 KivioShape *KivioSMLStencil::locateShape( const TQString &name )
 {
@@ -185,7 +185,7 @@ KivioShape *KivioSMLStencil::locateShape( const TQString &name )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->shapeData()->name() == name )
+        if( pShape->tqshapeData()->name() == name )
         {
             return pShape;
         }
@@ -233,7 +233,7 @@ TQDomElement KivioSMLStencil::saveXML( TQDomDocument &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,14 +420,14 @@ 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;
   TQPtrList <KivioPoint> *pPointList = pShapeData->pointList();
@@ -456,7 +456,7 @@ 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();
@@ -487,7 +487,7 @@ 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();
@@ -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();
 
@@ -546,7 +546,7 @@ void KivioSMLStencil::drawOutlineLineArray( KivioShape *pShape, KivioIntraStenci
   KivioShapeData *pShapeData;
   TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -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();
 
@@ -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();
 
@@ -643,7 +643,7 @@ void KivioSMLStencil::drawOutlinePolygon( KivioShape *pShape, KivioIntraStencilD
   KivioShapeData *pShapeData;
   TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -679,7 +679,7 @@ void KivioSMLStencil::drawOutlinePolyline( KivioShape *pShape, KivioIntraStencil
   KivioShapeData *pShapeData;
   TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -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;
@@ -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 );
@@ -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,14 +915,14 @@ 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;
   TQPtrList <KivioPoint> *pPointList = pShapeData->pointList();
@@ -954,7 +954,7 @@ 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();
@@ -988,7 +988,7 @@ 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();
@@ -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();
 
@@ -1089,7 +1089,7 @@ void KivioSMLStencil::drawLineArray( KivioShape *pShape, KivioIntraStencilData *
   KivioShapeData *pShapeData;
   TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -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();
 
@@ -1221,7 +1221,7 @@ void KivioSMLStencil::drawPolygon( KivioShape *pShape, KivioIntraStencilData *pD
   KivioShapeData *pShapeData;
   TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -1280,7 +1280,7 @@ void KivioSMLStencil::drawPolyline( KivioShape *pShape, KivioIntraStencilData *p
   KivioShapeData *pShapeData;
   TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -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;
@@ -1358,7 +1358,7 @@ void KivioSMLStencil::setFGColor( TQColor c )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->shapeData()->lineStyle()->setColor( c );
+        pShape->tqshapeData()->lineStyle()->setColor( c );
 
         pShape = m_pShapeList->next();
     }
@@ -1375,7 +1375,7 @@ void KivioSMLStencil::setBGColor( TQColor c )
     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();
     }
@@ -1405,7 +1405,7 @@ void KivioSMLStencil::setTextColor( TQColor c )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->shapeData()->setTextColor( c );
+        pShape->tqshapeData()->setTextColor( c );
 
         pShape = m_pShapeList->next();
     }
@@ -1422,7 +1422,7 @@ void KivioSMLStencil::setTextFont( const TQFont &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.
@@ -1590,9 +1590,9 @@ TQFont KivioSMLStencil::textFont()
     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();
@@ -1609,9 +1609,9 @@ TQColor KivioSMLStencil::textColor()
   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();
@@ -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();
@@ -1712,9 +1712,9 @@ TQString KivioSMLStencil::text()
     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();
@@ -1734,9 +1734,9 @@ void KivioSMLStencil::setText( const TQString &t )
     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;
 }
@@ -1777,7 +1777,7 @@ TQColor KivioSMLStencil::fgColor()
 
     pShape = m_pShapeList->first();
     if( pShape )
-        return pShape->shapeData()->lineStyle()->color();
+        return pShape->tqshapeData()->lineStyle()->color();
 
     return TQColor(0,0,0);
 }
@@ -1792,7 +1792,7 @@ TQColor KivioSMLStencil::bgColor()
 
     pShape = m_pShapeList->first();
     if( pShape )
-        return pShape->shapeData()->fillStyle()->color();
+        return pShape->tqshapeData()->fillStyle()->color();
 
     return TQColor(0,0,0);
 }
@@ -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;
 }
@@ -1923,7 +1923,7 @@ bool KivioSMLStencil::checkCollisionPolygon( KivioShape *pShape, KoPoint *pCheck
   TQPtrList<KivioPoint> *pList;
   KoPoint *pPoints;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -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,7 +2012,7 @@ void KivioSMLStencil::setLineStyle(KivioLineStyle ls)
 
     while( pShape )
     {
-        pShape->shapeData()->setLineStyle(ls);;
+        pShape->tqshapeData()->setLineStyle(ls);;
         pShape = m_pShapeList->next();
     }
 }
@@ -2032,12 +2032,12 @@ TQString 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 @@ TQString 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,7 +2063,7 @@ TQString KivioSMLStencil::getTextBoxName(const KoPoint& p)
   }
   
   if(first) {
-    return first->shapeData()->name();
+    return first->tqshapeData()->name();
   }
   
   return TQString();
@@ -2075,9 +2075,9 @@ void KivioSMLStencil::setText(const TQString& text, const TQString& name)
   
   while(pShape)
   {
-    if(pShape->shapeData()->name() == name)
+    if(pShape->tqshapeData()->name() == name)
     {
-      pShape->shapeData()->setText(text);
+      pShape->tqshapeData()->setText(text);
       return;
     }
 
@@ -2091,9 +2091,9 @@ TQString KivioSMLStencil::text(const TQString& name)
   
   while(pShape)
   {
-    if(pShape->shapeData()->name() == name)
+    if(pShape->tqshapeData()->name() == name)
     {
-      return pShape->shapeData()->text();
+      return pShape->tqshapeData()->text();
     }
 
     pShape = m_pShapeList->next();
@@ -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;
     }
 
@@ -2140,89 +2140,89 @@ bool KivioSMLStencil::hasTextBox() const
 
 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 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);
 }
 
 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 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 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 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 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 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);
 }