Rename KApplication to TDEApplication to avoid conflicts with KDE4

3 files changed, 3 insertions, 3 deletions

diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index 84b0458b9..bd3a055ca 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -133,7 +133,7 @@ void Module::save()
         if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
             {
             kdDebug( 1217 ) << "launching new khotkeys daemon" << endl;
-            KApplication::tdeinitExec( "khotkeys" );
+            TDEApplication::tdeinitExec( "khotkeys" );
             }
         else
             {
diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp
index 3880fc093..2d0d23b13 100644
--- a/khotkeys/kcontrol/menuedit.cpp
+++ b/khotkeys/kcontrol/menuedit.cpp
@@ -194,7 +194,7 @@ void khotkeys_send_reread_config()
     if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
         {
         kdDebug( 1217 ) << "launching new khotkeys daemon" << endl;
-        KApplication::tdeinitExec( "khotkeys" );
+        TDEApplication::tdeinitExec( "khotkeys" );
         }
     else
         {
diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp
index 5387382fa..00649d854 100644
--- a/khotkeys/update/update.cpp
+++ b/khotkeys/update/update.cpp
@@ -37,7 +37,7 @@ int main( int argc, char* argv[] )
     TDECmdLineArgs::init( argc, argv, "khotkeys_update", "KHotKeys Update",
 	"KHotKeys update utility", "1.0" );
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app( false, true ); // X11 connection is necessary for KKey* stuff :-/
+    TDEApplication app( false, true ); // X11 connection is necessary for KKey* stuff :-/
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     TQCString id = args->getOption( "id" );
     TQString file = locate( "data", "khotkeys/" + id + ".khotkeys" );