Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

10 files changed, 28 insertions, 28 deletions

diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp
index 9df9c6e..c97b203 100644
--- a/kdelirc/kcmlirc/kcmlirc.cpp
+++ b/kdelirc/kcmlirc/kcmlirc.cpp
@@ -49,11 +49,11 @@
 typedef KGenericFactory<KCMLirc, TQWidget> theFactory;
 K_EXPORT_COMPONENT_FACTORY(kcmlirc, theFactory("kcmlirc"))
 
-KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DCOPObject("KCMLirc"), KCModule(parent, name)
+KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DCOPObject("KCMLirc"), TDECModule(parent, name)
 {
 	TDEGlobal::locale()->insertCatalogue( "kcmlirc" );
 	setAboutData(new TDEAboutData("kcmlirc", I18N_NOOP("TDE Lirc"), VERSION, I18N_NOOP("The TDE IR Remote Control System"), TDEAboutData::License_GPL_V2, "Copyright (c)2003 Gav Wood", I18N_NOOP("Use this to configure TDE's infrared remote control system in order to control any TDE application with your infrared remote control."), "http://www.kde.org"));
-	setButtons(KCModule::Help);
+	setButtons(TDECModule::Help);
 	setQuickHelp(i18n("<h1>Remote Controls</h1><p>This module allows you to configure bindings between your remote controls and TDE applications. Simply select your remote control and click Add under the Actions/Buttons list. If you want TDE to attempt to automatically assign buttons to a supported application's actions, try clicking the Auto-Populate button.</p><p>To view the recognised applications and remote controls, simply select the <em>Loaded Extensions</em> tab.</p>"));
 	bool ok;
 	TDEApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok);
@@ -534,7 +534,7 @@ void KCMLirc::configChanged()
 // TODO: Take this out when I know how
 extern "C"
 {
-	KDE_EXPORT KCModule *create_kcmlirc(TQWidget *parent, const char *)
+	KDE_EXPORT TDECModule *create_kcmlirc(TQWidget *parent, const char *)
 	{	TDEGlobal::locale()->insertCatalogue("kcmlirc");
 		return new KCMLirc(parent, "KCMLirc");
 	}
diff --git a/kdelirc/kcmlirc/kcmlirc.h b/kdelirc/kcmlirc/kcmlirc.h
index a655b34..496908f 100644
--- a/kdelirc/kcmlirc/kcmlirc.h
+++ b/kdelirc/kcmlirc/kcmlirc.h
@@ -28,7 +28,7 @@ class TQDropEvent;
 class Profile;
 class Remote;
 
-class KCMLirc: public KCModule, virtual public DCOPObject
+class KCMLirc: public TDECModule, virtual public DCOPObject
 {
 	Q_OBJECT
 //	
diff --git a/kdelirc/kdelirc/iraction.cpp b/kdelirc/kdelirc/iraction.cpp
index ad558b5..7e2c26e 100644
--- a/kdelirc/kdelirc/iraction.cpp
+++ b/kdelirc/kdelirc/iraction.cpp
@@ -37,7 +37,7 @@ IRAction::IRAction(const TQString &newProgram, const TQString &newObject, const
 	theIfMulti = newIfMulti;
 }
 
-const IRAction &IRAction::loadFromConfig(KConfig &theConfig, int index)
+const IRAction &IRAction::loadFromConfig(TDEConfig &theConfig, int index)
 {
 	TQString Binding = "Binding" + TQString().setNum(index);
 	int numArguments = theConfig.readNumEntry(Binding + "Arguments");
@@ -64,7 +64,7 @@ const IRAction &IRAction::loadFromConfig(KConfig &theConfig, int index)
 	return *this;
 }
 
-void IRAction::saveToConfig(KConfig &theConfig, int index) const
+void IRAction::saveToConfig(TDEConfig &theConfig, int index) const
 {
 	TQString Binding = "Binding" + TQString().setNum(index);
 
diff --git a/kdelirc/kdelirc/iraction.h b/kdelirc/kdelirc/iraction.h
index 7d70d6c..14d0354 100644
--- a/kdelirc/kdelirc/iraction.h
+++ b/kdelirc/kdelirc/iraction.h
@@ -23,7 +23,7 @@
 @author Gav Wood
 */
 
-class KConfig;
+class TDEConfig;
 
 class IRAction
 {
@@ -36,8 +36,8 @@ class IRAction
 
 public:
 	// load/save convenience functions
-	const IRAction &loadFromConfig(KConfig &theConfig, int index);
-	void saveToConfig(KConfig &theConfig, int index) const;
+	const IRAction &loadFromConfig(TDEConfig &theConfig, int index);
+	void saveToConfig(TDEConfig &theConfig, int index) const;
 
 	// may be changed to a profile-based representation in the future.
 	const TQString function() const;
diff --git a/kdelirc/kdelirc/iractions.cpp b/kdelirc/kdelirc/iractions.cpp
index e4ec0da..fa5d34f 100644
--- a/kdelirc/kdelirc/iractions.cpp
+++ b/kdelirc/kdelirc/iractions.cpp
@@ -16,7 +16,7 @@
 #include "iractions.h"
 #include "iraction.h"
 
-void IRActions::loadFromConfig(KConfig &theConfig)
+void IRActions::loadFromConfig(TDEConfig &theConfig)
 {
 	clear();
 	int numBindings = theConfig.readNumEntry("Bindings");
@@ -24,7 +24,7 @@ void IRActions::loadFromConfig(KConfig &theConfig)
 		addAction(IRAction().loadFromConfig(theConfig, i));
 }
 
-void IRActions::purgeAllBindings(KConfig &theConfig)
+void IRActions::purgeAllBindings(TDEConfig &theConfig)
 {
 	int numBindings = theConfig.readNumEntry("Bindings");
 	for(int i = 0; i < numBindings; i++)
@@ -41,7 +41,7 @@ void IRActions::purgeAllBindings(KConfig &theConfig)
 	}
 }
 
-void IRActions::saveToConfig(KConfig &theConfig)
+void IRActions::saveToConfig(TDEConfig &theConfig)
 {
 	int index = 0;
 	purgeAllBindings(theConfig);
diff --git a/kdelirc/kdelirc/iractions.h b/kdelirc/kdelirc/iractions.h
index 8373669..4c44c46 100644
--- a/kdelirc/kdelirc/iractions.h
+++ b/kdelirc/kdelirc/iractions.h
@@ -25,7 +25,7 @@
 @author Gav Wood
 */
 
-class KConfig;
+class TDEConfig;
 
 typedef TQValueListIterator<IRAction> IRAIt;
 typedef TQValueList<IRAIt> IRAItList;
@@ -33,7 +33,7 @@ typedef TQValueList<IRAIt> IRAItList;
 class IRActions: protected TQValueList<IRAction>
 {
 private:
-	void purgeAllBindings(KConfig &theConfig);
+	void purgeAllBindings(TDEConfig &theConfig);
 
 public:
 	IRAIt addAction(const IRAction &theAction);
@@ -44,8 +44,8 @@ public:
 	void erase(const IRAIt &action) { TQValueList<IRAction>::erase(action); }
 	void renameMode(const Mode &mode, const TQString &to);
 
-	void loadFromConfig(KConfig &theConfig);
-	void saveToConfig(KConfig &theConfig);
+	void loadFromConfig(TDEConfig &theConfig);
+	void saveToConfig(TDEConfig &theConfig);
 };
 
 
diff --git a/kdelirc/kdelirc/mode.cpp b/kdelirc/kdelirc/mode.cpp
index cd0dc4c..3acae0a 100644
--- a/kdelirc/kdelirc/mode.cpp
+++ b/kdelirc/kdelirc/mode.cpp
@@ -31,7 +31,7 @@ Mode::~Mode()
 {
 }
 
-const Mode &Mode::loadFromConfig(KConfig &theConfig, int index)
+const Mode &Mode::loadFromConfig(TDEConfig &theConfig, int index)
 {
 	TQString Prefix = "Mode" + TQString().setNum(index);
 	theName = theConfig.readEntry(Prefix + "Name");
@@ -41,7 +41,7 @@ const Mode &Mode::loadFromConfig(KConfig &theConfig, int index)
 	return *this;
 }
 
-void Mode::saveToConfig(KConfig &theConfig, int index)
+void Mode::saveToConfig(TDEConfig &theConfig, int index)
 {
 	TQString Prefix = "Mode" + TQString().setNum(index);
 	theConfig.writeEntry(Prefix + "Name", theName);
diff --git a/kdelirc/kdelirc/mode.h b/kdelirc/kdelirc/mode.h
index a2fa477..55b7b0a 100644
--- a/kdelirc/kdelirc/mode.h
+++ b/kdelirc/kdelirc/mode.h
@@ -21,7 +21,7 @@
 @author Gav Wood
 */
 
-class KConfig;
+class TDEConfig;
 
 class Mode
 {
@@ -37,8 +37,8 @@ public:
 	const TQString &iconFile() const { return theIconFile; }
 	const TQString &remoteName() const { return RemoteServer::remoteServer()->getRemoteName(theRemote); }
 
-	const Mode &loadFromConfig(KConfig &theConfig, int index);
-	void saveToConfig(KConfig &theConfig, int index);
+	const Mode &loadFromConfig(TDEConfig &theConfig, int index);
+	void saveToConfig(TDEConfig &theConfig, int index);
 
 	bool operator==(const Mode &mode) const { return mode.theName == theName && mode.theRemote == theRemote; }
 
diff --git a/kdelirc/kdelirc/modes.cpp b/kdelirc/kdelirc/modes.cpp
index 5346837..bbab16f 100644
--- a/kdelirc/kdelirc/modes.cpp
+++ b/kdelirc/kdelirc/modes.cpp
@@ -25,7 +25,7 @@ Modes::~Modes()
 {
 }
 
-void Modes::loadFromConfig(KConfig &theConfig)
+void Modes::loadFromConfig(TDEConfig &theConfig)
 {
 	clear();
 	int numModes = theConfig.readNumEntry("Modes");
@@ -67,7 +67,7 @@ const Mode Modes::getDefault(const TQString &remote) const
 
 }
 
-void Modes::purgeAllModes(KConfig &theConfig)
+void Modes::purgeAllModes(TDEConfig &theConfig)
 {
 	int numModes = theConfig.readNumEntry("Modes");
 	for(int i = 0; i < numModes; i++)
@@ -77,7 +77,7 @@ void Modes::purgeAllModes(KConfig &theConfig)
 	}
 }
 
-void Modes::saveToConfig(KConfig &theConfig)
+void Modes::saveToConfig(TDEConfig &theConfig)
 {
 	int index = 0;
 	purgeAllModes(theConfig);
diff --git a/kdelirc/kdelirc/modes.h b/kdelirc/kdelirc/modes.h
index ce89d43..d0de17a 100644
--- a/kdelirc/kdelirc/modes.h
+++ b/kdelirc/kdelirc/modes.h
@@ -24,18 +24,18 @@
 @author Gav Wood
 */
 
-class KConfig;
+class TDEConfig;
 
 typedef TQValueList<Mode> ModeList;
 
 class Modes : protected TQMap<TQString, TQMap<TQString, Mode> >
 {
-	void purgeAllModes(KConfig &theConfig);
+	void purgeAllModes(TDEConfig &theConfig);
 	TQMap<TQString, TQString> theDefaults;
 
 public:
-	void loadFromConfig(KConfig &theConfig);
-	void saveToConfig(KConfig &theConfig);
+	void loadFromConfig(TDEConfig &theConfig);
+	void saveToConfig(TDEConfig &theConfig);
 	void generateNulls(const TQStringList &theRemotes);
 
 	const Mode &getMode(const TQString &remote, const TQString &mode) const;