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

6 files changed, 29 insertions, 29 deletions

diff --git a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
index 4858696b..df063672 100644
--- a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
+++ b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
@@ -78,7 +78,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -98,7 +98,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -114,7 +114,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -138,7 +138,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
index ece262fe..62d74ec6 100644
--- a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
+++ b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
@@ -37,7 +37,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -95,7 +95,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -155,7 +155,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>200</width>
                             <height>20</height>
@@ -166,7 +166,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -215,7 +215,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>192</width>
                             <height>20</height>
@@ -226,7 +226,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp
index 7062ab18..09238787 100644
--- a/buildtools/custommakefiles/custommanagerwidget.cpp
+++ b/buildtools/custommakefiles/custommanagerwidget.cpp
@@ -12,7 +12,7 @@
 #include "custommanagerwidget.h"
 
 #include <tqstringlist.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
diff --git a/buildtools/custommakefiles/custommanagerwidgetbase.ui b/buildtools/custommakefiles/custommanagerwidgetbase.ui
index c74ef412..a141c0b1 100644
--- a/buildtools/custommakefiles/custommanagerwidgetbase.ui
+++ b/buildtools/custommakefiles/custommanagerwidgetbase.ui
@@ -55,7 +55,7 @@ This will be used when adding/removing files in directories and re-populating th
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>108</height>
diff --git a/buildtools/custommakefiles/customotherconfigwidgetbase.ui b/buildtools/custommakefiles/customotherconfigwidgetbase.ui
index ffba0357..86917b10 100644
--- a/buildtools/custommakefiles/customotherconfigwidgetbase.ui
+++ b/buildtools/custommakefiles/customotherconfigwidgetbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -79,7 +79,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -128,7 +128,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -139,7 +139,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index ecdabd64..7ccf8e1c 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -242,7 +242,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
         m_contextDirName = m_contextDirName.mid( project()->projectDirectory().length() + 1 );
         int id = popup->insertItem( i18n( "Make Active Directory" ),
                                     this, TQT_SLOT( slotChooseActiveDirectory() ) );
-        popup->tqsetWhatsThis( id, i18n( "<b>Make active directory</b><p>"
+        popup->setWhatsThis( id, i18n( "<b>Make active directory</b><p>"
                                        "Chooses this directory as the destination for new files created using wizards "
                                        "like the <i>New Class</i> wizard." ) );
     }
@@ -258,7 +258,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
         {
             id = popup->insertItem( i18n( "Remove from blacklist" ),
                                     this, TQT_SLOT( slotChangeBlacklist() ) );
-            popup->tqsetWhatsThis( id, i18n( "<b>Remove from blacklist</b><p>"
+            popup->setWhatsThis( id, i18n( "<b>Remove from blacklist</b><p>"
                                            "Removes the given file or directory from the "
                                            "blacklist if it is already in it.<br>The blacklist contains files and"
                                            " directories that should be ignored even if they match a project filetype "
@@ -268,7 +268,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
         {
             id = popup->insertItem( i18n( "Add to blacklist" ),
                                     this, TQT_SLOT( slotChangeBlacklist() ) );
-            popup->tqsetWhatsThis( id, i18n( "<b>Add to blacklist</b><p>"
+            popup->setWhatsThis( id, i18n( "<b>Add to blacklist</b><p>"
                                            "Adds the given file or directory to the blacklist.<br>The blacklist contains files and"
                                            " directories that should be ignored even if they match a project filetype "
                                            "pattern" ) );
@@ -318,13 +318,13 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
     {
         int id = popup->insertItem( i18n( "Add Selected File/Dir(s) to Project" ),
                                     this, TQT_SLOT( slotAddToProject() ) );
-        popup->tqsetWhatsThis( id, i18n( "<b>Add to project</b><p>Adds selected file/dir(s) to the list of files in the project. "
+        popup->setWhatsThis( id, i18n( "<b>Add to project</b><p>Adds selected file/dir(s) to the list of files in the project. "
                                        "Note that the files should be manually added to the corresponding makefile or build.xml." ) );
         if ( dirAddRecursive )
         {
             int id = popup->insertItem( i18n( "Add Selected Dir(s) to Project (recursive)" ),
                                         this, TQT_SLOT( slotAddToProjectRecursive() ) );
-            popup->tqsetWhatsThis( id, i18n( "<b>Add to project</b><p>Recursively adds selected dir(s) to the list of files in the project. "
+            popup->setWhatsThis( id, i18n( "<b>Add to project</b><p>Recursively adds selected dir(s) to the list of files in the project. "
                                            "Note that the files should be manually added to the corresponding makefile or build.xml." ) );
         }
     }
@@ -333,14 +333,14 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
     {
         int id = popup->insertItem( i18n( "Remove Selected File/Dir(s) From Project" ),
                                     this, TQT_SLOT( slotRemoveFromProject() ) );
-        popup->tqsetWhatsThis( id, i18n( "<b>Remove from project</b><p>Removes selected file/dir(s) from the list of files in the project. "
+        popup->setWhatsThis( id, i18n( "<b>Remove from project</b><p>Removes selected file/dir(s) from the list of files in the project. "
                                        "Note that the files should be manually excluded from the corresponding makefile or build.xml." ) );
 
         if ( dirDelRecursive )
         {
             int id = popup->insertItem( i18n( "Remove Selected Dir(s) From Project (recursive)" ),
                                         this, TQT_SLOT( slotRemoveFromProjectRecursive() ) );
-            popup->tqsetWhatsThis( id, i18n( "<b>Remove from project</b><p>Recursively removes selected dir(s) from the list of files in the project. "
+            popup->setWhatsThis( id, i18n( "<b>Remove from project</b><p>Recursively removes selected dir(s) from the list of files in the project. "
                                            "Note that the files should be manually excluded from the corresponding makefile or build.xml." ) );
         }
     }
@@ -944,7 +944,7 @@ void CustomProjectPart::startMakeCommand( const TQString &dir, const TQString &t
     TQString nice;
     if ( prio != 0 )
     {
-        nice = TQString( "nice -n%1 " ).tqarg( prio );
+        nice = TQString( "nice -n%1 " ).arg( prio );
     }
 
     cmdline.prepend( nice );
@@ -1013,12 +1013,12 @@ void CustomProjectPart::slotCompileFile()
 
 void CustomProjectPart::slotInstallActiveDir()
 {
-    startMakeCommand( buildDirectory() + "/" + activeDirectory(), TQString::tqfromLatin1( "install" ) );
+    startMakeCommand( buildDirectory() + "/" + activeDirectory(), TQString::fromLatin1( "install" ) );
 }
 
 void CustomProjectPart::slotInstall()
 {
-    startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ) );
+    startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ) );
 }
 
 
@@ -1029,12 +1029,12 @@ void CustomProjectPart::slotInstallWithKdesu()
     slotBuild();
 
     // After that issue "make install" with the root user
-    startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ), true );
+    startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ), true );
 }
 
 void CustomProjectPart::slotClean()
 {
-    startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "clean" ) );
+    startMakeCommand( buildDirectory(), TQString::fromLatin1( "clean" ) );
 }
 
 
@@ -1056,7 +1056,7 @@ void CustomProjectPart::slotExecute()
         // Use tdesu??
         if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autotdesu", false ) )
             //slotInstallWithKdesu assumes that it hasn't just been build...
-            _auto ? slotInstallWithKdesu() : startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ), true );
+            _auto ? slotInstallWithKdesu() : startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ), true );
         else
             slotInstall();
         _auto = true;