Remove additional unneeded tq method conversions

(cherry picked from commit 7e66d7c3611d907ea28b140281b472bb1c406be6)

50 files changed, 270 insertions, 270 deletions

diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp
index e80b81cd..3d91c6b2 100644
--- a/languages/cpp/addattributedialog.cpp
+++ b/languages/cpp/addattributedialog.cpp
@@ -194,7 +194,7 @@ void AddAttributeDialog::updateGUI()
 void AddAttributeDialog::addAttribute()
 {
 	TQListViewItem * item = new TQListViewItem( attributes, "Protected", "Normal",
-	                                          "int", TQString( "attribute_%1" ).tqarg( ++m_count ) );
+	                                          "int", TQString( "attribute_%1" ).arg( ++m_count ) );
 	attributes->setCurrentItem( item );
 	attributes->setSelected( item, true );
 	
diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp
index c5de082c..218d9456 100644
--- a/languages/cpp/addmethoddialog.cpp
+++ b/languages/cpp/addmethoddialog.cpp
@@ -293,7 +293,7 @@ void AddMethodDialog::updateGUI()
 void AddMethodDialog::addMethod()
 {
 	TQListViewItem * item = new TQListViewItem( methods, "False", "Public", "Normal",
-	                                          "void", TQString( "method_%1()" ).tqarg( ++m_count ),
+	                                          "void", TQString( "method_%1()" ).arg( ++m_count ),
 	                                          sourceFile->currentText() );
 	methods->setCurrentItem( item );
 	methods->setSelected( item, true );
diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp
index 4b78645a..0dabf861 100644
--- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp
+++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp
@@ -159,7 +159,7 @@ void %{APPNAME}::load( const TQString &fileName )
     e->setText( ts.read() );
     e->setModified( FALSE );
     setCaption( fileName );
-    statusBar()->message( tr("Loaded document %1").tqarg(fileName), 2000 );
+    statusBar()->message( tr("Loaded document %1").arg(fileName), 2000 );
 }
 
 
@@ -173,7 +173,7 @@ void %{APPNAME}::save()
     TQString text = e->text();
     TQFile f( filename );
     if ( !f.open( IO_WriteOnly ) ) {
-	statusBar()->message( tr("Could not write to %1").tqarg(filename),
+	statusBar()->message( tr("Could not write to %1").arg(filename),
 			      2000 );
 	return;
     }
@@ -186,7 +186,7 @@ void %{APPNAME}::save()
 
     setCaption( filename );
 
-    statusBar()->message( tr( "File %1 saved" ).tqarg( filename ), 2000 );
+    statusBar()->message( tr( "File %1 saved" ).arg( filename ), 2000 );
 }
 
 
diff --git a/languages/cpp/app_templates/kconfig35/appview.cpp b/languages/cpp/app_templates/kconfig35/appview.cpp
index 6123db0b..30d627fe 100644
--- a/languages/cpp/app_templates/kconfig35/appview.cpp
+++ b/languages/cpp/app_templates/kconfig35/appview.cpp
@@ -33,7 +33,7 @@ void %{APPNAMELC}View::settingsChanged()
 	sillyLabel->setPaletteForegroundColor( Settings::col_foreground() );
 
 	// i18n : internationalization
-	sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) );
+	sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) );
 	emit signalChangeStatusbar( i18n("Settings changed") );
 }
 
diff --git a/languages/cpp/app_templates/kde4app/kapp4view_base.ui b/languages/cpp/app_templates/kde4app/kapp4view_base.ui
index c3780092..f85bd963 100644
--- a/languages/cpp/app_templates/kde4app/kapp4view_base.ui
+++ b/languages/cpp/app_templates/kde4app/kapp4view_base.ui
@@ -196,7 +196,7 @@
      <property name="scaledContents" >
       <bool>true</bool>
      </property>
-     <property name="tqalignment" >
+     <property name="alignment" >
       <set>Qt::AlignCenter</set>
      </property>
      <property name="wordWrap" >
diff --git a/languages/cpp/app_templates/kioslave/slave.cpp b/languages/cpp/app_templates/kioslave/slave.cpp
index ad5d7991..c8dc5d81 100644
--- a/languages/cpp/app_templates/kioslave/slave.cpp
+++ b/languages/cpp/app_templates/kioslave/slave.cpp
@@ -48,7 +48,7 @@ void kio_%{APPNAMELC}Protocol::get(const KURL& url )
     int remotePort = url.port();
     kdDebug() << "myURL: " << url.prettyURL() << endl;
     
-    infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) );
+    infoMessage(i18n("Looking for %1...").arg( remoteServer ) );
     // Send the mimeType as soon as it is known
     mimeType("text/plain");
     // Send the data
diff --git a/languages/cpp/app_templates/kmake/mainview.ui b/languages/cpp/app_templates/kmake/mainview.ui
index 94fb52fa..194d8ffe 100644
--- a/languages/cpp/app_templates/kmake/mainview.ui
+++ b/languages/cpp/app_templates/kmake/mainview.ui
@@ -45,7 +45,7 @@
                     <property name="scaledContents">
                         <bool>true</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
diff --git a/languages/cpp/app_templates/kscons_kxt/appview.cpp b/languages/cpp/app_templates/kscons_kxt/appview.cpp
index f2dd28a3..2bcc9c6a 100644
--- a/languages/cpp/app_templates/kscons_kxt/appview.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/appview.cpp
@@ -33,7 +33,7 @@ void %{APPNAME}View::settingsChanged()
 	sillyLabel->setPaletteForegroundColor( Settings::col_foreground() );
 
 	// i18n : internationalization
-	sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) );
+	sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) );
 	emit signalChangeStatusbar( i18n("Settings changed") );
 }
 
diff --git a/languages/cpp/app_templates/kxt/appview.cpp b/languages/cpp/app_templates/kxt/appview.cpp
index 6123db0b..30d627fe 100644
--- a/languages/cpp/app_templates/kxt/appview.cpp
+++ b/languages/cpp/app_templates/kxt/appview.cpp
@@ -33,7 +33,7 @@ void %{APPNAMELC}View::settingsChanged()
 	sillyLabel->setPaletteForegroundColor( Settings::col_foreground() );
 
 	// i18n : internationalization
-	sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) );
+	sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) );
 	emit signalChangeStatusbar( i18n("Settings changed") );
 }
 
diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
index b859d95f..8608ba88 100644
--- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp
+++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
@@ -124,7 +124,7 @@
     connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden()));
 
     // Event Filter for the RMB
-    for (TQPtrListIterator<TQObject> i(*tqchildren()); i.current(); ++i)
+    for (TQPtrListIterator<TQObject> i(*children()); i.current(); ++i)
         (*i)->installEventFilter(this);
 
     setCaption("Noatun");
@@ -189,7 +189,7 @@ void %{APPNAME}UI::changeCaption(const TQString& text)
 void %{APPNAME}UI::popup()
 {
     NoatunStdAction::ContextMenu::showContextMenu(
-        mapToGlobal(mPopup->tqgeometry().bottomLeft()) );
+        mapToGlobal(mPopup->geometry().bottomLeft()) );
 }
 
 void %{APPNAME}UI::slotPlaying()
diff --git a/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp b/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp
index f84a4fd3..5a5df025 100644
--- a/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp
+++ b/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp
@@ -117,7 +117,7 @@ void Bitmap<Type>::fadeStar()
             d++;
             x++;
         }
-        tqrepaint();
+        repaint();
     }
 }
 
@@ -220,7 +220,7 @@ void %{APPNAME}View::checkInput()
 
 #define output2 ((unsigned char*)outputBmp.data)
 
-void %{APPNAME}View::tqrepaint()
+void %{APPNAME}View::repaint()
 {
     SDL_LockSurface(surface);
     TEST();
diff --git a/languages/cpp/app_templates/noatunvisual/plugin_impl.h b/languages/cpp/app_templates/noatunvisual/plugin_impl.h
index a95845c9..2a7de7b1 100644
--- a/languages/cpp/app_templates/noatunvisual/plugin_impl.h
+++ b/languages/cpp/app_templates/noatunvisual/plugin_impl.h
@@ -58,7 +58,7 @@ protected:
     void setupPalette(double dummy=0.0);
 
     /** Draw everything.  */
-    void tqrepaint();
+    void repaint();
 
 private:
     /** used for pipelining  */
diff --git a/languages/cpp/app_templates/opieapp/examplebase.ui b/languages/cpp/app_templates/opieapp/examplebase.ui
index 90d39d17..b6b81b11 100644
--- a/languages/cpp/app_templates/opieapp/examplebase.ui
+++ b/languages/cpp/app_templates/opieapp/examplebase.ui
@@ -7,7 +7,7 @@
         <cstring>%{APPNAME}Base</cstring>
     </property>
     <property stdset="1">
-        <name>tqgeometry</name>
+        <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
diff --git a/languages/cpp/app_templates/prc-tool/palmhello.c b/languages/cpp/app_templates/prc-tool/palmhello.c
index 0a34b6c4..b09f5f74 100644
--- a/languages/cpp/app_templates/prc-tool/palmhello.c
+++ b/languages/cpp/app_templates/prc-tool/palmhello.c
@@ -22,7 +22,7 @@ static Boolean MainFormHandleEvent (EventPtr e)
 	break;
 
     case menuEvent:
-	MenuEraseStatus(NULL);
+	MenuErasetStatus(NULL);
 
 	switch(e->data.menu.itemID) {
 	}
diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp
index 4b78645a..0dabf861 100644
--- a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp
+++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp
@@ -159,7 +159,7 @@ void %{APPNAME}::load( const TQString &fileName )
     e->setText( ts.read() );
     e->setModified( FALSE );
     setCaption( fileName );
-    statusBar()->message( tr("Loaded document %1").tqarg(fileName), 2000 );
+    statusBar()->message( tr("Loaded document %1").arg(fileName), 2000 );
 }
 
 
@@ -173,7 +173,7 @@ void %{APPNAME}::save()
     TQString text = e->text();
     TQFile f( filename );
     if ( !f.open( IO_WriteOnly ) ) {
-	statusBar()->message( tr("Could not write to %1").tqarg(filename),
+	statusBar()->message( tr("Could not write to %1").arg(filename),
 			      2000 );
 	return;
     }
@@ -186,7 +186,7 @@ void %{APPNAME}::save()
 
     setCaption( filename );
 
-    statusBar()->message( tr( "File %1 saved" ).tqarg( filename ), 2000 );
+    statusBar()->message( tr( "File %1 saved" ).arg( filename ), 2000 );
 }
 
 
diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp
index f2178d9d..c3a8964f 100644
--- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp
+++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp
@@ -223,8 +223,8 @@ void %{APPNAME}::loadFile(const TQString &fileName)
       if (!file.open(TQFile::ReadOnly | TQFile::Text)) {
             TQMessageBox::warning(this, tr("Application"),
                               tr("Cannot read file %1:\n%2.")
-                              .tqarg(fileName)
-                              .tqarg(file.errorString()));
+                              .arg(fileName)
+                              .arg(file.errorString()));
             return;
       }
 
@@ -243,8 +243,8 @@ bool %{APPNAME}::saveFile(const TQString &fileName)
       if (!file.open(TQFile::WriteOnly | TQFile::Text)) {
             TQMessageBox::warning(this, tr("Application"),
                               tr("Cannot write file %1:\n%2.")
-                              .tqarg(fileName)
-                              .tqarg(file.errorString()));
+                              .arg(fileName)
+                              .arg(file.errorString()));
             return false;
       }
 
@@ -270,7 +270,7 @@ void %{APPNAME}::setCurrentFile(const TQString &fileName)
       else
             shownName = strippedName(curFile);
 
-      setWindowTitle(tr("%1[*] - %2").tqarg(shownName).tqarg(tr("Application")));
+      setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Application")));
 }
 
 TQString %{APPNAME}::strippedName(const TQString &fullFileName)
diff --git a/languages/cpp/app_templates/qtopiaapp/examplebase.ui b/languages/cpp/app_templates/qtopiaapp/examplebase.ui
index 90d39d17..b6b81b11 100644
--- a/languages/cpp/app_templates/qtopiaapp/examplebase.ui
+++ b/languages/cpp/app_templates/qtopiaapp/examplebase.ui
@@ -7,7 +7,7 @@
         <cstring>%{APPNAME}Base</cstring>
     </property>
     <property stdset="1">
-        <name>tqgeometry</name>
+        <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp
index 6f130dd2..6aeab3ea 100644
--- a/languages/cpp/ast_utils.cpp
+++ b/languages/cpp/ast_utils.cpp
@@ -40,8 +40,8 @@ AST* findNodeAt( AST* node, int line, int column )
 	     ( line < endLine || ( line == endLine && column < endColumn ) ) )
 	{
 		
-		TQPtrList<AST> tqchildren = node->tqchildren();
-		TQPtrListIterator<AST> it( tqchildren );
+		TQPtrList<AST> children = node->children();
+		TQPtrListIterator<AST> it( children );
 		while ( it.current() )
 		{
 			AST * a = it.current();
diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp
index e786fb87..32ef470d 100644
--- a/languages/cpp/ccconfigwidget.cpp
+++ b/languages/cpp/ccconfigwidget.cpp
@@ -230,7 +230,7 @@ void CCConfigWidget::slotRemovePCS()
 		return ;
 
 	TQString db = advancedOptions->selectedItem() ->text( 0 );
-	TQString question = i18n( "Are you sure you want to delete the \"%1\" database?" ).tqarg( db );
+	TQString question = i18n( "Are you sure you want to delete the \"%1\" database?" ).arg( db );
 
 	KStandardDirs *dirs = m_pPart->instance() ->dirs();
 	TQString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + KURL::encode_string_no_slash( db ) + ".db";
diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui
index 857c61d3..5daf1e34 100644
--- a/languages/cpp/ccconfigwidgetbase.ui
+++ b/languages/cpp/ccconfigwidgetbase.ui
@@ -949,7 +949,7 @@ This option only applies to QMake projects.</string>
                                         <property name="text">
                                             <string>(After changing the project needs to be re-opened)</string>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignVCenter</set>
                                         </property>
                                     </widget>
diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
index 4add5992..9ce8307c 100644
--- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
+++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
@@ -438,7 +438,7 @@ Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const
 	                                       "qualifier from the target type</qt>" ) );
 	new FlagListItem( wrestBox,
 	                  "-Wcast-align", i18n( "<qt>Warn whenever a pointer is cast such that the required\n"
-	                                        "tqalignment of the target is increased</qt>" ) );
+	                                        "alignment of the target is increased</qt>" ) );
 	new FlagListItem( wrestBox,
 	                  "-Wwrite-strings", i18n( "<qt>Warn when the address of a string constant is cast\n"
 	                                           "into a non-const <i>char *</i> pointer</qt>" ) );
diff --git a/languages/cpp/configproblemreporter.ui b/languages/cpp/configproblemreporter.ui
index fc47d3b2..0e03bec2 100644
--- a/languages/cpp/configproblemreporter.ui
+++ b/languages/cpp/configproblemreporter.ui
@@ -91,7 +91,7 @@ If disabled, the parser will typically only run when the file is saved.</string>
                             <property name="text">
                                 <string>msec</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                         </widget>
diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h
index 1931c66f..275420ab 100644
--- a/languages/cpp/configproblemreporter.ui.h
+++ b/languages/cpp/configproblemreporter.ui.h
@@ -92,7 +92,7 @@ void ConfigureProblemReporter::bgParserCheckbox_toggled( bool b )
 
 void ConfigureProblemReporter::setDelayLabel( int delay )
 {
-	delayLabel->setText( i18n( "delay: %1 msec" ).tqarg( delay ) );
+	delayLabel->setText( i18n( "delay: %1 msec" ).arg( delay ) );
 }
 // kate: indent-mode csands; tab-width 4;
 
diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index e1c3af4c..a6107480 100644
--- a/languages/cpp/cppcodecompletion.cpp
+++ b/languages/cpp/cppcodecompletion.cpp
@@ -356,7 +356,7 @@ struct PopupFillerHelpStruct {
     if ( d.memberType == SimpleTypeImpl::MemberInfo::Typedef && d.type->fullName() == "const int" )
       memType = "enum";
 
-    TQString txt = i18n( "Jump to %1 %2" ).tqarg( memType ).tqarg( cleanForMenu( d.name ) );
+    TQString txt = i18n( "Jump to %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) );
     int id = parent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) );
 
     receiver->m_popupActions.insert( id, d.decl );
@@ -423,7 +423,7 @@ struct PopupFillerHelpStruct {
 			        int sLine, sCol, eLine, eCol;
 			        i->getStartPosition( &sLine, &sCol );
 			        i->getEndPosition( &eLine, &eCol );
-		        	insertItem( parent, (new SimpleTypeCodeModel( i ))->desc(), prefix + " " + (*it)->name() + TQString(" (%1 Lines): ").tqarg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion.
+		        	insertItem( parent, (new SimpleTypeCodeModel( i ))->desc(), prefix + " " + (*it)->name() + TQString(" (%1 Lines): ").arg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion.
 		        }
 
 	        }
@@ -434,10 +434,10 @@ struct PopupFillerHelpStruct {
 
     if ( d.resolved() ) {
       if ( d.resolved() ->asFunction() ) {
-	      txt1 = prefix + i18n( "Jump to declaration of %1(...)" ).tqarg( d.resolved() ->scope().join( "::" ) );
-	      txt2 = prefix + i18n( "Jump to definition of %1(...)" ).tqarg( d.resolved() ->scope().join( "::" ) );
+	      txt1 = prefix + i18n( "Jump to declaration of %1(...)" ).arg( d.resolved() ->scope().join( "::" ) );
+	      txt2 = prefix + i18n( "Jump to definition of %1(...)" ).arg( d.resolved() ->scope().join( "::" ) );
       } else {
-        txt1 = prefix + i18n( "Jump to %1" ).tqarg( cleanForMenu( d.resolved() ->scope().join( "::" ) ) );
+        txt1 = prefix + i18n( "Jump to %1" ).arg( cleanForMenu( d.resolved() ->scope().join( "::" ) ) );
       }
     } else {
 			if( !BuiltinTypes::isBuiltin( d ) ) {
@@ -536,7 +536,7 @@ struct PopupClassViewFillerHelpStruct {
     if ( d.memberType == SimpleTypeImpl::MemberInfo::Typedef && d.type->fullName() == "const int" )
       memType = "enum";
 
-    TQString txt = i18n( "Show %1 %2" ).tqarg( memType ).tqarg( cleanForMenu( d.name ) );
+    TQString txt = i18n( "Show %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) );
     int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) );
 
     receiver->m_popupClassViewActions.insert( id, dom );
@@ -583,7 +583,7 @@ struct PopupClassViewFillerHelpStruct {
           if ( d.resolved() ->asFunction() ) {
             n = buildSignature( d.resolved() );
           }
-          txt = prefix + i18n( "Show %1" ).tqarg( cleanForMenu( n ) );
+          txt = prefix + i18n( "Show %1" ).arg( cleanForMenu( n ) );
         } else {
           txt = prefix + d.name() + " not in code-model";
         }
@@ -644,7 +644,7 @@ class PopupFiller {
 
 					//kdDebug( 9007 ) << "found include-file \"" << includeFile << "\"" << endl;
 				}
-				int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).tqarg ( includeFile ).tqarg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) );
+				int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) );
 				DeclarationInfo fakeDec;
 				fakeDec.name = decl.name;
 				fakeDec.file = includeFile;
@@ -670,7 +670,7 @@ class PopupFiller {
         f.type = d.desc();
         f.memberType = SimpleTypeImpl::MemberInfo::Variable;
 
-        /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").tqarg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) );
+        /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) );
 
         m_popupActions.insert( id, type.sourceVariable );*/
         struk.insertItem( parent, f, prefix );
@@ -679,7 +679,7 @@ class PopupFiller {
 
         if ( !sourceVariable.comment.isEmpty() ) {
           TQPopupMenu * m = PopupTracker::createPopup( parent );
-          parent->insertItem( i18n( "Comment on %1" ).tqarg( sourceVariable.name ), m );
+          parent->insertItem( i18n( "Comment on %1" ).arg( sourceVariable.name ), m );
           TQStringList ls = prepareTextForMenu( sourceVariable.comment, 15, 100 );
           for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) {
             m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) );
@@ -695,7 +695,7 @@ class PopupFiller {
 		    LocateResult r = p->locateDecType( d->name() );
 		    if( r ) {
 			    TQPopupMenu * m = PopupTracker::createPopup( parent );
-			    parent->insertItem( i18n( "Specialized from \"%1\"" ).tqarg( cleanForMenu( r->fullNameChain() ) ), m );
+			    parent->insertItem( i18n( "Specialized from \"%1\"" ).arg( cleanForMenu( r->fullNameChain() ) ), m );
 					fill( m, r );
 		    }
 	    }
@@ -704,7 +704,7 @@ class PopupFiller {
       for ( TypeDesc::TemplateParams::iterator it = p.begin(); it != p.end(); ++it ) {
         //if( (*it)->resolved() ) {
         TQPopupMenu * m = PopupTracker::createPopup( parent );
-        parent->insertItem( i18n( "Template-param \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m );
+        parent->insertItem( i18n( "Template-param \"%1\"" ).arg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m );
         fill( m, **it );
         /*} else {
            fill( parent, **it, prefix + depthAdd );
@@ -716,7 +716,7 @@ class PopupFiller {
           LocateResult rt = d->resolved() ->locateDecType( d->resolved() ->asFunction() ->getReturnType() );
           if ( rt ) {
             TQPopupMenu * m = PopupTracker::createPopup( parent );
-            parent->insertItem( i18n( "Return-type \"%1\"" ).tqarg( cleanForMenu( rt->fullNameChain() ) ), m );
+            parent->insertItem( i18n( "Return-type \"%1\"" ).arg( cleanForMenu( rt->fullNameChain() ) ), m );
             fill( m, rt );
           }
 
@@ -734,7 +734,7 @@ class PopupFiller {
                 ++it2;
               }
               TQPopupMenu * mo = PopupTracker::createPopup( m );
-              m->insertItem( i18n( "Argument \"%1\"" ).tqarg( cleanForMenu( at->fullNameChain() + " " + name ) ), mo );
+              m->insertItem( i18n( "Argument \"%1\"" ).arg( cleanForMenu( at->fullNameChain() + " " + name ) ), mo );
               fill( mo, at );
 
             }
@@ -753,7 +753,7 @@ class PopupFiller {
             TQString tail = ( *it ).second.fullNameChain();
             if ( !tail.isEmpty() )
               tail = "::" + tail;
-            m->insertItem( i18n( "%1 -> %2" ).tqarg( cleanForMenu( ( *it ).first.name + tail ) ).tqarg( cleanForMenu( ( *it ).first.type->fullNameChain() + tail ) ), mo );
+            m->insertItem( i18n( "%1 -> %2" ).arg( cleanForMenu( ( *it ).first.name + tail ) ).arg( cleanForMenu( ( *it ).first.type->fullNameChain() + tail ) ), mo );
 
             struk.insertItem( mo, ( *it ).first, prefix );
 
@@ -779,20 +779,20 @@ class PopupFiller {
         TQValueList<LocateResult> bases = d->resolved() ->getBases();
         for ( TQValueList<LocateResult>::iterator it = bases.begin(); it != bases.end(); ++it ) {
           TQPopupMenu * m = PopupTracker::createPopup( parent );
-          parent->insertItem( i18n( "Base-class \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m );
+          parent->insertItem( i18n( "Base-class \"%1\"" ).arg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m );
           fill( m, *it );
         }
 
         if ( d->resolved() ->parent() && d->resolved() ->parent() ->desc() ) {
           TQPopupMenu * m = PopupTracker::createPopup( parent );
-          parent->insertItem( i18n( "Nested in \"%1\"" ).tqarg( cleanForMenu( d->resolved() ->parent() ->fullTypeResolved() ) ), m );
+          parent->insertItem( i18n( "Nested in \"%1\"" ).arg( cleanForMenu( d->resolved() ->parent() ->fullTypeResolved() ) ), m );
           fill( m, d->resolved() ->parent() ->desc() );
         }
 
         if ( !d->resolved() ->comment().isEmpty() ) {
           parent->insertSeparator();
           TQPopupMenu * m = PopupTracker::createPopup( parent );
-          parent->insertItem( i18n( "Comment on %1" ).tqarg( cleanForMenu( d->name() ) ), m );
+          parent->insertItem( i18n( "Comment on %1" ).arg( cleanForMenu( d->name() ) ), m );
           TQStringList ls = prepareTextForMenu( d->resolved() ->comment(), 15, 100 );
           for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) {
             m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) );
@@ -1449,7 +1449,7 @@ void CppCodeCompletion::popupAction( int number ) {
     TQString fileName = ( *it ).file == "current_file" ? m_activeFileName : ( *it ).file.operator TQString();
 	  if( (*it).startLine == -1 ) {
 		  //startLine -1 indicates that the file should be added to the include-files
-		  m_activeEditor->insertLine( 0, TQString("#include \"%1\" /* defines %2 */").tqarg( fileName ).tqarg( (*it).name ) );
+		  m_activeEditor->insertLine( 0, TQString("#include \"%1\" /* defines %2 */").arg( fileName ).arg( (*it).name ) );
 	  } else {
     	m_pSupport->partController() ->editDocument( fileName, ( *it ).startLine );
 	  }
@@ -1532,11 +1532,11 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
 		TQPopupMenu * m = PopupTracker::createPopup( popup );
 		int gid;
 		if ( contextMenuEntriesAtTop )
-			gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).tqarg( cleanForMenu( type.macro.name() ) ), m, 5, cpos++ );
+			gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).arg( cleanForMenu( type.macro.name() ) ), m, 5, cpos++ );
 		else
-			gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).tqarg( cleanForMenu( type.macro.name() ) ), m );
+			gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).arg( cleanForMenu( type.macro.name() ) ), m );
 
-		int id = m->insertItem( i18n( "Jump to %1" ).tqarg( cleanForMenu( type.macro.name() ) ), this, TQT_SLOT( popupAction( int ) ) );
+		int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( type.macro.name() ) ), this, TQT_SLOT( popupAction( int ) ) );
 		TQPopupMenu * b = PopupTracker::createPopup( m );
 		m->insertItem( i18n( "Body" ), b );
 
@@ -1564,11 +1564,11 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
 			int gid;
 			TQPopupMenu * m = PopupTracker::createPopup( popup );
 			if ( contextMenuEntriesAtTop )
-				gid = popup->insertItem( i18n( "Goto Include File: %1" ).tqarg( cleanForMenu( includeFileName ) ), m, 5, cpos++ );
+				gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m, 5, cpos++ );
 			else
-				gid = popup->insertItem( i18n( "Goto Include File: %1" ).tqarg( cleanForMenu( includeFileName ) ), m );
+				gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m );
 
-			int id = m->insertItem( i18n( "Jump to %1" ).tqarg( cleanForMenu( includeFilePath ) ), this, TQT_SLOT( popupAction( int ) ) );
+			int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( includeFilePath ) ), this, TQT_SLOT( popupAction( int ) ) );
 
 			DeclarationInfo i;
 			i.file = includeFilePath;
@@ -1585,9 +1585,9 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
 		} else {
 			///Could not find include-file
 			if ( contextMenuEntriesAtTop )
-				popup->insertItem( i18n( "Not Found: \"%1\"" ).tqarg( includeFileName ), 5, cpos++ );
+				popup->insertItem( i18n( "Not Found: \"%1\"" ).arg( includeFileName ), 5, cpos++ );
 			else
-				popup->insertItem( i18n( "Not Found: \"%1\"" ).tqarg( includeFileName ) );
+				popup->insertItem( i18n( "Not Found: \"%1\"" ).arg( includeFileName ) );
 		}
 	}
 
@@ -1609,14 +1609,14 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
     TQPopupMenu * m = PopupTracker::createPopup( popup );
     int gid;
     if ( contextMenuEntriesAtTop )
-      gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).tqarg( cleanForMenu( name ) ), m, 5, cpos++ );
+      gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).arg( cleanForMenu( name ) ), m, 5, cpos++ );
     else
-      gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).tqarg( cleanForMenu( name ) ), m );
+      gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).arg( cleanForMenu( name ) ), m );
 
     popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to navigate to positions of items that are involved in this expression" ) );
 
     /*if( type.sourceVariable && type.sourceVariable.name != "this" ) {
-    	int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").tqarg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) );
+    	int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) );
 
     	m_popupActions.insert( id, type.sourceVariable );
     }*/
@@ -1629,9 +1629,9 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
       TQPopupMenu * m = PopupTracker::createPopup( popup );
       int gid;
       if ( contextMenuEntriesAtTop )
-        gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).tqarg( cleanForMenu( name ) ), m, 6, cpos++ );
+        gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).arg( cleanForMenu( name ) ), m, 6, cpos++ );
       else
-        gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).tqarg( cleanForMenu( name ) ), m );
+        gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).arg( cleanForMenu( name ) ), m );
 
       popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to show involved items in the class-view " ) );
 
@@ -1703,27 +1703,27 @@ void CppCodeCompletion::slotTextHint( int line, int column, TQString &text ) {
   const int timeout = 2000;
 
   if ( type->resolved() ) {
-    addStatusText( i18n( "Type of \"%1\" is \"%2\"" ).tqarg( type.expr.expr() ).tqarg( type->fullNameChain() ), timeout );
+    addStatusText( i18n( "Type of \"%1\" is \"%2\"" ).arg( type.expr.expr() ).arg( type->fullNameChain() ), timeout );
     if ( type.sourceVariable && !type.sourceVariable.comment.isEmpty() ) {
-      addStatusText( i18n( "Comment on variable \"%1\": \"%2\"" ).tqarg( type.sourceVariable.name ).tqarg( type.sourceVariable.comment ) , 10000 );
+      addStatusText( i18n( "Comment on variable \"%1\": \"%2\"" ).arg( type.sourceVariable.name ).arg( type.sourceVariable.comment ) , 10000 );
     }
     if ( !type->resolved() ->comment().isEmpty() ) {
-      addStatusText( i18n( "Comment on \"%1\": \"%2\"" ).tqarg( type->name() ).tqarg( type->resolved() ->comment() ) , 10000 );
+      addStatusText( i18n( "Comment on \"%1\": \"%2\"" ).arg( type->name() ).arg( type->resolved() ->comment() ) , 10000 );
     }
     if ( type->resolved() ->comment().isEmpty() ) {
-      addStatusText( i18n( "\"%1\" has no comment" ).tqarg( type->name() ) , timeout );
+      addStatusText( i18n( "\"%1\" has no comment" ).arg( type->name() ) , timeout );
     }
   } else {
     if ( type ) {
 			if( !BuiltinTypes::isBuiltin( type.resultType ) ) {
-				addStatusText( i18n( "Type of \"%1\" is unresolved, name: \"%2\"" ).tqarg( type.expr.expr() ).tqarg( type->fullNameChain() ), 2 * timeout );
+				addStatusText( i18n( "Type of \"%1\" is unresolved, name: \"%2\"" ).arg( type.expr.expr() ).arg( type->fullNameChain() ), 2 * timeout );
 			} else {
-				addStatusText( i18n( "\"%1\" is of builtin type \"%2\", a %3" ).tqarg( type.expr.expr() ).tqarg( type->fullNameChain() ).tqarg(BuiltinTypes::comment( type.resultType )), 2 * timeout );
+				addStatusText( i18n( "\"%1\" is of builtin type \"%2\", a %3" ).arg( type.expr.expr() ).arg( type->fullNameChain() ).arg(BuiltinTypes::comment( type.resultType )), 2 * timeout );
 			}
 
 
     } else {
-      addStatusText( i18n( "Type of \"%1\" could not be evaluated: tried to evaluate expression as \"%2\"" ).tqarg( type.expr.expr() ).tqarg( type.expr.typeAsString() ), 2 * timeout );
+      addStatusText( i18n( "Type of \"%1\" could not be evaluated: tried to evaluate expression as \"%2\"" ).arg( type.expr.expr() ).arg( type.expr.typeAsString() ), 2 * timeout );
     }
   }
 
@@ -2059,14 +2059,14 @@ void CppCodeCompletion::needRecoveryPoints() {
     if ( !ast ) {
       kdDebug( 9007 ) << "background-parser is missing the translation-unit. The file needs to be reparsed." << endl;
 	    m_pSupport->parseFileAndDependencies( m_activeFileName, true );
-// 	    m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Background-parser is missing the necessary translation-unit. It will be computed, but this completion will fail." ).tqarg( m_activeFileName ), 2000 );
+// 	    m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Background-parser is missing the necessary translation-unit. It will be computed, but this completion will fail." ).arg( m_activeFileName ), 2000 );
 	    return;
     } else {
       computeRecoveryPointsLocked();
     }
 	  if ( this->d->recoveryPoints.isEmpty() ) {
 		  kdDebug( 9007 ) << "Failed to compute recovery-points for " << m_activeFileName << endl;
-// 		  m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Failed to compute recovery-points for %1" ).tqarg( m_activeFileName ), 1000 );
+// 		  m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Failed to compute recovery-points for %1" ).arg( m_activeFileName ), 1000 );
 	  } else {
 		  kdDebug( 9007 ) << "successfully computed recovery-points for " << m_activeFileName << endl;
 	  }
@@ -2080,7 +2080,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column
   FileDom file = m_pSupport->codeModel() ->fileByName( m_activeFileName );
 
   if ( !file ) {
-//     m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).tqarg( m_activeFileName ), 1000 );
+//     m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).arg( m_activeFileName ), 1000 );
     kdDebug( 9007 ) << "Error: file " << m_activeFileName << " could not be located in the code-model, code-completion stopped\n";
     return SimpleType();
   }
@@ -2113,7 +2113,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column
       c = strCurLine[ --pos ];
 
     if ( !( c.isLetterOrNumber() || c == '_' || c == ')' || c == ']' || c == '>' ) ) {
-      conf.tqinvalidate();
+      conf.invalidate();
       return SimpleType();
     }
   }
@@ -2280,7 +2280,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column
 
   CppCodeCompletionConfig * cfg = m_pSupport->codeCompletionConfig();
   if( cfg->usePermanentCaching() && contextItem ) {
-    conf.tqinvalidate();
+    conf.invalidate();
     m_cachedFromContext = contextItem;
   }
 
@@ -2323,7 +2323,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
   FileDom file = m_pSupport->codeModel() ->fileByName( m_activeFileName );
 
   if ( !file ) {
-//     m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).tqarg( m_activeFileName ), 1000 );
+//     m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).arg( m_activeFileName ), 1000 );
     kdDebug( 9007 ) << "Error: file " << m_activeFileName << " could not be located in the code-model, code-completion stopped\n";
     return ;
   }
@@ -2905,7 +2905,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
   ctx = 0;
 
   if ( cfg->usePermanentCaching() ) {
-    conf.tqinvalidate();
+    conf.invalidate();
     m_cachedFromContext = contextItem;
   }
 }
@@ -2972,7 +2972,7 @@ void CppCodeCompletion::slotCodeModelUpdated( const TQString& fileName ) {
   if ( fileName != m_activeFileName || !m_pSupport || !m_activeEditor )
     return ;
 
-// 	m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file updated %1" ).tqarg( m_activeFileName ), 1000 );
+// 	m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file updated %1" ).arg( m_activeFileName ), 1000 );
 
   computeRecoveryPointsLocked();
 }
@@ -2981,7 +2981,7 @@ void CppCodeCompletion::slotFileParsed( const TQString& fileName ) {
   if ( fileName != m_activeFileName || !m_pSupport || !m_activeEditor )
     return ;
 
-// 	m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file parsed %1 (cache emptied)" ).tqarg( m_activeFileName ), 1000 );
+// 	m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file parsed %1 (cache emptied)" ).arg( m_activeFileName ), 1000 );
 
   emptyCache(); ///The cache has to be emptied, because the code-model changed. @todo Better: Only refresh the code-model(tell all code-model-types to refresh themselves on demand)
 
@@ -3463,7 +3463,7 @@ TQString CppCodeCompletion::commentFromItem( const SimpleType& parent, const Ite
     ret += "\nKind: Class";
   }
 
-  ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).tqarg( prepareTextForMenu( item->fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).tqarg( line ).tqarg( col );
+  ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).arg( prepareTextForMenu( item->fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).arg( line ).arg( col );
   if ( !item->comment().isEmpty() )
     ret += "\n\n" + prepareTextForMenu( item->comment(), 3, MAXCOMMENTCOLUMNS ).join( "\n" );
   return ret;
@@ -3585,7 +3585,7 @@ TQString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag )
     ret += "\nKind: Struct";
   }
 
-  ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).tqarg( prepareTextForMenu( tag.fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).tqarg( line ).tqarg( col );
+  ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).arg( prepareTextForMenu( tag.fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).arg( line ).arg( col );
   if ( !tag.comment().isEmpty() ) {
     ret += "\n\n" + prepareTextForMenu( tag.comment(), 20, MAXCOMMENTCOLUMNS ).join( "\n" );
   }
@@ -3807,7 +3807,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList
       break;
     }
 
-    e.userdata = TQString( "%1%2%3%4%5" ).tqarg( num ).tqarg( depth ).tqarg( className ).tqarg( sortPosition ).tqarg( subSorting );
+    e.userdata = TQString( "%1%2%3%4%5" ).arg( num ).arg( depth ).arg( className ).arg( sortPosition ).arg( subSorting );
 
     if ( m_completionMode != SignalCompletion ) {
       if ( !type->isNamespace() ) {
@@ -3981,7 +3981,7 @@ void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType
     if ( isInstance )
       continue;
 
-    entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( parent ).tqarg( 6 );
+    entry.userdata = TQString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 6 );
 
     entryList << entry;
 
@@ -4015,7 +4015,7 @@ void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType
     entry.prefix = stringMult( depth, "  " ) + entry.prefix.stripWhiteSpace();
     entry.text = klass->name();
     entry.comment = commentFromItem( type, klass.data() );
-    entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( parent ).tqarg( 5 );
+    entry.userdata = TQString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 5 );
     entryList << entry;
   }
 }
@@ -4136,7 +4136,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList
     if ( meth->isStatic() )
       subSorting = 5;
 
-    entry.userdata += TQString( "%1%2%3%4%5" ).tqarg( meth->access() ).tqarg( depth ).tqarg( className ).tqarg( 1 ).tqarg( subSorting );
+    entry.userdata += TQString( "%1%2%3%4%5" ).arg( meth->access() ).arg( depth ).arg( className ).arg( 1 ).arg( subSorting );
 
     if ( m_completionMode == VirtualDeclCompletion )
       entry.text += text + ";";
@@ -4187,7 +4187,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList
     CodeCompletionEntry entry;
     entry.text = attr->name();
     entry.comment = commentFromItem( type, model_cast<ItemDom>( attr ) );
-    entry.userdata += TQString( "%1%2%3%4" ).tqarg( attr->access() ).tqarg( depth ).tqarg( className ).tqarg( 2 );
+    entry.userdata += TQString( "%1%2%3%4" ).arg( attr->access() ).arg( depth ).arg( className ).arg( 2 );
 
 
     if ( !attr->isEnumeratorVariable() ) {
@@ -4261,7 +4261,7 @@ EvaluationResult CppCodeCompletion::evaluateExpression( ExpressionInfo expr, Sim
 		}
 	}
 
-  addStatusText( i18n( "Type of \"%1\" is \"%2\", %3" ).tqarg( expr.expr() ).tqarg( res->fullNameChain() ).tqarg( resolutionType ), 5000 );
+  addStatusText( i18n( "Type of \"%1\" is \"%2\", %3" ).arg( expr.expr() ).arg( res->fullNameChain() ).arg( resolutionType ), 5000 );
 
   return res;
 }
diff --git a/languages/cpp/cppevaluation.cpp b/languages/cpp/cppevaluation.cpp
index bb3e354b..b84185f5 100644
--- a/languages/cpp/cppevaluation.cpp
+++ b/languages/cpp/cppevaluation.cpp
@@ -102,7 +102,7 @@ OperatorIdentification UnaryOperator::identify( TQString& str ) {
 
 EvaluationResult UnaryOperator::apply( TQValueList<EvaluationResult> params, TQValueList<EvaluationResult> innerParams ) {
   if( !checkParams( params ) ) {
-  log( TQString("parameter-check failed: %1 params: ").tqarg( params.size() ) + printTypeList( params ) );
+  log( TQString("parameter-check failed: %1 params: ").arg( params.size() ) + printTypeList( params ) );
     return EvaluationResult();
   } else {
     EvaluationResult t = unaryApply( params.front(), innerParams );
diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp
index 75dcdaa7..4742c6e9 100644
--- a/languages/cpp/cppnewclassdlg.cpp
+++ b/languages/cpp/cppnewclassdlg.cpp
@@ -461,7 +461,7 @@ void CppNewClassDialog::addBaseClass()
 	if ( baseclasses_view->selectedItem() )
 		baseclasses_view->selectedItem() ->setSelected( false );
 	TQListViewItem* it = new TQListViewItem( baseclasses_view, baseclasses_view->lastItem(),
-	                                       TQString(), "public", TQString( "%1" ).tqarg( scope_box->currentItem() ), TQString(), "false" );
+	                                       TQString(), "public", TQString( "%1" ).arg( scope_box->currentItem() ), TQString(), "false" );
 	setStateOfInheritanceEditors( true );
 	public_button->setChecked( true );
 	virtual_box->setChecked( false );
@@ -589,7 +589,7 @@ void CppNewClassDialog::scopeboxActivated( int value )
 {
 	if ( baseclasses_view->selectedItem() )
 	{
-		baseclasses_view->selectedItem() ->setText( 2, TQString( "%1" ).tqarg( value ) );
+		baseclasses_view->selectedItem() ->setText( 2, TQString( "%1" ).arg( value ) );
 	}
 }
 
@@ -1268,8 +1268,8 @@ void CppNewClassDialog::to_constructors_list_clicked()
 					cparams += ( *argIt ) ->type() + " ";
 					if ( ( *argIt ) ->name().isEmpty() )
 					{
-						cparams += TQString( "arg%1" ).tqarg( unnamed );
-						bparams += TQString( "arg%1" ).tqarg( unnamed++ );
+						cparams += TQString( "arg%1" ).arg( unnamed );
+						bparams += TQString( "arg%1" ).arg( unnamed++ );
 					}
 					else
 					{
@@ -1455,7 +1455,7 @@ void CppNewClassDialog::ClassGenerator::common_text()
 		TQString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" );
 		TQString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" );
 		if( !email.isEmpty() )
-			author += TQString( " <%1>" ).tqarg( email );
+			author += TQString( " <%1>" ).arg( email );
 
 		if ( dlg.gen_config->author_box->isChecked() )
 			doc.append( "\t@author " + author + "\n" );
@@ -1618,8 +1618,8 @@ void CppNewClassDialog::ClassGenerator::genMethodDeclaration( FunctionDom method
 		cparams += ( *argIt ) ->type() + " ";
 		if ( ( *argIt ) ->name().isEmpty() )
 		{
-			cparams += TQString( "arg%1" ).tqarg( unnamed );
-			bparams += TQString( "arg%1" ).tqarg( unnamed++ );
+			cparams += TQString( "arg%1" ).arg( unnamed );
+			bparams += TQString( "arg%1" ).arg( unnamed++ );
 		}
 		else
 		{
@@ -1974,7 +1974,7 @@ void CppNewClassDialog::ClassGenerator::gen_interface()
 	TQString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" );
 	TQString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" );
 	if( !email.isEmpty() )
-		author += TQString( " <%1>" ).tqarg( email );
+		author += TQString( " <%1>" ).arg( email );
 
 	TQString inheritance;
 	if ( dlg.baseclasses_view->childCount() > 0 )
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index d9d29351..73bc258e 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -1558,7 +1558,7 @@ void CppSupportPart::slotParseFiles()
 				{
 					if ( _jd->pcs.contains( absFilePath ) )
 					{
-						_jd->stream.tqdevice() ->at( _jd->pcs[ absFilePath ].second );
+						_jd->stream.device() ->at( _jd->pcs[ absFilePath ].second );
 						FileDom file = codeModel() ->create<FileModel>();
 						file->read( _jd->stream );
 						codeModel() ->addFile( file );
@@ -2182,22 +2182,22 @@ void CppSupportPart::saveProjectSourceInfo()
 		if( m_timestamp.find( dom->name() ) == m_timestamp.end() ) {
 		  kdDebug( 9007 ) << dom->name() << ": timestamp is missing "  << endl;
 		}
-		offsets.insert( dom->name(), stream.tqdevice() ->at() );
+		offsets.insert( dom->name(), stream.device() ->at() );
 		stream << ( uint ) 0; // dummy offset
 	}
 
 	for ( FileList::ConstIterator it = fileList.begin(); it != fileList.end(); ++it )
 	{
 		const FileDom dom = ( *it );
-		int offset = stream.tqdevice() ->at();
+		int offset = stream.device() ->at();
 
 		dom->write( stream );
 
-		int end = stream.tqdevice() ->at();
+		int end = stream.device() ->at();
 
-		stream.tqdevice() ->at( offsets[ dom->name() ] );
+		stream.device() ->at( offsets[ dom->name() ] );
 		stream << offset;
-		stream.tqdevice() ->at( end );
+		stream.device() ->at( end );
 	}
 
 	TQFile::remove(  project() ->projectDirectory() + "/"
@@ -2259,7 +2259,7 @@ void CppSupportPart::slotExtractInterface( )
 	TQString ifaceFileName = fileInfo.dirPath( true ) + "/" + m_activeClass->name().lower() + "_interface.h";
 	if ( TQFile::exists( ifaceFileName ) )
 	{
-		KMessageBox::error( mainWindow() ->main(), i18n( "File %1 already exists" ).tqarg( ifaceFileName ),
+		KMessageBox::error( mainWindow() ->main(), i18n( "File %1 already exists" ).arg( ifaceFileName ),
 		                    i18n( "C++ Support" ) );
 	}
 	else
@@ -3118,7 +3118,7 @@ void CppSupportPart::addToRepository( ParsedFilePointer file ) {
 	w.parseTranslationUnit( *file );
 	codeRepository()->touchCatalog( catalog );
 
-	m_safeProjectFiles.insert( file->fileName() + "||" + TQString("%1").tqarg(file->usedMacros().valueHash()) + "||" + TQString("%1").tqarg(file->usedMacros().idHash()) );
+	m_safeProjectFiles.insert( file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash()) );
 }
 
 TQString CppSupportPart::findHeaderSimple( const TQString &header )
diff --git a/languages/cpp/debugger/breakpoint.cpp b/languages/cpp/debugger/breakpoint.cpp
index 9d1860e4..c9ed193e 100644
--- a/languages/cpp/debugger/breakpoint.cpp
+++ b/languages/cpp/debugger/breakpoint.cpp
@@ -213,7 +213,7 @@ bool Breakpoint::match(const Breakpoint* breakpoint) const
 TQString Breakpoint::dbgRemoveCommand() const
 {
     if (dbgId_>0)
-        return TQString("-break-delete %1").tqarg(dbgId_); // gdb command - not translatable
+        return TQString("-break-delete %1").arg(dbgId_); // gdb command - not translatable
 
     return TQString();
 }
@@ -386,7 +386,7 @@ FilePosBreakpoint::FilePosBreakpoint(const TQString &fileName, int lineNum,
     : Breakpoint(temporary, enabled)
 {
     // Sets 'subtype'
-    setLocation(TQString("%1:%2").tqarg(fileName).tqarg(lineNum));
+    setLocation(TQString("%1:%2").arg(fileName).arg(lineNum));
 }
 
 FilePosBreakpoint::~FilePosBreakpoint()
@@ -482,7 +482,7 @@ void FilePosBreakpoint::setLocation(const TQString& location)
 
         line_ = regExp1.cap(2).toInt();
 
-        location_ = TQString("%1:%2").tqarg(fileName_).tqarg(regExp1.cap(2));
+        location_ = TQString("%1:%2").arg(fileName_).arg(regExp1.cap(2));
     }
     else
     {
@@ -536,7 +536,7 @@ void Watchpoint::setBreakpoint(GDBController* controller)
 
         controller->addCommandBeforeRun(
             new GDBCommand(
-                TQString("-data-evaluate-expression &%1").tqarg(varName_),
+                TQString("-data-evaluate-expression &%1").arg(varName_),
                 this,
                 &Watchpoint::handleAddressComputed));
     }
@@ -547,7 +547,7 @@ void Watchpoint::handleAddressComputed(const GDBMI::ResultRecord& r)
     address_ = r["value"].literal().toULongLong(0, 16);
     controller()->addCommandBeforeRun(
         new GDBCommand(
-            TQString("-break-watch *%1").tqarg(r["value"].literal()),
+            TQString("-break-watch *%1").arg(r["value"].literal()),
             static_cast<Breakpoint*>(this),
             &Watchpoint::handleSet));
 }
diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp
index 64f4dcee..bde8d623 100644
--- a/languages/cpp/debugger/dbgpsdlg.cpp
+++ b/languages/cpp/debugger/dbgpsdlg.cpp
@@ -172,7 +172,7 @@ void Dbg_PS_Dialog::slotProcessExited()
                     // to 'arg'.
                     i18n("<b>Could not parse output from the <tt>ps</tt> command.</b>"
                          "<p>The following line could not be parsed:"
-                         "<b><tt>%1</tt>").tqarg(item),
+                         "<b><tt>%1</tt>").arg(item),
                     i18n("Internal error"), "gdb_error" );
                 break;
             }
diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp
index e27702f2..4d66f58c 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -121,7 +121,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
         setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
         TQApplication::setOverrideCursor(TQCursor(sizeAllCursor));
         setPalette(TQPalette(colorGroup().background()));
-        tqrepaint();
+        repaint();
     }
 }
 
@@ -135,7 +135,7 @@ void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e)
     setFrameStyle(TQFrame::Panel|TQFrame::Raised);
     TQApplication::restoreOverrideCursor();
     setPalette(TQPalette(colorGroup().background()));
-    tqrepaint();
+    repaint();
 }
 
 // **************************************************************************
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index cb3e550d..b4f26024 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -515,12 +515,12 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
     if (!m_contextIdent.isEmpty())
     {
         TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30);
-        int id = popup->insertItem( i18n("Evaluate: %1").tqarg(squeezed),
+        int id = popup->insertItem( i18n("Evaluate: %1").arg(squeezed),
                                     this, TQT_SLOT(contextEvaluate()),
                                     0, -1, index);
         index += running;
         popup->setWhatsThis(id, i18n("<b>Evaluate expression</b><p>Shows the value of the expression under the cursor."));
-        int id2 = popup->insertItem( i18n("Watch: %1").tqarg(squeezed),
+        int id2 = popup->insertItem( i18n("Watch: %1").arg(squeezed),
                                      this, TQT_SLOT(contextWatch()),
                                     0, -1, index);
         index += running;
@@ -659,7 +659,7 @@ bool DebuggerPart::startDebugger()
         {
             KMessageBox::information(
                 mainWindow()->main(),
-                i18n("Could not locate the debugging shell '%1'.").tqarg( shell_without_args ),
+                i18n("Could not locate the debugging shell '%1'.").arg( shell_without_args ),
                 i18n("Debugging Shell Not Found"), "gdb_error" );
             return false;
         }
@@ -955,7 +955,7 @@ void DebuggerPart::slotExamineCore()
     if (coreFile.isNull())
         return;
 
-    mainWindow()->statusBar()->message(i18n("Examining core file %1").tqarg(coreFile), 1000);
+    mainWindow()->statusBar()->message(i18n("Examining core file %1").arg(coreFile), 1000);
 
     startDebugger();
     controller->slotCoreFile(coreFile);
@@ -976,7 +976,7 @@ void DebuggerPart::slotAttachProcess()
 
 bool DebuggerPart::attachProcess(int pid)
 {
-    mainWindow()->statusBar()->message(i18n("Attaching to process %1").tqarg(pid), 1000);
+    mainWindow()->statusBar()->message(i18n("Attaching to process %1").arg(pid), 1000);
 
     bool ret = startDebugger();
     controller->slotAttachTo(pid);
diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp
index 639ab74b..cae6f89f 100644
--- a/languages/cpp/debugger/framestackwidget.cpp
+++ b/languages/cpp/debugger/framestackwidget.cpp
@@ -111,7 +111,7 @@ void FramestackWidget::slotSelectionChanged(TQListViewItem *thisItem)
                 if (frame->threadNo() != -1)
                     controller_->addCommand(
                         new GDBCommand(TQString("-thread-select %1")
-                                       .tqarg(frame->threadNo()).ascii()));
+                                       .arg(frame->threadNo()).ascii()));
 
                viewedThread_ = findThread(frame->threadNo());
                getBacktrace(frame->frameNo(), frame->frameNo() + frameChunk_);
@@ -208,7 +208,7 @@ void FramestackWidget::getBacktrace(int min_frame, int max_frame)
     maxFrame_ = max_frame;
 
     controller_->addCommand(
-        new GDBCommand(TQString("-stack-info-depth %1").tqarg(max_frame+1),
+        new GDBCommand(TQString("-stack-info-depth %1").arg(max_frame+1),
                        this, 
                        &FramestackWidget::handleStackDepth));        
 }
@@ -224,7 +224,7 @@ void FramestackWidget::handleStackDepth(const GDBMI::ResultRecord& r)
     //add the following command to the front, so noone switches threads in between
     controller_->addCommandToFront(
         new GDBCommand(TQString("-stack-list-frames %1 %2")
-                       .tqarg(minFrame_).tqarg(maxFrame_),
+                       .arg(minFrame_).arg(maxFrame_),
                        this, &FramestackWidget::parseGDBBacktraceList));    
 }
 
@@ -236,7 +236,7 @@ void FramestackWidget::getBacktraceForThread(int threadNo)
         // Switch to the target thread.
         controller_->addCommand(
             new GDBCommand(TQString("-thread-select %1")
-                           .tqarg(threadNo).ascii()));
+                           .arg(threadNo).ascii()));
 
         viewedThread_ = findThread(threadNo);
     }
@@ -248,7 +248,7 @@ void FramestackWidget::getBacktraceForThread(int threadNo)
         // Switch back to the original thread.
         controller_->addCommand(
             new GDBCommand(TQString("-thread-select %1")
-                           .tqarg(currentThread).ascii()));
+                           .arg(currentThread).ascii()));
     }
 }
 
@@ -274,13 +274,13 @@ void FramestackWidget::handleThreadList(const GDBMI::ResultRecord& r)
             TQString id = ids.results[i]->value->literal();
 
             controller_->addCommand(
-                new GDBCommand(TQString("-thread-select %1").tqarg(id).ascii(), 
+                new GDBCommand(TQString("-thread-select %1").arg(id).ascii(), 
                                this, &FramestackWidget::handleThread));
         }
 
         controller_->addCommand(
             new GDBCommand(TQString("-thread-select %1")
-                           .tqarg(controller_->currentThread()).ascii()));
+                           .arg(controller_->currentThread()).ascii()));
     }
 
     // Get backtrace for the current thread. We need to do this
@@ -558,7 +558,7 @@ ThreadStackItem::ThreadStackItem(FramestackWidget *parent, unsigned threadNo)
 : TQListViewItem(parent),
   threadNo_(threadNo)
 {
-    setText(0, i18n("Thread %1").tqarg(threadNo_));
+    setText(0, i18n("Thread %1").arg(threadNo_));
     setExpandable(true);
 }
 
diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp
index cefd4ad6..89497fb2 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.cpp
+++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp
@@ -377,10 +377,10 @@ void GDBBreakpointWidget::slotWatchpointHit(int id,
              "Address: 0x%2<br>"
              "Old value: %3<br>"
              "New value: %4")
-        .tqarg(b->varName())
-        .tqarg(b->address(), 0, 16)
-        .tqarg(oldValue)
-        .tqarg(newValue));
+        .arg(b->varName())
+        .arg(b->address(), 0, 16)
+        .arg(oldValue)
+        .arg(newValue));
 }
 
 /***************************************************************************/
diff --git a/languages/cpp/debugger/gdbcommand.cpp b/languages/cpp/debugger/gdbcommand.cpp
index b783b31f..65f872a0 100644
--- a/languages/cpp/debugger/gdbcommand.cpp
+++ b/languages/cpp/debugger/gdbcommand.cpp
@@ -105,7 +105,7 @@ ModifyBreakpointCommand::cmdToSend()
     if (bp_->dbgId() > 0)
     {
         TQString s(initialString());
-        s = s.tqarg(bp_->dbgId()) + "\n";
+        s = s.arg(bp_->dbgId()) + "\n";
         return s.local8Bit();
     }
     else
diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp
index 475afebc..43f29a91 100644
--- a/languages/cpp/debugger/gdbcontroller.cpp
+++ b/languages/cpp/debugger/gdbcontroller.cpp
@@ -294,7 +294,7 @@ void GDBController::queueCmd(GDBCommand *cmd, enum queue_where queue_where)
         KMessageBox::information(
             0,
             i18n("<b>Gdb command sent when debugger is not running</b><br>"
-            "The command was:<br> %1").tqarg(cmd->initialString()),
+            "The command was:<br> %1").arg(cmd->initialString()),
             i18n("Internal error"), "gdb_error");
         return;
     }
@@ -500,7 +500,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r)
     if (reason == "exited-signalled")
     {
         programNoApp(i18n("Exited on signal %1")
-                     .tqarg(r["signal-name"].literal()), false);
+                     .arg(r["signal-name"].literal()), false);
         // FIXME: figure out why this variable is needed.
         programHasExited_ = true;
         state_reload_needed = false;
@@ -554,7 +554,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r)
             // that'll end the program.
             KMessageBox::information(0,
                                      i18n("Program received signal %1 (%2)")
-                                     .tqarg(name).tqarg(user_name),
+                                     .arg(name).arg(user_name),
                                      i18n("Received signal"));
         }
     }
@@ -716,9 +716,9 @@ void GDBController::handleMiFileListExecSourceFile(const GDBMI::ResultRecord& r)
                  "Command was: %1\n"
                  "Response is: %2\n"
                  "Invalid response kind: \"%3\"")
-            .tqarg(currentCmd_->rawDbgCommand())
-            .tqarg(buf)
-            .tqarg(r.reason),
+            .arg(currentCmd_->rawDbgCommand())
+            .arg(buf)
+            .arg(r.reason),
             i18n("Invalid gdb reply"), "gdb_error");
 #endif
     }
@@ -846,7 +846,7 @@ bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_en
             i18n("<b>Could not start debugger.</b>"
                  "<p>Could not run '%1'. "
                  "Make sure that the path name is specified correctly."
-                ).tqarg(dbgProcess_->args()[0].data()),
+                ).arg(dbgProcess_->args()[0].data()),
             i18n("Could not start debugger"), "gdb_error");
 
         return false;
@@ -1159,7 +1159,7 @@ void GDBController::slotRun()
                          "    %1\n"
                          "<br>does not exist. Check that you have specified "
                          "the right application in the debugger configuration."
-                        ).tqarg(app.fileName()),
+                        ).arg(app.fileName()),
                     i18n("Application does not exist"));
 
                 // FIXME: after this, KDevelop will still show that debugger
@@ -1176,7 +1176,7 @@ void GDBController::slotRun()
                          "<p>The application does not have the executable bit set. "
                          "Try rebuilding the project, or change permissions "
                          "manually."
-                        ).tqarg(app.fileName()),
+                        ).arg(app.fileName()),
                     i18n("Could not run application"));
                 slotStopDebugger();
             }
@@ -1324,11 +1324,11 @@ void GDBController::selectFrame(int frameNo, int threadNo)
     {
         if (viewedThread_ != threadNo)
             queueCmd(new GDBCommand(
-                         TQString("-thread-select %1").tqarg(threadNo).ascii()));
+                         TQString("-thread-select %1").arg(threadNo).ascii()));
     }
 
     queueCmd(new GDBCommand(
-                 TQString("-stack-select-frame %1").tqarg(frameNo).ascii()));
+                 TQString("-stack-select-frame %1").arg(frameNo).ascii()));
 
     // Will emit the 'thread_or_frame_changed' event.
     queueCmd(new GDBCommand("-stack-info-frame",
@@ -1590,7 +1590,7 @@ void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen)
                      "<p>The debugger component encountered an internal error while "
                      "processing a reply from gdb. Please submit a bug report."),
                 i18n("The exception is: %1\n"
-                     "The MI response is: %2").tqarg(e.what()).tqarg(reply.data()),
+                     "The MI response is: %2").arg(e.what()).arg(reply.data()),
                 i18n("Internal debugger error"));
 
             destroyCurrentCommand();
@@ -1749,8 +1749,8 @@ void GDBController::explainDebuggerStatus()
                         "%2 commands being processed by gdb\n"
                         "Debugger state: %3\n");
     information =
-        information.tqarg(cmdList_.count()).tqarg(currentCmd_ ? 1 : 0)
-        .tqarg(state_);
+        information.arg(cmdList_.count()).arg(currentCmd_ ? 1 : 0)
+        .arg(state_);
 
     if (currentCmd_)
     {
@@ -1758,8 +1758,8 @@ void GDBController::explainDebuggerStatus()
                       "Current command text: '%2'\n"
                       "Current command origianl text: '%3'\n");
 
-        extra = extra.tqarg(
-            typeid(*currentCmd_).name()).tqarg(currentCmd_->cmdToSend()).
+        extra = extra.arg(
+            typeid(*currentCmd_).name()).arg(currentCmd_->cmdToSend()).
             arg(currentCmd_->initialString());
         information += extra;
     }
diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp
index 48c2ddd4..e61c7d29 100644
--- a/languages/cpp/debugger/memviewdlg.cpp
+++ b/languages/cpp/debugger/memviewdlg.cpp
@@ -263,8 +263,8 @@ namespace GDBDebugger
             new 
             GDBCommand(
                 TQString("-data-read-memory %1 x 1 1 %2")
-                .tqarg(rangeSelector_->startAddressLineEdit->text())
-                .tqarg(size).ascii(),
+                .arg(rangeSelector_->startAddressLineEdit->text())
+                .arg(size).ascii(),
                 this,
                 &MemoryView::memoryRead));
     }
@@ -280,7 +280,7 @@ namespace GDBDebugger
         start_ = startAsString_.toUInt(0, 0);
 
         setCaption(TQString("%1 (%2 bytes)")
-                   .tqarg(startAsString_).tqarg(amount_));
+                   .arg(startAsString_).arg(amount_));
         emit captionChanged(caption());
 
         KHE::BytesEditInterface* bytesEditor
@@ -328,9 +328,9 @@ namespace GDBDebugger
             controller_->addCommand(
                 new GDBCommand(
                     TQString("set *(char*)(%1 + %2) = %3")
-                        .tqarg(start_)
-                        .tqarg(i)
-                        .tqarg(TQString::number(data_[i]))));
+                        .arg(start_)
+                        .arg(i)
+                        .arg(TQString::number(data_[i]))));
         }
     }
     
@@ -374,7 +374,7 @@ namespace GDBDebugger
                 new 
                 GDBCommand(
                     TQString("-data-read-memory %1 x 1 1 %2")
-                    .tqarg(start_).tqarg(amount_).ascii(),
+                    .arg(start_).arg(amount_).ascii(),
                     this,
                     &MemoryView::memoryRead));
         }
diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp
index 1f869d0c..0803fa82 100644
--- a/languages/cpp/debugger/variablewidget.cpp
+++ b/languages/cpp/debugger/variablewidget.cpp
@@ -54,7 +54,7 @@
     recieved after current frame in the debugger can possibly changes.
 
     The widget has a list item for each frame/thread combination, with
-    variables as tqchildren. However, at each moment only one item is shown.
+    variables as children. However, at each moment only one item is shown.
     When handling the slotCurrentFrame, we check if variables for the
     current frame are available. If yes, we simply show the corresponding item.
     Otherwise, we fetch the new data from debugger.
@@ -338,7 +338,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
             controller_->addCommand(
                 new GDBCommand(
                     TQString("-data-evaluate-expression &%1")
-                    .tqarg(var->gdbExpression()),
+                    .arg(var->gdbExpression()),
                     this,
                     &VariableTree::handleAddressComputed,
                     true /*handles error*/));
@@ -505,8 +505,8 @@ void VariableTree::updateCurrentFrame()
 
     controller_->addCommand(
         new GDBCommand(TQString("-stack-list-arguments 0 %1 %2")
-                       .tqarg(controller_->currentFrame())
-                       .tqarg(controller_->currentFrame())
+                       .arg(controller_->currentFrame())
+                       .arg(controller_->currentFrame())
                        .ascii(),
                        this,
                        &VariableTree::argumentsReady));
@@ -882,8 +882,8 @@ void VarItem::handleCliPrint(const TQValueVector<TQString>& lines)
         {
             controller_->addCommand(
                 new GDBCommand(TQString("-var-create %1 * \"%2\"")
-                               .tqarg(varobjName_)
-                               .tqarg(r.cap(1)),
+                               .arg(varobjName_)
+                               .arg(r.cap(1)),
                                this,
                                &VarItem::varobjCreated,
                                // On initial create, errors get reported
@@ -1078,7 +1078,7 @@ VarItem::VarItem(TrimmableItem *parent,
       oldSpecialRepresentationSet_(false),
       format_(natural),
       numChildren_(0),
-      tqchildrenFetched_(false),
+      childrenFetched_(false),
       updateUnconditionally_(false),
       frozen_(frozen),
       initialCreation_(true),
@@ -1123,7 +1123,7 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj,
   oldSpecialRepresentationSet_(false),
   format_(format),
   numChildren_(0),
-  tqchildrenFetched_(false),
+  childrenFetched_(false),
   updateUnconditionally_(false),
   frozen_(false),
   initialCreation_(false),
@@ -1146,7 +1146,7 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj,
 
     controller_ = varTree()->controller();
 
-    // Set type and tqchildren.
+    // Set type and children.
     originalValueType_ = varobj["type"].literal();
     numChildren_ = varobj["numchild"].literal().toInt();
     setExpandable(numChildren_ != 0);
@@ -1159,7 +1159,7 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj,
 void VarItem::createVarobj()
 {
     TQString old = varobjName_;
-    varobjName_ = TQString("KDEV%1").tqarg(varobjIndex++);
+    varobjName_ = TQString("KDEV%1").arg(varobjIndex++);
     emit varobjNameChange(old, varobjName_);
 
     if (frozen_)
@@ -1169,7 +1169,7 @@ void VarItem::createVarobj()
         // variable and we create variable object from that.
         controller_->addCommand(
             new CliCommand(
-                TQString("print %1").tqarg(expression_),
+                TQString("print %1").arg(expression_),
                 this,
                 &VarItem::handleCliPrint));
     }
@@ -1177,7 +1177,7 @@ void VarItem::createVarobj()
     {
         controller_->addCommand(
             new CliCommand(
-                TQString("print /x &%1").tqarg(expression_),
+                TQString("print /x &%1").arg(expression_),
                 this,
                 &VarItem::handleCurrentAddress,
                 true));
@@ -1186,8 +1186,8 @@ void VarItem::createVarobj()
             // Need to quote expression, otherwise gdb won't like
             // spaces inside it.
             new GDBCommand(TQString("-var-create %1 * \"%2\"")
-                           .tqarg(varobjName_)
-                           .tqarg(expression_),
+                           .arg(varobjName_)
+                           .arg(expression_),
                            this,
                            &VarItem::varobjCreated,
                            initialCreation_ ? false : true));
@@ -1209,7 +1209,7 @@ void VarItem::varobjCreated(const GDBMI::ResultRecord& r)
     originalValueType_ = r["type"].literal();
     if (!oldType.isEmpty() && oldType != originalValueType_)
     {
-        // Type changed, the tqchildren might be no longer valid,
+        // Type changed, the children might be no longer valid,
         // so delete them.
         for(TQListViewItem* child = firstChild(); child; )
         {
@@ -1239,7 +1239,7 @@ void VarItem::setVarobjName(const TQString& name)
     {
         controller_->addCommand(
             new GDBCommand(TQString("-var-set-format \"%1\" %2")
-                           .tqarg(varobjName_).tqarg(varobjFormatName())));
+                           .arg(varobjName_).arg(varobjFormatName())));
     }
 
     // Get the initial value.
@@ -1247,7 +1247,7 @@ void VarItem::setVarobjName(const TQString& name)
 
     if (isOpen())
     {
-        // This regets tqchildren list.
+        // This regets children list.
         setOpen(true);
     }
 }
@@ -1333,18 +1333,18 @@ void VarItem::valueDone(const GDBMI::ResultRecord& r)
 }
 
 void VarItem::createChildren(const GDBMI::ResultRecord& r,
-                             bool tqchildren_of_fake)
+                             bool children_of_fake)
 {
-    const GDBMI::Value& tqchildren = r["tqchildren"];
+    const GDBMI::Value& children = r["children"];
 
     /* In order to figure out which variable objects correspond
        to base class subobject, we first must detect if *this
        is a structure type. We use present of 'public'/'private'/'protected'
        fake child as an indicator. */
     bool structureType = false;
-    if (!tqchildren_of_fake && tqchildren.size() > 0)
+    if (!children_of_fake && children.size() > 0)
     {
-        TQString exp = tqchildren[0]["exp"].literal();
+        TQString exp = children[0]["exp"].literal();
         bool ok = false;
         exp.toInt(&ok);
         if (!ok || exp[0] != '*')
@@ -1353,23 +1353,23 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r,
         }
     }
 
-    for (unsigned i = 0; i < tqchildren.size(); ++i)
+    for (unsigned i = 0; i < children.size(); ++i)
     {
-        TQString exp = tqchildren[i]["exp"].literal();
+        TQString exp = children[i]["exp"].literal();
         // For artificial accessibility nodes,
-        // fetch their tqchildren.
+        // fetch their children.
         if (exp == "public" || exp == "protected" || exp == "private")
         {
-            TQString name = tqchildren[i]["name"].literal();
+            TQString name = children[i]["name"].literal();
             controller_->addCommand(new GDBCommand(
-                                        "-var-list-tqchildren \"" +
+                                        "-var-list-children \"" +
                                         name + "\"",
                                         this,
-                                        &VarItem::tqchildrenOfFakesDone));
+                                        &VarItem::childrenOfFakesDone));
         }
         else
         {
-            /* All tqchildren of structures that are not artifical
+            /* All children of structures that are not artifical
                are base subobjects. */
             bool baseObject = structureType;
 
@@ -1388,7 +1388,7 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r,
             }
             if (existing)
             {
-                existing->setVarobjName(tqchildren[i]["name"].literal());
+                existing->setVarobjName(children[i]["name"].literal());
             }
             else
             {
@@ -1396,20 +1396,20 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r,
                               << exp << " " << baseObject << "\n";
                 // Propagate format from parent.
                 VarItem* v = 0;
-                v = new VarItem(this, tqchildren[i], format_, baseObject);
+                v = new VarItem(this, children[i], format_, baseObject);
             }
         }
     }
 }
 
 
-void VarItem::tqchildrenDone(const GDBMI::ResultRecord& r)
+void VarItem::childrenDone(const GDBMI::ResultRecord& r)
 {
     createChildren(r, false);
-    tqchildrenFetched_ = true;
+    childrenFetched_ = true;
 }
 
-void VarItem::tqchildrenOfFakesDone(const GDBMI::ResultRecord& r)
+void VarItem::childrenOfFakesDone(const GDBMI::ResultRecord& r)
 {
     createChildren(r, true);
 }
@@ -1603,8 +1603,8 @@ void VarItem::updateValue()
 void VarItem::setValue(const TQString& new_value)
 {
     controller_->addCommand(
-        new GDBCommand(TQString("-var-assign \"%1\" %2").tqarg(varobjName_)
-                       .tqarg(new_value)));
+        new GDBCommand(TQString("-var-assign \"%1\" %2").arg(varobjName_)
+                       .arg(new_value)));
 
     // And immediately reload it from gdb,
     // so that it's display format is the one gdb uses,
@@ -1661,14 +1661,14 @@ void VarItem::recreateLocallyMaybe()
 {
     controller_->addCommand(
         new CliCommand(
-            TQString("print /x &%1").tqarg(expression_),
+            TQString("print /x &%1").arg(expression_),
             this,
             &VarItem::handleCurrentAddress,
             true));
 
     controller_->addCommand(
         new CliCommand(
-            TQString("whatis %1").tqarg(expression_),
+            TQString("whatis %1").arg(expression_),
             this,
             &VarItem::handleType));
 }
@@ -1688,12 +1688,12 @@ void VarItem::setOpen(bool open)
 {
     TQListViewItem::setOpen(open);
 
-    if (open && !tqchildrenFetched_)
+    if (open && !childrenFetched_)
     {
         controller_->addCommand(new GDBCommand(
-                                    "-var-list-tqchildren \"" + varobjName_ + "\"",
+                                    "-var-list-children \"" + varobjName_ + "\"",
                                     this,
-                                    &VarItem::tqchildrenDone));
+                                    &VarItem::childrenDone));
     }
 }
 
@@ -1712,7 +1712,7 @@ bool VarItem::handleSpecialTypes()
             return false;
         varTree->controller()->addCommand(
             new ResultlessCommand(TQString("print $kdev_d=%1.d")
-                                  .tqarg(gdbExpression()),
+                                  .arg(gdbExpression()),
                                   true /* ignore error */));
 
         if (varTree->controller()->qtVersion() >= 4)
@@ -1760,7 +1760,7 @@ void VarItem::setFormat(format_t f)
 
     if (numChildren_)
     {
-        // If variable has tqchildren, change format for tqchildren.
+        // If variable has children, change format for children.
         // - for structures, that's clearly right
         // - for arrays, that's clearly right
         // - for pointers, this can be confusing, but nobody ever wants to
@@ -1775,7 +1775,7 @@ void VarItem::setFormat(format_t f)
     {
          controller_->addCommand(
             new GDBCommand(TQString("-var-set-format \"%1\" %2")
-                           .tqarg(varobjName_).tqarg(varobjFormatName())));
+                           .arg(varobjName_).arg(varobjFormatName())));
 
         updateValue();
     }
@@ -1876,7 +1876,7 @@ VariableTree* VarItem::varTree() const
 
 void VarItem::unhookFromGdb()
 {
-    // Unhook tqchildren first, so that child varitems are deleted
+    // Unhook children first, so that child varitems are deleted
     // before parent. Strictly speaking, we can avoid calling
     // -var-delete on child varitems, but that's a bit cheesy,
     for(TQListViewItem* child = firstChild();
@@ -1886,7 +1886,7 @@ void VarItem::unhookFromGdb()
     }
 
     alive_ = false;
-    tqchildrenFetched_ = false;
+    childrenFetched_ = false;
 
     emit varobjNameChange(varobjName_, "");
 
@@ -1894,7 +1894,7 @@ void VarItem::unhookFromGdb()
     {
         controller_->addCommand(
             new GDBCommand(
-                TQString("-var-delete \"%1\"").tqarg(varobjName_)));
+                TQString("-var-delete \"%1\"").arg(varobjName_)));
     }
 
     varobjName_ = "";
diff --git a/languages/cpp/debugger/variablewidget.h b/languages/cpp/debugger/variablewidget.h
index 2e5e6c38..6c612bd6 100644
--- a/languages/cpp/debugger/variablewidget.h
+++ b/languages/cpp/debugger/variablewidget.h
@@ -186,16 +186,16 @@ private:
 /***************************************************************************/
 /***************************************************************************/
 
-/** List view item that can 'trim' outdated tqchildren.
+/** List view item that can 'trim' outdated children.
 
-    The instances of this class hold a number of tqchildren corresponding
+    The instances of this class hold a number of children corresponding
     to variables. When program state changes, such as after a step in source,
     some variable values can change, and some variables can go out of scope.
     We need
     - highlight modified variables
     - remove gone variables
 
-    We could just remove all tqchildren and repopulate the list from
+    We could just remove all children and repopulate the list from
     the data from debugger, but then we'd loose information about previous
     variable values.
 
@@ -286,7 +286,7 @@ public:
 
     /** Recursively clears the varobjName_ field, making
        *this completely disconnected from gdb.
-       Automatically makes *this and tqchildren disables,
+       Automatically makes *this and children disables,
        since there's no possible interaction with unhooked
        object.
     */
@@ -300,7 +300,7 @@ public:
     format_t formatFromGdbModifier(char c) const;
 
     /** Clears highliting for this variable and 
-        all its tqchildren. */
+        all its children. */
     void clearHighlight();
 
     /** Sets new top-level textual value of this variable.
@@ -333,7 +333,7 @@ private:
            - sets varobjName_ to 'name'
            - sets format, if it's not default one
            - gets initial value
-           - if item is open, gets tqchildren.
+           - if item is open, gets children.
     */
     void setVarobjName(const TQString& name);
 
@@ -348,12 +348,12 @@ private:
                     int column, int width, int align );
     void varobjCreated(const GDBMI::ResultRecord& r);
     void valueDone(const GDBMI::ResultRecord& r);
-    void tqchildrenDone(const GDBMI::ResultRecord& r);    
-    void tqchildrenOfFakesDone(const GDBMI::ResultRecord& r);    
+    void childrenDone(const GDBMI::ResultRecord& r);    
+    void childrenOfFakesDone(const GDBMI::ResultRecord& r);    
     void handleCurrentAddress(const TQValueVector<TQString>& lines);
     void handleType(const TQValueVector<TQString>& lines);
 
-    void createChildren(const GDBMI::ResultRecord& r, bool tqchildren_of_fake);
+    void createChildren(const GDBMI::ResultRecord& r, bool children_of_fake);
 
     /** Called to handle the output of the cli print command.
      */
@@ -391,7 +391,7 @@ private:
     static int varobjIndex;
 
     int numChildren_;
-    bool tqchildrenFetched_;
+    bool childrenFetched_;
     
     TQString currentAddress_;
     TQString lastObtainedAddress_;
diff --git a/languages/cpp/declarationinfo.h b/languages/cpp/declarationinfo.h
index de49dae3..8b55557e 100644
--- a/languages/cpp/declarationinfo.h
+++ b/languages/cpp/declarationinfo.h
@@ -44,7 +44,7 @@ struct DeclarationInfo {
     }
     
     TQString locationToText() const {
-      return TQString("line %1 col %2 - line %3 col %4\nfile: %5").tqarg(startLine).tqarg(startCol).tqarg(endLine).tqarg(endCol).tqarg(file);
+      return TQString("line %1 col %2 - line %3 col %4\nfile: %5").arg(startLine).arg(startCol).arg(endLine).arg(endCol).arg(file);
     }
     
     TQString toText() const {
diff --git a/languages/cpp/doc/cppannotations.toc b/languages/cpp/doc/cppannotations.toc
index ad63b241..081ad646 100644
--- a/languages/cpp/doc/cppannotations.toc
+++ b/languages/cpp/doc/cppannotations.toc
@@ -427,7 +427,7 @@
     <tocsect3 name="19.7.1: The `Daemon' program" url="cplusplus19.html#l349"/>
     <tocsect3 name="19.7.2: The `Pipe' class" url="cplusplus19.html#l350"/>
     <tocsect3 name="19.7.3: The `ParentSlurp' class" url="cplusplus19.html#l351"/>
-    <tocsect3 name="19.7.4: Communicating with multiple tqchildren" url="cplusplus19.html#l352">
+    <tocsect3 name="19.7.4: Communicating with multiple children" url="cplusplus19.html#l352">
       <tocsect4 name="19.7.4.1: The `Select' class" url="cplusplus19.html#l353"/>
       <tocsect4 name="19.7.4.2: The `Child' class" url="cplusplus19.html#l354"/>
       <tocsect4 name="19.7.4.3: The `Monitor' class" url="cplusplus19.html#l355"/>
diff --git a/languages/cpp/doc/gnome1.toc b/languages/cpp/doc/gnome1.toc
index e6c13c48..552b40e6 100644
--- a/languages/cpp/doc/gnome1.toc
+++ b/languages/cpp/doc/gnome1.toc
@@ -135,7 +135,7 @@
   <tocsect2 name="GTK+ Widgets and Objects" url="gtk/gtkobjects.html">
     <tocsect3 name="GtkAccelLabel" url="gtk/gtkaccellabel.html"/>
     <tocsect3 name="GtkAdjustment" url="gtk/gtkadjustment.html"/>
-    <tocsect3 name="GtkAlignment" url="gtk/gtktqalignment.html"/>
+    <tocsect3 name="GtkAlignment" url="gtk/gtkalignment.html"/>
     <tocsect3 name="GtkArrow" url="gtk/gtkarrow.html"/>
     <tocsect3 name="GtkAspectFrame" url="gtk/gtkaspectframe.html"/>
     <tocsect3 name="GtkButtonBox" url="gtk/gtkbuttonbox.html"/>
@@ -261,7 +261,7 @@
     <tocsect3 name="gnome-canvas-util" url="gnomeui/gnomeui-gnome-canvas-util.html"/>
     <tocsect3 name="gnome-dialog-util" url="gnomeui/gnomeui-gnome-dialog-util.html"/>
     <tocsect3 name="gnome-dns" url="gnomeui/gnomeui-gnome-dns.html"/>
-    <tocsect3 name="gnome-tqgeometry" url="gnomeui/gnomeui-gnome-tqgeometry.html"/>
+    <tocsect3 name="gnome-geometry" url="gnomeui/gnomeui-gnome-geometry.html"/>
     <tocsect3 name="gnome-ice" url="gnomeui/gnomeui-gnome-ice.html"/>
     <tocsect3 name="gnome-icon-text" url="gnomeui/gnomeui-gnome-icon-text.html"/>
     <tocsect3 name="gnome-init" url="gnomeui/gnomeui-gnome-init.html"/>
diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc
index f779695e..6569eb91 100644
--- a/languages/cpp/doc/kde2book.toc
+++ b/languages/cpp/doc/kde2book.toc
@@ -413,11 +413,11 @@
 <entry name="check() method" url="ch10lev1sec3.html"/>
 <entry name="checkWord() method" url="ch10lev1sec3.html"/>
 <entry name="Child Classes command (Classbrowser pop-up menu)" url="ch18lev1sec4.html"/>
-<entry name="child widgets, tqgeometry management, QBoxLayout manager" url="ch04lev1sec3.html"/>
-<entry name="child widgets, tqgeometry management, QGridLayout manager" url="ch04lev1sec3.html"/>
-<entry name="child widgets, tqgeometry management" url="ch04lev1sec3.html"/>
-<entry name="child widgets, KChildren example, ktqchildren.cpp class definition" url="ch04lev1sec3.html"/>
-<entry name="child widgets, KChildren example, ktqchildren.h class declaration" url="ch04lev1sec3.html"/>
+<entry name="child widgets, geometry management, QBoxLayout manager" url="ch04lev1sec3.html"/>
+<entry name="child widgets, geometry management, QGridLayout manager" url="ch04lev1sec3.html"/>
+<entry name="child widgets, geometry management" url="ch04lev1sec3.html"/>
+<entry name="child widgets, KChildren example, kchildren.cpp class definition" url="ch04lev1sec3.html"/>
+<entry name="child widgets, KChildren example, kchildren.h class declaration" url="ch04lev1sec3.html"/>
 <entry name="child widgets, KChildren example, main() method" url="ch04lev1sec3.html"/>
 <entry name="child widgets, KChildren example" url="ch04lev1sec3.html"/>
 <entry name="child widgets" url="ch04lev1sec3.html"/>
@@ -1080,16 +1080,16 @@
 <entry name="gdb debugger, running" url="ch18lev1sec6.html"/>
 <entry name="gdb debugger" url="ch18lev1sec6.html"/>
 <entry name="gdb (GNU debugger)" url="ch02.html"/>
-<entry name="tqgeometry management (widgets), dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/>
-<entry name="tqgeometry management (widgets), dialog boxes, design issues" url="ch08lev1sec2.html"/>
-<entry name="tqgeometry management (widgets), dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/>
-<entry name="tqgeometry management (widgets), dialog boxes, manual placement" url="ch08lev1sec2.html"/>
-<entry name="tqgeometry management (widgets), dialog boxes, nested layouts" url="ch08lev1sec2.html"/>
-<entry name="tqgeometry management (widgets), dialog boxes, QLayout classes" url="ch08lev1sec2.html"/>
-<entry name="tqgeometry management (widgets), dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
-<entry name="tqgeometry management (widgets), QBoxLayout manager" url="ch04lev1sec3.html"/>
-<entry name="tqgeometry management (widgets), QGridLayout manager" url="ch04lev1sec3.html"/>
-<entry name="tqgeometry management (widgets)" url="ch04lev1sec3.html"/>
+<entry name="geometry management (widgets), dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/>
+<entry name="geometry management (widgets), dialog boxes, design issues" url="ch08lev1sec2.html"/>
+<entry name="geometry management (widgets), dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/>
+<entry name="geometry management (widgets), dialog boxes, manual placement" url="ch08lev1sec2.html"/>
+<entry name="geometry management (widgets), dialog boxes, nested layouts" url="ch08lev1sec2.html"/>
+<entry name="geometry management (widgets), dialog boxes, QLayout classes" url="ch08lev1sec2.html"/>
+<entry name="geometry management (widgets), dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
+<entry name="geometry management (widgets), QBoxLayout manager" url="ch04lev1sec3.html"/>
+<entry name="geometry management (widgets), QGridLayout manager" url="ch04lev1sec3.html"/>
+<entry name="geometry management (widgets)" url="ch04lev1sec3.html"/>
 <entry name="getColor() function" url="ch05lev1sec3.html"/>
 <entry name="getExistingDirectory() function" url="ch05lev1sec3.html"/>
 <entry name="getFont() function" url="ch05lev1sec3.html"/>
@@ -1278,10 +1278,10 @@
 <entry name="KApplication class" url="ch02lev1sec3.html"/>
 <entry name="KAudioPlayer class" url="ch14lev1sec6.html"/>
 <entry name="KButtonBox manager widget" url="ch08lev1sec4.html"/>
-<entry name="ktqchildren.cpp class definition (KChildren widget)" url="ch04lev1sec3.html"/>
-<entry name="ktqchildren.h class declaration (KChildren widget)" url="ch04lev1sec3.html"/>
-<entry name="KChildren sample widget (child widget), ktqchildren.cpp class definition" url="ch04lev1sec3.html"/>
-<entry name="KChildren sample widget (child widget), ktqchildren.h class declaration" url="ch04lev1sec3.html"/>
+<entry name="kchildren.cpp class definition (KChildren widget)" url="ch04lev1sec3.html"/>
+<entry name="kchildren.h class declaration (KChildren widget)" url="ch04lev1sec3.html"/>
+<entry name="KChildren sample widget (child widget), kchildren.cpp class definition" url="ch04lev1sec3.html"/>
+<entry name="KChildren sample widget (child widget), kchildren.h class declaration" url="ch04lev1sec3.html"/>
 <entry name="KChildren sample widget (child widget), main() method" url="ch04lev1sec3.html"/>
 <entry name="KChildren sample widget (child widget)" url="ch04lev1sec3.html"/>
 <entry name="kconfigdemo.cpp file (KConfigDemo widget)" url="ch07lev1sec2.html"/>
@@ -1558,9 +1558,9 @@
 <entry name="KStdActionsDemo widget" url="ch05.html"/>
 <entry name="ktictactoe.cpp class definition (KTicTacToe widget)" url="ch04lev1sec3.html"/>
 <entry name="ktictactoe.h class declaration (KTicTacToe widget)" url="ch04lev1sec3.html"/>
-<entry name="KTicTacToe widget (tqgeometry management example), ktictactoe.cpp class definition" url="ch04lev1sec3.html"/>
-<entry name="KTicTacToe widget (tqgeometry management example), ktictactoe.h class declaration" url="ch04lev1sec3.html"/>
-<entry name="KTicTacToe widget (tqgeometry management example), playing the game" url="ch04lev1sec3.html"/>
+<entry name="KTicTacToe widget (geometry management example), ktictactoe.cpp class definition" url="ch04lev1sec3.html"/>
+<entry name="KTicTacToe widget (geometry management example), ktictactoe.h class declaration" url="ch04lev1sec3.html"/>
+<entry name="KTicTacToe widget (geometry management example), playing the game" url="ch04lev1sec3.html"/>
 <entry name="KTMainWindow class" url="ch02lev1sec3.html"/>
 <entry name="Kulow, Stephen" url="ch16.html"/>
 <entry name="KUniqueApplication class, passing command-line parameters" url="ch13lev1sec7.html"/>
@@ -1656,12 +1656,12 @@
 <entry name="listings, dialog boxes, dialog from kdeui library" url="ch08lev1sec4.html"/>
 <entry name="listings, dialog boxes, KButtonBox in a dialog" url="ch08lev1sec4.html"/>
 <entry name="listings, dialog boxes, KEdit dialog code" url="ch08lev1sec6.html"/>
-<entry name="listings, dialog boxes, manual tqgeometry strategy and QLayouts classes" url="ch08lev1sec2.html"/>
+<entry name="listings, dialog boxes, manual geometry strategy and QLayouts classes" url="ch08lev1sec2.html"/>
 <entry name="listings, dialog boxes, modal dialog allocated from the heap" url="ch08lev1sec3.html"/>
 <entry name="listings, dialog boxes, modal dialog located on the stack" url="ch08lev1sec3.html"/>
 <entry name="listings, dialog boxes, modeless dialog example" url="ch08lev1sec3.html"/>
 <entry name="listings, dialog boxes, modeless dialogs, removing from memory" url="ch08lev1sec3.html"/>
-<entry name="listings, dialog boxes, QVBox widget for tqgeometry management" url="ch08lev1sec2.html"/>
+<entry name="listings, dialog boxes, QVBox widget for geometry management" url="ch08lev1sec2.html"/>
 <entry name="listings, dialog boxes, SelectDialog class" url="ch08.html"/>
 <entry name="listings, Example_ADD interface" url="ch14lev1sec2.html"/>
 <entry name="listings, Example_ADD module" url="ch14lev1sec2.html"/>
@@ -1672,8 +1672,8 @@
 <entry name="listings, KabDemo application (address book dialog), kabdemo.cpp class definition" url="ch10lev1sec4.html"/>
 <entry name="listings, KabDemo application (address book dialog), kabdemo.h class declaration" url="ch10lev1sec4.html"/>
 <entry name="listings, KabDemo application (address book dialog), main() method" url="ch10lev1sec4.html"/>
-<entry name="listings, KChildren widget, ktqchildren.cpp class definition" url="ch04lev1sec3.html"/>
-<entry name="listings, KChildren widget, ktqchildren.h class declaration" url="ch04lev1sec3.html"/>
+<entry name="listings, KChildren widget, kchildren.cpp class definition" url="ch04lev1sec3.html"/>
+<entry name="listings, KChildren widget, kchildren.h class declaration" url="ch04lev1sec3.html"/>
 <entry name="listings, KChildren widget, main() method" url="ch04lev1sec3.html"/>
 <entry name="listings, KConfigDemo widget, kconfigdemo.cpp class definition" url="ch07lev1sec2.html"/>
 <entry name="listings, KConfigDemo widget, kconfigdemo.h class declaration" url="ch07lev1sec2.html"/>
@@ -1829,7 +1829,7 @@
 <entry name="managing, sessions, source file example" url="ch06lev1sec2.html"/>
 <entry name="managing, sessions" url="ch06lev1sec2.html"/>
 <entry name="managing, sessions" url="ch07lev1sec3.html"/>
-<entry name="manual tqgeometry strategy (dialog boxes)" url="ch08lev1sec2.html"/>
+<entry name="manual geometry strategy (dialog boxes)" url="ch08lev1sec2.html"/>
 <entry name="mcopclass files" url="ch14lev1sec2.html"/>
 <entry name="MCOP, future of, composition/RAD" url="ch14lev1sec7.html"/>
 <entry name="MCOP, future of, GUIs" url="ch14lev1sec7.html"/>
@@ -1937,7 +1937,7 @@
 <entry name="methods, remoteFunctions()" url="ch13lev1sec6.html"/>
 <entry name="methods, remoteInterfaces()" url="ch13lev1sec6.html"/>
 <entry name="methods, remoteObjects()" url="ch13lev1sec6.html"/>
-<entry name="methods, tqrepaint(), QPainter class" url="ch04lev1sec2.html"/>
+<entry name="methods, repaint(), QPainter class" url="ch04lev1sec2.html"/>
 <entry name="methods, resume()" url="ch13lev1sec5.html"/>
 <entry name="methods, senderId()" url="ch13lev1sec6.html"/>
 <entry name="methods, send()" url="ch13lev1sec5.html"/>
@@ -2264,10 +2264,10 @@
 <entry name="protocols, DCOP" url="ch13.html"/>
 <entry name="protocols, FTP, snapshots" url="ch17lev1sec3.html"/>
 <entry name="protocols, XDND" url="ch07.html"/>
-<entry name="QBoxLayout tqgeometry manager" url="ch04lev1sec3.html"/>
+<entry name="QBoxLayout geometry manager" url="ch04lev1sec3.html"/>
 <entry name="QDataStream objects" url="ch13lev1sec3.html"/>
 <entry name="QGL widget" url="ch03lev1sec6.html"/>
-<entry name="QGridLayout tqgeometry manager" url="ch04lev1sec3.html"/>
+<entry name="QGridLayout geometry manager" url="ch04lev1sec3.html"/>
 <entry name="QHBox widget, tqlayout managers, creating" url="ch08lev1sec2.html"/>
 <entry name="QImage class" url="ch10lev1sec2.html"/>
 <entry name="QLayout classes, code example" url="ch08lev1sec2.html"/>
@@ -2278,7 +2278,7 @@
 <entry name="QPainter class, example usage (listing)" url="ch03lev1sec2.html"/>
 <entry name="QPainter class, member function" url="ch03lev1sec2.html"/>
 <entry name="QPainter class, methods, paintEvent()" url="ch04lev1sec2.html"/>
-<entry name="QPainter class, methods, tqrepaint()" url="ch04lev1sec2.html"/>
+<entry name="QPainter class, methods, repaint()" url="ch04lev1sec2.html"/>
 <entry name="QPainter class, methods, update()" url="ch04lev1sec2.html"/>
 <entry name="QPainter class" url="ch03lev1sec2.html"/>
 <entry name="QPainter class" url="ch04lev1sec2.html"/>
@@ -2386,7 +2386,7 @@
 <entry name="removing, modeless dialog boxes" url="ch08lev1sec3.html"/>
 <entry name="rendering, HTML files" url="ch10.html"/>
 <entry name="repainting, widgets" url="ch04lev1sec2.html"/>
-<entry name="tqrepaint() method, QPainter class" url="ch04lev1sec2.html"/>
+<entry name="repaint() method, QPainter class" url="ch04lev1sec2.html"/>
 <entry name="replace action" url="ch06.html"/>
 <entry name="reportBug action" url="ch06.html"/>
 <entry name="resiceGL(int width, int height) function (QGL widget)" url="ch03lev1sec6.html"/>
@@ -2789,7 +2789,7 @@
 <entry name="widets, KImageView (image viewer/converter), main() method" url="ch10lev1sec2.html"/>
 <entry name="widets, KImageView (image viewer/converter)" url="ch10lev1sec2.html"/>
 <entry name="widgets, attributes" url="ch04.html"/>
-<entry name="widgets, child widgets, tqgeometry management" url="ch04lev1sec3.html"/>
+<entry name="widgets, child widgets, geometry management" url="ch04lev1sec3.html"/>
 <entry name="widgets, child widgets, KChildren example" url="ch04lev1sec3.html"/>
 <entry name="widgets, child widgets" url="ch04lev1sec3.html"/>
 <entry name="widgets, compared to parts" url="ch12.html"/>
diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp
index cbd4c57b..ebd536ec 100644
--- a/languages/cpp/includepathresolver.cpp
+++ b/languages/cpp/includepathresolver.cpp
@@ -257,7 +257,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi
   dir = TQDir( dir.absPath() );
   TQFileInfo makeFile( dir, "Makefile" );
   if( !makeFile.exists() )
-    return PathResolutionResult(false, i18n("Makefile is missing in folder \"%1\"").tqarg(dir.absPath()), i18n("problem while trying to resolve include-paths for %1").tqarg(file) );
+    return PathResolutionResult(false, i18n("Makefile is missing in folder \"%1\"").arg(dir.absPath()), i18n("problem while trying to resolve include-paths for %1").arg(file) );
 
   TQStringList cachedPath; //If the call doesn't succeed, use the cached not up-to-date version
   TQDateTime makeFileModification = makeFile.lastModified();
@@ -298,7 +298,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi
   
   int dot;
   if( (dot = file.findRev( '.' )) == -1 )
-    return PathResolutionResult( false, i18n( "Filename %1 seems to be malformed" ).tqarg(file) );
+    return PathResolutionResult( false, i18n( "Filename %1 seems to be malformed" ).arg(file) );
 
   targetName = file.left( dot );
 
@@ -387,12 +387,12 @@ PathResolutionResult IncludePathResolver::getFullOutput( const TQString& command
 
     output = proc.stdOut();
     if( proc.exitStatus() != 0 )
-      return PathResolutionResult( false, i18n("make-process finished with nonzero exit-status"), i18n("output: %1").tqarg( output ) );
+      return PathResolutionResult( false, i18n("make-process finished with nonzero exit-status"), i18n("output: %1").arg( output ) );
   } else {
     bool ret = executeCommandPopen(command, workingDirectory, output);
     
     if( !ret )
-      return PathResolutionResult( false, i18n("make-process failed"), i18n("output: %1").tqarg( output ) );
+      return PathResolutionResult( false, i18n("make-process failed"), i18n("output: %1").arg( output ) );
   }
   return PathResolutionResult(true);
 }
@@ -471,14 +471,14 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
             return res;
           return resolveIncludePathInternal( KURL::relativePath(newWorkingDirectory,u.path()), newWorkingDirectory, makeParams , newSource );
         }else{
-          return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The parameter-string \"%1\" does not seem to be valid. Output was: %2").tqarg(makeParams).tqarg(fullOutput) );
+          return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The parameter-string \"%1\" does not seem to be valid. Output was: %2").arg(makeParams).arg(fullOutput) );
         }
       } else {
-        return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The directory \"%1\" does not exist. Output was: %2").tqarg(newWorkingDirectory).tqarg(fullOutput) );
+        return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The directory \"%1\" does not exist. Output was: %2").arg(newWorkingDirectory).arg(fullOutput) );
       }
 
     } else {
-      return PathResolutionResult( false, i18n("Recursive make-call malformed"), i18n("Output was: %2").tqarg(fullOutput) );
+      return PathResolutionResult( false, i18n("Recursive make-call malformed"), i18n("Output was: %2").arg(fullOutput) );
     }
 
     ++offset;
@@ -488,7 +488,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
   ///STEP 2: Search the output for include-paths
   TQRegExp validRx( "\\b([cg]\\+\\+|gcc)" );
   if( validRx.search( fullOutput ) == -1 )
-    return PathResolutionResult( false, i18n("Output seems not to be a valid gcc or g++ call"), i18n("Folder: \"%1\"  Command: \"%2\" Output: \"%3\"").tqarg(workingDirectory).tqarg( source.getCommand(file, makeParameters) ).tqarg(fullOutput) );
+    return PathResolutionResult( false, i18n("Output seems not to be a valid gcc or g++ call"), i18n("Folder: \"%1\"  Command: \"%2\" Output: \"%3\"").arg(workingDirectory).arg( source.getCommand(file, makeParameters) ).arg(fullOutput) );
 
   PathResolutionResult ret( true );
   ret.longErrorMessage = fullOutput;
@@ -497,7 +497,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
   TQString quotedRx( "(\\').*(\\')|(\\\").*(\\\")" ); //Matches "hello", 'hello', 'hello"hallo"', etc.
   TQString escapedPathRx( "(([^)(\"'\\s]*)(\\\\\\s)?)*" ); //Matches /usr/I\ am \ a\ strange\ path/include
 
-  TQRegExp includeRx( TQString( "%1(%2|%3)(?=\\s)" ).tqarg( includeParameterRx ).tqarg( quotedRx ).tqarg( escapedPathRx ) );
+  TQRegExp includeRx( TQString( "%1(%2|%3)(?=\\s)" ).arg( includeParameterRx ).arg( quotedRx ).arg( escapedPathRx ) );
   includeRx.setMinimal( true );
   includeRx.setCaseSensitive( true );
   offset = 0;
diff --git a/languages/cpp/kdevdriver.cpp b/languages/cpp/kdevdriver.cpp
index ed4fe3fa..3006342c 100644
--- a/languages/cpp/kdevdriver.cpp
+++ b/languages/cpp/kdevdriver.cpp
@@ -175,7 +175,7 @@ TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) {
 	CppTools::PathResolutionResult res = m_includePathResolver->resolveIncludePath( file );
 	
 	if( !res.success ) {
-		Problem p( i18n( "%1. Message: %2" ).tqarg( res.errorMessage ).tqarg( res.longErrorMessage ), 0, 0, Problem::Level_Warning );
+		Problem p( i18n( "%1. Message: %2" ).arg( res.errorMessage ).arg( res.longErrorMessage ), 0, 0, Problem::Level_Warning );
 		p.setFileName( file );
 		addProblem( file, p );
 	}
@@ -184,7 +184,7 @@ TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) {
 }
 
 bool KDevDriver::shouldParseIncludedFile( const ParsedFilePointer& file ) {
-	TQString compoundString = file->fileName() + "||" + TQString("%1").tqarg(file->usedMacros().valueHash()) + "||" + TQString("%1").tqarg(file->usedMacros().idHash());
+	TQString compoundString = file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash());
 
 	if( !m_shouldParseIncludedFiles )
 		return false;
diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
index 9994dcdd..02362333 100644
--- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
@@ -93,7 +93,7 @@ void SettingsDialog::validateDirectory( const TQString & dir )
 			elb->listBox() ->removeItem( elb->listBox() ->index( item ) );
 		}
 
-		TQString errormsg = TQString( "<qt><b>%1</b> is not a directory</qt>" ).tqarg( dir );
+		TQString errormsg = TQString( "<qt><b>%1</b> is not a directory</qt>" ).arg( dir );
 		KMessageBox::error( 0, errormsg, "Couldn't find directory" );
 	}
 	emit enabled( elb->listBox()->count() > 0 );
diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp
index f8dc13e3..1ab7b3c6 100644
--- a/languages/cpp/problemreporter.cpp
+++ b/languages/cpp/problemreporter.cpp
@@ -175,7 +175,7 @@ void ProblemReporter::slotFilter()
 	if(!m_tabBar->isTabEnabled(5))
 		m_tabBar->setTabEnabled(5,true);
 
-	m_tabBar->tab(5)->setText(i18n("Filtered: %1").tqarg( m_filterEdit->text() ));
+	m_tabBar->tab(5)->setText(i18n("Filtered: %1").arg( m_filterEdit->text() ));
 	m_tabBar->setCurrentTab(5);
 
 	m_filteredList->clear();
diff --git a/languages/cpp/qtbuildconfig.cpp b/languages/cpp/qtbuildconfig.cpp
index 7a14ff2b..c5c87b1c 100644
--- a/languages/cpp/qtbuildconfig.cpp
+++ b/languages/cpp/qtbuildconfig.cpp
@@ -141,9 +141,9 @@ void QtBuildConfig::findTQtDir()
     TQStringList qtdirs;
     if( m_version == 3 )
         qtdirs.push_back( ::getenv("QTDIR") );
-    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( m_version ) );
-    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").tqarg( m_version ) );
-    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( m_version ) );
+    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( m_version ) );
+    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( m_version ) );
+    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( m_version ) );
     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/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp
index a5efb703..2e512bc5 100644
--- a/languages/cpp/simpletype.cpp
+++ b/languages/cpp/simpletype.cpp
@@ -301,7 +301,7 @@ TQString SimpleTypeImpl::operatorToString( Operator op ) {
     case ParenOp:
     return "paren-operator";
     default:
-    return TQString( "%1" ).tqarg( ( long ) op );
+    return TQString( "%1" ).arg( ( long ) op );
   };
 }
 
diff --git a/languages/cpp/simpletype.h b/languages/cpp/simpletype.h
index 43e55280..d57e3d5f 100644
--- a/languages/cpp/simpletype.h
+++ b/languages/cpp/simpletype.h
@@ -214,7 +214,7 @@ class SimpleTypeConfiguration {
         SimpleType::destroyStore();
       }
     }
-    void tqinvalidate() {
+    void invalidate() {
       m_invalid = true;
     }
 };
diff --git a/languages/cpp/tag_creator.cpp b/languages/cpp/tag_creator.cpp
index 80ab86f5..16876219 100644
--- a/languages/cpp/tag_creator.cpp
+++ b/languages/cpp/tag_creator.cpp
@@ -78,9 +78,9 @@ void TagCreator::parseTranslationUnit( const ParsedFile& ast )
 	ast.write( stream );
 	tag.setAttribute( "cppparsedfile", data );
 	tag.setAttribute( "includedFrom", ast.includedFrom() );
-	tag.setAttribute( "skippedLines", TQString("%1").tqarg( ast.skippedLines()) );
-	tag.setAttribute( "macroValueHash", TQString("%1").tqarg( ast.usedMacros().valueHash()) );
-	tag.setAttribute( "macroIdHash", TQString("%1").tqarg( ast.usedMacros().idHash() ) );
+	tag.setAttribute( "skippedLines", TQString("%1").arg( ast.skippedLines()) );
+	tag.setAttribute( "macroValueHash", TQString("%1").arg( ast.usedMacros().valueHash()) );
+	tag.setAttribute( "macroIdHash", TQString("%1").arg( ast.usedMacros().idHash() ) );
 	
   	tag.setScope( m_currentScope );
   	if( !ast->comment().isEmpty() )