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

This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.

5 files changed, 24 insertions, 24 deletions

diff --git a/kio/kfile/tests/kdirselectdialogtest.cpp b/kio/kfile/tests/kdirselectdialogtest.cpp
index 47fcd02ca..c66ed3ff2 100644
--- a/kio/kfile/tests/kdirselectdialogtest.cpp
+++ b/kio/kfile/tests/kdirselectdialogtest.cpp
@@ -10,7 +10,7 @@ int main( int argc, char **argv )
     KURL u = KDirSelectDialog::selectDirectory( (argc >= 1) ? argv[1] : TQString::null );
     if ( u.isValid() )
         KMessageBox::information( 0L,
-                                TQString::fromLatin1("You selected the url: %1")
+                                TQString::tqfromLatin1("You selected the url: %1")
                                 .arg( u.prettyURL() ), "Selected URL" );
 
     return 0;
diff --git a/kio/kfile/tests/kfdtest.cpp b/kio/kfile/tests/kfdtest.cpp
index 867b9b4a8..43dbb4fd0 100644
--- a/kio/kfile/tests/kfdtest.cpp
+++ b/kio/kfile/tests/kfdtest.cpp
@@ -25,7 +25,7 @@ void KFDTest::doit()
 
     if ( dlg->exec() == KDialog::Accepted )
     {
-        KMessageBox::information(0, TQString::fromLatin1("You selected the file: %1").arg( dlg->selectedURL().prettyURL() ));
+        KMessageBox::information(0, TQString::tqfromLatin1("You selected the file: %1").arg( dlg->selectedURL().prettyURL() ));
     }
     
 //     tqApp->quit();
diff --git a/kio/kfile/tests/kfiletreeviewtest.cpp b/kio/kfile/tests/kfiletreeviewtest.cpp
index 5c520dd5d..bad100809 100644
--- a/kio/kfile/tests/kfiletreeviewtest.cpp
+++ b/kio/kfile/tests/kfiletreeviewtest.cpp
@@ -148,7 +148,7 @@ int main(int argc, char **argv)
     {
        for( int i = 1; i < argc; i++ )
        {
-	  argv1 = TQString::fromLatin1(argv[i]);
+	  argv1 = TQString::tqfromLatin1(argv[i]);
 	  kdDebug() << "Opening " << argv1 << endl;
 	  if( argv1 == "-d" )
 	     tf->setDirOnly();
diff --git a/kio/kfile/tests/kfstest.cpp b/kio/kfile/tests/kfstest.cpp
index 8661c9919..aad57b257 100644
--- a/kio/kfile/tests/kfstest.cpp
+++ b/kio/kfile/tests/kfstest.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <tqdir.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstringlist.h>
 #include <tqwidget.h>
 
@@ -51,11 +51,11 @@ int main(int argc, char **argv)
     TQString argv1;
     TQString startDir;
     if (argc > 1)
-	argv1 = TQString::fromLatin1(argv[1]);
+	argv1 = TQString::tqfromLatin1(argv[1]);
     if ( argc > 2 )
-        startDir = TQString::fromLatin1( argv[2]);
+        startDir = TQString::tqfromLatin1( argv[2]);
 
-    if (argv1 == TQString::fromLatin1("diroperator")) {
+    if (argv1 == TQString::tqfromLatin1("diroperator")) {
 	KDirOperator *op = new KDirOperator(startDir, 0, "operator");
 	op->setViewConfig( KGlobal::config(), "TestGroup" );
 	op->setView(KFile::Simple);
@@ -64,24 +64,24 @@ int main(int argc, char **argv)
 	a.exec();
     }
 
-    else if (argv1 == TQString::fromLatin1("justone")) {
+    else if (argv1 == TQString::tqfromLatin1("justone")) {
         TQString name = KFileDialog::getOpenFileName(startDir);
         qDebug("filename=%s",name.latin1());
     }
 
-    else if (argv1 == TQString::fromLatin1("existingURL")) {
+    else if (argv1 == TQString::tqfromLatin1("existingURL")) {
         KURL url = KFileDialog::getExistingURL();
         qDebug("URL=%s",url.url().latin1());
         name1 = url.url();
     }
 
-    else if (argv1 == TQString::fromLatin1("preview")) {
+    else if (argv1 == TQString::tqfromLatin1("preview")) {
         KURL u =  KFileDialog::getImageOpenURL();
         qDebug("filename=%s", u.url().latin1());
     }
 
-    else if (argv1 == TQString::fromLatin1("preselect")) {
-        names = KFileDialog::getOpenFileNames(TQString::fromLatin1("/etc/passwd"));
+    else if (argv1 == TQString::tqfromLatin1("preselect")) {
+        names = KFileDialog::getOpenFileNames(TQString::tqfromLatin1("/etc/passwd"));
         TQStringList::Iterator it = names.begin();
         while ( it != names.end() ) {
             qDebug("selected file: %s", (*it).latin1());
@@ -89,10 +89,10 @@ int main(int argc, char **argv)
         }
     }
 
-    else if (argv1 == TQString::fromLatin1("dirs"))
+    else if (argv1 == TQString::tqfromLatin1("dirs"))
 	name1 = KFileDialog::getExistingDirectory();
 
-    else if (argv1 == TQString::fromLatin1("heap")) {
+    else if (argv1 == TQString::tqfromLatin1("heap")) {
 	KFileDialog *dlg = new KFileDialog( startDir, TQString::null, 0L,
 					    "file dialog", true );
 	dlg->setMode( KFile::File);
@@ -104,33 +104,33 @@ int main(int argc, char **argv)
     if ( urlBar )
     {
         urlBar->insertDynamicItem( KURL("ftp://ftp.kde.org"), 
-                                   TQString::fromLatin1("KDE FTP Server") );
+                                   TQString::tqfromLatin1("KDE FTP Server") );
     }
 
 	if ( dlg->exec() == KDialog::Accepted )
 	    name1 = dlg->selectedURL().url();
     }
 
-    else if ( argv1 == TQString::fromLatin1("eventloop") )
+    else if ( argv1 == TQString::tqfromLatin1("eventloop") )
     {
         KFDTest *test = new KFDTest( startDir );
         return a.exec();
     }
 
-    else if (argv1 == TQString::fromLatin1("save")) {
+    else if (argv1 == TQString::tqfromLatin1("save")) {
         KURL u = KFileDialog::getSaveURL();
-//        TQString(TQDir::homeDirPath() + TQString::fromLatin1("/testfile")),
+//        TQString(TQDir::homeDirPath() + TQString::tqfromLatin1("/testfile")),
 //        TQString::null, 0L);
         name1 = u.url();
     }
 
-    else if (argv1 == TQString::fromLatin1("icon")) {
+    else if (argv1 == TQString::tqfromLatin1("icon")) {
     	KIconDialog dlg;
 	TQString icon = dlg.selectIcon();
 	kdDebug() << icon << endl;
     }
 
-//     else if ( argv1 == TQString::fromLatin1("dirselect") ) {
+//     else if ( argv1 == TQString::tqfromLatin1("dirselect") ) {
 //         KURL url;
 //         url.setPath( "/" );
 //         KURL selected = KDirSelectDialog::selectDirectory( url );
@@ -140,7 +140,7 @@ int main(int argc, char **argv)
 
     else {
 	KFileDialog dlg(startDir,
-			TQString::fromLatin1("*|All Files\n"
+			TQString::tqfromLatin1("*|All Files\n"
 					    "*.lo *.o *.la|All libtool Files"),
 			0, 0, true);
 //    dlg.setFilter( "*.tdevelop" );
@@ -177,7 +177,7 @@ int main(int argc, char **argv)
     }
 
     if (!(name1.isNull()))
-	KMessageBox::information(0, TQString::fromLatin1("You selected the file " ) + name1,
-				 TQString::fromLatin1("Your Choice"));
+	KMessageBox::information(0, TQString::tqfromLatin1("You selected the file " ) + name1,
+				 TQString::tqfromLatin1("Your Choice"));
     return 0;
 }
diff --git a/kio/kfile/tests/kurlrequestertest.cpp b/kio/kfile/tests/kurlrequestertest.cpp
index 9248eec5d..4a1d4bec0 100644
--- a/kio/kfile/tests/kurlrequestertest.cpp
+++ b/kio/kfile/tests/kurlrequestertest.cpp
@@ -10,7 +10,7 @@ int main( int argc, char **argv )
     qDebug( "Selected url: %s", url.url().latin1());
 
     KURLRequester *req = new KURLRequester();
-    KEditListBox *el = new KEditListBox( TQString::fromLatin1("Test"), req->customEditor() );
+    KEditListBox *el = new KEditListBox( TQString::tqfromLatin1("Test"), req->customEditor() );
     el->show();
     return app.exec();
 }