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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

3 files changed, 24 insertions, 24 deletions

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;
     }