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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

8 files changed, 51 insertions, 51 deletions

diff --git a/kivio/plugins/kivioconnectortool/tool_connector.cpp b/kivio/plugins/kivioconnectortool/tool_connector.cpp
index 26b8feb8..ca3ff402 100644
--- a/kivio/plugins/kivioconnectortool/tool_connector.cpp
+++ b/kivio/plugins/kivioconnectortool/tool_connector.cpp
@@ -122,7 +122,7 @@ void ConnectorTool::setActivated(bool a)
     m_pStencil = 0;
     m_pDragData = 0;
     view()->canvasWidget()->setShowConnectorTargets(true);
-    view()->canvasWidget()->repaint();
+    view()->canvasWidget()->tqrepaint();
     emit activated(this);
   } else {
     if(m_pStencil && (m_mode == stmDrawRubber) && (m_type == PolyLineConnector)) {
@@ -150,7 +150,7 @@ void ConnectorTool::setActivated(bool a)
     m_permanent = false;
     view()->setStatusBarInfo("");
     view()->canvasWidget()->setShowConnectorTargets(false);
-    view()->canvasWidget()->repaint();
+    view()->canvasWidget()->tqrepaint();
   }
 }
 
@@ -278,7 +278,7 @@ bool ConnectorTool::startRubberBanding( TQMouseEvent *e )
 
   m_pStencil->customDrag(m_pDragData);
 
-  canvas->repaint();
+  canvas->tqrepaint();
   canvas->setCursor(*m_pConnectorCursor2);
   return true;
 }
@@ -322,7 +322,7 @@ void ConnectorTool::continueRubberBanding( TQMouseEvent *e )
 
   m_pStencil->customDrag(m_pDragData);
   m_pStencil->updateGeometry();
-  canvas->repaint();
+  canvas->tqrepaint();
 }
 
 void ConnectorTool::mouseRelease( TQMouseEvent *e )
diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp
index 6117cf61..b6c24c57 100644
--- a/kivio/plugins/kivioselecttool/tool_select.cpp
+++ b/kivio/plugins/kivioselecttool/tool_select.cpp
@@ -247,7 +247,7 @@ bool SelectTool::startRubberBanding(const TQPoint &pos)
     canvas->activePage()->unselectAllStencils();
 
   canvas->startRectDraw( pos, KivioCanvas::Rubber );
-  canvas->repaint();
+  canvas->tqrepaint();
 
   return true;
 }
@@ -299,7 +299,7 @@ bool SelectTool::startDragging(const TQPoint &pos, bool onlySelected)
   // Create a new painter object
   canvas->beginUnclippedSpawnerPainter();
 
-  // Build the list of old geometry
+  // Build the list of old tqgeometry
   KivioSelectDragData *pData;
   m_lstOldGeometry.clear();
   pStencil = canvas->activePage()->selectedStencils()->first();
@@ -365,7 +365,7 @@ bool SelectTool::startCustomDragging(const TQPoint &pos, bool selectedOnly )
   m_customDragOrigPoint = pStencil->customIDPoint(m_customDragID);
 
   view()->canvasWidget()->setShowConnectorTargets(true);
-  view()->canvasWidget()->repaint();
+  view()->canvasWidget()->tqrepaint();
 
   // Create a new painter object
   canvas->beginUnclippedSpawnerPainter();
@@ -491,7 +491,7 @@ void SelectTool::continueRubberBanding(const TQPoint &pos)
  * Continues the dragging process of a stencil (moving)
  *
  * How does this work?  Initially we create a list of all the original
- * geometry of all the selected stencils.  We use that to calculate delta
+ * tqgeometry of all the selected stencils.  We use that to calculate delta
  * movements and snap them to the grid.
  */
 void SelectTool::continueDragging(const TQPoint &pos, bool ignoreGridGuides)
@@ -512,7 +512,7 @@ void SelectTool::continueDragging(const TQPoint &pos, bool ignoreGridGuides)
     canvas->drawSelectedStencilsXOR();
   } else {
     canvas->activePage()->setPaintSelected(false);
-    canvas->repaint();
+    canvas->tqrepaint();
     m_firstTime = false;
   }
 
@@ -628,7 +628,7 @@ void SelectTool::continueCustomDragging(const TQPoint &pos)
       canvas->drawStencilXOR(m_pCustomDraggingStencil);
     } else {
       m_pCustomDraggingStencil->setHidden(true);
-      canvas->repaint();
+      canvas->tqrepaint();
       m_firstTime = false;
     }
   }
@@ -641,7 +641,7 @@ void SelectTool::continueCustomDragging(const TQPoint &pos)
   if(m_pCustomDraggingStencil->type() != kstConnector){
     canvas->drawStencilXOR(m_pCustomDraggingStencil);
   } else {
-    view()->canvasWidget()->repaint();
+    view()->canvasWidget()->tqrepaint();
   }
 
   view()->updateToolBars();
@@ -674,7 +674,7 @@ void SelectTool::continueResizing(const TQPoint &pos, bool ignoreGridGuides)
   
   if( !pData )
   {
-      kdDebug(43000) << "SelectTool::continueResizing() - Original geometry not found" << endl;
+      kdDebug(43000) << "SelectTool::continueResizing() - Original tqgeometry not found" << endl;
       return;
   }
 
@@ -687,7 +687,7 @@ void SelectTool::continueResizing(const TQPoint &pos, bool ignoreGridGuides)
       canvas->drawStencilXOR( m_pResizingStencil );
     } else {
       m_pResizingStencil->setHidden(true);
-      canvas->repaint();
+      canvas->tqrepaint();
       m_firstTime = false;
     }
   
@@ -1050,7 +1050,7 @@ void SelectTool::endDragging(const TQPoint&)
 
   canvas->drawSelectedStencilsXOR();
   canvas->endUnclippedSpawnerPainter();
-  // Clear the list of old geometry
+  // Clear the list of old tqgeometry
   m_lstOldGeometry.clear();
 }
 
@@ -1077,7 +1077,7 @@ void SelectTool::endCustomDragging(const TQPoint&)
   canvas->endUnclippedSpawnerPainter();
 
   canvas->setShowConnectorTargets(false);
-  canvas->repaint();
+  canvas->tqrepaint();
 }
 
 void SelectTool::endResizing(const TQPoint&)
@@ -1200,7 +1200,7 @@ void SelectTool::keyPress(TQKeyEvent* e)
   // Create a new painter object
   canvas->beginUnclippedSpawnerPainter();
 
-  // Build the list of old geometry
+  // Build the list of old tqgeometry
   KivioSelectDragData *pData;
   m_lstOldGeometry.clear();
   KivioStencil* pStencil = canvas->activePage()->selectedStencils()->first();
diff --git a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp
index 8617eb98..3745820c 100644
--- a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp
+++ b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp
@@ -32,7 +32,7 @@
 #include "kivio_stencil_spawner_set.h"
 #include "kivio_text_style.h"
 #include "kivio_shape.h"
-#include "kivio_shape_data.h"
+#include "kivio_tqshape_data.h"
 #include "kivio_point.h"
 
 #include "tkmath.h"
@@ -96,9 +96,9 @@ KivioSMLConnector::KivioSMLConnector( const TQString &name )
 	// This is a stencil of type connector
 	setType( kstConnector );
 
-	// We only have one shape, an open path.
-	//m_shape = new KivioShape();
-	//m_shape->shapeData() ->setShapeType( KivioShapeData::kstOpenPath );
+	// We only have one tqshape, an open path.
+	//m_tqshape = new KivioShape();
+	//m_tqshape->tqshapeData() ->setShapeType( KivioShapeData::kstOpenPath );
 	loadPath( name );
 }
 
@@ -196,7 +196,7 @@ KivioStencil *KivioSMLConnector::duplicate()
 void KivioSMLConnector::drawOpenPath( KivioShape *pShape, KivioIntraStencilData *pData )
 {
 	KivioPainter * painter;
-	KivioShapeData *pShapeData = pShape->shapeData();
+	KivioShapeData *pShapeData = pShape->tqshapeData();
 	KivioPoint *pPoint, *pNewPoint;
 	TQPtrList <KivioPoint> *pPointList = pShapeData->pointList();
 
@@ -262,7 +262,7 @@ void KivioSMLConnector::paint( KivioIntraStencilData *pData )
 	}
 
 
-	// Build shape up from m_pConnectorPoints
+	// Build tqshape up from m_pConnectorPoints
 
 
 	TQPtrList <KivioPoint> *pNewPoints = new TQPtrList<KivioPoint>;
@@ -314,7 +314,7 @@ bool KivioSMLConnector::saveCustom( TQDomElement &e, TQDomDocument &doc )
 	kdDebug(43000) << "Save custom " << endl;
 	e.appendChild( saveArrowHeads( doc ) );
 
-	//TQDomElement type = m_shape->saveXML(doc);
+	//TQDomElement type = m_tqshape->saveXML(doc);
 	KivioConnectorPoint *p = m_PointList.first();
 	while ( p )
 	{
@@ -341,7 +341,7 @@ bool KivioSMLConnector::loadCustom( const TQDomElement &e )
 		}
 		else if ( name == "KivioShape" )
 		{
-			//m_shape->loadXML(node.toElement());
+			//m_tqshape->loadXML(node.toElement());
 			TQDomNode pts = node.firstChild();
 			while ( !pts.isNull() )
 			{
diff --git a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h
index b631f84b..a50ec750 100644
--- a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h
+++ b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h
@@ -43,7 +43,7 @@ class KivioSMLConnector : public Kivio1DStencil
 private:
 	bool loadPath(const TQString &file);
     //void drawOpenPath( KivioShape *, KivioIntraStencilData * );
-    KivioShape *m_shape;
+    KivioShape *m_tqshape;
     TQPtrList<KivioConnectorPoint> m_PointList;
 
     TQString m_name;
diff --git a/kivio/plugins/kiviosmlconnector/tool_connector.cpp b/kivio/plugins/kiviosmlconnector/tool_connector.cpp
index 5cef094e..4578f0a7 100644
--- a/kivio/plugins/kiviosmlconnector/tool_connector.cpp
+++ b/kivio/plugins/kiviosmlconnector/tool_connector.cpp
@@ -190,7 +190,7 @@ bool SMLConnector::startRubberBanding( TQMouseEvent *e )
   m_pStencil->customDrag(m_pDragData);
 
 
-  canvas->repaint();
+  canvas->tqrepaint();
   canvas->setCursor(*m_pConnectorCursor2);
   return true;
 }
@@ -223,7 +223,7 @@ void SMLConnector::continueRubberBanding( TQMouseEvent *e )
   m_pStencil->customDrag(m_pDragData);
 
   m_pStencil->updateGeometry();
-  canvas->repaint();
+  canvas->tqrepaint();
 }
 
 void SMLConnector::mouseRelease( TQMouseEvent *e )
diff --git a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
index 0e8aac77..cfa2f317 100644
--- a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
+++ b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
@@ -185,7 +185,7 @@ You should have received a copy of the GNU General Public License along with thi
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>110</width>
                     <height>20</height>
diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
index 062e329e..49a42589 100644
--- a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
+++ b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
@@ -108,7 +108,7 @@ void StencilTextEditor::setHorizontalAlign(int flag)
 
   m_mainWidget->m_hAlignButton->popup()->setItemChecked(flag, true);
   m_mainWidget->m_hAlignButton->setIconSet(*(m_mainWidget->m_hAlignButton->popup()->iconSet(flag)));
-  m_mainWidget->m_textArea->setAlignment(flag|verticalAlignment());
+  m_mainWidget->m_textArea->tqsetAlignment(flag|verticalAlignment());
   m_hAlign = flag;
 }
 
@@ -120,7 +120,7 @@ void StencilTextEditor::setVerticalAlign(int flag)
 
   m_mainWidget->m_vAlignButton->popup()->setItemChecked(flag, true);
   m_mainWidget->m_vAlignButton->setIconSet(*(m_mainWidget->m_vAlignButton->popup()->iconSet(flag)));
-  m_mainWidget->m_textArea->setAlignment(flag|horizontalAlignment());
+  m_mainWidget->m_textArea->tqsetAlignment(flag|horizontalAlignment());
   m_vAlign = flag;
 }
 
@@ -169,7 +169,7 @@ void StencilTextEditor::updateFormating()
 
 
   m_mainWidget->m_textArea->selectAll(true);
-  m_mainWidget->m_textArea->setAlignment(horizontalAlignment()|verticalAlignment());
+  m_mainWidget->m_textArea->tqsetAlignment(horizontalAlignment()|verticalAlignment());
   m_mainWidget->m_textArea->selectAll(false);
 
   m_mainWidget->m_textArea->setFocus();
diff --git a/kivio/plugins/kiviotexttool/tool_text.cpp b/kivio/plugins/kiviotexttool/tool_text.cpp
index 5b1ee4fc..7d449ae0 100644
--- a/kivio/plugins/kiviotexttool/tool_text.cpp
+++ b/kivio/plugins/kiviotexttool/tool_text.cpp
@@ -185,7 +185,7 @@ void TextTool::mousePress( TQMouseEvent *e )
 bool TextTool::startRubberBanding( TQMouseEvent *e )
 {
   view()->canvasWidget()->startRectDraw( e->pos(), KivioCanvas::Rubber );
-  view()->canvasWidget()->repaint();
+  view()->canvasWidget()->tqrepaint();
   m_startPoint = e->pos();
 
   return true;
@@ -222,7 +222,7 @@ void TextTool::mouseRelease( TQMouseEvent *e )
 
   m_mode = stmNone;
 
-  view()->canvasWidget()->repaint();
+  view()->canvasWidget()->tqrepaint();
 }
 
 void TextTool::endRubberBanding(TQMouseEvent */*e*/)
@@ -282,12 +282,12 @@ void TextTool::applyToolAction(TQPtrList<KivioStencil>* stencils)
     TQString text = editor.text();
     TQFont font = editor.font();
     TQColor textColor = editor.fontColor();
-    int halignment = editor.horizontalAlignment();
-    int valignment = editor.verticalAlignment();
+    int htqalignment = editor.horizontalAlignment();
+    int vtqalignment = editor.verticalAlignment();
     bool changeFont = (stencil->textFont() != font);
     bool changeTextColor = (stencil->textColor() != textColor);
-    bool changeHAlignment = (stencil->hTextAlign() != halignment);
-    bool changeVAlignment = (stencil->vTextAlign() != valignment);
+    bool changeHAlignment = (stencil->hTextAlign() != htqalignment);
+    bool changeVAlignment = (stencil->vTextAlign() != vtqalignment);
 
 
     while( stencil )
@@ -317,18 +317,18 @@ void TextTool::applyToolAction(TQPtrList<KivioStencil>* stencils)
         changed = true;
       }
 
-      if(changeHAlignment && (stencil->hTextAlign() != halignment)) {
+      if(changeHAlignment && (stencil->hTextAlign() != htqalignment)) {
         KivioChangeStencilHAlignmentCommand* cmd = new KivioChangeStencilHAlignmentCommand(
-            i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil, stencil->hTextAlign(), halignment);
-        stencil->setHTextAlign(halignment);
+            i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil, stencil->hTextAlign(), htqalignment);
+        stencil->setHTextAlign(htqalignment);
         macroCmd->addCommand(cmd);
         changed = true;
       }
 
-      if(changeVAlignment && (stencil->vTextAlign() != valignment)) {
+      if(changeVAlignment && (stencil->vTextAlign() != vtqalignment)) {
         KivioChangeStencilVAlignmentCommand* cmd = new KivioChangeStencilVAlignmentCommand(
-            i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil, stencil->vTextAlign(), valignment);
-        stencil->setVTextAlign(valignment);
+            i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil, stencil->vTextAlign(), vtqalignment);
+        stencil->setVTextAlign(vtqalignment);
         macroCmd->addCommand(cmd);
         changed = true;
       }
@@ -400,24 +400,24 @@ void TextTool::applyToolAction(KivioStencil* stencil, const KoPoint& pos)
       changed = true;
     }
 
-    int halignment = editor.horizontalAlignment();
+    int htqalignment = editor.horizontalAlignment();
 
-    if(stencil->hTextAlign(name) != halignment) {
+    if(stencil->hTextAlign(name) != htqalignment) {
       KivioChangeStencilHAlignmentCommand* cmd = new KivioChangeStencilHAlignmentCommand(
           i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil,
-          stencil->hTextAlign(name), halignment, name);
-      stencil->setHTextAlign(name, halignment);
+          stencil->hTextAlign(name), htqalignment, name);
+      stencil->setHTextAlign(name, htqalignment);
       macroCmd->addCommand(cmd);
       changed = true;
     }
 
-    int valignment = editor.verticalAlignment();
+    int vtqalignment = editor.verticalAlignment();
 
-    if(stencil->vTextAlign(name) != valignment) {
+    if(stencil->vTextAlign(name) != vtqalignment) {
       KivioChangeStencilVAlignmentCommand* cmd = new KivioChangeStencilVAlignmentCommand(
           i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil,
-      stencil->vTextAlign(name), valignment, name);
-      stencil->setVTextAlign(name, valignment);
+      stencil->vTextAlign(name), vtqalignment, name);
+      stencil->setVTextAlign(name, vtqalignment);
       macroCmd->addCommand(cmd);
       changed = true;
     }