From cc74f360bb40da3d79f58048f8e8611804980aa6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:30:47 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 khotkeys/kcontrol/init.cpp        |  2 +-
 khotkeys/kcontrol/kcmkhotkeys.cpp | 12 ++++++------
 khotkeys/kcontrol/kcmkhotkeys.h   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'khotkeys/kcontrol')

diff --git a/khotkeys/kcontrol/init.cpp b/khotkeys/kcontrol/init.cpp
index 2278fa038..518e45972 100644
--- a/khotkeys/kcontrol/init.cpp
+++ b/khotkeys/kcontrol/init.cpp
@@ -24,7 +24,7 @@ extern "C"
 {
     KDE_EXPORT void init_khotkeys()
     {
-    KConfig cfg( "khotkeysrc", true );
+    TDEConfig cfg( "khotkeysrc", true );
     cfg.setGroup( "Main" );
     if( !cfg.readBoolEntry( "Autostart", false ))
         return;
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index 5f1ca3df3..46f96c9fc 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -48,7 +48,7 @@
 
 extern "C"
 {
-    KDE_EXPORT KCModule* create_khotkeys( TQWidget* parent_P, const char* name_P )
+    KDE_EXPORT TDECModule* create_khotkeys( TQWidget* parent_P, const char* name_P )
     {
 //    sleep( 20 ); // CHECKME DEBUG
     TDEGlobal::locale()->insertCatalogue("khotkeys");
@@ -62,7 +62,7 @@ namespace KHotKeys
 {
 
 Module::Module( TQWidget* parent_P, const char* )
-    : KCModule( parent_P, "khotkeys" ), _actions_root( NULL ), _current_action_data( NULL ),
+    : TDECModule( parent_P, "khotkeys" ), _actions_root( NULL ), _current_action_data( NULL ),
         listview_is_changed( false ), deleting_action( false )
     {
     setButtons( Help | Cancel | Apply | Ok );
@@ -114,7 +114,7 @@ void Module::load()
     kdDebug( 1217 ) << "actions_root:" << _actions_root << endl;
     actions_listview_widget->build_up();
     tab_widget->load_current_action();
-    emit KCModule::changed( false ); // HACK otherwise the module would be changed from the very beginning
+    emit TDECModule::changed( false ); // HACK otherwise the module would be changed from the very beginning
     }
 
 void Module::save()
@@ -142,7 +142,7 @@ void Module::save()
             kdDebug( 1217 ) << "telling khotkeys daemon to reread configuration" << endl;
             }
         }
-    emit KCModule::changed( false );
+    emit TDECModule::changed( false );
     }
 
 
@@ -287,12 +287,12 @@ void Module::import()
     actions_listview_widget->clear();
     actions_listview_widget->build_up();
     tab_widget->load_current_action();
-    emit KCModule::changed( true );
+    emit TDECModule::changed( true );
     }
     
 void Module::changed()
     {
-    emit KCModule::changed( true );
+    emit TDECModule::changed( true );
     }
 
 void Module::init_arts()
diff --git a/khotkeys/kcontrol/kcmkhotkeys.h b/khotkeys/kcontrol/kcmkhotkeys.h
index b406df8fe..fdc12a8f2 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.h
+++ b/khotkeys/kcontrol/kcmkhotkeys.h
@@ -28,7 +28,7 @@ class Action_data_base;
 class Main_buttons_widget;
 
 class Module
-    : public KCModule
+    : public TDECModule
     {
     Q_OBJECT
     public:
-- 
cgit v1.2.1