diff options
Diffstat (limited to 'kalarm')
| -rw-r--r-- | kalarm/daemon.cpp | 2 | ||||
| -rw-r--r-- | kalarm/functions.cpp | 2 | ||||
| -rw-r--r-- | kalarm/kalarmapp.cpp | 6 | ||||
| -rw-r--r-- | kalarm/kalarmapp.h | 4 | ||||
| -rw-r--r-- | kalarm/kalarmd/adapp.cpp | 2 | ||||
| -rw-r--r-- | kalarm/kalarmd/adapp.h | 4 | ||||
| -rw-r--r-- | kalarm/kalarmd/admain.cpp | 2 | ||||
| -rw-r--r-- | kalarm/main.cpp | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp index fd0996326..06206cc93 100644 --- a/kalarm/daemon.cpp +++ b/kalarm/daemon.cpp @@ -132,7 +132,7 @@ bool Daemon::start() { if (mStartTimer) return true; // we're currently waiting for the daemon to start - // Start the alarm daemon. It is a KUniqueApplication, which means that + // Start the alarm daemon. It is a TDEUniqueApplication, which means that // there is automatically only one instance of the alarm daemon running. TQString execStr = locate("exe", TQString::fromLatin1(DAEMON_APP_NAME)); if (execStr.isEmpty()) diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index 455c27a2c..d91d65ae0 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -1044,7 +1044,7 @@ bool runKOrganizer() TQCString dummy; if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) { - DCOPRef ref(dcopService, dcopService); // talk to the KUniqueApplication or its Kontact wrapper + DCOPRef ref(dcopService, dcopService); // talk to the TDEUniqueApplication or its Kontact wrapper DCOPReply reply = ref.call("load()"); if (!reply.isValid() || !(bool)reply) { diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index d9adbf7ce..713467381 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -94,7 +94,7 @@ TQString KAlarmApp::mFatalMessage; * Construct the application. */ KAlarmApp::KAlarmApp() - : KUniqueApplication(), + : TDEUniqueApplication(), mInitialised(false), mDcopHandler(new DcopHandler()), #ifdef OLD_DCOP @@ -244,7 +244,7 @@ bool KAlarmApp::restoreSession() } /****************************************************************************** -* Called for a KUniqueApplication when a new instance of the application is +* Called for a TDEUniqueApplication when a new instance of the application is * started. */ int KAlarmApp::newInstance() @@ -834,7 +834,7 @@ void KAlarmApp::doQuit(TQWidget* parent) void KAlarmApp::commitData(TQSessionManager& sm) { mSessionClosingDown = true; - KUniqueApplication::commitData(sm); + TDEUniqueApplication::commitData(sm); mSessionClosingDown = false; // reset in case shutdown is cancelled } diff --git a/kalarm/kalarmapp.h b/kalarm/kalarmapp.h index 17f707ea8..52359ef03 100644 --- a/kalarm/kalarmapp.h +++ b/kalarm/kalarmapp.h @@ -27,7 +27,7 @@ class TQTimer; class TQDateTime; -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <kurl.h> class TDEProcess; namespace KCal { class Event; } @@ -45,7 +45,7 @@ class TrayWindow; class ShellProcess; -class KAlarmApp : public KUniqueApplication +class KAlarmApp : public TDEUniqueApplication { TQ_OBJECT diff --git a/kalarm/kalarmd/adapp.cpp b/kalarm/kalarmd/adapp.cpp index 2c9e09dc7..3d5f22981 100644 --- a/kalarm/kalarmd/adapp.cpp +++ b/kalarm/kalarmd/adapp.cpp @@ -30,7 +30,7 @@ AlarmDaemonApp::AlarmDaemonApp() - : KUniqueApplication(false, false), + : TDEUniqueApplication(false, false), mAd(0) { disableSessionManagement(); diff --git a/kalarm/kalarmd/adapp.h b/kalarm/kalarmd/adapp.h index 629920942..c4a4188d8 100644 --- a/kalarm/kalarmd/adapp.h +++ b/kalarm/kalarmd/adapp.h @@ -23,12 +23,12 @@ #ifndef ADAPP_H #define ADAPP_H -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> class AlarmDaemon; -class AlarmDaemonApp : public KUniqueApplication +class AlarmDaemonApp : public TDEUniqueApplication { TQ_OBJECT diff --git a/kalarm/kalarmd/admain.cpp b/kalarm/kalarmd/admain.cpp index a5d9fd160..b1533e4a5 100644 --- a/kalarm/kalarmd/admain.cpp +++ b/kalarm/kalarmd/admain.cpp @@ -49,7 +49,7 @@ int main(int argc, char** argv) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); TDEStartupInfo::disableAutoAppStartedSending(); if (!AlarmDaemonApp::start()) diff --git a/kalarm/main.cpp b/kalarm/main.cpp index f29ec6735..62904a17c 100644 --- a/kalarm/main.cpp +++ b/kalarm/main.cpp @@ -115,7 +115,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); if (!KAlarmApp::start()) { |