From 7574a7287e2e121c9d5c91a5f4ea38c5b3ae2a04 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 6 Nov 2011 02:28:57 -0600
Subject: Additional kde to tde renaming

---
 khotkeys/app/CMakeLists.txt       | 6 +++---
 khotkeys/app/Makefile.am          | 2 +-
 khotkeys/kcontrol/CMakeLists.txt  | 2 +-
 khotkeys/kcontrol/init.cpp        | 4 ++--
 khotkeys/kcontrol/kcmkhotkeys.cpp | 2 +-
 khotkeys/kcontrol/menuedit.cpp    | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'khotkeys')

diff --git a/khotkeys/app/CMakeLists.txt b/khotkeys/app/CMakeLists.txt
index 8d5cc8fef..789d4ea7f 100644
--- a/khotkeys/app/CMakeLists.txt
+++ b/khotkeys/app/CMakeLists.txt
@@ -31,14 +31,14 @@ install( FILES khotkeys.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 
 tde_add_kpart( kded_khotkeys AUTOMOC
   SOURCES kded.cpp kded.skel
-  LINK khotkeys_shared-shared kdeinit_kded-shared
+  LINK khotkeys_shared-shared tdeinit_kded-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
 
-##### khotkeys (kdeinit) ########################
+##### khotkeys (tdeinit) ########################
 
-tde_add_kdeinit_executable( khotkeys AUTOMOC
+tde_add_tdeinit_executable( khotkeys AUTOMOC
   SOURCES app.cpp app.skel
   LINK khotkeys_shared-shared
 )
diff --git a/khotkeys/app/Makefile.am b/khotkeys/app/Makefile.am
index 274f4b57e..726b40374 100644
--- a/khotkeys/app/Makefile.am
+++ b/khotkeys/app/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS =
 lib_LTLIBRARIES =
-kdeinit_LTLIBRARIES = khotkeys.la
+tdeinit_LTLIBRARIES = khotkeys.la
 kde_module_LTLIBRARIES = kded_khotkeys.la
 
 khotkeys_la_SOURCES = app.cpp app.skel
diff --git a/khotkeys/kcontrol/CMakeLists.txt b/khotkeys/kcontrol/CMakeLists.txt
index e8c08a0ec..73f295447 100644
--- a/khotkeys/kcontrol/CMakeLists.txt
+++ b/khotkeys/kcontrol/CMakeLists.txt
@@ -53,6 +53,6 @@ tde_add_kpart( kcm_khotkeys AUTOMOC
 
 tde_add_kpart( kcm_khotkeys_init AUTOMOC
   SOURCES init.cpp
-  LINK kdecore-shared
+  LINK tdecore-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/khotkeys/kcontrol/init.cpp b/khotkeys/kcontrol/init.cpp
index 67dc2ee6e..4bc587494 100644
--- a/khotkeys/kcontrol/init.cpp
+++ b/khotkeys/kcontrol/init.cpp
@@ -33,14 +33,14 @@ extern "C"
     // kded modules in such case.
     TQCString multiHead = getenv("KDE_MULTIHEAD");
     if (multiHead.lower() == "true")
-        kapp->kdeinitExec( "khotkeys" );
+        kapp->tdeinitExec( "khotkeys" );
     else
         {
         DCOPRef ref( "kded", "kded" );
         if( !ref.call( "loadModule", TQCString( "khotkeys" )))
             {
             kdWarning( 1217 ) << "Loading of khotkeys module failed." << endl;
-            kapp->kdeinitExec( "khotkeys" );
+            kapp->tdeinitExec( "khotkeys" );
             }
         }
     }
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index eb38ef7cc..54b3125a0 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::kdeinitExec( "khotkeys" );
+            KApplication::tdeinitExec( "khotkeys" );
             }
         else
             {
diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp
index 199f59750..efab89d8b 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::kdeinitExec( "khotkeys" );
+        KApplication::tdeinitExec( "khotkeys" );
         }
     else
         {
-- 
cgit v1.2.3