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

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2011-12-15 15:51:21 -0600
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2011-12-15 15:51:21 -0600
commit: b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04 (patch)
tree: 76f49820693d443128d3720322ff1605e9bcd558 /languages/cpp
parent: 247f828db1b8dcdc9346c1568d81cfa00db99c9e (diff)
download: tdevelop-b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.tar.gz
tdevelop-b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.zip
105 files changed, 582 insertions, 582 deletions
diff --git a/languages/cpp/README.dox b/languages/cpp/README.dox
index 04c7fe30..4ac19153 100644
--- a/languages/cpp/README.dox
+++ b/languages/cpp/README.dox
@@ -16,7 +16,7 @@ and if you want play with the c++ parser go to lib/cppparser/, the best is to st
 \feature can do code completion
 \feature has presistent class store
 \feature code highlight
-\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
 
 \bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=tdevelop&component=cppsupport&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">cppsupport component at Bugzilla database</a>
 
diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp
index 69d373fd..95e33970 100644
--- a/languages/cpp/addattributedialog.cpp
+++ b/languages/cpp/addattributedialog.cpp
@@ -38,7 +38,7 @@
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
 #include <tqtoolbutton.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 AddAttributeDialog::AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass,
                                         TQWidget* parent, const char* name, bool modal, WFlags fl )
@@ -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 );
 	
@@ -248,13 +248,13 @@ TQString AddAttributeDialog::accessID( VariableDom var ) const
 	switch ( var->access() )
 	{
 	case CodeModelItem::Public:
-		return TQString::tqfromLatin1( "Public" );
+		return TQString::fromLatin1( "Public" );
 		
 	case CodeModelItem::Protected:
-		return TQString::tqfromLatin1( "Protected" );
+		return TQString::fromLatin1( "Protected" );
 		
 	case CodeModelItem::Private:
-		return TQString::tqfromLatin1( "Private" );
+		return TQString::fromLatin1( "Private" );
 	}
 	
 	return TQString();
diff --git a/languages/cpp/addattributedialogbase.ui b/languages/cpp/addattributedialogbase.ui
index 0ad0f62e..4e42f714 100644
--- a/languages/cpp/addattributedialogbase.ui
+++ b/languages/cpp/addattributedialogbase.ui
@@ -79,7 +79,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -95,7 +95,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>111</width>
                             <height>20</height>
@@ -133,7 +133,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -178,7 +178,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -244,7 +244,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp
index 6f13ed91..dfb6c314 100644
--- a/languages/cpp/addmethoddialog.cpp
+++ b/languages/cpp/addmethoddialog.cpp
@@ -41,7 +41,7 @@
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
 #include <tqtoolbutton.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 AddMethodDialog::AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass,
                                   TQWidget* parent, const char* name, bool modal, WFlags fl )
@@ -119,24 +119,24 @@ void AddMethodDialog::reject()
 TQString AddMethodDialog::accessID( FunctionDom fun ) const
 {
 	if ( fun->isSignal() )
-		return TQString::tqfromLatin1( "Signals" );
+		return TQString::fromLatin1( "Signals" );
 
 	switch ( fun->access() )
 	{
 	case CodeModelItem::Public:
 		if ( fun->isSlot() )
-			return TQString::tqfromLatin1( "Public Slots" );
-		return TQString::tqfromLatin1( "Public" );
+			return TQString::fromLatin1( "Public Slots" );
+		return TQString::fromLatin1( "Public" );
 
 	case CodeModelItem::Protected:
 		if ( fun->isSlot() )
-			return TQString::tqfromLatin1( "Protected Slots" );
-		return TQString::tqfromLatin1( "Protected" );
+			return TQString::fromLatin1( "Protected Slots" );
+		return TQString::fromLatin1( "Protected" );
 
 	case CodeModelItem::Private:
 		if ( fun->isSlot() )
-			return TQString::tqfromLatin1( "Private Slots" );
-		return TQString::tqfromLatin1( "Private" );
+			return TQString::fromLatin1( "Private Slots" );
+		return TQString::fromLatin1( "Private" );
 	}
 
 	return TQString();
@@ -248,7 +248,7 @@ void AddMethodDialog::accept()
 		bool isInline = currentItem->text( 0 ) == "True";
 		if ( !isInline )
 		{
-			editIface->insertLine( editIface->numLines(), TQString::tqfromLatin1( "" ) );
+			editIface->insertLine( editIface->numLines(), TQString::fromLatin1( "" ) );
 			editIface->insertText( editIface->numLines() - 1, 0, str );
 			m_cppSupport->backgroundParser() ->addFile( implementationFile );
 		}
@@ -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 );
@@ -387,7 +387,7 @@ TQString AddMethodDialog::functionDefinition( TQListViewItem* item ) const
 		<< ind << " */\n";
 
 	stream
-		<< ind << item->text( 3 ) << " " << ( isInline ? TQString::tqfromLatin1( "" ) : fullName + "::" )
+		<< ind << item->text( 3 ) << " " << ( isInline ? TQString::fromLatin1( "" ) : fullName + "::" )
 		<< item->text( 4 ) << "\n"
 		<< ind << "{\n"
 		<< ind << "    /// @todo implement me\n"
diff --git a/languages/cpp/addmethoddialogbase.ui b/languages/cpp/addmethoddialogbase.ui
index a3887be6..a8048708 100644
--- a/languages/cpp/addmethoddialogbase.ui
+++ b/languages/cpp/addmethoddialogbase.ui
@@ -90,7 +90,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -106,7 +106,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>111</width>
                             <height>20</height>
@@ -144,7 +144,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -189,7 +189,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -300,7 +300,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp
index 4b78645a..9666125e 100644
--- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp
+++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp
@@ -8,7 +8,7 @@
 #include <tqtoolbutton.h>
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqfile.h>
 #include <tqfiledialog.h>
 #include <statusbar.h>
@@ -16,7 +16,7 @@
 #include <tqprinter.h>
 #include <tqapplication.h>
 #include <tqaccel.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqwhatsthis.h>
@@ -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/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp
index 5f9d906a..9cc3cec3 100644
--- a/languages/cpp/app_templates/kapp/appview.cpp
+++ b/languages/cpp/app_templates/kapp/appview.cpp
@@ -3,7 +3,7 @@
 #include "%{APPNAMELC}view.h"
 
 #include <tqpainter.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kurl.h>
 
@@ -17,7 +17,7 @@
     : TQWidget(parent),
       DCOPObject("%{APPNAME}Iface")
 {
-    // setup our tqlayout manager to automatically add our widgets
+    // setup our layout manager to automatically add our widgets
     TQHBoxLayout *top_layout = new TQHBoxLayout(this);
     top_layout->setAutoAdd(true);
 
diff --git a/languages/cpp/app_templates/kapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp
index 673df14e..87951c76 100644
--- a/languages/cpp/app_templates/kapp/pref.cpp
+++ b/languages/cpp/app_templates/kapp/pref.cpp
@@ -4,7 +4,7 @@
 
 #include <klocale.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 %{APPNAME}Preferences::%{APPNAME}Preferences()
@@ -25,8 +25,8 @@
 %{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *parent)
     : TQFrame(parent)
 {
-    TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
-    tqlayout->setAutoAdd(true);
+    TQHBoxLayout *layout = new TQHBoxLayout(this);
+    layout->setAutoAdd(true);
 
     new TQLabel(i18n("Add something here"), this);
 }
@@ -34,8 +34,8 @@
 %{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *parent)
     : TQFrame(parent)
 {
-    TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
-    tqlayout->setAutoAdd(true);
+    TQHBoxLayout *layout = new TQHBoxLayout(this);
+    layout->setAutoAdd(true);
 
     new TQLabel(i18n("Add something here"), this);
 }
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
index 18595d10..d159d8f4 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
@@ -7,7 +7,7 @@
 #include <kstandarddirs.h>
 #include <kfiledialog.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 class PluginView : public KXMLGUIClient
diff --git a/languages/cpp/app_templates/kcmodule/module.cpp b/languages/cpp/app_templates/kcmodule/module.cpp
index bb15b923..3e0c0512 100644
--- a/languages/cpp/app_templates/kcmodule/module.cpp
+++ b/languages/cpp/app_templates/kcmodule/module.cpp
@@ -1,6 +1,6 @@
 %{CPP_TEMPLATE}
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kglobal.h>
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/kconfig35/prefs-base.ui b/languages/cpp/app_templates/kconfig35/prefs-base.ui
index 46a35473..03af967a 100644
--- a/languages/cpp/app_templates/kconfig35/prefs-base.ui
+++ b/languages/cpp/app_templates/kconfig35/prefs-base.ui
@@ -66,7 +66,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -83,7 +83,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -111,7 +111,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
diff --git a/languages/cpp/app_templates/kde4app/kapp4view_base.ui b/languages/cpp/app_templates/kde4app/kapp4view_base.ui
index c3780092..6738a789 100644
--- a/languages/cpp/app_templates/kde4app/kapp4view_base.ui
+++ b/languages/cpp/app_templates/kde4app/kapp4view_base.ui
@@ -15,7 +15,7 @@
   <property name="autoFillBackground" >
    <bool>true</bool>
   </property>
-  <tqlayout class="TQGridLayout" >
+  <layout class="TQGridLayout" >
    <property name="leftMargin" >
     <number>11</number>
    </property>
@@ -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" >
@@ -204,7 +204,7 @@
      </property>
     </widget>
    </item>
-  </tqlayout>
+  </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
diff --git a/languages/cpp/app_templates/kde4app/prefs_base.ui b/languages/cpp/app_templates/kde4app/prefs_base.ui
index f1e5fdfb..87a191f1 100644
--- a/languages/cpp/app_templates/kde4app/prefs_base.ui
+++ b/languages/cpp/app_templates/kde4app/prefs_base.ui
@@ -9,7 +9,7 @@
     <height>156</height>
    </rect>
   </property>
-  <tqlayout class="TQGridLayout" >
+  <layout class="TQGridLayout" >
    <item row="0" column="0" >
     <widget class="TQLabel" name="textLabel2_2" >
      <property name="text" >
@@ -80,7 +80,7 @@ p, li { white-space: pre-wrap; }
      <property name="sizeType" >
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="tqsizeHint" >
+     <property name="sizeHint" >
       <size>
        <width>41</width>
        <height>20</height>
@@ -96,7 +96,7 @@ p, li { white-space: pre-wrap; }
      <property name="sizeType" >
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="tqsizeHint" >
+     <property name="sizeHint" >
       <size>
        <width>41</width>
        <height>20</height>
@@ -128,7 +128,7 @@ p, li { white-space: pre-wrap; }
      <property name="sizeType" >
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="tqsizeHint" >
+     <property name="sizeHint" >
       <size>
        <width>41</width>
        <height>20</height>
@@ -136,7 +136,7 @@ p, li { white-space: pre-wrap; }
      </property>
     </spacer>
    </item>
-  </tqlayout>
+  </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
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/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp
index 1f3992af..6d9bf7ac 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.cpp
+++ b/languages/cpp/app_templates/kpartapp/app_part.cpp
@@ -9,7 +9,7 @@
 #include <klocale.h>
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqmultilineedit.h>
 
 %{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName,
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
index 06a6409c..0094f5dd 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
@@ -11,7 +11,7 @@
 #include <klocale.h>
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqmultilineedit.h>
 
 typedef KParts::GenericFactory<%{APPNAMELC}Part> %{APPNAMELC}PartFactory;
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
index 006b844e..a1cfb9f0 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
@@ -1,7 +1,7 @@
 %{CPP_TEMPLATE}
 
 #include <tqpixmap.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kiconloader.h>
 #include <klocale.h>
@@ -35,9 +35,9 @@
 			part()->widget()->setFocus();
 			setFocusProxy(part()->widget());
 
-			TQBoxLayout* tqlayout = new TQHBoxLayout(this, 0, -1, "kdissertviewtqlayout" );
+			TQBoxLayout* layout = new TQHBoxLayout(this, 0, -1, "kdissertviewlayout" );
 			part()->widget()->reparent( this, TQPoint(0, 0) );
-			tqlayout->addWidget( part()->widget() );
+			layout->addWidget( part()->widget() );
 
 			// connect( m_part, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(updateCaption()) );
 		}
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/kscons_kxt/prefs-base.ui b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui
index a343c6cf..b1115e6f 100644
--- a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui
+++ b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui
@@ -68,7 +68,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -85,7 +85,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -113,7 +113,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
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/kxt/prefs-base.ui b/languages/cpp/app_templates/kxt/prefs-base.ui
index 46a35473..03af967a 100644
--- a/languages/cpp/app_templates/kxt/prefs-base.ui
+++ b/languages/cpp/app_templates/kxt/prefs-base.ui
@@ -66,7 +66,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -83,7 +83,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -111,7 +111,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
index 508f7cc9..b8654693 100644
--- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp
+++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
@@ -11,7 +11,7 @@
 
 #include <tqpushbutton.h>
 #include <tqdragobject.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqobjectlist.h>
 #include <tqobjectdict.h>
@@ -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");
@@ -132,7 +132,7 @@
     show();
 
     // What it is now, stay.
-    setFixedSize(tqminimumSize());
+    setFixedSize(minimumSize());
 }
 
 %{APPNAME}UI::~%{APPNAME}UI()
@@ -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/example.h b/languages/cpp/app_templates/opieapp/example.h
index 7da09f5a..92a4019f 100644
--- a/languages/cpp/app_templates/opieapp/example.h
+++ b/languages/cpp/app_templates/opieapp/example.h
@@ -9,7 +9,7 @@ class %{APPNAME} : public %{APPNAME}Base
 
 public:
     static TQString appName() {
-        return TQString::tqfromLatin1("%{APPNAMELC}" );
+        return TQString::fromLatin1("%{APPNAMELC}" );
     }
     %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~%{APPNAME}();
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/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp
index 6a7bef4f..a4c2e177 100644
--- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp
+++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp
@@ -58,7 +58,7 @@ void %{APPNAME}::slotKey(int _ke){
 	
 	/*
 	 *  Send the key
-	 * ke is the tqunicode
+	 * ke is the unicode
 	 * _ke + 0x41 is the keycode
 	 *  m_state Normally the state 
 	 * down/up
diff --git a/languages/cpp/app_templates/opienet/simmplemodule.h b/languages/cpp/app_templates/opienet/simmplemodule.h
index 5c928ec9..b19152b6 100644
--- a/languages/cpp/app_templates/opienet/simmplemodule.h
+++ b/languages/cpp/app_templates/opienet/simmplemodule.h
@@ -12,7 +12,7 @@ public:
     VirtualModule();
     ~VirtualModule();
 
-    const TQString type() {return TQString::tqfromLatin1("vpn" );}
+    const TQString type() {return TQString::fromLatin1("vpn" );}
     void setProfile( const TQString& ) {}
     bool isOwner( Interface* );
     TQWidget *configure( Interface* );
@@ -21,7 +21,7 @@ public:
     void possibleNewInterfaces( TQMap<TQString, TQString>& );
     Interface *addNewInterface( const TQString& );
     bool remove( Interface* iface );
-    TQString getPixmapName( Interface*  ) {return TQString::tqfromLatin1("Tux"); }
+    TQString getPixmapName( Interface*  ) {return TQString::fromLatin1("Tux"); }
     void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen
 private:
     TQList<Interface> m_interfaces;
diff --git a/languages/cpp/app_templates/opienet/simpleiface.cpp b/languages/cpp/app_templates/opienet/simpleiface.cpp
index e98148d2..bbabcbda 100644
--- a/languages/cpp/app_templates/opienet/simpleiface.cpp
+++ b/languages/cpp/app_templates/opienet/simpleiface.cpp
@@ -31,13 +31,13 @@ bool %{APPNAME}Interface::refresh() {
 
 void %{APPNAME}Interface::start() {
 // call pptp
-    settqStatus(true);
+    setStatus(true);
     refresh();
     emit updateMessage("VPN started");
 }
 
 void %{APPNAME}Interface::stop() {
-    settqStatus(false );
+    setStatus(false );
     refresh();
     emit updateMessage("VPN halted");
 }
diff --git a/languages/cpp/app_templates/opienet/simplemodule.h b/languages/cpp/app_templates/opienet/simplemodule.h
index 327c1d43..6fce8b10 100644
--- a/languages/cpp/app_templates/opienet/simplemodule.h
+++ b/languages/cpp/app_templates/opienet/simplemodule.h
@@ -12,7 +12,7 @@ public:
     %{APPNAME}Module();
     ~%{APPNAME}Module();
 
-    const TQString type() {return TQString::tqfromLatin1("vpn" );}
+    const TQString type() {return TQString::fromLatin1("vpn" );}
     void setProfile( const TQString& ) {}
     bool isOwner( Interface* );
     TQWidget *configure( Interface* );
@@ -21,7 +21,7 @@ public:
     void possibleNewInterfaces( TQMap<TQString, TQString>& );
     Interface *addNewInterface( const TQString& );
     bool remove( Interface* iface );
-    TQString getPixmapName( Interface*  ) {return TQString::tqfromLatin1("Tux"); }
+    TQString getPixmapName( Interface*  ) {return TQString::fromLatin1("Tux"); }
     void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen
 private:
     TQList<Interface> m_interfaces;
diff --git a/languages/cpp/app_templates/opietoday/exampleplugin.cpp b/languages/cpp/app_templates/opietoday/exampleplugin.cpp
index 12d702b6..3606927f 100644
--- a/languages/cpp/app_templates/opietoday/exampleplugin.cpp
+++ b/languages/cpp/app_templates/opietoday/exampleplugin.cpp
@@ -19,7 +19,7 @@ double %{APPNAME}::versionNumber() const {
 
 // this sets the image that will be shown on the left side of the plugin
 TQString %{APPNAME}::pixmapNameWidget() const {
-    return TQString::tqfromLatin1("%{APPNAMELC}/%{APPNAMELC}");
+    return TQString::fromLatin1("%{APPNAMELC}/%{APPNAMELC}");
 }
 
 TQWidget* %{APPNAME}::widget( TQWidget * wid ) {
diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.h b/languages/cpp/app_templates/opietoday/examplepluginwidget.h
index f079013e..ddb38793 100644
--- a/languages/cpp/app_templates/opietoday/examplepluginwidget.h
+++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.h
@@ -1,7 +1,7 @@
 #ifndef %{APPNAME}_PLUGIN_WIDGET_H
 #define %{APPNAME}_PLUGIN_WIDGET_H
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <opie/oclickablelabel.h>
 
diff --git a/languages/cpp/app_templates/prc-tool/palmhello.c b/languages/cpp/app_templates/prc-tool/palmhello.c
index e0317932..0a34b6c4 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:
-	MenuErasetqStatus(NULL);
+	MenuEraseStatus(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..9666125e 100644
--- a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp
+++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp
@@ -8,7 +8,7 @@
 #include <tqtoolbutton.h>
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqfile.h>
 #include <tqfiledialog.h>
 #include <statusbar.h>
@@ -16,7 +16,7 @@
 #include <tqprinter.h>
 #include <tqapplication.h>
 #include <tqaccel.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqwhatsthis.h>
@@ -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/qtopia4app/examplebase.ui b/languages/cpp/app_templates/qtopia4app/examplebase.ui
index 76e7d49f..107d4e96 100644
--- a/languages/cpp/app_templates/qtopia4app/examplebase.ui
+++ b/languages/cpp/app_templates/qtopia4app/examplebase.ui
@@ -15,7 +15,7 @@
     <property name="windowTitle" >
       <string>%{APPNAME}</string>
     </property>
-    <tqlayout class="TQVBoxLayout" >
+    <layout class="TQVBoxLayout" >
       <property name="margin" >
         <number>11</number>
       </property>
@@ -39,6 +39,6 @@
           </property>
         </widget>
       </item>
-    </tqlayout>
+    </layout>
   </widget>
 </ui>
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 9fded09c..f6d19c2a 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();
@@ -73,7 +73,7 @@ void scopeOfNode( AST* ast, TQStringList& scope )
 		if ( ( ( ClassSpecifierAST* ) ast ) ->name() )
 		{
 			s = ( ( ClassSpecifierAST* ) ast ) ->name() ->text();
-			s = s.isEmpty() ? TQString::tqfromLatin1( "<unnamed>" ) : s;
+			s = s.isEmpty() ? TQString::fromLatin1( "<unnamed>" ) : s;
 			scope.push_back( s );
 		}
 		break;
@@ -81,7 +81,7 @@ void scopeOfNode( AST* ast, TQStringList& scope )
 	case NodeType_Namespace:
 		{
 			AST* namespaceName = ( ( NamespaceAST* ) ast ) ->namespaceName();
-			s = namespaceName ? namespaceName->text() : TQString::tqfromLatin1( "<unnamed>" );
+			s = namespaceName ? namespaceName->text() : TQString::fromLatin1( "<unnamed>" );
 			scope.push_back( s );
 		}
 		break;
@@ -141,7 +141,7 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b
 	text += scope;
 	
 	if ( declarator->subDeclarator() )
-		text += TQString::tqfromLatin1( "(" ) + declaratorToString( declarator->subDeclarator() ) + TQString::tqfromLatin1( ")" );
+		text += TQString::fromLatin1( "(" ) + declaratorToString( declarator->subDeclarator() ) + TQString::fromLatin1( ")" );
 	
 	if ( declarator->declaratorId() )
 		text += declarator->declaratorId() ->text();
diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp
index 668c5599..df9a2383 100644
--- a/languages/cpp/backgroundparser.cpp
+++ b/languages/cpp/backgroundparser.cpp
@@ -34,7 +34,7 @@
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <list>
 #include <tqdatastream.h>
 
diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp
index 445940e6..196c4d16 100644
--- a/languages/cpp/ccconfigwidget.cpp
+++ b/languages/cpp/ccconfigwidget.cpp
@@ -22,7 +22,7 @@
 #include <tqheader.h>
 #include <tqcolor.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // kde includes
 #include <kdevproject.h>
@@ -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";
@@ -561,7 +561,7 @@ void CCConfigWidget::openPluginPaths()
     kdDebug(9024) << "Plugin paths opened" << endl;
     QtBuildConfig* c = m_pPart->qtBuildConfig();
     KDialog d( this );
-    TQVBoxLayout* maintqlayout = new TQVBoxLayout( &d );
+    TQVBoxLayout* mainlayout = new TQVBoxLayout( &d );
     KPushButton* ok = new KPushButton( KStdGuiItem::ok(), &d );
     connect( ok, TQT_SIGNAL(clicked()), &d, TQT_SLOT(accept()));
     KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), &d );
@@ -576,8 +576,8 @@ void CCConfigWidget::openPluginPaths()
     req->setMode( KFile::Directory );
     KEditListBox* p = new KEditListBox( i18n( "Plugin Paths" ), req->customEditor(), &d );
     p->insertStringList( c->designerPluginPaths() );
-    maintqlayout->addWidget( p );
-    maintqlayout->addLayout( btns );
+    mainlayout->addWidget( p );
+    mainlayout->addLayout( btns );
     d.resize( 450, 250 );
     if( d.exec() == TQDialog::Accepted)
     {
diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui
index 441d1bb1..dae89168 100644
--- a/languages/cpp/ccconfigwidgetbase.ui
+++ b/languages/cpp/ccconfigwidgetbase.ui
@@ -36,7 +36,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout11</cstring>
+                            <cstring>layout11</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -77,7 +77,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout13</cstring>
+                                            <cstring>layout13</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -93,7 +93,7 @@
                                                 <property name="sizeType">
                                                     <enum>Fixed</enum>
                                                 </property>
-                                                <property name="tqsizeHint">
+                                                <property name="sizeHint">
                                                     <size>
                                                         <width>30</width>
                                                         <height>20</height>
@@ -227,7 +227,7 @@ completion-box.</string>
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout14</cstring>
+                                            <cstring>layout14</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -243,7 +243,7 @@ completion-box.</string>
                                                 <property name="sizeType">
                                                     <enum>Fixed</enum>
                                                 </property>
-                                                <property name="tqsizeHint">
+                                                <property name="sizeHint">
                                                     <size>
                                                         <width>30</width>
                                                         <height>20</height>
@@ -299,7 +299,7 @@ argument hint</string>
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout12</cstring>
+                            <cstring>layout12</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -397,7 +397,7 @@ Note: Parsing may become very slow when this is enabled
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout6</cstring>
+                                            <cstring>layout6</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -413,7 +413,7 @@ Note: Parsing may become very slow when this is enabled
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="tqsizeHint">
+                                                <property name="sizeHint">
                                                     <size>
                                                         <width>20</width>
                                                         <height>31</height>
@@ -449,7 +449,7 @@ Note: Parsing may become very slow when this is enabled
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="tqsizeHint">
+                                                <property name="sizeHint">
                                                     <size>
                                                         <width>20</width>
                                                         <height>31</height>
@@ -558,7 +558,7 @@ if they were one("a=b" is equivalent to "a&lt;&lt;b;b&lt;&lt;a")</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -605,7 +605,7 @@ if they were one("a=b" is equivalent to "a&lt;&lt;b;b&lt;&lt;a")</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout6</cstring>
+                                    <cstring>layout6</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -691,7 +691,7 @@ navigate the header and vice versa</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>400</height>
@@ -853,7 +853,7 @@ plugin enabled to have use all options.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>337</height>
@@ -905,7 +905,7 @@ This option only applies to QMake projects.</string>
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout9</cstring>
+                                    <cstring>layout9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -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>
@@ -963,7 +963,7 @@ This option only applies to QMake projects.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>470</width>
                                                 <height>20</height>
@@ -974,7 +974,7 @@ This option only applies to QMake projects.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout9</cstring>
+                                    <cstring>layout9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1006,7 +1006,7 @@ This option only applies to QMake projects.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout8</cstring>
+                                    <cstring>layout8</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1149,7 +1149,7 @@ This option only applies to QMake projects.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout9</cstring>
+                                    <cstring>layout9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1178,7 +1178,7 @@ This option only applies to QMake projects.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout10</cstring>
+                                    <cstring>layout10</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1217,7 +1217,7 @@ This option only applies to QMake projects.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>70</height>
@@ -1250,7 +1250,7 @@ This option only applies to QMake projects.</string>
                             </property>
                             <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                                 <property name="name">
-                                    <cstring>tqlayout5_2</cstring>
+                                    <cstring>layout5_2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1282,7 +1282,7 @@ This option only applies to QMake projects.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>61</width>
                                                 <height>20</height>
@@ -1435,7 +1435,7 @@ you right click on a variable in a header file.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>87</width>
                                         <height>20</height>
@@ -1460,7 +1460,7 @@ you right click on a variable in a header file.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>87</width>
                                         <height>20</height>
@@ -1477,7 +1477,7 @@ you right click on a variable in a header file.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>92</width>
                                         <height>20</height>
@@ -1494,7 +1494,7 @@ you right click on a variable in a header file.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>92</width>
                                         <height>20</height>
@@ -1513,7 +1513,7 @@ you right click on a variable in a header file.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>91</height>
diff --git a/languages/cpp/classgeneratorconfig.cpp b/languages/cpp/classgeneratorconfig.cpp
index 70ad5d10..eab8beac 100644
--- a/languages/cpp/classgeneratorconfig.cpp
+++ b/languages/cpp/classgeneratorconfig.cpp
@@ -11,7 +11,7 @@
 
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
 
diff --git a/languages/cpp/codeinformationrepository.cpp b/languages/cpp/codeinformationrepository.cpp
index 7498ad23..cf255601 100644
--- a/languages/cpp/codeinformationrepository.cpp
+++ b/languages/cpp/codeinformationrepository.cpp
@@ -265,7 +265,7 @@ KTextEditor::CompletionEntry CodeInformationRepository::toEntry( Tag & tag, CppC
                             {
                                     TQString argName = argumentNames[ i ];
                                     if ( !argName.isEmpty() ) 
-                                        signature += TQString::tqfromLatin1( " " ) + argName;
+                                        signature += TQString::fromLatin1( " " ) + argName;
                                     
                             }
                             
diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
index ca2d8fa5..30f0b7ac 100644
--- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
+++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
@@ -15,7 +15,7 @@
 #include <tqradiobutton.h>
 #include <tqvaluelist.h>
 #include <tqtabwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <kdialog.h>
 #include <klocale.h>
@@ -101,9 +101,9 @@ private:
 GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name )
 		: TQWidget( parent, name ), controller( new FlagCheckBoxController )
 {
-	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-	tqlayout->setAutoAdd( true );
-	tqlayout->addSpacing( 10 );
+	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	layout->setAutoAdd( true );
+	layout->addSpacing( 10 );
 
 	TQVButtonGroup *output_group = new TQVButtonGroup( i18n( "Output" ), this );
 	new FlagCheckBox( output_group, controller,
@@ -114,7 +114,7 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const cha
 	                  "-save-temps", i18n( "Do not delete intermediate output like assembler files" ) );
 
 	TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
-	tqlayout->addSpacing( 10 );
+	layout->addSpacing( 10 );
 
 	TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this );
 	if ( type != GccOptionsPlugin::GPP )
@@ -142,7 +142,7 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const cha
 	                  "-short-double", i18n( "Make 'double' the same as 'float'" ) );
 
 	TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
-	tqlayout->addStretch();
+	layout->addStretch();
 }
 
 
@@ -167,8 +167,8 @@ void GeneralTab::writeFlags( TQStringList *list )
 OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name )
 		: TQWidget( parent, name )
 {
-	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-	tqlayout->setAutoAdd( true );
+	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	layout->setAutoAdd( true );
 
 	TQVButtonGroup *group = new TQVButtonGroup( i18n( "Optimization Level" ), this );
 	Odefault = new TQRadioButton( i18n( "Default" ), group );
@@ -211,7 +211,7 @@ OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent,
 	}
 
 	TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
-	tqlayout->addStretch();
+	layout->addStretch();
 }
 
 
@@ -264,9 +264,9 @@ void OptimizationTab::writeFlags( TQStringList *list )
 G77Tab::G77Tab( TQWidget *parent, const char *name )
 		: TQWidget( parent, name ), controller( new FlagCheckBoxController )
 {
-	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-	tqlayout->setAutoAdd( true );
-	tqlayout->addSpacing( 10 );
+	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	layout->setAutoAdd( true );
+	layout->addSpacing( 10 );
 
 	TQVButtonGroup *dialect_group = new TQVButtonGroup( i18n( "Dialect" ), this );
 	new FlagCheckBox( dialect_group, controller,
@@ -283,7 +283,7 @@ G77Tab::G77Tab( TQWidget *parent, const char *name )
 	                  "-fonetrip", i18n( "DO loops are executed at least once" ) );
 
 	TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
-	tqlayout->addSpacing( 10 );
+	layout->addSpacing( 10 );
 
 	TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this );
 	new FlagCheckBox( codegen_group, controller,
@@ -294,7 +294,7 @@ G77Tab::G77Tab( TQWidget *parent, const char *name )
 	                  "-fbounds-check", i18n( "Generate run-time checks for array subscripts" ) );
 
 	TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
-	tqlayout->addStretch();
+	layout->addStretch();
 }
 
 
@@ -319,8 +319,8 @@ void G77Tab::writeFlags( TQStringList *list )
 Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name )
 		: TQWidget( parent, name ), controller( new FlagCheckBoxController )
 {
-	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-	tqlayout->setAutoAdd( true );
+	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	layout->setAutoAdd( true );
 
 	new FlagCheckBox( this, controller,
 	                  "-w", i18n( "Inhibit all warnings" ) );
@@ -417,8 +417,8 @@ void Warnings1Tab::writeFlags( TQStringList *list )
 Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name )
 		: TQWidget( parent, name )
 {
-	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-	tqlayout->setAutoAdd( true );
+	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	layout->setAutoAdd( true );
 
 	wrestBox = new FlagListBox( this );
 
@@ -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>" ) );
@@ -463,7 +463,7 @@ Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const
 	                        "deprecated by using the 'deprecated' attribute</qt>" ) );
 	new FlagListItem( wrestBox,
 	                  "-Wpacked", i18n( "<qt>Warn if a structure is given the packed attribute, but the packed\n"
-	                                    "attribute has no effect on the tqlayout or size of the structure</qt>" ) );
+	                                    "attribute has no effect on the layout or size of the structure</qt>" ) );
 	new FlagListItem( wrestBox,
 	                  "-Wpadded", i18n( "<qt>Warn if padding is included in a structure, either to align an\n"
 	                                    "element of the structure or to align the whole structure</qt>" ) );
diff --git a/languages/cpp/configproblemreporter.ui b/languages/cpp/configproblemreporter.ui
index fc47d3b2..d752d715 100644
--- a/languages/cpp/configproblemreporter.ui
+++ b/languages/cpp/configproblemreporter.ui
@@ -62,7 +62,7 @@ If disabled, the parser will typically only run when the file is saved.</string>
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -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..01d30c25 100644
--- a/languages/cpp/configproblemreporter.ui.h
+++ b/languages/cpp/configproblemreporter.ui.h
@@ -16,7 +16,7 @@
 #include <kdebug.h>
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 void ConfigureProblemReporter::init()
 {
@@ -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 9796bd17..9fe4b073 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->tqsetWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to navigate to positions of items that are involved in this expression" ) );
+    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,11 +1629,11 @@ 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->tqsetWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to show involved items in the class-view " ) );
+      popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to show involved items in the class-view " ) );
 
       PopupClassViewFillerHelpStruct h( this );
       PopupFiller<PopupClassViewFillerHelpStruct> filler( h, "" );
@@ -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;
 }
@@ -4467,7 +4467,7 @@ bool CppCodeCompletion::getIncludeInfo( int line, TQString& includeFileName, TQS
 		//It is an include-directive. The regular expression captures the string, and the closing sign('"' or '>').
 		isIncludeDirective = true;
 		usedProjectFiles = false;
-		TQStringList captured = includeRx.tqcapturedTexts();
+		TQStringList captured = includeRx.capturedTexts();
 		if( captured.size() == 3 ) {
 			Dependence d;
 			d.first = captured[1];
diff --git a/languages/cpp/cppcodecompletionconfig.cpp b/languages/cpp/cppcodecompletionconfig.cpp
index 1bcc6ace..8372efeb 100644
--- a/languages/cpp/cppcodecompletionconfig.cpp
+++ b/languages/cpp/cppcodecompletionconfig.cpp
@@ -18,7 +18,7 @@
 #include <kdebug.h>
 #include <tqdom.h>
 
-TQString CppCodeCompletionConfig::defaultPath = TQString::tqfromLatin1( "/kdevcppsupport/codecompletion" );
+TQString CppCodeCompletionConfig::defaultPath = TQString::fromLatin1( "/kdevcppsupport/codecompletion" );
 
 CppCodeCompletionConfig::CppCodeCompletionConfig( CppSupportPart * part, TQDomDocument* dom )
 		: TQObject( part ), m_part( part ), m_dom( dom )
diff --git a/languages/cpp/cppevaluation.cpp b/languages/cpp/cppevaluation.cpp
index 3338b97a..7a4f9406 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/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp
index 14294fe0..ed8a2308 100644
--- a/languages/cpp/cppimplementationwidget.cpp
+++ b/languages/cpp/cppimplementationwidget.cpp
@@ -20,7 +20,7 @@
 #include "cppimplementationwidget.h"
 
 #include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tqregexp.h>
diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp
index dd4d278b..96e10a9b 100644
--- a/languages/cpp/cppnewclassdlg.cpp
+++ b/languages/cpp/cppnewclassdlg.cpp
@@ -24,7 +24,7 @@
 #include <tqfileinfo.h>
 #include <tqradiobutton.h>
 #include <tqregexp.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqrect.h>
 #include <tqstyle.h>
 
@@ -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
 		{
@@ -1896,11 +1896,11 @@ void CppNewClassDialog::ClassGenerator::gen_interface()
 		      + ( advConstructorsHeader.isEmpty() ? TQString("    $CLASSNAME$($ARGS$);\n") : advConstructorsHeader )
 		      + TQString("\n    ~$CLASSNAME$();\n")
 		      + advH_public
-		      + (advH_public_slots.isEmpty() ? TQString::tqfromLatin1("") : ("\n\npublic slots:" + advH_public_slots))
-		      + (advH_protected.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprotected:" + advH_protected))
-		      + (advH_protected_slots.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprotected slots:" + advH_protected_slots))
-		      + (advH_private.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprivate:" + advH_private))
-		      + (advH_private_slots.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprivate slots:" + advH_private_slots))
+		      + (advH_public_slots.isEmpty() ? TQString::fromLatin1("") : ("\n\npublic slots:" + advH_public_slots))
+		      + (advH_protected.isEmpty() ? TQString::fromLatin1("") : ("\n\nprotected:" + advH_protected))
+		      + (advH_protected_slots.isEmpty() ? TQString::fromLatin1("") : ("\n\nprotected slots:" + advH_protected_slots))
+		      + (advH_private.isEmpty() ? TQString::fromLatin1("") : ("\n\nprivate:" + advH_private))
+		      + (advH_private_slots.isEmpty() ? TQString::fromLatin1("") : ("\n\nprivate slots:" + advH_private_slots))
 		      + TQString("};\n"
 				"\n")
 		      + namespaceEnd
@@ -1963,7 +1963,7 @@ void CppNewClassDialog::ClassGenerator::gen_interface()
 			if ( !it.current() ->text( 0 ).isEmpty() )
 				if ( !it.current() ->text( 3 ).isEmpty() )
 					//          if ((!childClass) || (it.current()->text(0) != TQWIDGET_OBJECT_NAME_STRING))
-					includeBaseHeader += ( includeBaseHeader.isEmpty() ? TQString( "" ) : TQString( "\n" ) ) + TQString::tqfromLatin1( "#include " ) +
+					includeBaseHeader += ( includeBaseHeader.isEmpty() ? TQString( "" ) : TQString( "\n" ) ) + TQString::fromLatin1( "#include " ) +
 					                     ( it.current() ->text( 2 ).toInt() == 0 ? TQString( "<" ) : TQString( "\"" ) )
 					                     + it.current() ->text( 3 )
 					                     + ( it.current() ->text( 2 ).toInt() == 0 ? TQString( ">" ) : TQString( "\"" ) );
@@ -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/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui
index a5405690..3e61701b 100644
--- a/languages/cpp/cppnewclassdlgbase.ui
+++ b/languages/cpp/cppnewclassdlgbase.ui
@@ -47,7 +47,7 @@
                         <property name="sizeType">
                             <enum>Preferred</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>10</width>
                                 <height>20</height>
@@ -270,7 +270,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -320,7 +320,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -403,7 +403,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>20</height>
@@ -431,7 +431,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>20</height>
@@ -446,7 +446,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                             </widget>
                             <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
                                 <property name="name">
-                                    <cstring>tqlayout5</cstring>
+                                    <cstring>layout5</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -640,7 +640,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout4</cstring>
+                                        <cstring>layout4</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -658,7 +658,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
-                                            <property name="tqminimumSize">
+                                            <property name="minimumSize">
                                                 <size>
                                                     <width>125</width>
                                                     <height>0</height>
@@ -680,7 +680,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
-                                            <property name="tqminimumSize">
+                                            <property name="minimumSize">
                                                 <size>
                                                     <width>125</width>
                                                     <height>0</height>
@@ -700,7 +700,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>150</width>
                                                     <height>20</height>
@@ -958,7 +958,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/languages/cpp/cppsplitheadersourceconfig.cpp b/languages/cpp/cppsplitheadersourceconfig.cpp
index a9edc315..7298354b 100644
--- a/languages/cpp/cppsplitheadersourceconfig.cpp
+++ b/languages/cpp/cppsplitheadersourceconfig.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <tqdom.h>
 
-TQString CppSplitHeaderSourceConfig::defaultPath = TQString::tqfromLatin1( "/kdevcppsupport/splitheadersource" );
+TQString CppSplitHeaderSourceConfig::defaultPath = TQString::fromLatin1( "/kdevcppsupport/splitheadersource" );
 
 CppSplitHeaderSourceConfig::CppSplitHeaderSourceConfig( CppSupportPart * part, TQDomDocument* dom )
         : TQObject( part ), m_part( part ), m_dom( dom )
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index ac9d52ba..747a7e0a 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -688,7 +688,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 		if ( !text.isEmpty() )
 		{
 			id = popup->insertItem( i18n( "Make Member" ), this, TQT_SLOT( slotMakeMember() ) );
-			popup->tqsetWhatsThis( id, i18n( "<b>Make member</b><p>Creates a class member function in implementation file "
+			popup->setWhatsThis( id, i18n( "<b>Make member</b><p>Creates a class member function in implementation file "
 			                               "based on the member declaration at the current line." ) );
 		}
 
@@ -737,7 +737,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 			{
 				TQPopupMenu * m2 = new TQPopupMenu( popup );
 				id = popup->insertItem( i18n( "Go to Declaration" ), m2 );
-				popup->tqsetWhatsThis( id, i18n( "<b>Go to declaration</b><p>Provides a menu to select available function declarations "
+				popup->setWhatsThis( id, i18n( "<b>Go to declaration</b><p>Provides a menu to select available function declarations "
 				                               "in the current file and in the corresponding header (if the current file is an implementation) or source (if the current file is a header) file." ) );
 
 				FileDom file2 = codeModel() ->fileByName( candidate );
@@ -753,7 +753,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 						text += "::";
 					}
 					text += formatModelItem( *it, true );
-					text = text.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&&" ) );
+					text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) );
 					int id = m2->insertItem( text, this, TQT_SLOT( gotoDeclarationLine( int ) ) );
 					int line, column;
 					( *it ) ->getStartPosition( &line, &column );
@@ -781,7 +781,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 			{
 				TQPopupMenu * m = new TQPopupMenu( popup );
 				id = popup->insertItem( i18n( "Go to Definition" ), m );
-				popup->tqsetWhatsThis( id, i18n( "<b>Go to definition</b><p>Provides a menu to select available function definitions "
+				popup->setWhatsThis( id, i18n( "<b>Go to definition</b><p>Provides a menu to select available function definitions "
 				                               "in the current file and in the corresponding header (if the current file is an implementation) or source (if the current file is a header) file." ) );
 
 				const FileDom file = codeModel() ->fileByName( candidate1 );
@@ -794,7 +794,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 						text += "::";
 					}
 					text += formatModelItem( *it, true );
-					text = text.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&&" ) );
+					text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) );
 					int id = m->insertItem( text, this, TQT_SLOT( gotoLine( int ) ) );
 					int line, column;
 					( *it ) ->getStartPosition( &line, &column );
@@ -822,7 +822,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 		{
 			m_activeClass = ( ClassModel* ) mcontext->item();
 			int id = popup->insertItem( i18n( "Extract Interface..." ), this, TQT_SLOT( slotExtractInterface() ) );
-			popup->tqsetWhatsThis( id, i18n( "<b>Extract interface</b><p>Extracts interface from the selected class and creates a new class with this interface. "
+			popup->setWhatsThis( id, i18n( "<b>Extract interface</b><p>Extracts interface from the selected class and creates a new class with this interface. "
 			                               "No implementation code is extracted and no implementation code is created." ) );
 		}
 		else if ( mcontext->item() ->isFunction() )
@@ -840,7 +840,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 		{
 			m_contextFileName = url.path();
 			int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQT_SLOT( slotCreateSubclass() ) );
-			popup->tqsetWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) );
+			popup->setWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) );
 		}
 	}
 }
@@ -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 );
@@ -1777,7 +1777,7 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum
 			TQString declStr = declaratorToString( declarator, scopeStr ).simplifyWhiteSpace();
 			if ( declarator->exceptionSpecification() )
 			{
-				declStr += TQString::tqfromLatin1( " throw( " );
+				declStr += TQString::fromLatin1( " throw( " );
 				TQPtrList<AST> l = declarator->exceptionSpecification() ->nodeList();
 				TQPtrListIterator<AST> type_it( l );
 				while ( type_it.current() )
@@ -1786,10 +1786,10 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum
 					++type_it;
 
 					if ( type_it.current() )
-						declStr += TQString::tqfromLatin1( ", " );
+						declStr += TQString::fromLatin1( ", " );
 				}
 
-				declStr += TQString::tqfromLatin1( " )" );
+				declStr += TQString::fromLatin1( " )" );
 			}
 
 			text += "\n\n";
@@ -2034,10 +2034,10 @@ TQString CppSupportPart::formatTag( const Tag & inputTag )
 	switch ( tag.kind() )
 	{
 	case Tag::Kind_Namespace:
-		return TQString::tqfromLatin1( "namespace " ) + tag.name();
+		return TQString::fromLatin1( "namespace " ) + tag.name();
 
 	case Tag::Kind_Class:
-		return TQString::tqfromLatin1( "class " ) + tag.name();
+		return TQString::fromLatin1( "class " ) + tag.name();
 
 	case Tag::Kind_Function:
 	case Tag::Kind_FunctionDeclaration:
@@ -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
@@ -2856,7 +2856,7 @@ void CppSupportPart::addMethod( ClassDom aClass, const TQString& name, const TQS
 	if ( !editIface )
 		return ; //@fixme errorverdoedelung
 
-	editIface->insertLine( editIface->numLines(), TQString::tqfromLatin1( "" ) );
+	editIface->insertLine( editIface->numLines(), TQString::fromLatin1( "" ) );
 	editIface->insertText( editIface->numLines() - 1, 0, definitionString );
 	backgroundParser() ->addFile( implementationFile );
 }
@@ -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 )
@@ -3143,7 +3143,7 @@ void UIBlockTester::UIBlockTesterThread::run() {
   while(!m_stop) {
 	  msleep( m_parent.m_msecs / 10 );
 	  m_parent.m_timeMutex.lock();
-	  TQDateTime t = TQDateTime::tqcurrentDateTime();
+	  TQDateTime t = TQDateTime::currentDateTime();
 	  uint msecs = m_parent.m_lastTime.time().msecsTo( t.time() );
 	  if( msecs > m_parent.m_msecs ) {
 		  m_parent.lockup();
@@ -3171,7 +3171,7 @@ UIBlockTester::~UIBlockTester() {
 
 void UIBlockTester::timer() {
 	m_timeMutex.lock();
-	m_lastTime = TQDateTime::tqcurrentDateTime();
+	m_lastTime = TQDateTime::currentDateTime();
 	m_timeMutex.unlock();
 }
 
diff --git a/languages/cpp/creategettersetter.ui b/languages/cpp/creategettersetter.ui
index fd4feaf6..81edebf0 100644
--- a/languages/cpp/creategettersetter.ui
+++ b/languages/cpp/creategettersetter.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>61</width>
                     <height>20</height>
@@ -136,7 +136,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
diff --git a/languages/cpp/creategettersetterconfiguration.cpp b/languages/cpp/creategettersetterconfiguration.cpp
index 3bee7f16..7190e796 100644
--- a/languages/cpp/creategettersetterconfiguration.cpp
+++ b/languages/cpp/creategettersetterconfiguration.cpp
@@ -17,7 +17,7 @@
 
 #include <tqdom.h>
 #include <kmessagebox.h>
-TQString CreateGetterSetterConfiguration::defaultPath = TQString::tqfromLatin1( "/kdevcppsupport/creategettersetter" );
+TQString CreateGetterSetterConfiguration::defaultPath = TQString::fromLatin1( "/kdevcppsupport/creategettersetter" );
 
 CreateGetterSetterConfiguration::CreateGetterSetterConfiguration( CppSupportPart * part ) 
 : TQObject(part), m_part(part), m_settings(0)
diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp
index e237d683..a53ebe35 100644
--- a/languages/cpp/createpcsdialog.cpp
+++ b/languages/cpp/createpcsdialog.cpp
@@ -39,7 +39,7 @@
 #include <tqheader.h>
 #include <tqlabel.h>
 #include <tqregexp.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 #include <tqpushbutton.h>
 
diff --git a/languages/cpp/createpcsdialogbase.ui b/languages/cpp/createpcsdialogbase.ui
index f40f7c94..eafbc184 100644
--- a/languages/cpp/createpcsdialogbase.ui
+++ b/languages/cpp/createpcsdialogbase.ui
@@ -89,7 +89,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>20</width>
                         <height>111</height>
@@ -132,7 +132,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>20</width>
                         <height>81</height>
diff --git a/languages/cpp/debugger/TODO.txt b/languages/cpp/debugger/TODO.txt
index 563cf85c..38aca109 100644
--- a/languages/cpp/debugger/TODO.txt
+++ b/languages/cpp/debugger/TODO.txt
@@ -69,7 +69,7 @@ TODO:
 
        - Add icons
 
-       - tqStatus display column is just ugly
+       - Status display column is just ugly
      
        - Handle "out of breakpoints" message.
 
diff --git a/languages/cpp/debugger/breakpoint.cpp b/languages/cpp/debugger/breakpoint.cpp
index c42f32c9..1b6efdaf 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/dbgcontroller.h b/languages/cpp/debugger/dbgcontroller.h
index c87a333f..f8103ab2 100644
--- a/languages/cpp/debugger/dbgcontroller.h
+++ b/languages/cpp/debugger/dbgcontroller.h
@@ -118,7 +118,7 @@ signals:
     void gdbUserCommandStdout (const char *output);
     void gdbStderr            (const char *output);
     void showStepInSource     (const TQString &fileName, int lineNum, const TQString &address);
-    void dbgtqStatus            (const TQString &status, int statusFlag);
+    void dbgStatus            (const TQString &status, int statusFlag);
 
 protected:
     KProcess *dbgProcess_;
diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp
index c31f4a4c..22c85502 100644
--- a/languages/cpp/debugger/dbgpsdlg.cpp
+++ b/languages/cpp/debugger/dbgpsdlg.cpp
@@ -28,7 +28,7 @@
 
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <tqtoolbutton.h>
 #include <tqpushbutton.h>
@@ -77,7 +77,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name)
     buttonbox->addStretch();
     TQPushButton *ok       = buttonbox->addButton(KStdGuiItem::ok());
     TQPushButton *cancel   = buttonbox->addButton(KStdGuiItem::cancel());
-    buttonbox->tqlayout();
+    buttonbox->layout();
     topLayout->addWidget(buttonbox);
 
     connect(ok,     TQT_SIGNAL(clicked()),  TQT_SLOT(accept()));
@@ -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 e8bb0c90..435591a3 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -28,7 +28,7 @@
 #include <tqapplication.h>
 #include <tqcursor.h>
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
@@ -120,8 +120,8 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
         offset_ = parentWidget()->pos() - e->globalPos();
         setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
         TQApplication::setOverrideCursor(TQCursor(sizeAllCursor));
-        setPalette(TQPalette(tqcolorGroup().background()));
-        tqrepaint();
+        setPalette(TQPalette(colorGroup().background()));
+        repaint();
     }
 }
 
@@ -134,8 +134,8 @@ void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e)
     offset_ = TQPoint(0,0);
     setFrameStyle(TQFrame::Panel|TQFrame::Raised);
     TQApplication::restoreOverrideCursor();
-    setPalette(TQPalette(tqcolorGroup().background()));
-    tqrepaint();
+    setPalette(TQPalette(colorGroup().background()));
+    repaint();
 }
 
 // **************************************************************************
@@ -162,7 +162,7 @@ public:
               DbgToolBar *parent, const char *name=0);
     virtual ~DbgButton() {};
     void drawButtonLabel(TQPainter *painter);
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
 private:
     TQPixmap pixmap_;
@@ -191,21 +191,21 @@ void DbgButton::drawButtonLabel(TQPainter *painter)
     painter->drawPixmap(x, y, pixmap_);
 
     if (hasText) {
-        painter->setPen(tqcolorGroup().text());
+        painter->setPen(colorGroup().text());
         painter->drawText(height()+2, 0, width()-(height()+2), height(), AlignLeft|AlignVCenter, text());
     }
 }
 
 // **************************************************************************
 
-TQSize DbgButton::tqsizeHint() const
+TQSize DbgButton::sizeHint() const
 {
     if (text().isEmpty())
         return pixmap_.size();
     else
     {
         TQSize ps = pixmap_.size();
-        TQSize bs = TQPushButton::tqsizeHint();
+        TQSize bs = TQPushButton::sizeHint();
         TQSize result;
         result.setWidth( ps.width() + bs.width()+10 );
         result.setHeight( ps.height() > bs.height() ? ps.height() : bs.height() );
@@ -365,12 +365,12 @@ DbgToolBar::DbgToolBar(DebuggerPart* part,
     nextLayout->addWidget(bNext);
     nextLayout->addWidget(bNexti);
 
-//     int w = TQMAX(bRun->tqsizeHint().width(), bFinish->tqsizeHint().width());
-//     w = TQMAX(w, bInterrupt->tqsizeHint().width());
-//     w = TQMAX(w, bView->tqsizeHint().width());
+//     int w = TQMAX(bRun->sizeHint().width(), bFinish->sizeHint().width());
+//     w = TQMAX(w, bInterrupt->sizeHint().width());
+//     w = TQMAX(w, bView->sizeHint().width());
 
     // they should have the same height, so don't be too fussy
-//     int h = bFinish->tqsizeHint().height();
+//     int h = bFinish->sizeHint().height();
 //
 //     bNext->setMinimumHeight(h);
 //     bNexti->setMinimumHeight(h);
@@ -404,10 +404,10 @@ void DbgToolBar::slotKdevFocus()
     // If anyone has a way of determining what window the app is _actually_ running on
     // then please fix and send a patch.
 
-    if (winModule_->activeWindow() != tqtopLevelWidget()->winId())
+    if (winModule_->activeWindow() != topLevelWidget()->winId())
         activeWindow_ = winModule_->activeWindow();
 
-    KWin::activateWindow(tqtopLevelWidget()->winId());
+    KWin::activateWindow(topLevelWidget()->winId());
 }
 
 // **************************************************************************
@@ -421,7 +421,7 @@ void DbgToolBar::slotPrevFocus()
 
 // If the app is active then the app button is highlighted, otherwise
 // kdev button is highlighted.
-void DbgToolBar::slotDbgtqStatus(const TQString&, int state)
+void DbgToolBar::slotDbgStatus(const TQString&, int state)
 {
     bool appIndicator = state & s_dbgBusy;
     if (appIndicator != appIsActive_) {
@@ -435,11 +435,11 @@ void DbgToolBar::slotDbgtqStatus(const TQString&, int state)
 void DbgToolBar::setAppIndicator(bool appIndicator)
 {
     if (appIndicator) {
-        bPrevFocus_->setPalette(TQPalette(tqcolorGroup().mid()));
-        bKDevFocus_->setPalette(TQPalette(tqcolorGroup().background()));
+        bPrevFocus_->setPalette(TQPalette(colorGroup().mid()));
+        bKDevFocus_->setPalette(TQPalette(colorGroup().background()));
     } else {
-        bPrevFocus_->setPalette(TQPalette(tqcolorGroup().background()));
-        bKDevFocus_->setPalette(TQPalette(tqcolorGroup().mid()));
+        bPrevFocus_->setPalette(TQPalette(colorGroup().background()));
+        bKDevFocus_->setPalette(TQPalette(colorGroup().mid()));
     }
 }
 
@@ -487,7 +487,7 @@ void DbgToolBar::slotActivateAndUndock()
     if (!docked_)
         return;
 
-    KWin::activateWindow(tqtopLevelWidget()->winId());
+    KWin::activateWindow(topLevelWidget()->winId());
     slotUndock();
 }
 
diff --git a/languages/cpp/debugger/dbgtoolbar.h b/languages/cpp/debugger/dbgtoolbar.h
index 5e1424d7..7f124c6c 100644
--- a/languages/cpp/debugger/dbgtoolbar.h
+++ b/languages/cpp/debugger/dbgtoolbar.h
@@ -58,7 +58,7 @@ public:
     virtual ~DbgToolBar();
 
 private slots:
-    void slotDbgtqStatus(const TQString&, int);
+    void slotDbgStatus(const TQString&, int);
     void slotDock();
     void slotUndock();
     void slotIconifyAndDock();
diff --git a/languages/cpp/debugger/debuggerconfigwidget.cpp b/languages/cpp/debugger/debuggerconfigwidget.cpp
index d4c97957..05a8cf78 100644
--- a/languages/cpp/debugger/debuggerconfigwidget.cpp
+++ b/languages/cpp/debugger/debuggerconfigwidget.cpp
@@ -78,7 +78,7 @@ DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *parent,
 
     // ??? DomUtil::readEntry(dom, "/kdevdebugger/general/allowforcedbpset");
 
-    resize(tqsizeHint());
+    resize(sizeHint());
 }
 
 
diff --git a/languages/cpp/debugger/debuggerconfigwidgetbase.ui b/languages/cpp/debugger/debuggerconfigwidgetbase.ui
index a3a1e321..72bb4c93 100644
--- a/languages/cpp/debugger/debuggerconfigwidgetbase.ui
+++ b/languages/cpp/debugger/debuggerconfigwidgetbase.ui
@@ -102,7 +102,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -208,7 +208,7 @@ check this option.</string>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -303,7 +303,7 @@ check this option.</string>
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -404,7 +404,7 @@ or if your executable contains the gdb stub
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index 59294487..fb1577d4 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -92,7 +92,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
     statusBarIndicator = new LabelWithDoubleClick(
         " ", mainWindow()->statusBar());
     statusBarIndicator->setFixedWidth(15);
-    statusBarIndicator->tqsetAlignment(TQt::AlignCenter);
+    statusBarIndicator->setAlignment(TQt::AlignCenter);
     mainWindow()->statusBar()->addWidget(statusBarIndicator, 0, true);
     statusBarIndicator->show();
 
@@ -500,7 +500,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
                                         this, TQT_SLOT(slotRunToCursor()),
                                         0, -1, index);
 
-            popup->tqsetWhatsThis(id, act->whatsThis());
+            popup->setWhatsThis(id, act->whatsThis());
             index += running;
         }
     }
@@ -510,21 +510,21 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
                                     this, TQT_SLOT(toggleBreakpoint()),
                                     0, -1, index);
         index += running;
-        popup->tqsetWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line."));
+        popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line."));
     }
     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->tqsetWhatsThis(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),
+        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").arg(squeezed),
                                      this, TQT_SLOT(contextWatch()),
                                     0, -1, index);
         index += running;
-        popup->tqsetWhatsThis(id2, i18n("<b>Watch expression</b><p>Adds an expression under the cursor to the Variables/Watch list."));
+        popup->setWhatsThis(id2, i18n("<b>Watch expression</b><p>Adds an expression under the cursor to the Variables/Watch list."));
     }
     if (running)
         popup->insertSeparator(index);
@@ -589,8 +589,8 @@ void DebuggerPart::setupController()
              disassembleWidget,     TQT_SLOT(slotShowStepInSource(const TQString&, int, const TQString&)));
 
     // controller -> this
-    connect( controller,            TQT_SIGNAL(dbgtqStatus(const TQString&, int)),
-             this,                  TQT_SLOT(slottqStatus(const TQString&, int)));
+    connect( controller,            TQT_SIGNAL(dbgStatus(const TQString&, int)),
+             this,                  TQT_SLOT(slotStatus(const TQString&, int)));
     connect( controller,            TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)),
              this,                  TQT_SLOT(slotShowStep(const TQString&, int)));
     connect( controller,            TQT_SIGNAL(debuggerAbnormalExit()),
@@ -613,16 +613,16 @@ void DebuggerPart::setupController()
 
     connect( controller,            TQT_SIGNAL(gdbStderr(const char*)),
              gdbOutputWidget,       TQT_SLOT(slotReceivedStderr(const char*)) );
-    connect( controller,            TQT_SIGNAL(dbgtqStatus(const TQString&, int)),
-             gdbOutputWidget,       TQT_SLOT(slotDbgtqStatus(const TQString&, int)));
+    connect( controller,            TQT_SIGNAL(dbgStatus(const TQString&, int)),
+             gdbOutputWidget,       TQT_SLOT(slotDbgStatus(const TQString&, int)));
 
     // controller -> viewerWidget
-    connect( controller, TQT_SIGNAL(dbgtqStatus(const TQString&, int)),
+    connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)),
              viewerWidget, TQT_SLOT(slotDebuggerState(const TQString&, int)));
 
 
     connect(statusBarIndicator, TQT_SIGNAL(doubleClicked()),
-            controller, TQT_SLOT(explainDebuggertqStatus()));
+            controller, TQT_SLOT(explainDebuggerStatus()));
 
 }
 
@@ -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);
@@ -1092,7 +1092,7 @@ void DebuggerPart::slotRefreshBPState( const Breakpoint& BP)
     }
 }
 
-void DebuggerPart::slottqStatus(const TQString &msg, int state)
+void DebuggerPart::slotStatus(const TQString &msg, int state)
 {
     TQString stateIndicator, stateIndicatorFull;
 
diff --git a/languages/cpp/debugger/debuggerpart.h b/languages/cpp/debugger/debuggerpart.h
index b201b15a..40877e29 100644
--- a/languages/cpp/debugger/debuggerpart.h
+++ b/languages/cpp/debugger/debuggerpart.h
@@ -95,7 +95,7 @@ private slots:
 
     void slotRefreshBPState(const Breakpoint&);
 
-    void slottqStatus(const TQString &msg, int state);
+    void slotStatus(const TQString &msg, int state);
     void slotShowStep(const TQString &fileName, int lineNum);
     void slotGotoSource(const TQString &fileName, int lineNum);
 
diff --git a/languages/cpp/debugger/debuggertracingdialogbase.ui b/languages/cpp/debugger/debuggertracingdialogbase.ui
index 51cfe410..faa68cd7 100644
--- a/languages/cpp/debugger/debuggertracingdialogbase.ui
+++ b/languages/cpp/debugger/debuggertracingdialogbase.ui
@@ -71,7 +71,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
diff --git a/languages/cpp/debugger/disassemblewidget.cpp b/languages/cpp/debugger/disassemblewidget.cpp
index 705185fd..dcb9ab6b 100644
--- a/languages/cpp/debugger/disassemblewidget.cpp
+++ b/languages/cpp/debugger/disassemblewidget.cpp
@@ -24,7 +24,7 @@
 
 #include <tqdict.h>
 #include <tqheader.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 #include <stdlib.h>
 
diff --git a/languages/cpp/debugger/disassemblewidget.h b/languages/cpp/debugger/disassemblewidget.h
index 73e743f7..93d3f44d 100644
--- a/languages/cpp/debugger/disassemblewidget.h
+++ b/languages/cpp/debugger/disassemblewidget.h
@@ -18,7 +18,7 @@
 
 #include "mi/gdbmi.h"
 
-#include <tqtextedit.h>
+#include <textedit.h>
 
 /***************************************************************************/
 /***************************************************************************/
diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp
index 2b8ae5a6..d7f50778 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 8626a3e1..146ed57b 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.cpp
+++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp
@@ -37,7 +37,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
@@ -56,7 +56,7 @@ enum Column {
     Control     = 0,
     Enable      = 1,
     Type        = 2,
-    tqStatus      = 3,
+    Status      = 3,
     Location    = 4,
     Condition   = 5,
     IgnoreCount = 6,
@@ -161,7 +161,7 @@ void BreakpointTableRow::setRow()
 
         TQString status=m_breakpoint->statusDisplay(m_activeFlag);
 
-        table()->setText(row(), tqStatus, status);
+        table()->setText(row(), Status, status);
         table()->setText(row(), Condition, m_breakpoint->conditional());
         table()->setText(row(), IgnoreCount, TQString::number(m_breakpoint->ignoreCount() ));
         table()->setText(row(), Hits, TQString::number(m_breakpoint->hits() ));
@@ -183,7 +183,7 @@ void BreakpointTableRow::setRow()
 
         table()->setText(row(), Type, displayType);
         table()->adjustColumn(Type);
-        table()->adjustColumn(tqStatus);
+        table()->adjustColumn(Status);
         table()->adjustColumn(Location);
         table()->adjustColumn(Hits);
         table()->adjustColumn(IgnoreCount);
@@ -208,7 +208,7 @@ controller_(controller)
 
     m_table->hideColumn(Control);
     m_table->setColumnReadOnly(Type, true);
-    m_table->setColumnReadOnly(tqStatus, true);
+    m_table->setColumnReadOnly(Status, true);
     m_table->setColumnReadOnly(Hits, true);
     m_table->setColumnWidth( Enable, 20);
 
@@ -216,7 +216,7 @@ controller_(controller)
 
     header->setLabel( Enable,       "" );
     header->setLabel( Type,         i18n("Type") );
-    header->setLabel( tqStatus,       i18n("Status") );
+    header->setLabel( Status,       i18n("Status") );
     header->setLabel( Location,     i18n("Location") );
     header->setLabel( Condition,    i18n("Condition") );
     header->setLabel( IgnoreCount,  i18n("Ignore Count") );
@@ -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));
 }
 
 /***************************************************************************/
@@ -1213,7 +1213,7 @@ TQWidget* ComplexEditCell::createEditor() const
 {
     TQHBox* box = new TQHBox( table()->viewport() );
     box->setPaletteBackgroundColor(
-               table()->tqpalette().active().highlight());
+               table()->palette().active().highlight());
 
     label_ = new TQLabel(text(), box, "label");
     label_->setBackgroundMode(TQt::PaletteHighlight);
@@ -1225,16 +1225,16 @@ TQWidget* ComplexEditCell::createEditor() const
     TQPalette p = label_->palette();
 
     p.setColor(TQPalette::Active, TQColorGroup::Foreground,
-               table()->tqpalette().active().highlightedText());
+               table()->palette().active().highlightedText());
     p.setColor(TQPalette::Inactive, TQColorGroup::Foreground,
-               table()->tqpalette().active().highlightedText());
+               table()->palette().active().highlightedText());
 
     label_->setPalette(p);
 
     TQPushButton* b = new TQPushButton("...", box);
     // This is exactly what is done in TQDesigner source in the
     // similar context. Haven't had any success making the good look
-    // with tqlayout, I suppose that tqsizeHint for button is always larger
+    // with layout, I suppose that sizeHint for button is always larger
     // than 20.
     b->setFixedWidth( 20 );
 
diff --git a/languages/cpp/debugger/gdbcommand.cpp b/languages/cpp/debugger/gdbcommand.cpp
index c6c4bbc3..b5412dc0 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 ab7ffe69..b0c3171e 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;
     }
@@ -320,7 +320,7 @@ void GDBController::queueCmd(GDBCommand *cmd, enum queue_where queue_where)
                   << (stateReloadInProgress_ ? " (state reloading)\n" : "\n");
 
     setStateOn(s_dbgBusy);
-    emit dbgtqStatus("", state_);
+    emit dbgStatus("", state_);
     raiseEvent(debugger_busy);
 
     executeCmd();
@@ -409,7 +409,7 @@ void GDBController::executeCmd()
     else
         emit gdbInternalCommandStdout( prettyCmd.latin1() );
 
-    emit dbgtqStatus ("", state_);
+    emit dbgStatus ("", state_);
 }
 
 // **************************************************************************
@@ -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;
@@ -540,7 +540,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r)
             // or whatever).
 
             setStateOff(s_explicitBreakInto);
-            emit dbgtqStatus("Application interrupted", state_);
+            emit dbgStatus("Application interrupted", state_);
             // Will show the source line in the code
             // handling non-special stop kinds, below.
         }
@@ -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"));
         }
     }
@@ -592,7 +592,7 @@ void GDBController::reloadProgramState()
         maybeAnnounceWatchpointHit();
     }
 
-    emit dbgtqStatus ("", state_);
+    emit dbgStatus ("", state_);
 
     // We're always at frame zero when the program stops
     // and we must reset the active flag
@@ -648,7 +648,7 @@ void GDBController::programNoApp(const TQString &msg, bool msgBox)
     if (msgBox)
         KMessageBox::information(0, i18n("gdb message:\n")+msg,"Warning", "gdb_error");
 
-    emit dbgtqStatus (msg, state_);
+    emit dbgStatus (msg, state_);
     /* Also show message in gdb window, so that users who
        prefer to look at gdb window know what's up.  */
     emit gdbUserCommandStdout(msg.ascii());
@@ -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
     }
@@ -755,7 +755,7 @@ void GDBController::maybeAnnounceWatchpointHit()
         }
         else if (last_stop_reason == "read-watchpoint-trigger")
         {
-            emit dbgtqStatus ("Read watchpoint triggered", state_);
+            emit dbgStatus ("Read watchpoint triggered", state_);
         }
     }
 }
@@ -846,14 +846,14 @@ 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;
     }
 
     setStateOff(s_dbgNotStarted);
-    emit dbgtqStatus ("", state_);
+    emit dbgStatus ("", state_);
 
     saw_gdb_prompt_ = false;
 
@@ -1043,7 +1043,7 @@ void GDBController::slotStopDebugger()
     gdbOutput_ = "";
 
     setState(s_dbgNotStarted | s_appNotStarted);
-    emit dbgtqStatus (i18n("Debugger stopped"), state_);
+    emit dbgStatus (i18n("Debugger stopped"), state_);
 
     raiseEvent(debugger_exited);
 }
@@ -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",
@@ -1352,7 +1352,7 @@ void GDBController::defaultErrorHandler(const GDBMI::ResultRecord& result)
     if (msg.contains("No such process"))
     {
         setState(s_appNotStarted|s_programExited);
-        emit dbgtqStatus (i18n("Process exited"), state_);
+        emit dbgStatus (i18n("Process exited"), state_);
         raiseEvent(program_exited);
         return;
     }
@@ -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();
@@ -1629,7 +1629,7 @@ void GDBController::commandDone()
     {
         kdDebug(9012) << "No more commands\n";
         setStateOff(s_dbgBusy);
-        emit dbgtqStatus("", state_);
+        emit dbgStatus("", state_);
         raiseEvent(debugger_ready);
     }
 }
@@ -1688,7 +1688,7 @@ void GDBController::raiseEvent(event_t e)
 void GDBController::slotDbgStderr(KProcess *proc, char *buf, int buflen)
 {
     // At the moment, just drop a message out and redirect
-    kdDebug(9012) << "STDERR: " << TQString::tqfromLatin1(buf, buflen+1) << endl;
+    kdDebug(9012) << "STDERR: " << TQString::fromLatin1(buf, buflen+1) << endl;
     slotDbgStdout(proc, buf, buflen);
 }
 
@@ -1722,7 +1722,7 @@ void GDBController::slotDbgProcessExited(KProcess* process)
 
     destroyCmds();
     setState(s_dbgNotStarted|s_appNotStarted|s_programExited);
-    emit dbgtqStatus (i18n("Process exited"), state_);
+    emit dbgStatus (i18n("Process exited"), state_);
 
     emit gdbUserCommandStdout("(gdb) Process exited\n");
 }
@@ -1743,14 +1743,14 @@ void GDBController::slotUserGDBCmd(const TQString& cmd)
     //    raiseEvent(program_state_changed);
 }
 
-void GDBController::explainDebuggertqStatus()
+void GDBController::explainDebuggerStatus()
 {
     TQString information("%1 commands in queue\n"
                         "%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::explainDebuggertqStatus()
                       "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/gdbcontroller.h b/languages/cpp/debugger/gdbcontroller.h
index 6ea27f41..3bc0020d 100644
--- a/languages/cpp/debugger/gdbcontroller.h
+++ b/languages/cpp/debugger/gdbcontroller.h
@@ -250,7 +250,7 @@ public slots:
     // Pops up a dialog box with some hopefully
     // detailed information about which state debugger
     // is in, which commands were sent and so on.
-    void explainDebuggertqStatus();
+    void explainDebuggerStatus();
 
 
 protected slots:
diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp
index c0157463..82385c72 100644
--- a/languages/cpp/debugger/gdboutputwidget.cpp
+++ b/languages/cpp/debugger/gdboutputwidget.cpp
@@ -25,12 +25,12 @@
 #include <kpopupmenu.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqtextedit.h>
+#include <layout.h>
+#include <textedit.h>
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqdom.h>
 
 
@@ -62,7 +62,7 @@ GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) :
     userGDBCmdEntry->setStretchFactor(m_userGDBCmdEditor, 1);
 
     m_Interrupt = new TQToolButton( this, "add breakpoint" );
-    m_Interrupt->tqsetSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0,
+    m_Interrupt->setSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0,
                                          ( TQSizePolicy::SizeType)0,
                                          0,
                                          0,
@@ -76,7 +76,7 @@ GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) :
     topLayout->addWidget(m_gdbView, 10);
     topLayout->addLayout(userGDBCmdEntry);
 
-    slotDbgtqStatus( "", s_dbgNotStarted);
+    slotDbgStatus( "", s_dbgNotStarted);
 
     connect( m_userGDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotGDBCmd()) );
     connect( m_Interrupt,        TQT_SIGNAL(clicked()),       TQT_SIGNAL(breakInto()));
@@ -257,7 +257,7 @@ void GDBOutputWidget::flushPending()
 
 /***************************************************************************/
 
-void GDBOutputWidget::slotDbgtqStatus(const TQString &, int statusFlag)
+void GDBOutputWidget::slotDbgStatus(const TQString &, int statusFlag)
 {
     if (statusFlag & s_dbgNotStarted)
     {
@@ -328,7 +328,7 @@ TQPopupMenu* OutputText::createPopupMenu(const TQPoint&)
                                TQT_SLOT(toggleShowInternalCommands()));
 
     popup->setItemChecked(id, parent_->showInternalCommands_);
-    popup->tqsetWhatsThis(
+    popup->setWhatsThis(
         id, 
         i18n(
             "Controls if commands issued internally by KDevelop "
@@ -356,8 +356,8 @@ void OutputText::copyAll()
 
     // Make sure the text is pastable both with Ctrl-C and with
     // middle click.
-    TQApplication::tqclipboard()->setText(text, TQClipboard::Clipboard);
-    TQApplication::tqclipboard()->setText(text, TQClipboard::Selection);
+    TQApplication::clipboard()->setText(text, TQClipboard::Clipboard);
+    TQApplication::clipboard()->setText(text, TQClipboard::Selection);
 }
 
 void OutputText::toggleShowInternalCommands()
diff --git a/languages/cpp/debugger/gdboutputwidget.h b/languages/cpp/debugger/gdboutputwidget.h
index 28ffb8bc..de7704f1 100644
--- a/languages/cpp/debugger/gdboutputwidget.h
+++ b/languages/cpp/debugger/gdboutputwidget.h
@@ -19,7 +19,7 @@
 #define _GDBOUTPUTWIDGET_H_
 
 #include <tqwidget.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqtimer.h>
 #include <tqstringlist.h>
 
@@ -50,7 +50,7 @@ public slots:
     void slotInternalCommandStdout(const char* line);
     void slotUserCommandStdout(const char* line);
     void slotReceivedStderr(const char* line);
-    void slotDbgtqStatus     (const TQString &status, int statusFlag);
+    void slotDbgStatus     (const TQString &status, int statusFlag);
 
     void slotGDBCmd();
 
diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp
index 3b69c206..217f09fe 100644
--- a/languages/cpp/debugger/memviewdlg.cpp
+++ b/languages/cpp/debugger/memviewdlg.cpp
@@ -27,14 +27,14 @@
 #include <kiconloader.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmultilineedit.h>
 #include <tqpushbutton.h>
 #include <tqvariant.h>
 #include <tqpopupmenu.h>
 #include <tqhbox.h>
 #include <tqtoolbox.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 #include <kmessagebox.h>
 
@@ -84,7 +84,7 @@ namespace GDBDebugger
         {
             TQVBoxLayout* l = new TQVBoxLayout(this);
 
-            // Grid tqlayout: labels + address field
+            // Grid layout: labels + address field
             TQGridLayout* gl = new TQGridLayout(l);
 
             gl->setColSpacing(0, 2);
@@ -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 a8c9f594..4adf33c2 100644
--- a/languages/cpp/debugger/variablewidget.cpp
+++ b/languages/cpp/debugger/variablewidget.cpp
@@ -26,7 +26,7 @@
 
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqpainter.h>
 #include <tqpushbutton.h>
@@ -36,7 +36,7 @@
 #include <klocale.h>
 
 #include <tqpoint.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
 
@@ -47,14 +47,14 @@
 
 /** The variables widget is passive, and is invoked by the rest of the
     code via two main slots:
-    - slotDbgtqStatus
+    - slotDbgStatus
     - slotCurrentFrame
 
     The first is received the program status changes and the second is
     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));
@@ -607,7 +607,7 @@ void VariableTree::maybeTip(const TQPoint &p)
     VarItem * item = dynamic_cast<VarItem*>( itemAt( p ) );
     if ( item )
     {
-        TQRect r = tqitemRect( item );
+        TQRect r = itemRect( item );
         if ( r.isValid() )
             tip( r, item->tipText() );
     }
@@ -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
@@ -988,7 +988,7 @@ void VariableTree::keyPressEvent(TQKeyEvent* e)
 
 void VariableTree::copyToClipboard(TQListViewItem* item)
 {
-    TQClipboard *qb = KApplication::tqclipboard();
+    TQClipboard *qb = KApplication::clipboard();
     TQString text = item->text( 1 );
 
     qb->setText( text, TQClipboard::Clipboard );
@@ -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,
@@ -1624,7 +1624,7 @@ void VarItem::updateSpecialRepresentation(const TQString& xs)
             s = s.mid(i+2);
     }
 
-    // A hack to nicely display TQStrings. The content of TQString is tqunicode
+    // A hack to nicely display TQStrings. The content of TQString is unicode
     // for for ASCII only strings we get ascii character mixed with \000.
     // Remove those \000 now.
 
@@ -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)
@@ -1736,7 +1736,7 @@ bool VarItem::handleSpecialTypes()
         else
             varTree->controller()->addCommand(
                 new ValueSpecialRepresentationCommand(
-                    this, "print ($kdev_s>0) ? (*((char*)&$kdev_d.tqunicode[0])@$kdev_s) : \"\""));
+                    this, "print ($kdev_s>0) ? (*((char*)&$kdev_d.unicode[0])@$kdev_s) : \"\""));
 
         return true;
     }
@@ -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();
     }
@@ -1853,7 +1853,7 @@ void VarItem::paintCell(TQPainter *p, const TQColorGroup &cg,
     if (!alive_)
     {
         /* Draw this as disabled. */
-        TQListViewItem::paintCell(p, varTree()->TQWidget::tqpalette().disabled(),
+        TQListViewItem::paintCell(p, varTree()->TQWidget::palette().disabled(),
                                  column, width, align);
     }
     else
@@ -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 cb8ffb0f..da885216 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 413e8ded..1e31a01f 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 81f7f04d..e4d538c5 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 bbab9265..577d61af 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 2f7dd1f4..e10972d4 100644
--- a/languages/cpp/doc/kde2book.toc
+++ b/languages/cpp/doc/kde2book.toc
@@ -405,7 +405,7 @@
 <entry name="CDE (Common Desktop Environment)" url="ch01.html"/>
 <entry name="cgi resource type" url="ch07lev1sec4.html"/>
 <entry name="CGotoDialog class, modeless dialog box" url="ch08lev1sec3.html"/>
-<entry name="CGotoDialog example, tqlayout" url="ch08lev1sec2.html"/>
+<entry name="CGotoDialog example, layout" url="ch08lev1sec2.html"/>
 <entry name="Chapter tag (DocBook)" url="ch15lev1sec2.html"/>
 <entry name="checking out, applications (CVS)" url="ch17lev1sec5.html"/>
 <entry name="checking spelling" url="ch10lev1sec3.html"/>
@@ -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"/>
@@ -729,7 +729,7 @@
 <entry name="deleting, CVS (Concurrent Version System) directories" url="ch17lev1sec5.html"/>
 <entry name="deleting, CVS (Concurrent Version System) files" url="ch17lev1sec5.html"/>
 <entry name="deprecated (" url="ch15.html"/>
-<entry name="design guidelines, dialog boxes, tqlayout issues" url="ch08lev1sec2.html"/>
+<entry name="design guidelines, dialog boxes, layout issues" url="ch08lev1sec2.html"/>
 <entry name="design guidelines, dialog boxes" url="ch08lev1sec7.html"/>
 <entry name="designing, icons" url="ch06lev1sec3.html"/>
 <entry name="Desktop Communication Protocol. See DCOP" url="ch13.html"/>
@@ -760,13 +760,13 @@
 <entry name="dialog boxes, KDialogBase class" url="ch08lev1sec5.html"/>
 <entry name="dialog boxes, KEdit Option dialog example" url="ch08lev1sec6.html"/>
 <entry name="dialog boxes, KSpellConfig configuration dialog" url="ch10lev1sec3.html"/>
-<entry name="dialog boxes, tqlayout, CGotoDialog example" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, tqlayout, design issues" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, tqlayout, hierarchies of layouts" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, tqlayout, manual placement" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, tqlayout, nested layouts" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, tqlayout, QLayout classes" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, tqlayout, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, layout, CGotoDialog example" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, layout, design issues" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, layout, hierarchies of layouts" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, layout, manual placement" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, layout, nested layouts" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, layout, QLayout classes" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, layout, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
 <entry name="dialog boxes, modal, advantages/disadvantages" url="ch08lev1sec3.html"/>
 <entry name="dialog boxes, modal, modal dialog allocated from the heap" url="ch08lev1sec3.html"/>
 <entry name="dialog boxes, modal, modal dialog located on the stack" url="ch08lev1sec3.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"/>
@@ -1130,7 +1130,7 @@
 <entry name="GUIs, dialog boxes, tdeui (KDE user-interface library)" url="ch08lev1sec4.html"/>
 <entry name="GUIs, dialog boxes, KDialogBase class" url="ch08lev1sec5.html"/>
 <entry name="GUIs, dialog boxes, KEdit Option dialog example" url="ch08lev1sec6.html"/>
-<entry name="GUIs, dialog boxes, tqlayout" url="ch08lev1sec2.html"/>
+<entry name="GUIs, dialog boxes, layout" url="ch08lev1sec2.html"/>
 <entry name="GUIs, dialog boxes, modal" url="ch08lev1sec3.html"/>
 <entry name="GUIs, dialog boxes, modeless" url="ch08lev1sec3.html"/>
 <entry name="GUIs, dialog boxes, simple example" url="ch08.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"/>
@@ -1591,15 +1591,15 @@
 <entry name="languages, i18n() function" url="ch06lev1sec4.html"/>
 <entry name="languages, translator files" url="ch06lev1sec4.html"/>
 <entry name="lastPage action" url="ch06.html"/>
-<entry name="tqlayout, dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/>
-<entry name="tqlayout, dialog boxes, design guidelines" url="ch08lev1sec7.html"/>
-<entry name="tqlayout, dialog boxes, design issues" url="ch08lev1sec2.html"/>
-<entry name="tqlayout, dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/>
-<entry name="tqlayout, dialog boxes, manual placement" url="ch08lev1sec2.html"/>
-<entry name="tqlayout, dialog boxes, nested layouts" url="ch08lev1sec2.html"/>
-<entry name="tqlayout, dialog boxes, QLayout classes" url="ch08lev1sec2.html"/>
-<entry name="tqlayout, dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
-<entry name="tqlayout managers, creating internally, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
+<entry name="layout, dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/>
+<entry name="layout, dialog boxes, design guidelines" url="ch08lev1sec7.html"/>
+<entry name="layout, dialog boxes, design issues" url="ch08lev1sec2.html"/>
+<entry name="layout, dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/>
+<entry name="layout, dialog boxes, manual placement" url="ch08lev1sec2.html"/>
+<entry name="layout, dialog boxes, nested layouts" url="ch08lev1sec2.html"/>
+<entry name="layout, dialog boxes, QLayout classes" url="ch08lev1sec2.html"/>
+<entry name="layout, dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
+<entry name="layout managers, creating internally, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
 <entry name="leaveEvent() event handler, widgets" url="ch04.html"/>
 <entry name="legal issues" url="ch01lev1sec6.html"/>
 <entry name="legal issues" url="ch19.html"/>
@@ -1656,12 +1656,12 @@
 <entry name="listings, dialog boxes, dialog from tdeui 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,11 +2264,11 @@
 <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="QHBox widget, tqlayout managers, creating" url="ch08lev1sec2.html"/>
+<entry name="QGridLayout geometry manager" url="ch04lev1sec3.html"/>
+<entry name="QHBox widget, layout managers, creating" url="ch08lev1sec2.html"/>
 <entry name="QImage class" url="ch10lev1sec2.html"/>
 <entry name="QLayout classes, code example" url="ch08lev1sec2.html"/>
 <entry name="QLayout classes, design issues" 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"/>
@@ -2327,7 +2327,7 @@
 <entry name="Qt, utility classes" url="ch03lev1sec5.html"/>
 <entry name="queryClose() function" url="ch07lev1sec3.html"/>
 <entry name="quit action" url="ch06.html"/>
-<entry name="QVBox widget, tqlayout managers, creating" url="ch08lev1sec2.html"/>
+<entry name="QVBox widget, layout managers, creating" url="ch08lev1sec2.html"/>
 <entry name="QWidget class, attributes" url="ch04.html"/>
 <entry name="QWidget class, documentation" url="ch04.html"/>
 <entry name="QWidget class, event handlers, closeEvent()" url="ch04.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 d6b6dd02..964ff233 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();
@@ -272,7 +272,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi
         return ret;
       } else {
         //We have a cached failed result. We should use that for some time but then try again. Return the failed result if: ( there were too many tries within this folder OR this file was already tried ) AND The last tries have not expired yet
-        if( /*((*it).failedFiles.size() > 3 || (*it).failedFiles.find( file ) != (*it).failedFiles.end()) &&*/ (*it).failTime.secsTo( TQDateTime::tqcurrentDateTime() ) < CACHE_FAIL_FOR_SECONDS ) {
+        if( /*((*it).failedFiles.size() > 3 || (*it).failedFiles.find( file ) != (*it).failedFiles.end()) &&*/ (*it).failTime.secsTo( TQDateTime::currentDateTime() ) < CACHE_FAIL_FOR_SECONDS ) {
           PathResolutionResult ret(false); //Fake that the result is ok
           ret.errorMessage = i18n("Cached: ") + (*it).errorMessage;
           ret.longErrorMessage = (*it).longErrorMessage;
@@ -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 );
 
@@ -365,7 +365,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi
     ce.failed = true;
     ce.errorMessage = res.errorMessage;
     ce.longErrorMessage = res.longErrorMessage;
-    ce.failTime = TQDateTime::tqcurrentDateTime();
+    ce.failTime = TQDateTime::currentDateTime();
     ce.failedFiles[file] = true;
   } else {
     ce.failed = false;
@@ -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 35d0a3ee..4ea75fca 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/main.cpp b/languages/cpp/main.cpp
index d2ad2d94..7474112c 100644
--- a/languages/cpp/main.cpp
+++ b/languages/cpp/main.cpp
@@ -10,7 +10,7 @@
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 
 #include <catalog.h>
diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
index def22f97..0d78624d 100644
--- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
@@ -29,7 +29,7 @@
 
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 
 #include <cstdlib>
@@ -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/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
index 5a38e464..84a93b85 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
@@ -18,7 +18,7 @@
 #include <kprocess.h>
 #include <kdebug.h>
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqlabel.h>
 #include <tqdir.h>
 
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
index 77546f8d..b95c825b 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
@@ -26,7 +26,7 @@ public:
     KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
     virtual ~KDevQt4Importer();
 
-    virtual TQString dbName() const { return TQString::tqfromLatin1("TQt4"); }
+    virtual TQString dbName() const { return TQString::fromLatin1("TQt4"); }
     virtual TQStringList fileList();
     virtual TQStringList includePaths();
 
diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
index d69e5b0b..6d1c85b6 100644
--- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
+++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
@@ -25,7 +25,7 @@ public:
     KDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
     virtual ~KDevQtImporter();
 
-    virtual TQString dbName() const { return TQString::tqfromLatin1("TQt"); }
+    virtual TQString dbName() const { return TQString::fromLatin1("TQt"); }
     virtual TQStringList fileList();
     virtual TQStringList includePaths();
 
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
index 3e085845..19fd0db1 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
@@ -26,7 +26,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>161</width>
                     <height>21</height>
@@ -35,7 +35,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h
index 06782a37..ccace71a 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h
+++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h
@@ -25,7 +25,7 @@ public:
     KDevKDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
     virtual ~KDevKDELibsImporter();
 
-    virtual TQString dbName() const { return TQString::tqfromLatin1("KDElibs"); }
+    virtual TQString dbName() const { return TQString::fromLatin1("KDElibs"); }
     virtual TQStringList fileList();
     virtual TQStringList includePaths();
 
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui
index 1f967edc..5e2604d3 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui
@@ -96,7 +96,7 @@ Only the selected entry will be used</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>220</width>
                     <height>20</height>
diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp
index 7508e1df..c5abd730 100644
--- a/languages/cpp/problemreporter.cpp
+++ b/languages/cpp/problemreporter.cpp
@@ -51,7 +51,7 @@
 #include <tqwhatsthis.h>
 #include <tqtabbar.h>
 #include <tqwidgetstack.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 
 class ProblemItem: public KListViewItem
@@ -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/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp
index 3742c0f6..0705f03c 100644
--- a/languages/cpp/qtdesignercppintegration.cpp
+++ b/languages/cpp/qtdesignercppintegration.cpp
@@ -167,7 +167,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
 		atColumn = 0;
 	}
 	
-	//    editIface->insertLine( atLine + 1, TQString::tqfromLatin1("") );
+	//    editIface->insertLine( atLine + 1, TQString::fromLatin1("") );
 	kdDebug() << "at line in intg: " << atLine << " atCol: " << atColumn << endl;
 	kdDebug() << "text: " << stri << endl;
 	editIface->insertText( atLine, atColumn, stri );
@@ -185,24 +185,24 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
 TQString QtDesignerCppIntegration::accessID( FunctionDom fun ) const
 {
 	if ( fun->isSignal() )
-		return TQString::tqfromLatin1( "signals" );
+		return TQString::fromLatin1( "signals" );
 
 	switch ( fun->access() )
 	{
 	case CodeModelItem::Public:
 		if ( fun->isSlot() )
-			return TQString::tqfromLatin1( "public slots" );
-		return TQString::tqfromLatin1( "public" );
+			return TQString::fromLatin1( "public slots" );
+		return TQString::fromLatin1( "public" );
 
 	case CodeModelItem::Protected:
 		if ( fun->isSlot() )
-			return TQString::tqfromLatin1( "protected slots" );
-		return TQString::tqfromLatin1( "protected" );
+			return TQString::fromLatin1( "protected slots" );
+		return TQString::fromLatin1( "protected" );
 
 	case CodeModelItem::Private:
 		if ( fun->isSlot() )
-			return TQString::tqfromLatin1( "private slots" );
-		return TQString::tqfromLatin1( "private" );
+			return TQString::fromLatin1( "private slots" );
+		return TQString::fromLatin1( "private" );
 	}
 
 	return TQString();
diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp
index 2254fb35..b1d9087c 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 c6ca1031..bf90a4e7 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/subclassingdlgbase.ui b/languages/cpp/subclassingdlgbase.ui
index 6984dcf6..f6170896 100644
--- a/languages/cpp/subclassingdlgbase.ui
+++ b/languages/cpp/subclassingdlgbase.ui
@@ -204,7 +204,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>110</width>
                     <height>20</height>
diff --git a/languages/cpp/tag_creator.cpp b/languages/cpp/tag_creator.cpp
index 1b95b4cd..011b9f95 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() )
diff --git a/languages/cpp/typedesc.cpp b/languages/cpp/typedesc.cpp
index 1150f8fb..f9785604 100644
--- a/languages/cpp/typedesc.cpp
+++ b/languages/cpp/typedesc.cpp
@@ -21,7 +21,7 @@
 #include "driver.h"
 #include "lexer.h"
 #include "parser.h"
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kglobal.h>
 
@@ -238,7 +238,7 @@ size_t TypeDescData::hashKey() {
 
     int len = m_cleanName.length();
     for ( int a = 0; a < len; a++ )
-			ret += m_cleanName[ a ].tqunicode() * 3 * (11*(a+1));
+			ret += m_cleanName[ a ].unicode() * 3 * (11*(a+1));
 
 
     int n = 1;
@@ -266,7 +266,7 @@ size_t TypeDescData::hashKey2() {
 	
 		int len = m_cleanName.length();
 		for ( int a = 0; a < len; a++ )
-			ret += m_cleanName[ a ].tqunicode() * 19 * (7*(a+1));
+			ret += m_cleanName[ a ].unicode() * 19 * (7*(a+1));
 	
 	
 		int n = 1;
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2011-12-15 15:51:21 -0600
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2011-12-15 15:51:21 -0600
commit	b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04 (patch)
tree	76f49820693d443128d3720322ff1605e9bcd558 /languages/cpp
parent	247f828db1b8dcdc9346c1568d81cfa00db99c9e (diff)
download	tdevelop-b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.tar.gz tdevelop-b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.zip