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

---
 kcontrol/iccconfig/iccconfig.cpp | 2 +-
 kcontrol/iccconfig/iccconfig.h   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kcontrol/iccconfig')

diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp
index 56af11adc..c65699489 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -61,7 +61,7 @@ KSimpleConfig *systemconfig;
 /**** KICCConfig ****/
 
 KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
-  : KCModule(KICCCFactory::instance(), parent, name), iccFileArray(NULL)
+  : TDECModule(KICCCFactory::instance(), parent, name), iccFileArray(NULL)
 {
 
   TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
diff --git a/kcontrol/iccconfig/iccconfig.h b/kcontrol/iccconfig/iccconfig.h
index d113e5d84..74fe1b49d 100644
--- a/kcontrol/iccconfig/iccconfig.h
+++ b/kcontrol/iccconfig/iccconfig.h
@@ -31,11 +31,11 @@
 
 #include "iccconfigbase.h"
 
-class KConfig;
+class TDEConfig;
 class KPopupMenu;
 class KListViewItem;
 
-class KICCConfig : public KCModule, public DCOPObject
+class KICCConfig : public TDECModule, public DCOPObject
 {
   K_DCOP
     Q_OBJECT
@@ -59,7 +59,7 @@ public:
 
 private:
 
-  KConfig *config;
+  TDEConfig *config;
   bool _ok;
   Display *randr_display;
   ScreenInfo *randr_screen_info;
-- 
cgit v1.2.1