From 4bb787f41f7cdefac2aac33ef59317b7157302c1 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:38:13 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kdelirc/kcmlirc/kcmlirc.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kdelirc/kcmlirc/kcmlirc.cpp')

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");
 	}
-- 
cgit v1.2.1