summaryrefslogtreecommitdiffstats
path: root/khtml/java/kjavaappletserver.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:35:07 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:35:07 -0600
commit703fb0c89c2eee56a1e613e67a446db9d4287929 (patch)
treedd8c5ca66075cd89c2638a2b48cf78386a9870a7 /khtml/java/kjavaappletserver.cpp
parent818e7abec3d5d3809b6b77293558678371c16b71 (diff)
downloadtdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz
tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'khtml/java/kjavaappletserver.cpp')
-rw-r--r--khtml/java/kjavaappletserver.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp
index 56e056a62..a82a80a0e 100644
--- a/khtml/java/kjavaappletserver.cpp
+++ b/khtml/java/kjavaappletserver.cpp
@@ -193,7 +193,7 @@ void KJavaAppletServer::freeJavaServer()
//instead of immediately quitting here, set a timer to kill us
//if there are still no servers- give us one minute
//this is to prevent repeated loading and unloading of the jvm
- KConfig config( "konquerorrc", true );
+ TDEConfig config( "konquerorrc", true );
config.setGroup( "Java/JavaScript Settings" );
if( config.readBoolEntry( "ShutdownAppletServer", true ) )
{
@@ -214,7 +214,7 @@ void KJavaAppletServer::checkShutdown()
void KJavaAppletServer::setupJava( KJavaProcess *p )
{
- KConfig config ( "konquerorrc", true );
+ TDEConfig config ( "konquerorrc", true );
config.setGroup( "Java/JavaScript Settings" );
TQString jvm_path = "java";