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

(limited to 'kcontrol/konsole')

diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index 8eb8747ce..3d4e00bdd 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -37,7 +37,7 @@ typedef KGenericFactory<KCMKonsole, TQWidget> ModuleFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_konsole, ModuleFactory("kcmkonsole") )
 
 KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&)
-:KCModule(ModuleFactory::instance(), parent, name)
+:TDECModule(ModuleFactory::instance(), parent, name)
 {
     
     setQuickHelp( i18n("<h1>Konsole</h1> With this module you can configure Konsole, the KDE terminal"
@@ -87,7 +87,7 @@ void KCMKonsole::load()
 
 void KCMKonsole::load(bool useDefaults)
 {
-    KConfig config("konsolerc", true);
+    TDEConfig config("konsolerc", true);
     config.setDesktopGroup();
     config.setReadDefaults(useDefaults);
 
@@ -126,7 +126,7 @@ void KCMKonsole::save()
        dialog->SessionEditor1->querySave();
     }
 
-    KConfig config("konsolerc");
+    TDEConfig config("konsolerc");
     config.setDesktopGroup();
 
     config.writeEntry("TerminalSizeHint", dialog->terminalSizeHintCB->isChecked());
diff --git a/kcontrol/konsole/kcmkonsole.h b/kcontrol/konsole/kcmkonsole.h
index 255a63e66..71b0fb7a7 100644
--- a/kcontrol/konsole/kcmkonsole.h
+++ b/kcontrol/konsole/kcmkonsole.h
@@ -26,7 +26,7 @@ class TQFont;
 class TQStringList;
 
 class KCMKonsole
-	: public KCModule
+	: public TDECModule
 {
 	Q_OBJECT
 
-- 
cgit v1.2.3