diff options
| author | Timothy Pearson <[email protected]> | 2011-12-16 09:59:13 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-16 09:59:13 -0600 |
| commit | 56160bf4dfe503631ef6373367b281f081bab2b4 (patch) | |
| tree | 7fcea2ffd9c3420af999c3dcad0ed032eef93956 /khtml/java/kjavaappletserver.cpp | |
| parent | 13281e2856a2ef43bbab78c5528470309c23aa77 (diff) | |
| download | tdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.tar.gz tdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.
Diffstat (limited to 'khtml/java/kjavaappletserver.cpp')
| -rw-r--r-- | khtml/java/kjavaappletserver.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
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) |