diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
commit | 560378aaca1784ba19806a0414a32b20c744de39 (patch) | |
tree | ce0dfd7c3febf2a1adc7603d1019a8be2083c415 /khtml/java/kjavaappletcontext.cpp | |
parent | d4d5af1cdbd3cc65d095e0afc5b1f4260091cf5d (diff) | |
download | tdelibs-560378aaca1784ba19806a0414a32b20c744de39.tar.gz tdelibs-560378aaca1784ba19806a0414a32b20c744de39.zip |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/java/kjavaappletcontext.cpp')
-rw-r--r-- | khtml/java/kjavaappletcontext.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/khtml/java/kjavaappletcontext.cpp b/khtml/java/kjavaappletcontext.cpp index 76914a5dc..6875ddfe5 100644 --- a/khtml/java/kjavaappletcontext.cpp +++ b/khtml/java/kjavaappletcontext.cpp @@ -138,27 +138,27 @@ 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(); - tmp.replace(TQRegExp("[\n\r]"), ""); + tmp.tqreplace(TQRegExp("[\n\r]"), ""); kdDebug(6100) << "status message = " << tmp << endl; - emit showStatus( tmp ); + emit showtqStatus( 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) @@ -230,7 +230,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg KJavaApplet* const applet = d->applets[appletID]; /* TQString errorDetail(arg[1]); - errorDetail.replace(TQRegExp(":\\s*"), ":\n"); + errorDetail.tqreplace(TQRegExp(":\\s*"), ":\n"); KMessageBox::detailedError(0L, i18n("Java error while loading applet."), errorDetail); */ if (applet) |