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/kded/kcmkded.cpp | 14 +++++++-------
 kcontrol/kded/kcmkded.h   |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kcontrol/kded')

diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index af606f5fd..eeccfb362 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kded, KDEDFactory( "kcmkded" ) )
 
 
 KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) :
-	KCModule( KDEDFactory::instance(), parent, name )
+	TDECModule( KDEDFactory::instance(), parent, name )
 {
 	TDEAboutData *about =
 		new TDEAboutData( I18N_NOOP( "kcmkded" ), I18N_NOOP( "TDE Service Manager" ),
@@ -110,7 +110,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &)
 	load();
 }
 
-void setModuleGroup(KConfig *config, const TQString &filename)
+void setModuleGroup(TDEConfig *config, const TQString &filename)
 {
 	TQString module = filename;
 	int i = module.findRev('/');
@@ -123,13 +123,13 @@ void setModuleGroup(KConfig *config, const TQString &filename)
 	config->setGroup(TQString("Module-%1").arg(module));
 }
 
-bool KDEDConfig::autoloadEnabled(KConfig *config, const TQString &filename)
+bool KDEDConfig::autoloadEnabled(TDEConfig *config, const TQString &filename)
 {
 	setModuleGroup(config, filename);
 	return config->readBoolEntry("autoload", true);
 }
 
-void KDEDConfig::setAutoloadEnabled(KConfig *config, const TQString &filename, bool b)
+void KDEDConfig::setAutoloadEnabled(TDEConfig *config, const TQString &filename, bool b)
 {
 	setModuleGroup(config, filename);
 	return config->writeEntry("autoload", b);
@@ -141,7 +141,7 @@ void KDEDConfig::load() {
 
 
 void KDEDConfig::load( bool useDefaults ) {
-	KConfig kdedrc("kdedrc", true, false);
+	TDEConfig kdedrc("kdedrc", true, false);
    kdedrc.setReadDefaults( useDefaults );
 
 	_lvStartup->clear();
@@ -190,13 +190,13 @@ void KDEDConfig::save() {
 			TQString::fromLatin1( "kded/*.desktop" ),
 			true, true, files );
 
-	KConfig kdedrc("kdedrc", false, false);
+	TDEConfig kdedrc("kdedrc", false, false);
 
 	for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) {
 
 		if ( KDesktopFile::isDesktopFile( *it ) ) {
 
-			KConfig file( *it, false, false, "services" );
+			TDEConfig file( *it, false, false, "services" );
 			file.setGroup("Desktop Entry");
 
 			if (file.readBoolEntry("X-TDE-Kded-autoload")){
diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h
index 1e9e42e72..86f5aaf94 100644
--- a/kcontrol/kded/kcmkded.h
+++ b/kcontrol/kded/kcmkded.h
@@ -28,7 +28,7 @@ class KListView;
 class TQStringList;
 class TQPushButton;
 
-class KDEDConfig : public KCModule
+class KDEDConfig : public TDECModule
 {
 Q_OBJECT
 public:
@@ -49,8 +49,8 @@ protected slots:
 	void slotItemChecked(TQCheckListItem *item);
 	void getServiceStatus();
 
-        bool autoloadEnabled(KConfig *config, const TQString &filename);
-        void setAutoloadEnabled(KConfig *config, const TQString &filename, bool b);
+        bool autoloadEnabled(TDEConfig *config, const TQString &filename);
+        void setAutoloadEnabled(TDEConfig *config, const TQString &filename, bool b);
 
 private:
 	KListView *_lvLoD;
-- 
cgit v1.2.1