From 2f64e55b006125b1110fcdb05df19909159cee71 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 20 Jan 2025 17:21:59 +0900 Subject: Use tdeApp Signed-off-by: Michele Calgaro --- tdelirc/irkick/irkick.cpp | 4 ++-- tdelirc/kcmlirc/addaction.cpp | 4 ++-- tdelirc/kcmlirc/editaction.cpp | 4 ++-- tdelirc/kcmlirc/kcmlirc.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tdelirc') diff --git a/tdelirc/irkick/irkick.cpp b/tdelirc/irkick/irkick.cpp index cf4827a..af72da7 100644 --- a/tdelirc/irkick/irkick.cpp +++ b/tdelirc/irkick/irkick.cpp @@ -49,7 +49,7 @@ void IRKTrayIcon::mousePressEvent(TQMouseEvent *e) IRKick::IRKick(const TQCString &obj) : TQObject(), DCOPObject(obj), npApp(TQString()) { - kapp->dcopClient()->setDefaultObject(obj); + tdeApp->dcopClient()->setDefaultObject(obj); theClient = new KLircClient(); theTrayIcon = new IRKTrayIcon(); @@ -120,7 +120,7 @@ void IRKick::doQuit() case KMessageBox::Yes: theConfig.writeEntry("AutoStart", true); break; case KMessageBox::Cancel: return; } - TDEApplication::kApplication()->quit(); + tdeApp->quit(); } void IRKick::resetModes() diff --git a/tdelirc/kcmlirc/addaction.cpp b/tdelirc/kcmlirc/addaction.cpp index 3a3e6bd..0ebf472 100644 --- a/tdelirc/kcmlirc/addaction.cpp +++ b/tdelirc/kcmlirc/addaction.cpp @@ -143,7 +143,7 @@ void AddAction::updateButtonStates() const TQStringList AddAction::getFunctions(const TQString app, const TQString obj) { TQStringList ret; - DCOPClient *theClient = TDEApplication::kApplication()->dcopClient(); + DCOPClient *theClient = tdeApp->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 = TDEApplication::kApplication()->dcopClient(); + DCOPClient *theClient = tdeApp->dcopClient(); QCStringList theApps = theClient->registeredApplications(); for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i) { diff --git a/tdelirc/kcmlirc/editaction.cpp b/tdelirc/kcmlirc/editaction.cpp index 8d8a0cb..1b44eb7 100644 --- a/tdelirc/kcmlirc/editaction.cpp +++ b/tdelirc/kcmlirc/editaction.cpp @@ -315,7 +315,7 @@ void EditAction::updateDCOPApplications() TQStringList names; theDCOPApplications->clear(); - DCOPClient *theClient = TDEApplication::kApplication()->dcopClient(); + DCOPClient *theClient = tdeApp->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 = TDEApplication::kApplication()->dcopClient(); + DCOPClient *theClient = tdeApp->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/tdelirc/kcmlirc/kcmlirc.cpp b/tdelirc/kcmlirc/kcmlirc.cpp index a22508c..3b2a870 100644 --- a/tdelirc/kcmlirc/kcmlirc.cpp +++ b/tdelirc/kcmlirc/kcmlirc.cpp @@ -57,7 +57,7 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC setButtons(TDECModule::Help); setQuickHelp(i18n("

Remote Controls

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.

To view the recognised applications and remote controls, simply select the Loaded Extensions tab.

")); bool ok; - TDEApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok); + tdeApp->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" << TDEApplication::startServiceByDesktopName("irkick") << endl; @@ -68,7 +68,7 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC theConfig.writeEntry("AutoStart", true); } - TDEApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok); + tdeApp->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok); kdDebug() << "OK" << ok << endl; -- cgit v1.2.3