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

---
 kopete/plugins/nowlistening/kopete_nowlistening_config.desktop | 2 +-
 kopete/plugins/nowlistening/nowlisteningplugin.h               | 2 +-
 kopete/plugins/nowlistening/nowlisteningpreferences.cpp        | 6 +++---
 kopete/plugins/nowlistening/nowlisteningpreferences.h          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kopete/plugins/nowlistening')

diff --git a/kopete/plugins/nowlistening/kopete_nowlistening_config.desktop b/kopete/plugins/nowlistening/kopete_nowlistening_config.desktop
index 43625fdd..7985f663 100644
--- a/kopete/plugins/nowlistening/kopete_nowlistening_config.desktop
+++ b/kopete/plugins/nowlistening/kopete_nowlistening_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kaboodle
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_nowlistening
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.h b/kopete/plugins/nowlistening/nowlisteningplugin.h
index 8489044e..c0ee77d5 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.h
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.h
@@ -96,7 +96,7 @@ friend class NowListeningGUIClient;
 		void slotNewKMM( Kopete::ChatSession* );
 		
 		/**
-		 * Reacts to the plugin's settings changed signal, originating from the KCModule dispatcher
+		 * Reacts to the plugin's settings changed signal, originating from the TDECModule dispatcher
 		 */ 
 		void slotSettingsChanged();
 
diff --git a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
index bd0cb983..d7117852 100644
--- a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
@@ -37,7 +37,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kopete_nowlistening, NowListeningPreferencesFact
 
 
 NowListeningPreferences::NowListeningPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args)
-	: KCModule( NowListeningPreferencesFactory::instance(), parent, args )
+	: TDECModule( NowListeningPreferencesFactory::instance(), parent, args )
 {
 	(  new TQVBoxLayout(  this ) )->setAutoAdd(  true );
 	preferencesDialog = new NowListeningPrefsUI( this );
@@ -63,12 +63,12 @@ NowListeningPreferences::~NowListeningPreferences( )
 
 void NowListeningPreferences::save()
 {
-	KCModule::save();
+	TDECModule::save();
 }
 
 void NowListeningPreferences::load()
 {
-	KCModule::load();
+	TDECModule::load();
 }
 
 void NowListeningPreferences::slotSettingsChanged()
diff --git a/kopete/plugins/nowlistening/nowlisteningpreferences.h b/kopete/plugins/nowlistening/nowlisteningpreferences.h
index 7e29df51..05169c10 100644
--- a/kopete/plugins/nowlistening/nowlisteningpreferences.h
+++ b/kopete/plugins/nowlistening/nowlisteningpreferences.h
@@ -29,7 +29,7 @@ class NowListeningConfig;
   *@author Will Stephenson
   */
 
-class NowListeningPreferences : public KCModule
+class NowListeningPreferences : public TDECModule
 {
 Q_OBJECT
   
-- 
cgit v1.2.1