From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:07 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- khtml/java/kjavaappletserver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'khtml/java/kjavaappletserver.cpp') 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"; -- cgit v1.2.3