diff options
Diffstat (limited to 'kalarm/daemon.cpp')
-rw-r--r-- | kalarm/daemon.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp index 842514d9..264e0a5b 100644 --- a/kalarm/daemon.cpp +++ b/kalarm/daemon.cpp @@ -23,7 +23,7 @@ #include <tqtimer.h> #include <tqiconset.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdeaboutdata.h> #include <tdemessagebox.h> @@ -95,7 +95,7 @@ void Daemon::initialise() { if (!mInstance) mInstance = new Daemon(); - connect(AlarmCalendar::activeCalendar(), TQT_SIGNAL(calendarSaved(AlarmCalendar*)), mInstance, TQT_SLOT(slotCalendarSaved(AlarmCalendar*))); + connect(AlarmCalendar::activeCalendar(), TQ_SIGNAL(calendarSaved(AlarmCalendar*)), mInstance, TQ_SLOT(slotCalendarSaved(AlarmCalendar*))); } /****************************************************************************** @@ -111,10 +111,10 @@ void Daemon::createDcopHandler() mRunning = isRunning(false); mStatusTimerInterval = Preferences::daemonTrayCheckInterval(); - Preferences::connect(TQT_SIGNAL(preferencesChanged()), mInstance, TQT_SLOT(slotPreferencesChanged())); + Preferences::connect(TQ_SIGNAL(preferencesChanged()), mInstance, TQ_SLOT(slotPreferencesChanged())); mStatusTimer = new TQTimer(mInstance); - connect(mStatusTimer, TQT_SIGNAL(timeout()), mInstance, TQT_SLOT(timerCheckIfRunning())); + connect(mStatusTimer, TQ_SIGNAL(timeout()), mInstance, TQ_SLOT(timerCheckIfRunning())); mStatusTimer->start(mStatusTimerInterval * 1000); // check regularly if daemon is running } @@ -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()) @@ -145,7 +145,7 @@ bool Daemon::start() kdDebug(5950) << "Daemon::start(): Alarm daemon started" << endl; mStartTimeout = 5000/startCheckInterval + 1; // check daemon status for 5 seconds before giving up mStartTimer = new TQTimer(mInstance); - connect(mStartTimer, TQT_SIGNAL(timeout()), mInstance, TQT_SLOT(checkIfStarted())); + connect(mStartTimer, TQ_SIGNAL(timeout()), mInstance, TQ_SLOT(checkIfStarted())); mStartTimer->start(startCheckInterval); mInstance->checkIfStarted(); return true; @@ -188,12 +188,12 @@ bool Daemon::registerWith(bool reregister) bool disabledIfStopped = theApp()->alarmsDisabledIfStopped(); kdDebug(5950) << (reregister ? "Daemon::reregisterWith(): " : "Daemon::registerWith(): ") << (disabledIfStopped ? "NO_START" : "COMMAND_LINE") << endl; - TQCString appname = kapp->aboutData()->appName(); + TQCString appname = tdeApp->aboutData()->appName(); AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT); if (reregister) s.registerChange(appname, !disabledIfStopped); else - s.registerApp(appname, kapp->aboutData()->programName(), TQCString(NOTIFY_DCOP_OBJECT), AlarmCalendar::activeCalendar()->urlString(), !disabledIfStopped); + s.registerApp(appname, tdeApp->aboutData()->programName(), TQCString(NOTIFY_DCOP_OBJECT), AlarmCalendar::activeCalendar()->urlString(), !disabledIfStopped); if (!s.ok()) { kdError(5950) << "Daemon::registerWith(" << reregister << "): DCOP error" << endl; @@ -201,7 +201,7 @@ bool Daemon::registerWith(bool reregister) return false; } mRegisterTimer = new TQTimer(mInstance); - connect(mRegisterTimer, TQT_SIGNAL(timeout()), mInstance, TQT_SLOT(registerTimerExpired())); + connect(mRegisterTimer, TQ_SIGNAL(timeout()), mInstance, TQ_SLOT(registerTimerExpired())); mRegisterTimer->start(REGISTER_TIMEOUT * 1000); // wait for the reply return true; } @@ -233,11 +233,11 @@ void Daemon::registrationResult(bool reregister, int result, int version) // We've successfully registered with the daemon, but the daemon can't // find the KAlarm executable so won't be able to restart KAlarm if // KAlarm exits. - kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << kapp->aboutData()->appName() << " not found\n"; + kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << tdeApp->aboutData()->appName() << " not found\n"; KMessageBox::error(0, i18n("Alarms will be disabled if you stop KAlarm.\n" "(Installation or configuration error: %1 cannot locate %2 executable.)") .arg(TQString::fromLatin1(DAEMON_APP_NAME)) - .arg(kapp->aboutData()->appName())); + .arg(tdeApp->aboutData()->appName())); break; case KAlarmd::FAILURE: default: @@ -314,7 +314,7 @@ void Daemon::checkIfStarted() */ void Daemon::updateRegisteredStatus(bool timeout) { - if (!kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME)) + if (!tdeApp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME)) { mStatus = STOPPED; mRegisterFailMsg = false; @@ -327,7 +327,7 @@ void Daemon::updateRegisteredStatus(bool timeout) // The daemon has newly been detected as registered with DCOP. // Wait for a short time to ensure that it is ready for DCOP calls. mStatus = RUNNING; - TQTimer::singleShot(startCheckInterval, mInstance, TQT_SLOT(slotStarted())); + TQTimer::singleShot(startCheckInterval, mInstance, TQ_SLOT(slotStarted())); break; case RUNNING: if (timeout) @@ -350,7 +350,7 @@ void Daemon::updateRegisteredStatus(bool timeout) bool Daemon::stop() { kdDebug(5950) << "Daemon::stop()" << endl; - if (kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME)) + if (tdeApp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME)) { AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT); s.quit(); @@ -371,10 +371,10 @@ bool Daemon::stop() bool Daemon::reset() { kdDebug(5950) << "Daemon::reset()" << endl; - if (!kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME)) + if (!tdeApp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME)) return false; AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT); - s.resetCalendar(TQCString(kapp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString()); + s.resetCalendar(TQCString(tdeApp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString()); if (!s.ok()) kdError(5950) << "Daemon::reset(): resetCalendar dcop send failed" << endl; return true; @@ -387,7 +387,7 @@ void Daemon::reload() { kdDebug(5950) << "Daemon::reload()\n"; AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT); - s.reloadCalendar(TQCString(kapp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString()); + s.reloadCalendar(TQCString(tdeApp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString()); if (!s.ok()) kdError(5950) << "Daemon::reload(): reloadCalendar dcop send failed" << endl; } @@ -569,8 +569,8 @@ void Daemon::slotPreferencesChanged() AlarmEnableAction* Daemon::createAlarmEnableAction(TDEActionCollection* actions, const char* name) { AlarmEnableAction* a = new AlarmEnableAction(0, actions, name); - connect(a, TQT_SIGNAL(userClicked(bool)), mInstance, TQT_SLOT(setAlarmsEnabled(bool))); - connect(mInstance, TQT_SIGNAL(daemonRunning(bool)), a, TQT_SLOT(setCheckedActual(bool))); + connect(a, TQ_SIGNAL(userClicked(bool)), mInstance, TQ_SLOT(setAlarmsEnabled(bool))); + connect(mInstance, TQ_SIGNAL(daemonRunning(bool)), a, TQ_SLOT(setCheckedActual(bool))); return a; } @@ -635,7 +635,7 @@ void Daemon::notifyEventHandled(const TQString& eventId, bool reloadCal) { kdDebug(5950) << "Daemon::notifyEventHandled(" << eventId << (reloadCal ? "): reload" : ")") << endl; AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT); - s.eventHandled(TQCString(kapp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString(), eventId, reloadCal); + s.eventHandled(TQCString(tdeApp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString(), eventId, reloadCal); if (!s.ok()) kdError(5950) << "Daemon::notifyEventHandled(): eventHandled dcop send failed" << endl; } |