Remove additional unneeded tq method conversions

36 files changed, 134 insertions, 134 deletions

diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp
index d97a62d1..5d47b818 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -420,7 +420,7 @@ KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
     if (!factory) {
         TQString errorMessage = KLibLoader::self()->lastErrorMessage();
         KMessageBox::error(0, i18n("There was an error loading the module %1.\n"
-                                   "The diagnostics are:\n%2").tqarg(service->name()).tqarg(errorMessage));
+                                   "The diagnostics are:\n%2").arg(service->name()).arg(errorMessage));
         exit(1);
     }
 
diff --git a/buildtools/ant/antoptionswidget.ui b/buildtools/ant/antoptionswidget.ui
index fd7ece90..0beab188 100644
--- a/buildtools/ant/antoptionswidget.ui
+++ b/buildtools/ant/antoptionswidget.ui
@@ -99,7 +99,7 @@
             <property name="text">
                 <string>&amp;Properties:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignTop</set>
             </property>
             <property name="buddy" stdset="0">
diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp
index bb3f958a..769fd3df 100644
--- a/buildtools/ant/antprojectpart.cpp
+++ b/buildtools/ant/antprojectpart.cpp
@@ -458,7 +458,7 @@ void AntProjectPart::ant(const TQString &target)
   if (!m_classPath.count() == 0)
     cp = "CLASSPATH="+m_classPath.join(":");
 
-  makeFrontend()->queueCommand(m_projectDirectory, cmd.tqarg(cp).tqarg(m_projectDirectory).tqarg(target).tqarg(m_antOptions.m_buildXML).tqarg(verb).tqarg(options));
+  makeFrontend()->queueCommand(m_projectDirectory, cmd.arg(cp).arg(m_projectDirectory).arg(target).arg(m_antOptions.m_buildXML).arg(verb).arg(options));
 }
 
 
@@ -562,13 +562,13 @@ void AntProjectPart::contextMenu(TQPopupMenu *popup, const Context *context)
   popup->insertSeparator();
   if (inProject)
   {
-    int id = popup->insertItem( i18n("Remove %1 From Project").tqarg(popupstr),
+    int id = popup->insertItem( i18n("Remove %1 From Project").arg(popupstr),
                        this, TQT_SLOT(slotRemoveFromProject()) );
     popup->setWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project."));
   }
   else
   {
-    int id = popup->insertItem( i18n("Add %1 to Project").tqarg(popupstr),
+    int id = popup->insertItem( i18n("Add %1 to Project").arg(popupstr),
                        this, TQT_SLOT(slotAddToProject()) );
     popup->setWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project."));
   }
diff --git a/buildtools/autotools/addapplicationdlgbase.ui b/buildtools/autotools/addapplicationdlgbase.ui
index 85c754f9..9b357801 100644
--- a/buildtools/autotools/addapplicationdlgbase.ui
+++ b/buildtools/autotools/addapplicationdlgbase.ui
@@ -192,7 +192,7 @@
                     <property name="text">
                         <string>E&amp;xecutable:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -210,7 +210,7 @@
                     <property name="text">
                         <string>&amp;Icon:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -228,7 +228,7 @@
                     <property name="text">
                         <string>&amp;Section:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -246,7 +246,7 @@
                     <property name="text">
                         <string>&amp;File name:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -264,7 +264,7 @@
                     <property name="text">
                         <string>&amp;Name:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -282,7 +282,7 @@
                     <property name="text">
                         <string>Co&amp;mment:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp
index 341953e0..912edc52 100644
--- a/buildtools/autotools/addexistingdirectoriesdlg.cpp
+++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp
@@ -229,7 +229,7 @@ void AddExistingDirectoriesDialog::slotOk()
             m_widget->getSubprojectView()->parse( newitem );
         } else {
             if (!f.open(IO_WriteOnly)) {
-//                KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").tqarg(name));
+//                KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name));
                 continue;
             }
             TQTextStream stream(&f);
diff --git a/buildtools/autotools/addicondlgbase.ui b/buildtools/autotools/addicondlgbase.ui
index b9ac24a8..7a3336dc 100644
--- a/buildtools/autotools/addicondlgbase.ui
+++ b/buildtools/autotools/addicondlgbase.ui
@@ -34,7 +34,7 @@
             <property name="text">
                 <string>&amp;Type:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
@@ -52,7 +52,7 @@
             <property name="text">
                 <string>&amp;Size:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
@@ -75,7 +75,7 @@
             <property name="text">
                 <string>File name:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
@@ -93,7 +93,7 @@
             <property name="text">
                 <string>&amp;Name:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp
index ccc10ec2..7576741e 100644
--- a/buildtools/autotools/addservicedlg.cpp
+++ b/buildtools/autotools/addservicedlg.cpp
@@ -136,7 +136,7 @@ void AddServiceDialog::propertyExecuted(TQListViewItem *item)
     TQString prop = item->text(0);
     TQString value = item->text(1);
     bool ok;
-    value = KInputDialog::getText(i18n("Enter Value"), i18n("Property %1:").tqarg(prop), value, &ok, this);
+    value = KInputDialog::getText(i18n("Enter Value"), i18n("Property %1:").arg(prop), value, &ok, this);
     if (!ok)
         return;
 
diff --git a/buildtools/autotools/addservicedlgbase.ui b/buildtools/autotools/addservicedlgbase.ui
index 540f0f1c..c1f52b22 100644
--- a/buildtools/autotools/addservicedlgbase.ui
+++ b/buildtools/autotools/addservicedlgbase.ui
@@ -54,7 +54,7 @@
                     <property name="text">
                         <string>&amp;Icon:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -138,7 +138,7 @@
                     <property name="text">
                         <string>&amp;Library:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -156,7 +156,7 @@
                     <property name="text">
                         <string>&amp;File name:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -174,7 +174,7 @@
                     <property name="text">
                         <string>&amp;Name:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -192,7 +192,7 @@
                     <property name="text">
                         <string>Co&amp;mment:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -405,7 +405,7 @@
                     <property name="text">
                         <string>&amp;Properties:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp
index f156a5e1..e59a172b 100644
--- a/buildtools/autotools/addsubprojectdlg.cpp
+++ b/buildtools/autotools/addsubprojectdlg.cpp
@@ -82,25 +82,25 @@ void AddSubprojectDialog::accept()
     TQFileInfo file( dir, name );
 
     if( file.exists() && !file.isDir() ) {
-        KMessageBox::sorry(this, i18n("A file named %1 already exists.").tqarg(name));
+        KMessageBox::sorry(this, i18n("A file named %1 already exists.").arg(name));
         TQDialog::accept();
         return;
     } else if( file.isDir() ) {
         if( KMessageBox::warningContinueCancel(this,
                i18n("A subdirectory %1 already exists. "
-                    "Do you wish to add it as a subproject?").tqarg(name))
+                    "Do you wish to add it as a subproject?").arg(name))
             == KMessageBox::Cancel ){
             TQDialog::accept();
             return;
 	}
     } else if (!dir.mkdir(name)) {
-        KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").tqarg(name));
+        KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").arg(name));
         TQDialog::accept();
         return;
     }
 
     if(!dir.cd(name)) {
-       KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").tqarg(name));
+       KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").arg(name));
        TQDialog::accept();
        return;
     }
@@ -148,7 +148,7 @@ void AddSubprojectDialog::accept()
         m_subprojectView->parse( newitem );
     } else {
         if (!f.open(IO_WriteOnly)) {
-            KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").tqarg(name));
+            KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name));
             return;
         }
         TQTextStream stream(&f);
diff --git a/buildtools/autotools/addtargetdlgbase.ui b/buildtools/autotools/addtargetdlgbase.ui
index 34c028af..9e8b561f 100644
--- a/buildtools/autotools/addtargetdlgbase.ui
+++ b/buildtools/autotools/addtargetdlgbase.ui
@@ -44,7 +44,7 @@
                     <property name="text">
                         <string>&amp;Primary:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -67,7 +67,7 @@
                     <property name="text">
                         <string>Pre&amp;fix:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -90,7 +90,7 @@
                     <property name="text">
                         <string>File &amp;name:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp
index b7061a0a..9e1a6526 100644
--- a/buildtools/autotools/autodetailsview.cpp
+++ b/buildtools/autotools/autodetailsview.cpp
@@ -499,7 +499,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
 		else
 			caption = titem->name;
 
-		KPopupMenu popup( i18n( "Target: %1" ).tqarg( caption ), this );
+		KPopupMenu popup( i18n( "Target: %1" ).arg( caption ), this );
 
 		if ( titem->primary == "PROGRAMS" || titem->primary == "LIBRARIES"
 		        || titem->primary == "LTLIBRARIES" || titem->primary == "JAVA" )
@@ -554,7 +554,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
 			return;
 		}
 
-		KPopupMenu popup( i18n( "File: %1" ).tqarg( fitem->name ), this );
+		KPopupMenu popup( i18n( "File: %1" ).arg( fitem->name ), this );
 
 		removeDetailAction->plug( &popup );
 		KURL::List urls;
diff --git a/buildtools/autotools/autolistviewitems.cpp b/buildtools/autotools/autolistviewitems.cpp
index 6ffa69a0..e77aa84b 100644
--- a/buildtools/autotools/autolistviewitems.cpp
+++ b/buildtools/autotools/autolistviewitems.cpp
@@ -42,7 +42,7 @@ ProjectItem::ProjectItem( Type type, ProjectItem *parent, const TQString &text )
 
 
 void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg,
-                             int column, int width, int tqalignment )
+                             int column, int width, int alignment )
 {
 	if ( isBold() )
 	{
@@ -50,7 +50,7 @@ void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg,
 		font.setBold( true );
 		p->setFont( font );
 	}
-	TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+	TQListViewItem::paintCell( p, cg, column, width, alignment );
 }
 
 
diff --git a/buildtools/autotools/autolistviewitems.h b/buildtools/autotools/autolistviewitems.h
index 0dc28dc5..162d8467 100644
--- a/buildtools/autotools/autolistviewitems.h
+++ b/buildtools/autotools/autolistviewitems.h
@@ -35,7 +35,7 @@ public:
 	ProjectItem( Type type, ProjectItem *parent, const TQString &text );
 
 	void paintCell( TQPainter *p, const TQColorGroup &cg,
-	                int column, int width, int tqalignment );
+	                int column, int width, int alignment );
 	void setBold( bool b )
 	{
 		bld = b;
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index 107a2fc5..5e282acf 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -414,7 +414,7 @@ TQString AutoProjectPart::mainProgram() const
             KMessageBox::error( m_widget, i18n("Active target \"%1\" is not binary ( %2 ).\n"
                                 "Unable to determine the main program.  If you want this\n"
                                 "to be the active target, set a main program under\n"
-                                "Project -> Project Options -> Run Options").tqarg(titem->name).tqarg(titem->primary), i18n("Active target is not a library") );
+                                "Project -> Project Options -> Run Options").arg(titem->name).arg(titem->primary), i18n("Active target is not a library") );
             kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl;
             return TQString();
         }
@@ -643,7 +643,7 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ
         {
             int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory\n"
                                                "and no configure script for this project.\n"
-                                               "Run automake & friends and configure first?").tqarg(buildDirectory()), TQString(), i18n("Run Them"), i18n("Do Not Run"));
+                                               "Run automake & friends and configure first?").arg(buildDirectory()), TQString(), i18n("Run Them"), i18n("Do Not Run"));
             if (r == KMessageBox::No)
                 return TQString();
             preCommand = makefileCvsCommand();
@@ -654,7 +654,7 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ
         }
         else
         {
-            int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").tqarg(dir), TQString(), i18n("Run configure"), i18n("Do Not Run"));
+            int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").arg(dir), TQString(), i18n("Run configure"), i18n("Do Not Run"));
             if (r == KMessageBox::No)
                 return TQString();
             preCommand = configureCommand() + " && ";
@@ -668,7 +668,7 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ
     kdDebug(9020) << k_funcinfo << "nice = " << prio<< endl;
     if (prio != 0)
     {
-        nice = TQString("nice -n%1 ").tqarg(prio);
+        nice = TQString("nice -n%1 ").arg(prio);
     }
 
     if (cmdline.isEmpty())
@@ -792,7 +792,7 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr
                     tdir += dependency.left(pos+1);
                     tname = dependency.mid(pos+1);
                 }
-                KMessageBox::error( 0, i18n("Found a circular dependency in the project, between this target and %1.\nCannot build this project until this is resolved.").tqarg(tname), i18n("Circular Dependency found") );
+                KMessageBox::error( 0, i18n("Found a circular dependency in the project, between this target and %1.\nCannot build this project until this is resolved.").arg(tname), i18n("Circular Dependency found") );
                 return false;
             }
         }
@@ -912,28 +912,28 @@ TQString AutoProjectPart::configureCommand() const
     cmdline += "/configure\"";
     TQString cc = DomUtil::readEntry(dom, prefix + "ccompilerbinary");
     if (!cc.isEmpty())
-        cmdline.prepend(TQString("CC=%1 ").tqarg(cc));
+        cmdline.prepend(TQString("CC=%1 ").arg(cc));
     TQString cflags = DomUtil::readEntry(dom, prefix + "cflags");
     if (!cflags.isEmpty())
-        cmdline.prepend(TQString("CFLAGS=\"%1\" ").tqarg(cflags));
+        cmdline.prepend(TQString("CFLAGS=\"%1\" ").arg(cflags));
     TQString cxx = DomUtil::readEntry(dom, prefix + "cxxcompilerbinary");
     if (!cxx.isEmpty())
-        cmdline.prepend(TQString("CXX=%1 ").tqarg(cxx));
+        cmdline.prepend(TQString("CXX=%1 ").arg(cxx));
     TQString cxxflags = DomUtil::readEntry(dom, prefix + "cxxflags");
     if (!cxxflags.isEmpty())
-        cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").tqarg(cxxflags));
+        cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").arg(cxxflags));
     TQString f77 = DomUtil::readEntry(dom, prefix + "f77compilerbinary");
     if (!f77.isEmpty())
-        cmdline.prepend(TQString("F77=%1 ").tqarg(f77));
+        cmdline.prepend(TQString("F77=%1 ").arg(f77));
     TQString fflags = DomUtil::readEntry(dom, prefix + "f77flags");
     if (!fflags.isEmpty())
-        cmdline.prepend(TQString("FFLAGS=\"%1\" ").tqarg(fflags));
+        cmdline.prepend(TQString("FFLAGS=\"%1\" ").arg(fflags));
     TQString cppflags = DomUtil::readEntry(dom, prefix + "cppflags");
     if (!cppflags.isEmpty())
-        cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").tqarg(cppflags));
+        cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").arg(cppflags));
     TQString ldflags = DomUtil::readEntry(dom, prefix + "ldflags");
     if (!ldflags.isEmpty())
-        cmdline.prepend(TQString("LDFLAGS=\"%1\" ").tqarg(ldflags));
+        cmdline.prepend(TQString("LDFLAGS=\"%1\" ").arg(ldflags));
 
     TQString configargs = DomUtil::readEntry(dom, prefix + "configargs");
     if (!configargs.isEmpty()) {
@@ -997,7 +997,7 @@ TQString AutoProjectPart::makefileCvsCommand() const
     TQString nice;
     kdDebug(9020) << "makefileCvsCommand() nice = " << prio<< endl;
     if (prio != 0) {
-        nice = TQString("nice -n%1 ").tqarg(prio);
+        nice = TQString("nice -n%1 ").arg(prio);
     }
 
     if (TQFile::exists(topsourceDirectory() + "/Makefile.cvs"))
@@ -1171,7 +1171,7 @@ void AutoProjectPart::executeTarget(const TQDir& dir, const TargetItem* titem)
         KMessageBox::error( m_widget, i18n("Active target \"%1\" is not binary ( %2 ).\n"
                                 "Unable to determine the main program. If you want this\n"
                                 "to be the active target, set a main program under\n"
-                                "Project -> Project Options -> Run Options").tqarg(titem->name).tqarg(titem->primary), i18n("Active target is not a library") );
+                                "Project -> Project Options -> Run Options").arg(titem->name).arg(titem->primary), i18n("Active target is not a library") );
         kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl;
         program += titem->name;
     }else
diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp
index 86adb657..79f0a1b2 100644
--- a/buildtools/autotools/autoprojectwidget.cpp
+++ b/buildtools/autotools/autoprojectwidget.cpp
@@ -557,7 +557,7 @@ void AutoProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item )
 	// Delete the items from the details view first.
 	if ( m_shownSubproject )
 	{
-		// Remove all TargetItems and all of their tqchildren from the view
+		// Remove all TargetItems and all of their children from the view
 		kdDebug ( 9020 ) << "m_shownSubproject (before takeItem()): " << m_shownSubproject->subdir << endl;
 
 		TQListViewItem* i = m_detailView->listView()->firstChild();
@@ -575,7 +575,7 @@ void AutoProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item )
 	if ( !m_shownSubproject) return;
 	kdDebug ( 9020 ) << "m_shownSubproject (after takeItem()):  " << selectedSubproject()->subdir << endl;
 
-	// Insert all TargetItems and all of their tqchildren into the view
+	// Insert all TargetItems and all of their children into the view
 	TQPtrListIterator<TargetItem> it2( selectedSubproject()->targets );
 	for ( ; it2.current(); ++it2 )
 	{
@@ -632,9 +632,9 @@ TargetItem *AutoProjectWidget::createTargetItem( const TQString &name,
 	if ( docgroup )
 		text = i18n( "Documentation data" );
 	else if ( icongroup )
-		text = i18n( "KDE Icon data" ).tqarg( prefix );
+		text = i18n( "KDE Icon data" ).arg( prefix );
 	else
-		text = i18n( "%1 (%2 in %3)" ).tqarg( name ).tqarg( nicePrimary( primary ) ).tqarg( prefix );
+		text = i18n( "%1 (%2 in %3)" ).arg( name ).arg( nicePrimary( primary ) ).arg( prefix );
 
 	// Workaround because of TQListView not being able to create
 	// items without actually inserting them
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp
index 7230b20c..69408d00 100644
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@@ -280,7 +280,7 @@ void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, con
 	if ( !item )
 		return ;
 
-	KPopupMenu popup( i18n( "Subproject: %1" ).tqarg( item->text( 0 ) ), this );
+	KPopupMenu popup( i18n( "Subproject: %1" ).arg( item->text( 0 ) ), this );
 
 	subProjectOptionsAction->plug( &popup );
 	popup.insertSeparator();
@@ -448,13 +448,13 @@ void AutoSubprojectView::slotRemoveSubproject()
     {
         topsubdirs = false;
         if( it == list.end() ){
-            KMessageBox::sorry(this, i18n("There is no subproject %1 in SUBDIRS").tqarg(spitem->subdir));
+            KMessageBox::sorry(this, i18n("There is no subproject %1 in SUBDIRS").arg(spitem->subdir));
             return;
         }
     }
 
-    RemoveSubprojectDialog dlg(i18n("Remove Subproject %1").tqarg(spitem->text(0)),
-        i18n("Do you really want to remove subproject %1 with all targets and files?").tqarg(spitem->text(0)));
+    RemoveSubprojectDialog dlg(i18n("Remove Subproject %1").arg(spitem->text(0)),
+        i18n("Do you really want to remove subproject %1 with all targets and files?").arg(spitem->text(0)));
     if( dlg.exec() ){
 
     bool removeSources = dlg.removeFromDisk();
@@ -1045,7 +1045,7 @@ void AutoSubprojectView::slotManageBuildCommands( )
 		{
 			config->writeEntry(widget->commandsTable->text(i, 0),
 				widget->commandsTable->text(i, 1)+":::"+
-				TQString("%1").tqarg(static_cast<TQComboTableItem*>(widget->
+				TQString("%1").arg(static_cast<TQComboTableItem*>(widget->
 				commandsTable->item(i, 2))->currentItem()));
 		}
 		config->sync();
diff --git a/buildtools/autotools/choosetargetdlgbase.ui b/buildtools/autotools/choosetargetdlgbase.ui
index 927ad6eb..f98c9145 100644
--- a/buildtools/autotools/choosetargetdlgbase.ui
+++ b/buildtools/autotools/choosetargetdlgbase.ui
@@ -158,7 +158,7 @@
                     <property name="text">
                         <string>&lt;qt&gt;&lt;b&gt;Note:&lt;/b&gt; If you cancel, your files will be created but will &lt;b&gt;not&lt;/b&gt; be added to the project.&lt;/qt&gt;</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter</set>
                     </property>
                 </widget>
diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp
index afa50b2e..8ff8d36c 100644
--- a/buildtools/autotools/configureoptionswidget.cpp
+++ b/buildtools/autotools/configureoptionswidget.cpp
@@ -236,7 +236,7 @@ void ConfigureOptionsWidget::saveSettings(const TQString &config)
     DomUtil::writeEntry(dom, prefix + "cxxflags", cxxflags_edit->text());
     DomUtil::writeEntry(dom, prefix + "f77flags", f77flags_edit->text());
 
-    if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").tqarg(config), TQString(), i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes)
+    if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").arg(config), TQString(), i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes)
         TQTimer::singleShot(0, m_part, TQT_SLOT(slotConfigure()));
 
 }
@@ -396,7 +396,7 @@ KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin
     if (!factory) {
         TQString errorMessage = KLibLoader::self()->lastErrorMessage();
         KMessageBox::error(0, i18n("There was an error loading the module %1.\n"
-                                   "The diagnostics is:\n%2").tqarg(service->name()).tqarg(errorMessage));
+                                   "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage));
         exit(1);
     }
 
diff --git a/buildtools/autotools/makefilehandler.cpp b/buildtools/autotools/makefilehandler.cpp
index 7e19dd56..db30508d 100644
--- a/buildtools/autotools/makefilehandler.cpp
+++ b/buildtools/autotools/makefilehandler.cpp
@@ -81,7 +81,7 @@ void MakefileHandler::parse( const TQString& folder, bool recursive )
 
     if ( recursive && ast && ast->hasChildren() )
     {
-        TQValueList<AutoTools::AST*> astChildList = ast->tqchildren();
+        TQValueList<AutoTools::AST*> astChildList = ast->children();
         TQValueList<AutoTools::AST*>::iterator it(astChildList.begin()), clEnd(astChildList.end());
         for ( ; it != clEnd; ++it )
         {
@@ -145,7 +145,7 @@ TQString MakefileHandler::resolveVariable( const TQString& variable, AutoTools::
         return variable;
 
     kdDebug(9020) << k_funcinfo << "attempting to resolve '" << variable << "'"<< endl;
-    ASTList childList = ast->tqchildren();
+    ASTList childList = ast->children();
     ASTList::iterator it( childList.begin() ), clEnd( childList.end() );
     for ( ; it != clEnd; ++it )
     {
diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp
index 95447092..d13c72d2 100644
--- a/buildtools/autotools/removefiledlg.cpp
+++ b/buildtools/autotools/removefiledlg.cpp
@@ -63,7 +63,7 @@ RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* p
 
 		TQString joinedtargets = "    *" + targets.join("\n    *");
 		removeFromTargetsCheckBox->setText ( i18n ( "The file %1 is still used by the following targets:\n%2\n"
-												"Remove it from all of them?").tqarg(filename).tqarg(joinedtargets) );
+												"Remove it from all of them?").arg(filename).arg(joinedtargets) );
         setMinimumSize(TQSize(size().width(), size().height() + removeFromTargetsCheckBox->size().height()*2) );
 	}
 
diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp
index a13ba30b..aabb4b5e 100644
--- a/buildtools/autotools/subprojectoptionsdlg.cpp
+++ b/buildtools/autotools/subprojectoptionsdlg.cpp
@@ -45,7 +45,7 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj
                                                  SubprojectItem *item, TQWidget *parent, const char *name)
     : SubprojectOptionsDialogBase(parent, name, true)
 {
-    setCaption(i18n("Subproject Options for '%1'").tqarg(item->subdir));
+    setCaption(i18n("Subproject Options for '%1'").arg(item->subdir));
 
     subProject = item;
     m_part = part;
diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp
index 7c40fbfc..f462ee60 100644
--- a/buildtools/autotools/targetoptionsdlg.cpp
+++ b/buildtools/autotools/targetoptionsdlg.cpp
@@ -37,7 +37,7 @@ TargetOptionsDialog::TargetOptionsDialog(AutoProjectWidget *widget, TargetItem *
                                          TQWidget *parent, const char *name)
     : TargetOptionsDialogBase(parent, name, true)
 {
-    setCaption( i18n("Target Options for '%1'").tqarg(item->name) );
+    setCaption( i18n("Target Options for '%1'").arg(item->name) );
     setIcon( SmallIcon("configure") );
 
     target = item;
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index 88e7ee03..7ccf8e1c 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -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 );
diff --git a/buildtools/lib/parsers/autotools/autotoolsast.cpp b/buildtools/lib/parsers/autotools/autotoolsast.cpp
index 659fe47f..0512be78 100644
--- a/buildtools/lib/parsers/autotools/autotoolsast.cpp
+++ b/buildtools/lib/parsers/autotools/autotoolsast.cpp
@@ -28,7 +28,7 @@ namespace AutoTools {
 
 AST::~AST()
 {
-	for (TQValueList<AST*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
+	for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it)
 	{
 		AST *node = *it;
 		delete node;
@@ -37,13 +37,13 @@ AST::~AST()
 
 void AST::addChildAST(AST *node)
 {
-	m_tqchildren.append(node);
+	m_children.append(node);
 }
 
 void AST::writeBack(TQString &buffer)
 {
-	for (TQValueList<AST*>::const_iterator it = m_tqchildren.constBegin();
-	     it != m_tqchildren.constEnd(); ++it)
+	for (TQValueList<AST*>::const_iterator it = m_children.constBegin();
+	     it != m_children.constEnd(); ++it)
 	{
 		if (*it)
 			(*it)->writeBack(buffer);
@@ -60,12 +60,12 @@ TQString AST::indentation()
 
 bool AST::hasChildren() const
 {
-	return !m_tqchildren.isEmpty();
+	return !m_children.isEmpty();
 }
 
-TQValueList<AST*> AST::tqchildren() const
+TQValueList<AST*> AST::children() const
 {
-	return m_tqchildren;
+	return m_children;
 }
 
 //ProjectAST
diff --git a/buildtools/lib/parsers/autotools/autotoolsast.h b/buildtools/lib/parsers/autotools/autotoolsast.h
index 0f5dcdc9..adefc640 100644
--- a/buildtools/lib/parsers/autotools/autotoolsast.h
+++ b/buildtools/lib/parsers/autotools/autotoolsast.h
@@ -37,7 +37,7 @@ namespace AutoTools
  * AST node.
  * This is the base class. Objects of this type are not created by the parser.
  *
- * Each AST node holds the list of its tqchildren which are always deleted in the
+ * Each AST node holds the list of its children which are always deleted in the
  * destructor. This way, it's possible call delete for only root AST node and
  * others will be deleted automatically.
  *
@@ -85,20 +85,20 @@ public:
 	/** @return The indentation string based on node depth.*/
 	virtual TQString indentation();
 	
-	//! \return true if this AST has tqchildren
+	//! \return true if this AST has children
 	bool hasChildren() const;
 
 	/**
-	 * Get the tqchildren of this ast
+	 * Get the children of this ast
 	 * \return the list of this ast's childre
 	 */
-	TQValueList<AST*> tqchildren() const;
+	TQValueList<AST*> children() const;
 
 
 	
 protected:
 	NodeType m_nodeType;
-	TQValueList<AST*> m_tqchildren;
+	TQValueList<AST*> m_children;
 	
 private:
 	int m_depth;
diff --git a/buildtools/lib/parsers/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp
index 5f55af4b..90306ff1 100644
--- a/buildtools/lib/parsers/qmake/qmakeast.cpp
+++ b/buildtools/lib/parsers/qmake/qmakeast.cpp
@@ -27,28 +27,28 @@ namespace TQMake {
 
 AST::~AST()
 {
-    for (TQValueList<AST*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
+    for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it)
     {
         AST *node = *it;
         delete node;
     }
-    m_tqchildren.clear();
+    m_children.clear();
 }
 
 void AST::addChildAST(AST *node)
 {
-    m_tqchildren.append(node);
+    m_children.append(node);
 }
 
 void AST::removeChildAST(AST *node)
 {
-    m_tqchildren.remove(node);
+    m_children.remove(node);
 }
 
 void AST::writeBack(TQString &buffer)
 {
-    for (TQValueList<AST*>::const_iterator it = m_tqchildren.constBegin();
-        it != m_tqchildren.constEnd(); ++it)
+    for (TQValueList<AST*>::const_iterator it = m_children.constBegin();
+        it != m_children.constEnd(); ++it)
     {
         if (*it)
         {
@@ -70,7 +70,7 @@ TQString AST::indentation()
 void ProjectAST::writeBack(TQString &buffer)
 {
     bool hasActualStatements = false;
-    for (TQValueList<TQMake::AST*>::const_iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
+    for (TQValueList<TQMake::AST*>::const_iterator it = m_children.begin(); it != m_children.end(); ++it)
     {
         if ((*it)->nodeType() != AST::IncludeAST)
         {
@@ -84,7 +84,7 @@ void ProjectAST::writeBack(TQString &buffer)
         if( !buffer.endsWith(": ") )
             buffer += indentation();
         buffer += scopedID;
-	if( m_tqchildren.count() == 1 )
+	if( m_children.count() == 1 )
 	    buffer += " : ";
         else
             buffer += " {";
@@ -94,9 +94,9 @@ void ProjectAST::writeBack(TQString &buffer)
         if( !buffer.endsWith(": ") )
             buffer += indentation();
         buffer += scopedID + "(" + args + ")";
-	if( m_tqchildren.count() == 1 && hasActualStatements )
+	if( m_children.count() == 1 && hasActualStatements )
             buffer += ": ";
-        else if( (m_tqchildren.count() > 0 && hasActualStatements) )
+        else if( (m_children.count() > 0 && hasActualStatements) )
             buffer += "{";
         else
             buffer += "";
@@ -104,10 +104,10 @@ void ProjectAST::writeBack(TQString &buffer)
     else if( !buffer.endsWith(": ") )
         buffer += indentation();
     AST::writeBack(buffer);
-    if (isScope() && m_tqchildren.count() > 1 )
+    if (isScope() && m_children.count() > 1 )
         buffer += indentation() + "}";
 
-    if (isFunctionScope() && (hasActualStatements) && m_tqchildren.count() > 1)
+    if (isFunctionScope() && (hasActualStatements) && m_children.count() > 1)
         buffer += indentation() + "}";
 }
 
diff --git a/buildtools/lib/parsers/qmake/qmakeast.h b/buildtools/lib/parsers/qmake/qmakeast.h
index a0c5c1de..15929d2d 100644
--- a/buildtools/lib/parsers/qmake/qmakeast.h
+++ b/buildtools/lib/parsers/qmake/qmakeast.h
@@ -33,7 +33,7 @@ namespace TQMake {
 AST node.
 This is the base class. Objects of this type are not created by the parser.
 
-Each AST node holds the list of its tqchildren which are always deleted in the
+Each AST node holds the list of its children which are always deleted in the
 destructor. This way, it's possible call delete for only root AST node and
 others will be deleted automatically.
 
@@ -79,7 +79,7 @@ public:
     virtual TQString indentation();
 
     /**The list of child AST nodes.*/
-    TQValueList<AST*> m_tqchildren;
+    TQValueList<AST*> m_children;
 
 protected:
     NodeType m_nodeType;
diff --git a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp
index b733a880..8740f16a 100644
--- a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp
+++ b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp
@@ -29,8 +29,8 @@ void ASTVisitor::processProject(ProjectAST *project)
         enterScope(project);
     else if (project->isFunctionScope())
         enterFunctionScope(project);
-    for (TQValueList<TQMake::AST*>::const_iterator it = project->m_tqchildren.constBegin();
-         it != project->m_tqchildren.constEnd(); ++it)
+    for (TQValueList<TQMake::AST*>::const_iterator it = project->m_children.constBegin();
+         it != project->m_children.constEnd(); ++it)
     {
         AST *ast = *it;
         if (ast == 0)
diff --git a/buildtools/lib/widgets/runoptionswidgetbase.ui b/buildtools/lib/widgets/runoptionswidgetbase.ui
index 40d79634..30f10e48 100644
--- a/buildtools/lib/widgets/runoptionswidgetbase.ui
+++ b/buildtools/lib/widgets/runoptionswidgetbase.ui
@@ -51,7 +51,7 @@
                     <property name="text">
                         <string>Note: These options override target specific settings.</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter</set>
                     </property>
                     <property name="whatsThis" stdset="0">
diff --git a/buildtools/lib/widgets/subclassesdlgbase.ui b/buildtools/lib/widgets/subclassesdlgbase.ui
index 6df8ca17..51d0e5b3 100644
--- a/buildtools/lib/widgets/subclassesdlgbase.ui
+++ b/buildtools/lib/widgets/subclassesdlgbase.ui
@@ -95,7 +95,7 @@
             <property name="text">
                 <string>Related subclass &amp;location:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
             <property name="buddy" stdset="0">
diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp
index 22261004..6cb66847 100644
--- a/buildtools/pascal/pascalproject_part.cpp
+++ b/buildtools/pascal/pascalproject_part.cpp
@@ -448,7 +448,7 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &na
     if (!factory) {
         TQString errorMessage = KLibLoader::self()->lastErrorMessage();
         KMessageBox::error(0, i18n("There was an error loading the module %1.\n"
-                                   "The diagnostics is:\n%2").tqarg(service->name()).tqarg(errorMessage));
+                                   "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage));
         exit(1);
     }
 
diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui
index 1ded80ef..a952d6f8 100644
--- a/buildtools/qmake/projectconfigurationdlgbase.ui
+++ b/buildtools/qmake/projectconfigurationdlgbase.ui
@@ -2162,7 +2162,7 @@
                                 <property name="text">
                                     <string>Value:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
diff --git a/buildtools/qmake/qmakeoptionswidgetbase.ui b/buildtools/qmake/qmakeoptionswidgetbase.ui
index 7f30c4e1..b70e6af1 100644
--- a/buildtools/qmake/qmakeoptionswidgetbase.ui
+++ b/buildtools/qmake/qmakeoptionswidgetbase.ui
@@ -80,7 +80,7 @@ Leave this empty to automatically search for a .pro file in the project director
                     <property name="text">
                         <string>The following settings determine what the project configuration dialog should do when another subproject is selected while the dialog is still open.</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp
index b937287c..2c862fb3 100644
--- a/buildtools/qmake/scope.cpp
+++ b/buildtools/qmake/scope.cpp
@@ -158,7 +158,7 @@ bool Scope::loadFromFile( const TQString& filename )
         if( DomUtil::readBoolEntry( *m_part->projectDom(),
             "/kdevtrollproject/qmake/showParseErrors", true ) )
         {
-            KMessageBox::error( 0, i18n( "Could not parse project file: %1" ).tqarg( filename ),
+            KMessageBox::error( 0, i18n( "Could not parse project file: %1" ).arg( filename ),
                     i18n( "Could not parse project file" ) );
         }
         m_root = 0;
@@ -198,7 +198,7 @@ void Scope::saveToFile() const
         file.close();
     }else
     {
-        KMessageBox::error( 0, i18n( "Could not write project file: %1" ).tqarg( filename ),
+        KMessageBox::error( 0, i18n( "Could not write project file: %1" ).arg( filename ),
                 i18n( "Could not write project file" ) );
     }
 #ifdef DEBUG
@@ -292,7 +292,7 @@ TQStringList Scope::variableValuesForOp( const TQString& variable , const TQStri
         return result;
 
     TQValueList<TQMake::AST*>::const_iterator it;
-    for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it )
+    for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it )
     {
         TQMake::AST* ast = *it;
         if ( ast->nodeType() == TQMake::AST::AssignmentAST )
@@ -352,7 +352,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re
     }
 
     TQValueList<TQMake::AST*>::const_iterator it;
-    for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it )
+    for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it )
     {
         if ( stopHere && *it == stopHere )
             return ;
@@ -628,7 +628,7 @@ bool Scope::deleteFunctionScope( unsigned int num )
     Scope* funcScope = m_scopes[ num ];
     if ( funcScope )
     {
-        TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.findIndex( funcScope->m_root ) ];
+        TQMake::AST* ast = m_root->m_children[ m_root->m_children.findIndex( funcScope->m_root ) ];
         if( !ast )
             return false;
         m_scopes.remove( num );
@@ -648,7 +648,7 @@ bool Scope::deleteSimpleScope( unsigned int num )
     Scope* simpleScope = m_scopes[ num ];
     if ( simpleScope )
     {
-        TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.findIndex( simpleScope->m_root ) ];
+        TQMake::AST* ast = m_root->m_children[ m_root->m_children.findIndex( simpleScope->m_root ) ];
         if( !ast )
             return false;
         m_scopes.remove( num );
@@ -686,10 +686,10 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir )
         return false;
 
     TQValueList<TQMake::AST*>::iterator it = findExistingVariable( "TEMPLATE" );
-    if ( it != m_root->m_tqchildren.end() )
+    if ( it != m_root->m_children.end() )
     {
         TQMake::AssignmentAST * tempast = static_cast<TQMake::AssignmentAST*>( *it );
-        if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_tqchildren.end() )
+        if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_children.end() )
         {
             Scope* project = m_scopes[ num ];
             if( !project )
@@ -723,7 +723,7 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir )
                 }
             }
             TQValueList<TQMake::AST*>::iterator foundit = findExistingVariable( "SUBDIRS" );
-            if ( foundit != m_root->m_tqchildren.end() )
+            if ( foundit != m_root->m_children.end() )
             {
                 TQMake::AssignmentAST * ast = static_cast<TQMake::AssignmentAST*>( *foundit );
                 updateValues( ast->values, TQStringList( projdir ), true, ast->indent );
@@ -804,11 +804,11 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const
     if( m_varCache.contains( variable ) )
         m_varCache.erase( variable );
 
-    for ( int i = m_root->m_tqchildren.count() - 1; i >= 0; --i )
+    for ( int i = m_root->m_children.count() - 1; i >= 0; --i )
     {
-        if ( m_root->m_tqchildren[ i ] ->nodeType() == TQMake::AST::AssignmentAST )
+        if ( m_root->m_children[ i ] ->nodeType() == TQMake::AST::AssignmentAST )
         {
-            TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( m_root->m_tqchildren[ i ] );
+            TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( m_root->m_children[ i ] );
             if ( assignment->scopedID == variable && Scope::isCompatible( assignment->op, op ) )
             {
                 updateValues( assignment->values, values, removeFromOp, assignment->indent );
@@ -898,7 +898,7 @@ TQValueList<TQMake::AST*>::iterator Scope::findExistingVariable( const TQString&
     TQStringList ops;
     ops << "=" << "+=";
 
-    for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end() ; ++it )
+    for ( it = m_root->m_children.begin(); it != m_root->m_children.end() ; ++it )
     {
         if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
         {
@@ -909,7 +909,7 @@ TQValueList<TQMake::AST*>::iterator Scope::findExistingVariable( const TQString&
             }
         }
     }
-    return m_root->m_tqchildren.end();
+    return m_root->m_children.end();
 }
 
 void Scope::init()
@@ -921,7 +921,7 @@ void Scope::init()
     m_maxCustomVarNum = 1;
 
     TQValueList<TQMake::AST*>::const_iterator it;
-    for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it )
+    for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it )
     {
         if ( ( *it ) ->nodeType() == TQMake::AST::ProjectAST )
         {
@@ -1088,7 +1088,7 @@ void Scope::removeCustomVariable( unsigned int id )
     {
         TQMake::AssignmentAST* m = m_customVariables[id];
         m_customVariables.remove(id);
-        m_root->m_tqchildren.remove( m );
+        m_root->m_children.remove( m );
     }
 }
 
@@ -1097,8 +1097,8 @@ bool Scope::isVariableReset( const TQString& var )
     bool result = false;
     if( !m_root )
         return result;
-    TQValueList<TQMake::AST*>::const_iterator it = m_root->m_tqchildren.begin();
-    for ( ; it != m_root->m_tqchildren.end(); ++it )
+    TQValueList<TQMake::AST*>::const_iterator it = m_root->m_children.begin();
+    for ( ; it != m_root->m_children.end(); ++it )
     {
         if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
         {
@@ -1120,16 +1120,16 @@ void Scope::removeVariable( const TQString& var, const TQString& op )
 
     TQMake::AssignmentAST* ast = 0;
 
-    TQValueList<TQMake::AST*>::iterator it = m_root->m_tqchildren.begin();
-    for ( ; it != m_root->m_tqchildren.end(); ++it )
+    TQValueList<TQMake::AST*>::iterator it = m_root->m_children.begin();
+    for ( ; it != m_root->m_children.end(); ++it )
     {
         if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
         {
             ast = static_cast<TQMake::AssignmentAST*>( *it );
             if ( ast->scopedID == var && ast->op == op )
             {
-                m_root->m_tqchildren.remove( ast );
-                it = m_root->m_tqchildren.begin();
+                m_root->m_children.remove( ast );
+                it = m_root->m_children.begin();
             }
         }
     }
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index dd8f85d0..8e672b4e 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -852,9 +852,9 @@ TQString TrollProjectPart::findTQtDir()
     TQStringList qtdirs;
     if( !isTQt4Project() )
         qtdirs.push_back( ::getenv("QTDIR") );
-    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
-    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
-    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
+    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
+    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
+    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
     qtdirs.push_back( TQDir::rootDirPath()+"usr" );
     qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt" );
 
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 65fdfcc2..000554ca 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -529,7 +529,7 @@ TQString TrollProjectWidget::getCurrentOutputFilename()
 
 void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item )
 {
-    // If no tqchildren in detailview
+    // If no children in detailview
     // it is a subdir template
     if ( item && details->childCount() )
     {
@@ -556,7 +556,7 @@ void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item )
 void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl )
 {
 
-    // Insert all GroupItems and all of their tqchildren into the view
+    // Insert all GroupItems and all of their children into the view
     if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 )
         return ;
 
@@ -974,7 +974,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
     QMakeScopeItem *spitem = static_cast<QMakeScopeItem*>( item );
 
     KPopupMenu popup( this );
-    popup.insertTitle( i18n( "Subproject %1" ).tqarg( item->text( 0 ) ) );
+    popup.insertTitle( i18n( "Subproject %1" ).arg( item->text( 0 ) ) );
 
     int idBuild = -2;
     int idRebuild = -2;
@@ -1757,9 +1757,9 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
 
         KPopupMenu popup( this );
         if ( !( gitem->groupType == GroupItem::InstallObject ) )
-            popup.insertTitle( i18n( "File: %1" ).tqarg( fitem->text( 0 ) ) );
+            popup.insertTitle( i18n( "File: %1" ).arg( fitem->text( 0 ) ) );
         else
-            popup.insertTitle( i18n( "Pattern: %1" ).tqarg( fitem->text( 0 ) ) );
+            popup.insertTitle( i18n( "Pattern: %1" ).arg( fitem->text( 0 ) ) );
 
         int idRemoveFile = -2;
         int idSubclassWidget = -2;
@@ -1932,7 +1932,7 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem )
     if ( KMessageBox::warningYesNo( this,
                                     "<qt>" +
                                     i18n( "Do you want to delete the file <strong>%1</strong> from the project and your disk?" )
-                                    .tqarg( fitem->text( 0 ) ) +
+                                    .arg( fitem->text( 0 ) ) +
                                     "</qt>",
                                     i18n( "Remove File" ),
                                     KStdGuiItem::remove(),
@@ -2459,7 +2459,7 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem )
 void TrollProjectWidget::slotProjectDirty(const TQString& path)
 {
     kdDebug(9024) << "File is dirty:" << path << " using method " << endl;
-    if( KMessageBox::warningYesNo(this, i18n("The project file \"%1\" has changed on disk\n(Or you have \"%2\" opened in the editor, which also triggers a reload when you change something in the TQMake Manager).\n\nDo you want to reload it?").tqarg(path).tqarg(path), i18n("Project File Changed"), i18n("Reload"), i18n("Do Not Reload"), "trollproject_reload_project_file" ) != KMessageBox::No )
+    if( KMessageBox::warningYesNo(this, i18n("The project file \"%1\" has changed on disk\n(Or you have \"%2\" opened in the editor, which also triggers a reload when you change something in the TQMake Manager).\n\nDo you want to reload it?").arg(path).arg(path), i18n("Project File Changed"), i18n("Reload"), i18n("Do Not Reload"), "trollproject_reload_project_file" ) != KMessageBox::No )
     {
         m_part->dirWatch()->stopScan();
         TQListViewItemIterator it(m_rootSubproject);