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

This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.

4 files changed, 39 insertions, 39 deletions

diff --git a/khtml/java/kjavaappletcontext.cpp b/khtml/java/kjavaappletcontext.cpp
index 76914a5dc..776eb8a64 100644
--- a/khtml/java/kjavaappletcontext.cpp
+++ b/khtml/java/kjavaappletcontext.cpp
@@ -138,7 +138,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
     kdDebug(6100) << "KJavaAppletContext::received, cmd = >>" << cmd << "<<" << endl;
     kdDebug(6100) << "arg count = " << arg.count() << endl;
 
-    if ( cmd == TQString::fromLatin1("showstatus")
+    if ( cmd == TQString::tqfromLatin1("showstatus")
 	 && !arg.empty() )
     {
         TQString tmp = arg.first();
@@ -146,19 +146,19 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
         kdDebug(6100) << "status message = " << tmp << endl;
         emit showStatus( tmp );
     }
-    else if ( cmd == TQString::fromLatin1( "showurlinframe" )
+    else if ( cmd == TQString::tqfromLatin1( "showurlinframe" )
               && arg.count() > 1 )
     {
         kdDebug(6100) << "url = " << arg[0] << ", frame = " << arg[1] << endl;
         emit showDocument( arg[0], arg[1] );
     }
-    else if ( cmd == TQString::fromLatin1( "showdocument" )
+    else if ( cmd == TQString::tqfromLatin1( "showdocument" )
               && !arg.empty() )
     {
         kdDebug(6100) << "url = " << arg.first() << endl;
         emit showDocument( arg.first(), "_top" );
     }
-    else if ( cmd == TQString::fromLatin1( "resizeapplet" )
+    else if ( cmd == TQString::tqfromLatin1( "resizeapplet" )
               && arg.count() > 2 )
     {
         //arg[1] should be appletID
@@ -180,10 +180,10 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
                 tmp->resizeAppletWidget( width, height );
         }
     }
-    else if (cmd.startsWith(TQString::fromLatin1("audioclip_"))) {
+    else if (cmd.startsWith(TQString::tqfromLatin1("audioclip_"))) {
         kdDebug(DEBUGAREA) << "process Audio command (not yet implemented): " << cmd  << " " << arg[0] << endl;
     }
-    else if ( cmd == TQString::fromLatin1( "JS_Event" )
+    else if ( cmd == TQString::tqfromLatin1( "JS_Event" )
               && arg.count() > 2 )
     {
         bool ok;
@@ -198,7 +198,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
         else
             kdError(DEBUGAREA) << "parse JS event " << arg[0] << " " << arg[1] << endl;
     }
-    else if ( cmd == TQString::fromLatin1( "AppletStateNotification" ) )
+    else if ( cmd == TQString::tqfromLatin1( "AppletStateNotification" ) )
     {
         bool ok;
         const int appletID = arg.first().toInt(&ok);
@@ -222,7 +222,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
         } else
             kdError(DEBUGAREA) << "AppletStateNotification: Applet ID is not numerical" << endl;
     }
-    else if ( cmd == TQString::fromLatin1( "AppletFailed" ) ) {
+    else if ( cmd == TQString::tqfromLatin1( "AppletFailed" ) ) {
         bool ok;
         const int appletID = arg.first().toInt(&ok);
         if (ok)
diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp
index 4852a5471..4eab56972 100644
--- a/khtml/java/kjavaappletserver.cpp
+++ b/khtml/java/kjavaappletserver.cpp
@@ -48,7 +48,7 @@
 #include <tqlabel.h>
 #include <tqdialog.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqregexp.h>
 
 #include <stdlib.h>
@@ -531,19 +531,19 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
     switch( cmd_code )
     {
         case KJAS_SHOW_DOCUMENT:
-            cmd = TQString::fromLatin1( "showdocument" );
+            cmd = TQString::tqfromLatin1( "showdocument" );
             break;
 
         case KJAS_SHOW_URLINFRAME:
-            cmd = TQString::fromLatin1( "showurlinframe" );
+            cmd = TQString::tqfromLatin1( "showurlinframe" );
             break;
 
         case KJAS_SHOW_STATUS:
-            cmd = TQString::fromLatin1( "showstatus" );
+            cmd = TQString::tqfromLatin1( "showstatus" );
             break;
 
         case KJAS_RESIZE_APPLET:
-            cmd = TQString::fromLatin1( "resizeapplet" );
+            cmd = TQString::tqfromLatin1( "resizeapplet" );
             break;
 
         case KJAS_GET_URLDATA:
@@ -573,7 +573,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
                 kdError(6100) << "KIO Data command error " << ok << " args:" << args.size() << endl;
             return;
         case KJAS_JAVASCRIPT_EVENT:
-            cmd = TQString::fromLatin1( "JS_Event" );
+            cmd = TQString::tqfromLatin1( "JS_Event" );
             kdDebug(6100) << "Javascript request: "<< contextID
                           << " code: " << args[0] << endl;
             break;
@@ -593,24 +593,24 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
             return;
         }
         case KJAS_AUDIOCLIP_PLAY:
-            cmd = TQString::fromLatin1( "audioclip_play" );
+            cmd = TQString::tqfromLatin1( "audioclip_play" );
             kdDebug(6100) << "Audio Play: url=" << args[0] << endl;
             break;
         case KJAS_AUDIOCLIP_LOOP:
-            cmd = TQString::fromLatin1( "audioclip_loop" );
+            cmd = TQString::tqfromLatin1( "audioclip_loop" );
             kdDebug(6100) << "Audio Loop: url=" << args[0] << endl;
             break;
         case KJAS_AUDIOCLIP_STOP:
-            cmd = TQString::fromLatin1( "audioclip_stop" );
+            cmd = TQString::tqfromLatin1( "audioclip_stop" );
             kdDebug(6100) << "Audio Stop: url=" << args[0] << endl;
             break;
         case KJAS_APPLET_STATE:
             kdDebug(6100) << "Applet State Notification for Applet " << args[0] << ". New state=" << args[1] << endl;
-            cmd = TQString::fromLatin1( "AppletStateNotification" );
+            cmd = TQString::tqfromLatin1( "AppletStateNotification" );
             break;
         case KJAS_APPLET_FAILED:
             kdDebug(6100) << "Applet " << args[0] << " Failed: " << args[1] << endl;
-            cmd = TQString::fromLatin1( "AppletFailed" );
+            cmd = TQString::tqfromLatin1( "AppletFailed" );
             break;
         case KJAS_SECURITY_CONFIRM: {
             if (KSSL::doesSSLWork() && !d->kssl)
diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp
index e17e70110..9071fa5d5 100644
--- a/khtml/java/kjavaappletviewer.cpp
+++ b/khtml/java/kjavaappletviewer.cpp
@@ -234,7 +234,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
         if (equalPos > 0) {
             const TQString name = (*it).left (equalPos).upper ();
             TQString value = (*it).right ((*it).length () - equalPos - 1);
-            if (value.at(0)=='\"')
+            if (value.tqat(0)=='\"')
                 value = value.right (value.length () - 1);
             if (value.at (value.length () - 1) == '\"')
                 value.truncate (value.length () - 1);
@@ -245,27 +245,27 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
                     baseurl = KURL (KURL (value), TQString (".")).url ();
                 } else if (name == "__KHTML__CODEBASE")
                     khtml_codebase = value;
-                else if (name_lower == TQString::fromLatin1("codebase") ||
-                         name_lower == TQString::fromLatin1("java_codebase")) {
+                else if (name_lower == TQString::tqfromLatin1("codebase") ||
+                         name_lower == TQString::tqfromLatin1("java_codebase")) {
                     if (!value.isEmpty ())
                         codebase = value;
                 } else if (name == "__KHTML__CLASSID")
-                //else if (name.lower()==TQString::fromLatin1("classid"))
+                //else if (name.lower()==TQString::tqfromLatin1("classid"))
                     classid = value;
-                else if (name_lower == TQString::fromLatin1("code") ||
-                         name_lower == TQString::fromLatin1("java_code"))
+                else if (name_lower == TQString::tqfromLatin1("code") ||
+                         name_lower == TQString::tqfromLatin1("java_code"))
                     classname = value;
-                else if (name_lower == TQString::fromLatin1("src"))
+                else if (name_lower == TQString::tqfromLatin1("src"))
                     src_param = value;
-                else if (name_lower == TQString::fromLatin1("archive") ||
-                         name_lower == TQString::fromLatin1("java_archive") ||
+                else if (name_lower == TQString::tqfromLatin1("archive") ||
+                         name_lower == TQString::tqfromLatin1("java_archive") ||
                          name_lower.startsWith ("cache_archive"))
                     applet->setArchives (value);
-                else if (name_lower == TQString::fromLatin1("name"))
+                else if (name_lower == TQString::tqfromLatin1("name"))
                     applet->setAppletName (value);
-                else if (name_lower == TQString::fromLatin1("width"))
+                else if (name_lower == TQString::tqfromLatin1("width"))
                     width = value.toInt();
-                else if (name_lower == TQString::fromLatin1("height"))
+                else if (name_lower == TQString::tqfromLatin1("height"))
                     height = value.toInt();
                 if (!name.startsWith ("__KHTML__")) {
                     applet->setParameter (name, value);
@@ -327,7 +327,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
         info.verifyPath = true;
 
         TQDataStream stream(params, IO_WriteOnly);
-        stream << info << m_view->topLevelWidget()->winId();
+        stream << info << m_view->tqtopLevelWidget()->winId();
 
         if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int)", params, replyType, reply ) ) {
             kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl;
@@ -342,7 +342,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
 
     /* install event filter for close events */
     if (wparent)
-        wparent->topLevelWidget ()->installEventFilter (this);
+        wparent->tqtopLevelWidget ()->installEventFilter (this);
 
     setInstance (KJavaAppletViewerFactory::instance ());
     KParts::Part::setWidget (m_view);
diff --git a/khtml/java/kjavaprocess.cpp b/khtml/java/kjavaprocess.cpp
index 6156b5df7..c86b922dd 100644
--- a/khtml/java/kjavaprocess.cpp
+++ b/khtml/java/kjavaprocess.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <kio/kprotocolmanager.h>
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqmap.h>
 
 #include <config.h>
@@ -168,7 +168,7 @@ void KJavaProcess::storeSize( TQByteArray* buff )
 
     const char* size_ptr = size_str.latin1();
     for( int i = 0; i < 8; ++i )
-        buff->at(i) = size_ptr[i];
+        buff->tqat(i) = size_ptr[i];
 }
 
 void KJavaProcess::sendBuffer( TQByteArray* buff )
@@ -218,12 +218,12 @@ void KJavaProcess::popBuffer()
 //	kdDebug(6100) << "Sending buffer to java, buffer = >>";
 //        for( unsigned int i = 0; i < buf->size(); i++ )
 //        {
-//            if( buf->at(i) == (char)0 )
+//            if( buf->tqat(i) == (char)0 )
 //                kdDebug(6100) << "<SEP>";
-//            else if( buf->at(i) > 0 && buf->at(i) < 10 )
-//                kdDebug(6100) << "<CMD " << (int) buf->at(i) << ">";
+//            else if( buf->tqat(i) > 0 && buf->tqat(i) < 10 )
+//                kdDebug(6100) << "<CMD " << (int) buf->tqat(i) << ">";
 //            else
-//                kdDebug(6100) << buf->at(i);
+//                kdDebug(6100) << buf->tqat(i);
 //        }
 //        kdDebug(6100) << "<<" << endl;