Rename KApplication to TDEApplication to avoid conflicts with KDE4

4 files changed, 13 insertions, 13 deletions

diff --git a/kdelirc/irkick/irkick.cpp b/kdelirc/irkick/irkick.cpp
index 0f34b4f..ddc2205 100644
--- a/kdelirc/irkick/irkick.cpp
+++ b/kdelirc/irkick/irkick.cpp
@@ -120,7 +120,7 @@ void IRKick::doQuit()
 		case KMessageBox::Yes: theConfig.writeEntry("AutoStart", true); break;
 		case KMessageBox::Cancel: return;
 	}
-	KApplication::kApplication()->quit();
+	TDEApplication::kApplication()->quit();
 }
 
 void IRKick::resetModes()
@@ -152,7 +152,7 @@ void IRKick::slotReloadConfiguration()
 
 void IRKick::slotConfigure()
 {
-	KApplication::startServiceByDesktopName("kcmlirc");
+	TDEApplication::startServiceByDesktopName("kcmlirc");
 }
 
 void IRKick::updateModeIcons()
@@ -180,7 +180,7 @@ void IRKick::updateModeIcons()
 
 bool IRKick::getPrograms(const IRAction &action, TQStringList &programs)
 {
-	DCOPClient *theDC = KApplication::dcopClient();
+	DCOPClient *theDC = TDEApplication::dcopClient();
 	programs.clear();
 
 	if(action.unique())
@@ -234,7 +234,7 @@ bool IRKick::getPrograms(const IRAction &action, TQStringList &programs)
 
 void IRKick::executeAction(const IRAction &action)
 {
-	DCOPClient *theDC = KApplication::dcopClient();
+	DCOPClient *theDC = TDEApplication::dcopClient();
 	TQStringList programs;
 
 	if(!getPrograms(action, programs)) return;
@@ -245,7 +245,7 @@ void IRKick::executeAction(const IRAction &action)
 		if(!sname.isNull())
 		{
 			KPassivePopup::message("IRKick", i18n("Starting <b>%1</b>...").arg(action.application()), SmallIcon("irkick"), theTrayIcon);
-			KApplication::startServiceByDesktopName(sname);
+			TDEApplication::startServiceByDesktopName(sname);
 		}
 	}
 	if(action.isJustStart()) return;
@@ -286,7 +286,7 @@ void IRKick::gotMessage(const TQString &theRemote, const TQString &theButton, in
 		// send notifier by DCOP to npApp/npModule/npMethod(theRemote, theButton);
 		TQByteArray data; TQDataStream arg(data, IO_WriteOnly);
 		arg << theRemote << theButton;
-		KApplication::dcopClient()->send(theApp.utf8(), npModule.utf8(), npMethod.utf8(), data);
+		TDEApplication::dcopClient()->send(theApp.utf8(), npModule.utf8(), npMethod.utf8(), data);
 	}
 	else
 	{
diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp
index c12b9f0..d5df7ec 100644
--- a/kdelirc/kcmlirc/addaction.cpp
+++ b/kdelirc/kcmlirc/addaction.cpp
@@ -143,7 +143,7 @@ void AddAction::updateButtonStates()
 const TQStringList AddAction::getFunctions(const TQString app, const TQString obj)
 {
 	TQStringList ret;
-	DCOPClient *theClient = KApplication::kApplication()->dcopClient();
+	DCOPClient *theClient = TDEApplication::kApplication()->dcopClient();
 	QCStringList theApps = theClient->remoteFunctions(app.utf8(), obj.utf8());
 	for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i)
 		if(	*i != "QCStringList interfaces()" &&
@@ -335,7 +335,7 @@ void AddAction::updateObjects()
 	uniqueProgramMap.clear();
 	nameProgramMap.clear();
 
-	DCOPClient *theClient = KApplication::kApplication()->dcopClient();
+	DCOPClient *theClient = TDEApplication::kApplication()->dcopClient();
 	QCStringList theApps = theClient->registeredApplications();
 	for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i)
 	{
diff --git a/kdelirc/kcmlirc/editaction.cpp b/kdelirc/kcmlirc/editaction.cpp
index 8b1b03b..be113e6 100644
--- a/kdelirc/kcmlirc/editaction.cpp
+++ b/kdelirc/kcmlirc/editaction.cpp
@@ -315,7 +315,7 @@ void EditAction::updateDCOPApplications()
 	TQStringList names;
 
 	theDCOPApplications->clear();
-	DCOPClient *theClient = KApplication::kApplication()->dcopClient();
+	DCOPClient *theClient = TDEApplication::kApplication()->dcopClient();
 	QCStringList theApps = theClient->registeredApplications();
 	for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i)
 	{
@@ -337,7 +337,7 @@ void EditAction::updateDCOPApplications()
 void EditAction::updateDCOPObjects()
 {
 	theDCOPObjects->clear();
-	DCOPClient *theClient = KApplication::kApplication()->dcopClient();
+	DCOPClient *theClient = TDEApplication::kApplication()->dcopClient();
 	if(theDCOPApplications->currentText().isNull() || theDCOPApplications->currentText().isEmpty()) return;
 	QCStringList theObjects = theClient->remoteObjects(nameProgramMap[theDCOPApplications->currentText()].utf8());
 	if(!theObjects.size() && theDCOPApplications->currentText() == (*theAction).program()) theDCOPObjects->insertItem((*theAction).object());
diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp
index c59632a..ccd9d2f 100644
--- a/kdelirc/kcmlirc/kcmlirc.cpp
+++ b/kdelirc/kcmlirc/kcmlirc.cpp
@@ -56,10 +56,10 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC
 	setButtons(KCModule::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;
-	KApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok);
+	TDEApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok);
 	if(!ok)
 		if(KMessageBox::questionYesNo(this, i18n("The Infrared Remote Control software is not currently running. This configuration module will not work properly without it. Would you like to start it now?"), i18n("Software Not Running"), i18n("Start"), i18n("Do Not Start")) == KMessageBox::Yes)
-		{	kdDebug() << "S" << KApplication::startServiceByDesktopName("irkick") << endl;
+		{	kdDebug() << "S" << TDEApplication::startServiceByDesktopName("irkick") << endl;
 			KSimpleConfig theConfig("irkickrc");
 			theConfig.setGroup("General");
 			if(theConfig.readBoolEntry("AutoStart", true) == false)
@@ -67,7 +67,7 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC
 					theConfig.writeEntry("AutoStart", true);
 		}
 
-	KApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok);
+	TDEApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok);
 	kdDebug() << "OK" << ok << endl;