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

---
 libkcddb/kcmcddb/kcmcddb.cpp | 8 ++++----
 libkcddb/kcmcddb/kcmcddb.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'libkcddb/kcmcddb')

diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp
index 5235d40a..75dd8501 100644
--- a/libkcddb/kcmcddb/kcmcddb.cpp
+++ b/libkcddb/kcmcddb/kcmcddb.cpp
@@ -46,7 +46,7 @@ typedef KGenericFactory<CDDBModule, TQWidget> KCDDBFactory;
 K_EXPORT_COMPONENT_FACTORY ( kcm_cddb, KCDDBFactory( "kcmcddb" ) )
 
 CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
   TDEGlobal::locale()->insertCatalogue("libkcddb");
   setButtons(Default | Apply);
@@ -71,7 +71,7 @@ CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &)
   void
 CDDBModule::defaults()
 {
-  KCModule::defaults();
+  TDECModule::defaults();
 
   updateWidgetsFromConfig(KCDDB::Config());
 }
@@ -112,7 +112,7 @@ CDDBModule::updateWidgetsFromConfig(const KCDDB::Config & config)
   void
 CDDBModule::save()
 {
-  KCModule::save();
+  TDECModule::save();
 
   checkSettings();
 }
@@ -120,7 +120,7 @@ CDDBModule::save()
   void
 CDDBModule::load()
 {
-  KCModule::load();
+  TDECModule::load();
 
   KCDDB::Config config;
   config.readConfig();
diff --git a/libkcddb/kcmcddb/kcmcddb.h b/libkcddb/kcmcddb/kcmcddb.h
index 0e58998f..af83fe80 100644
--- a/libkcddb/kcmcddb/kcmcddb.h
+++ b/libkcddb/kcmcddb/kcmcddb.h
@@ -25,9 +25,9 @@
 #include "libkcddb/config.h"
 
 class CDDBConfigWidgetBase;
-class KConfigDialogManager;
+class TDEConfigDialogManager;
 
-class CDDBModule : public KCModule
+class CDDBModule : public TDECModule
 {
   Q_OBJECT
   
-- 
cgit v1.2.1