Rename old tq methods that no longer need a unique name

51 files changed, 178 insertions, 178 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..f99106b7 100644
--- a/languages/cpp/addattributedialog.cpp
+++ b/languages/cpp/addattributedialog.cpp
@@ -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..0ca00eb4 100644
--- a/languages/cpp/addattributedialogbase.ui
+++ b/languages/cpp/addattributedialogbase.ui
@@ -95,7 +95,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>111</width>
                             <height>20</height>
@@ -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..04e07285 100644
--- a/languages/cpp/addmethoddialog.cpp
+++ b/languages/cpp/addmethoddialog.cpp
@@ -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 );
 		}
@@ -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..40a59154 100644
--- a/languages/cpp/addmethoddialogbase.ui
+++ b/languages/cpp/addmethoddialogbase.ui
@@ -106,7 +106,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>111</width>
                             <height>20</height>
@@ -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/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/prefs_base.ui b/languages/cpp/app_templates/kde4app/prefs_base.ui
index f1e5fdfb..3a78c979 100644
--- a/languages/cpp/app_templates/kde4app/prefs_base.ui
+++ b/languages/cpp/app_templates/kde4app/prefs_base.ui
@@ -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>
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/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..b859d95f 100644
--- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp
+++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
@@ -132,7 +132,7 @@
     show();
 
     // What it is now, stay.
-    setFixedSize(tqminimumSize());
+    setFixedSize(minimumSize());
 }
 
 %{APPNAME}UI::~%{APPNAME}UI()
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/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/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/ast_utils.cpp b/languages/cpp/ast_utils.cpp
index 9fded09c..d3dbba32 100644
--- a/languages/cpp/ast_utils.cpp
+++ b/languages/cpp/ast_utils.cpp
@@ -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/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui
index 441d1bb1..857c61d3 100644
--- a/languages/cpp/ccconfigwidgetbase.ui
+++ b/languages/cpp/ccconfigwidgetbase.ui
@@ -93,7 +93,7 @@
                                                 <property name="sizeType">
                                                     <enum>Fixed</enum>
                                                 </property>
-                                                <property name="tqsizeHint">
+                                                <property name="sizeHint">
                                                     <size>
                                                         <width>30</width>
                                                         <height>20</height>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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/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/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index 9796bd17..b4978a2d 100644
--- a/languages/cpp/cppcodecompletion.cpp
+++ b/languages/cpp/cppcodecompletion.cpp
@@ -1613,7 +1613,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
     else
       gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).tqarg( 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 ) ) );
@@ -1633,7 +1633,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
       else
         gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).tqarg( 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, "" );
@@ -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/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp
index dd4d278b..243c643f 100644
--- a/languages/cpp/cppnewclassdlg.cpp
+++ b/languages/cpp/cppnewclassdlg.cpp
@@ -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( "\"" ) );
diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui
index a5405690..f4d3a399 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>
@@ -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..22d22fd8 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." ) );
 		}
 	}
 }
@@ -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:
@@ -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 );
 }
@@ -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/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/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/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp
index e8bb0c90..27b79783 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -120,7 +120,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
         offset_ = parentWidget()->pos() - e->globalPos();
         setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
         TQApplication::setOverrideCursor(TQCursor(sizeAllCursor));
-        setPalette(TQPalette(tqcolorGroup().background()));
+        setPalette(TQPalette(colorGroup().background()));
         tqrepaint();
     }
 }
@@ -134,7 +134,7 @@ void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e)
     offset_ = TQPoint(0,0);
     setFrameStyle(TQFrame::Panel|TQFrame::Raised);
     TQApplication::restoreOverrideCursor();
-    setPalette(TQPalette(tqcolorGroup().background()));
+    setPalette(TQPalette(colorGroup().background()));
     tqrepaint();
 }
 
@@ -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..eee96cb9 100644
--- a/languages/cpp/debugger/debuggerconfigwidgetbase.ui
+++ b/languages/cpp/debugger/debuggerconfigwidgetbase.ui
@@ -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..8fff0206 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,7 +510,7 @@ 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())
     {
@@ -519,12 +519,12 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
                                     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."));
+        popup->setWhatsThis(id, i18n("<b>Evaluate expression</b><p>Shows the value of the expression under the cursor."));
         int id2 = popup->insertItem( i18n("Watch: %1").tqarg(squeezed),
                                      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()));
 
 }
 
@@ -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/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp
index 8626a3e1..18851c58 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.cpp
+++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp
@@ -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") );
@@ -1234,7 +1234,7 @@ TQWidget* ComplexEditCell::createEditor() const
     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 tqlayout, I suppose that sizeHint for button is always larger
     // than 20.
     b->setFixedWidth( 20 );
 
diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp
index ab7ffe69..7808fccc 100644
--- a/languages/cpp/debugger/gdbcontroller.cpp
+++ b/languages/cpp/debugger/gdbcontroller.cpp
@@ -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_);
 }
 
 // **************************************************************************
@@ -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.
         }
@@ -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());
@@ -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_);
         }
     }
 }
@@ -853,7 +853,7 @@ bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_en
     }
 
     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);
 }
@@ -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;
     }
@@ -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,7 +1743,7 @@ 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"
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..e6f80530 100644
--- a/languages/cpp/debugger/gdboutputwidget.cpp
+++ b/languages/cpp/debugger/gdboutputwidget.cpp
@@ -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 "
diff --git a/languages/cpp/debugger/gdboutputwidget.h b/languages/cpp/debugger/gdboutputwidget.h
index 28ffb8bc..36db2cfb 100644
--- a/languages/cpp/debugger/gdboutputwidget.h
+++ b/languages/cpp/debugger/gdboutputwidget.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/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp
index a8c9f594..653a4b33 100644
--- a/languages/cpp/debugger/variablewidget.cpp
+++ b/languages/cpp/debugger/variablewidget.cpp
@@ -47,7 +47,7 @@
 
 /** 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
@@ -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() );
     }
diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp
index d6b6dd02..b9f1c0a9 100644
--- a/languages/cpp/includepathresolver.cpp
+++ b/languages/cpp/includepathresolver.cpp
@@ -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;
@@ -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;
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..6f0ac590 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>
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/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/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>