diff options
Diffstat (limited to 'kalarm/kalarmd/alarmdaemon.cpp')
| -rw-r--r-- | kalarm/kalarmd/alarmdaemon.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp index 5f4fbba81..4f8066610 100644 --- a/kalarm/kalarmd/alarmdaemon.cpp +++ b/kalarm/kalarmd/alarmdaemon.cpp @@ -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 @@ -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; |