diff options
Diffstat (limited to 'kalarm/kalarmd/alarmdaemon.cpp')
| -rw-r--r-- | kalarm/kalarmd/alarmdaemon.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp index 573cac0d..8759c171 100644 --- a/kalarm/kalarmd/alarmdaemon.cpp +++ b/kalarm/kalarmd/alarmdaemon.cpp @@ -29,8 +29,8 @@ #include <tqdatetime.h> #include <tdeapplication.h> -#include <kstandarddirs.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeprocess.h> #include <tdeio/netaccess.h> #include <dcopclient.h> #include <tdeconfig.h> @@ -89,7 +89,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name) if (autostart) { bool done = false; - DCOPClient* client = kapp->dcopClient(); + DCOPClient* client = tdeApp->dcopClient(); if (client->isApplicationRegistered("ksmserver")) { TQByteArray callData; @@ -98,7 +98,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name) for (int i=0; !done && i<KALARM_AUTOSTART_TIMEOUT; ++i) { // Check if the session has been fully created/restored. If not, wait a little and try again - if (!kapp->dcopClient()->call("ksmserver", "ksmserver", "startupCompleted()", callData, replyType, replyData) || + if (!tdeApp->dcopClient()->call("ksmserver", "ksmserver", "startupCompleted()", callData, replyType, replyData) || replyType != "bool") { done = true; // In case of DCOP call error, just continue normally @@ -119,7 +119,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name) } } // Give some extra time to KAlarm to be fully restored, then proceed as usual - TQTimer::singleShot(3000, this, TQT_SLOT(autostartKAlarm())); + TQTimer::singleShot(3000, this, TQ_SLOT(autostartKAlarm())); } } } @@ -168,7 +168,7 @@ void AlarmDaemon::startMonitoring() { // Set up the alarm timer mAlarmTimer = new TQTimer(this); - connect(mAlarmTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAlarmsSlot())); + connect(mAlarmTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAlarmsSlot())); setTimerStatus(); // Start monitoring calendar files. @@ -216,7 +216,7 @@ void AlarmDaemon::reloadCal(ADCalendar* cal, bool reset) { cal->close(); if (!cal->setLoadedConnected()) - connect(cal, TQT_SIGNAL(loaded(ADCalendar*, bool)), TQT_SLOT(calendarLoaded(ADCalendar*, bool))); + connect(cal, TQ_SIGNAL(loaded(ADCalendar*, bool)), TQ_SLOT(calendarLoaded(ADCalendar*, bool))); cal->loadFile(reset); } else if (reset) @@ -512,12 +512,12 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID) TQString id = TQString::fromLatin1("ad:") + eventID; // prefix to indicate that the notification if from the daemon // Check if the client application is running and ready to receive notification - bool registered = kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname)); + bool registered = tdeApp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname)); bool ready = registered; if (registered) { // It's running, but check if it has created our DCOP interface yet - QCStringList objects = kapp->dcopClient()->remoteObjects(appname); + QCStringList objects = tdeApp->dcopClient()->remoteObjects(appname); if (objects.find(client->dcopObject()) == objects.end()) ready = false; } @@ -606,7 +606,7 @@ void AlarmDaemon::notifyCalStatus(const ADCalendar* cal) if (!client) return; TQCString appname = client->appName(); - if (kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname))) + if (tdeApp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname))) { KAlarmd::CalendarStatus change = cal->available() ? (cal->enabled() ? KAlarmd::CALENDAR_ENABLED : KAlarmd::CALENDAR_DISABLED) : KAlarmd::CALENDAR_UNAVAILABLE; |