diff options
Diffstat (limited to 'tdelirc/irkick')
-rw-r--r-- | tdelirc/irkick/irkick.cpp | 32 | ||||
-rw-r--r-- | tdelirc/irkick/irkick.h | 2 | ||||
-rw-r--r-- | tdelirc/irkick/main.cpp | 8 | ||||
-rw-r--r-- | tdelirc/irkick/tdelircclient.cpp | 4 | ||||
-rw-r--r-- | tdelirc/irkick/tdelircclient.h | 2 |
5 files changed, 24 insertions, 24 deletions
diff --git a/tdelirc/irkick/irkick.cpp b/tdelirc/irkick/irkick.cpp index 2d042f0..6255430 100644 --- a/tdelirc/irkick/irkick.cpp +++ b/tdelirc/irkick/irkick.cpp @@ -20,7 +20,7 @@ #if !(TDE_VERSION_MINOR<=1 && TDE_VERSION_RELEASE<=5) #include <tdeactioncollection.h> #endif -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <ksystemtray.h> #include <kiconloader.h> #include <kpassivepopup.h> @@ -44,12 +44,12 @@ void IRKTrayIcon::mousePressEvent(TQMouseEvent *e) { - KSystemTray::mousePressEvent(new TQMouseEvent(TQEvent::MouseButtonPress, e->pos(), e->globalPos(), e->button() == Qt::LeftButton ? Qt::RightButton : e->button(), e->state())); + KSystemTray::mousePressEvent(new TQMouseEvent(TQEvent::MouseButtonPress, e->pos(), e->globalPos(), e->button() == TQt::LeftButton ? TQt::RightButton : e->button(), e->state())); } IRKick::IRKick(const TQCString &obj) : TQObject(), DCOPObject(obj), npApp(TQString()) { - kapp->dcopClient()->setDefaultObject(obj); + tdeApp->dcopClient()->setDefaultObject(obj); theClient = new KLircClient(); theTrayIcon = new IRKTrayIcon(); @@ -60,23 +60,23 @@ IRKick::IRKick(const TQCString &obj) : TQObject(), DCOPObject(obj), npApp(TQStri else { theTrayIcon->setPixmap(SmallIcon("irkickoff")); TQToolTip::add(theTrayIcon, i18n("TDE Lirc Server: No infra-red remote controls found.")); - TQTimer::singleShot(10000, this, TQT_SLOT(checkLirc())); + TQTimer::singleShot(10000, this, TQ_SLOT(checkLirc())); } theFlashOff = new TQTimer(theTrayIcon); - connect(theFlashOff, TQT_SIGNAL(timeout()), TQT_SLOT(flashOff())); + connect(theFlashOff, TQ_SIGNAL(timeout()), TQ_SLOT(flashOff())); theResetCount = 0; slotReloadConfiguration(); - connect(theClient, TQT_SIGNAL(connectionClosed()), this, TQT_SLOT(slotClosed())); - connect(theClient, TQT_SIGNAL(remotesRead()), this, TQT_SLOT(resetModes())); - connect(theClient, TQT_SIGNAL(commandReceived(const TQString &, const TQString &, int)), this, TQT_SLOT(gotMessage(const TQString &, const TQString &, int))); + connect(theClient, TQ_SIGNAL(connectionClosed()), this, TQ_SLOT(slotClosed())); + connect(theClient, TQ_SIGNAL(remotesRead()), this, TQ_SLOT(resetModes())); + connect(theClient, TQ_SIGNAL(commandReceived(const TQString &, const TQString &, int)), this, TQ_SLOT(gotMessage(const TQString &, const TQString &, int))); theTrayIcon->contextMenu()->changeTitle(0, "IRKick"); - theTrayIcon->contextMenu()->insertItem(SmallIcon( "configure" ), i18n("&Configure..."), this, TQT_SLOT(slotConfigure())); + theTrayIcon->contextMenu()->insertItem(SmallIcon( "configure" ), i18n("&Configure..."), this, TQ_SLOT(slotConfigure())); theTrayIcon->contextMenu()->insertSeparator(); theTrayIcon->contextMenu()->insertItem(SmallIcon( "help" ), KStdGuiItem::help().text(), (new KHelpMenu(theTrayIcon, TDEGlobal::instance()->aboutData()))->menu()); - theTrayIcon->actionCollection()->action("file_quit")->disconnect(TQT_SIGNAL(activated())); - connect(theTrayIcon->actionCollection()->action("file_quit"), TQT_SIGNAL(activated()), TQT_SLOT(doQuit())); + theTrayIcon->actionCollection()->action("file_quit")->disconnect(TQ_SIGNAL(activated())); + connect(theTrayIcon->actionCollection()->action("file_quit"), TQ_SIGNAL(activated()), TQ_SLOT(doQuit())); theTrayIcon->show(); } @@ -92,7 +92,7 @@ void IRKick::slotClosed() { theTrayIcon->setPixmap(SmallIcon("irkickoff")); KPassivePopup::message("IRKick", i18n("The infrared system has severed its connection. Remote controls are no longer available."), SmallIcon("irkick"), theTrayIcon); - TQTimer::singleShot(1000, this, TQT_SLOT(checkLirc())); + TQTimer::singleShot(1000, this, TQ_SLOT(checkLirc())); } void IRKick::checkLirc() @@ -103,7 +103,7 @@ void IRKick::checkLirc() theTrayIcon->setPixmap(SmallIcon("irkick")); } else - TQTimer::singleShot(10000, this, TQT_SLOT(checkLirc())); + TQTimer::singleShot(10000, this, TQ_SLOT(checkLirc())); } void IRKick::flashOff() @@ -113,14 +113,14 @@ void IRKick::flashOff() void IRKick::doQuit() { - KSimpleConfig theConfig("irkickrc"); + TDESimpleConfig theConfig("irkickrc"); theConfig.setGroup("General"); switch(KMessageBox::questionYesNoCancel(0, i18n("Should the Infrared Remote Control server start automatically when you begin TDE?"), i18n("Automatically Start?"), i18n("Start Automatically"), i18n("Do Not Start"))) { case KMessageBox::No: theConfig.writeEntry("AutoStart", false); break; case KMessageBox::Yes: theConfig.writeEntry("AutoStart", true); break; case KMessageBox::Cancel: return; } - TDEApplication::kApplication()->quit(); + tdeApp->quit(); } void IRKick::resetModes() @@ -143,7 +143,7 @@ void IRKick::resetModes() void IRKick::slotReloadConfiguration() { // load configuration from config file - KSimpleConfig theConfig("irkickrc"); + TDESimpleConfig theConfig("irkickrc"); allActions.loadFromConfig(theConfig); allModes.loadFromConfig(theConfig); if(currentModes.count() && theResetCount) diff --git a/tdelirc/irkick/irkick.h b/tdelirc/irkick/irkick.h index cecc26b..a3b7cc3 100644 --- a/tdelirc/irkick/irkick.h +++ b/tdelirc/irkick/irkick.h @@ -41,7 +41,7 @@ public: class IRKick: public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/tdelirc/irkick/main.cpp b/tdelirc/irkick/main.cpp index 5d5a791..be98cae 100644 --- a/tdelirc/irkick/main.cpp +++ b/tdelirc/irkick/main.cpp @@ -13,11 +13,11 @@ #include <tdeaboutdata.h> #include <tdeglobal.h> #include <kdebug.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include "irkick.h" -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { TDEAboutData *aboutData = new TDEAboutData("irkick", I18N_NOOP("IRKick"), VERSION, I18N_NOOP("The TDE Infrared Remote Control Server"), TDEAboutData::License_GPL, "(c) 2003, Gav Wood", 0, 0, "gav@kde.org"); aboutData->addAuthor("Gav Wood", I18N_NOOP("Author"), "gav@kde.org", "http://www.indigoarchive.net/gav/"); @@ -27,8 +27,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) aboutData->addCredit("Antonio Larrosa Jiménez", I18N_NOOP("Ideas"), "larrosa@kde.org"); TDECmdLineArgs::init( argc, argv, aboutData ); - KUniqueApplication::addCmdLineOptions(); - KUniqueApplication app; + TDEUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication app; TDEGlobal::locale()->insertCatalogue( "tdelirc" ); app.disableSessionManagement(); IRKick *theIRKick = new IRKick("IRKick"); diff --git a/tdelirc/irkick/tdelircclient.cpp b/tdelirc/irkick/tdelircclient.cpp index ee00c88..c70d39a 100644 --- a/tdelirc/irkick/tdelircclient.cpp +++ b/tdelirc/irkick/tdelircclient.cpp @@ -72,8 +72,8 @@ bool KLircClient::connectToLirc() theSocket = new TQSocket; theSocket->setSocket(sock); - connect(theSocket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotRead())); - connect(theSocket, TQT_SIGNAL(connectionClosed()), TQT_SLOT(slotClosed())); + connect(theSocket, TQ_SIGNAL(readyRead()), TQ_SLOT(slotRead())); + connect(theSocket, TQ_SIGNAL(connectionClosed()), TQ_SLOT(slotClosed())); updateRemotes(); return true; } diff --git a/tdelirc/irkick/tdelircclient.h b/tdelirc/irkick/tdelircclient.h index 68c1906..a3da5df 100644 --- a/tdelirc/irkick/tdelircclient.h +++ b/tdelirc/irkick/tdelircclient.h @@ -28,7 +28,7 @@ class TQSocketNotifier; class KLircClient: public TQObject { - Q_OBJECT + TQ_OBJECT private: |