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

This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.

1 files changed, 15 insertions, 15 deletions

diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp
index 96e10a9b..dd4d278b 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 <textedit.h>
+#include <tqtextedit.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" ).arg( scope_box->currentItem() ), TQString(), "false" );
+	                                       TQString(), "public", TQString( "%1" ).tqarg( 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" ).arg( value ) );
+		baseclasses_view->selectedItem() ->setText( 2, TQString( "%1" ).tqarg( value ) );
 	}
 }
 
@@ -1268,8 +1268,8 @@ void CppNewClassDialog::to_constructors_list_clicked()
 					cparams += ( *argIt ) ->type() + " ";
 					if ( ( *argIt ) ->name().isEmpty() )
 					{
-						cparams += TQString( "arg%1" ).arg( unnamed );
-						bparams += TQString( "arg%1" ).arg( unnamed++ );
+						cparams += TQString( "arg%1" ).tqarg( unnamed );
+						bparams += TQString( "arg%1" ).tqarg( 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>" ).arg( email );
+			author += TQString( " <%1>" ).tqarg( 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" ).arg( unnamed );
-			bparams += TQString( "arg%1" ).arg( unnamed++ );
+			cparams += TQString( "arg%1" ).tqarg( unnamed );
+			bparams += TQString( "arg%1" ).tqarg( 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::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))
+		      + (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))
 		      + 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::fromLatin1( "#include " ) +
+					includeBaseHeader += ( includeBaseHeader.isEmpty() ? TQString( "" ) : TQString( "\n" ) ) + TQString::tqfromLatin1( "#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>" ).arg( email );
+		author += TQString( " <%1>" ).tqarg( email );
 
 	TQString inheritance;
 	if ( dlg.baseclasses_view->childCount() > 0 )