summaryrefslogtreecommitdiffstats
path: root/khtml/java/kjavaappletcontext.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /khtml/java/kjavaappletcontext.cpp
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/java/kjavaappletcontext.cpp')
-rw-r--r--khtml/java/kjavaappletcontext.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/khtml/java/kjavaappletcontext.cpp b/khtml/java/kjavaappletcontext.cpp
index 6875ddfe5..76914a5dc 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::tqfromLatin1("showstatus")
+ if ( cmd == TQString::fromLatin1("showstatus")
&& !arg.empty() )
{
TQString tmp = arg.first();
- tmp.tqreplace(TQRegExp("[\n\r]"), "");
+ tmp.replace(TQRegExp("[\n\r]"), "");
kdDebug(6100) << "status message = " << tmp << endl;
- emit showtqStatus( tmp );
+ emit showStatus( tmp );
}
- else if ( cmd == TQString::tqfromLatin1( "showurlinframe" )
+ else if ( cmd == TQString::fromLatin1( "showurlinframe" )
&& arg.count() > 1 )
{
kdDebug(6100) << "url = " << arg[0] << ", frame = " << arg[1] << endl;
emit showDocument( arg[0], arg[1] );
}
- else if ( cmd == TQString::tqfromLatin1( "showdocument" )
+ else if ( cmd == TQString::fromLatin1( "showdocument" )
&& !arg.empty() )
{
kdDebug(6100) << "url = " << arg.first() << endl;
emit showDocument( arg.first(), "_top" );
}
- else if ( cmd == TQString::tqfromLatin1( "resizeapplet" )
+ else if ( cmd == TQString::fromLatin1( "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::tqfromLatin1("audioclip_"))) {
+ else if (cmd.startsWith(TQString::fromLatin1("audioclip_"))) {
kdDebug(DEBUGAREA) << "process Audio command (not yet implemented): " << cmd << " " << arg[0] << endl;
}
- else if ( cmd == TQString::tqfromLatin1( "JS_Event" )
+ else if ( cmd == TQString::fromLatin1( "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::tqfromLatin1( "AppletStateNotification" ) )
+ else if ( cmd == TQString::fromLatin1( "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::tqfromLatin1( "AppletFailed" ) ) {
+ else if ( cmd == TQString::fromLatin1( "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.tqreplace(TQRegExp(":\\s*"), ":\n");
+ errorDetail.replace(TQRegExp(":\\s*"), ":\n");
KMessageBox::detailedError(0L, i18n("Java error while loading applet."), errorDetail);
*/
if (applet)