From 76ce0b1e44d7105792de5733e1b147f9892a9347 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:06:07 -0600
Subject: [PATCH] Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kcm_gtk/kcmgtk.cpp    | 12 ++++++------
 kcm_gtk/kcmgtk.h      |  4 ++--
 src/qt_qt_wrapper.cpp |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp
index 3e42a0a..5cebe54 100644
--- a/kcm_gtk/kcmgtk.cpp
+++ b/kcm_gtk/kcmgtk.cpp
@@ -68,7 +68,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_gtk, KcmGtkFactory("gtk"))*/
 
 extern "C"
 {
-	KCModule *create_kcmgtk( TQWidget * parent, const char * name )
+	TDECModule *create_kcmgtk( TQWidget * parent, const char * name )
 	{
 		TDEGlobal::locale()->insertCatalogue( "gtkqtengine" );
 		return new KcmGtk( parent, "kcmgtk" );
@@ -160,14 +160,14 @@ TQFont GtkRcParser::parseFont(TQString fontString)
 }
 
 KcmGtk::KcmGtk(TQWidget *parent, const char *name, const TQStringList&)
-    : KCModule(parent, name),
+    : TDECModule(parent, name),
       myAboutData(0),
       emacsDetailsDialog(NULL),
       searchPathsDialog(NULL)
 {
 	TDEGlobal::locale()->insertCatalogue("gtkqtengine");
 	
-	config = new KConfig("kcmgtkrc");
+	config = new TDEConfig("kcmgtkrc");
 
 	TQStringList gtkSearchPathsDefault;
 	gtkSearchPathsDefault.append("/usr");
@@ -370,7 +370,7 @@ void KcmGtk::load()
 	bool usingGtk3TQtEngine = false;
 	if (TQFile::exists(GTK3_INI_DIR + GTK3_INI_FILE)) {
 		TQString activeGtk3Style;
-		KConfig gtk3Config(GTK3_INI_DIR + GTK3_INI_FILE);
+		TDEConfig gtk3Config(GTK3_INI_DIR + GTK3_INI_FILE);
 		gtk3Config.setGroup("Settings");
 		activeGtk3Style = gtk3Config.readEntry("gtk-theme-name");
 		if (activeGtk3Style == "tdegtk") {
@@ -533,7 +533,7 @@ void KcmGtk::save()
 
 int KcmGtk::buttons()
 {
-	return KCModule::Apply;
+	return TDECModule::Apply;
 }
 
 TQString KcmGtk::quickHelp() const
@@ -601,7 +601,7 @@ void KcmGtk::getProfiles(const TQString& basePath, int type)
 	TQString fileName = basePath + "/profiles.ini";
 	if (TQFile::exists(fileName))
 	{
-		KConfig config(fileName, true, false);
+		TDEConfig config(fileName, true, false);
 		TQStringList groups = config.groupList();
 		
 		for ( TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it )
diff --git a/kcm_gtk/kcmgtk.h b/kcm_gtk/kcmgtk.h
index 7199d96..803ef07 100644
--- a/kcm_gtk/kcmgtk.h
+++ b/kcm_gtk/kcmgtk.h
@@ -44,7 +44,7 @@ private:
 	TQFont parseFont(TQString fontString);
 };
 
-class KcmGtk: public KCModule
+class KcmGtk: public TDECModule
 {
 	Q_OBJECT
   
@@ -103,7 +103,7 @@ private:
 	EmacsDetails* emacsDetailsDialog;
 	TQStringList gtkSearchPaths;
 	SearchPaths* searchPathsDialog;
-	KConfig* config;
+	TDEConfig* config;
 };
 
 #endif
diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp
index 8448087..aa37d8a 100644
--- a/src/qt_qt_wrapper.cpp
+++ b/src/qt_qt_wrapper.cpp
@@ -513,14 +513,14 @@ GdkFilterReturn gdkEventFilter(GdkXEvent *xevent, GdkEvent *gevent, gpointer dat
 
 TQString kdeConfigValue(const TQString& section, const TQString& name, const TQString& def)
 {
-	KConfig currentConfig;
+	TDEConfig currentConfig;
 	currentConfig.setGroup(section);
 	return currentConfig.readEntry(name, def);
 }
 
 bool kdeBoolConfigValue(const TQString& section, const TQString& name, bool def)
 {
-	KConfig currentConfig;
+	TDEConfig currentConfig;
 	currentConfig.setGroup(section);
 	return currentConfig.readBoolEntry(name, def);
 }