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

This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.

4 files changed, 22 insertions, 22 deletions

diff --git a/parts/valgrind/dialog_widget.ui b/parts/valgrind/dialog_widget.ui
index 5da3365d..727215ba 100644
--- a/parts/valgrind/dialog_widget.ui
+++ b/parts/valgrind/dialog_widget.ui
@@ -103,7 +103,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout2</cstring>
+                                    <cstring>tqlayout2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -122,7 +122,7 @@
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -141,15 +141,15 @@
                             </widget>
                             <widget class="TQCheckBox">
                                 <property name="name">
-                                    <cstring>childrenBox</cstring>
+                                    <cstring>tqchildrenBox</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>&amp;Trace children</string>
+                                    <string>&amp;Trace tqchildren</string>
                                 </property>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout3</cstring>
+                                    <cstring>tqlayout3</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -223,7 +223,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="1" column="0">
                                 <property name="name">
-                                    <cstring>layout3_2</cstring>
+                                    <cstring>tqlayout3_2</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -271,7 +271,7 @@
                                     <cstring>ctChildrenBox</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>&amp;Trace children</string>
+                                    <string>&amp;Trace tqchildren</string>
                                 </property>
                             </widget>
                         </grid>
@@ -323,7 +323,7 @@
     <tabstop>paramEdit</tabstop>
     <tabstop>memleakBox</tabstop>
     <tabstop>reachableBox</tabstop>
-    <tabstop>childrenBox</tabstop>
+    <tabstop>tqchildrenBox</tabstop>
     <tabstop>valExecutableEdit</tabstop>
     <tabstop>valParamEdit</tabstop>
     <tabstop>ctChildrenBox</tabstop>
diff --git a/parts/valgrind/valgrind_dialog.cpp b/parts/valgrind/valgrind_dialog.cpp
index fe440449..cfca7074 100644
--- a/parts/valgrind/valgrind_dialog.cpp
+++ b/parts/valgrind/valgrind_dialog.cpp
@@ -1,4 +1,4 @@
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqregexp.h>
 #include <tqwidgetstack.h>
@@ -89,7 +89,7 @@ void ValgrindDialog::setValExecutable( const TQString& ve )
 static const TQString memCheckParam( "--tool=memcheck" );
 static const TQString leakCheckParam( "--leak-check=yes" );
 static const TQString reachableParam( "--show-reachable=yes" );
-static const TQString childrenParam( "--trace-children=yes" );
+static const TQString tqchildrenParam( "--trace-tqchildren=yes" );
 
 TQString ValgrindDialog::valParams() const
 {
@@ -100,8 +100,8 @@ TQString ValgrindDialog::valParams() const
     params += " " + leakCheckParam;
   if ( w->reachableBox->isChecked() )
     params += " " + reachableParam;
-  if ( w->childrenBox->isChecked() )
-    params += " " + childrenParam;
+  if ( w->tqchildrenBox->isChecked() )
+    params += " " + tqchildrenParam;
 
   return params;
 }
@@ -113,14 +113,14 @@ void ValgrindDialog::setValParams( const TQString& params )
     w->memleakBox->setChecked( true );
   if ( myParams.contains( reachableParam ) )
     w->reachableBox->setChecked( true );
-  if ( myParams.contains( childrenParam ) )
-    w->childrenBox->setChecked( true );
+  if ( myParams.contains( tqchildrenParam ) )
+    w->tqchildrenBox->setChecked( true );
   w->init();
 
   myParams = myParams.replace( TQRegExp( memCheckParam ), "" );
   myParams = myParams.replace( TQRegExp( leakCheckParam ), "" );
   myParams = myParams.replace( TQRegExp( reachableParam ), "" );
-  myParams = myParams.replace( TQRegExp( childrenParam ), "" );
+  myParams = myParams.replace( TQRegExp( tqchildrenParam ), "" );
   myParams = myParams.stripWhiteSpace();
   w->valParamEdit->setText( myParams );
 }
@@ -150,7 +150,7 @@ TQString ValgrindDialog::ctParams() const
 {
   TQString params = w->ctParamEdit->text();
   if ( w->ctChildrenBox->isChecked() )
-    params += " " + childrenParam;
+    params += " " + tqchildrenParam;
 
   return params;
 }
@@ -161,11 +161,11 @@ void ValgrindDialog::setCtParams( const TQString& params )
   //force --tool=callgrind if no params are given
   if (myParams.isEmpty())
     myParams = "--tool=callgrind";
-  if ( myParams.contains( childrenParam ) )
+  if ( myParams.contains( tqchildrenParam ) )
     w->ctChildrenBox->setChecked( true );
   w->init();
 
-  myParams = myParams.replace( TQRegExp( childrenParam ), "" );
+  myParams = myParams.replace( TQRegExp( tqchildrenParam ), "" );
   myParams = myParams.stripWhiteSpace();
   w->ctParamEdit->setText( myParams );
 }
diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp
index bd0df1ef..abf10a6d 100644
--- a/parts/valgrind/valgrind_part.cpp
+++ b/parts/valgrind/valgrind_part.cpp
@@ -93,7 +93,7 @@ void ValgrindPart::loadOutput()
 
   TQFile f( fName );
   if ( !f.open( IO_ReadOnly ) ) {
-    KMessageBox::sorry( 0, i18n("Could not open valgrind output: %1").arg(fName) );
+    KMessageBox::sorry( 0, i18n("Could not open valgrind output: %1").tqarg(fName) );
     return;
   }
 
@@ -234,7 +234,7 @@ void ValgrindPart::runValgrind( const TQString& exec, const TQString& params, co
   DomUtil::PairList::ConstIterator it;
   for (it = run_envvars.begin(); it != run_envvars.end(); ++it)
   {
-    envVarList << TQString("%1=\"%2\" ").arg((*it).first).arg((*it).second);
+    envVarList << TQString("%1=\"%2\" ").tqarg((*it).first).tqarg((*it).second);
   }
 
   *proc << envVarList.join("") << valExec << valParams << exec << params;
@@ -312,7 +312,7 @@ void ValgrindPart::processExited( KProcess* p )
         KProcess *kcProc = new KProcess;
 //        kcProc->setWorkingDirectory(kcInfo.kcWorkDir);
         *kcProc << kcInfo.kcPath;
-        *kcProc << TQString("callgrind.out.%1").arg(p->pid());
+        *kcProc << TQString("callgrind.out.%1").tqarg(p->pid());
         kcProc->start(KProcess::DontCare);
     }
   }
diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp
index d9980d7c..074a2c38 100644
--- a/parts/valgrind/valgrind_widget.cpp
+++ b/parts/valgrind/valgrind_widget.cpp
@@ -1,4 +1,4 @@
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqpopupmenu.h>