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/hwmanager/hwmanager.cpp | 2 +-
 kcontrol/hwmanager/hwmanager.h   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kcontrol/hwmanager')

diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp
index a63eb84ea..b1bae281a 100644
--- a/kcontrol/hwmanager/hwmanager.cpp
+++ b/kcontrol/hwmanager/hwmanager.cpp
@@ -61,7 +61,7 @@ KSimpleConfig *systemconfig;
 /**** TDEHWManager ****/
 
 TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringList &)
-  : KCModule(TDEHWManagerFactory::instance(), parent, name)
+  : TDECModule(TDEHWManagerFactory::instance(), parent, name)
 {
 	TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 	config = new KSimpleConfig( TQString::fromLatin1( "hwmanagerrc" ));
diff --git a/kcontrol/hwmanager/hwmanager.h b/kcontrol/hwmanager/hwmanager.h
index 1847f4f33..7e395d0a3 100644
--- a/kcontrol/hwmanager/hwmanager.h
+++ b/kcontrol/hwmanager/hwmanager.h
@@ -34,11 +34,11 @@
 #include "devicepropsdlg.h"
 #include "deviceiconview.h"
 
-class KConfig;
+class TDEConfig;
 class KPopupMenu;
 class KListViewItem;
 
-class TDEHWManager : public KCModule, public DCOPObject
+class TDEHWManager : public TDECModule, public DCOPObject
 {
 	K_DCOP
 	Q_OBJECT
@@ -65,7 +65,7 @@ private slots:
 private:
 	TDEHWManagerBase *base;
 
-	KConfig *config;
+	TDEConfig *config;
 };
 
 #endif
-- 
cgit v1.2.3