diff options
Diffstat (limited to 'kalarm/functions.cpp')
| -rw-r--r-- | kalarm/functions.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index 9ae28740..d3e85a62 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -718,7 +718,7 @@ TQString runKMail(bool minimise) */ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString& dcopName, TQString& errorMessage) { - if (!kapp->dcopClient()->isApplicationRegistered(program)) + if (!tdeApp->dcopClient()->isApplicationRegistered(program)) { // KOrganizer is not already running, so start it if (TDEApplication::startServiceByDesktopName(TQString::fromLatin1(program), TQString(), &errorMessage, &dcopName)) @@ -729,7 +729,7 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString // Minimise its window - don't use hide() since this would remove all // trace of it from the panel if it is not configured to be docked in // the system tray. - kapp->dcopClient()->send(dcopName, windowName, "minimize()", TQString()); + tdeApp->dcopClient()->send(dcopName, windowName, "minimize()", TQString()); } else if (dcopName.isEmpty()) dcopName = program; @@ -747,7 +747,7 @@ bool readConfigWindowSize(const char* window, TQSize& result) { TDEConfig* config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1(window)); - TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop()); + TQWidget* desktop = TDEApplication::desktop(); TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), 0), config->readNumEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), 0)); if (s.isEmpty()) @@ -764,7 +764,7 @@ void writeConfigWindowSize(const char* window, const TQSize& size) { TDEConfig* config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1(window)); - TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop()); + TQWidget* desktop = TDEApplication::desktop(); config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width()); config->writeEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), size.height()); config->sync(); @@ -981,7 +981,7 @@ kdDebug(5950)<<"Korg->"<<iCal<<endl; TQCString replyType; TQDataStream arg(data, IO_WriteOnly); arg << iCal; - if (kapp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "addIncidence(TQString)", data, replyType, replyData) + if (tdeApp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "addIncidence(TQString)", data, replyType, replyData) && replyType == "bool") { bool result; @@ -1009,7 +1009,7 @@ bool deleteFromKOrganizer(const TQString& eventID) TQCString replyType; TQDataStream arg(data, IO_WriteOnly); arg << newID << true; - if (kapp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "deleteIncidence(TQString,bool)", data, replyType, replyData) + if (tdeApp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "deleteIncidence(TQString,bool)", data, replyType, replyData) && replyType == "bool") { bool result; @@ -1042,16 +1042,16 @@ bool runKOrganizer() // to load KOrganizer into Kontact. But if KOrganizer is running independently, // the load() method doesn't exist. TQCString dummy; - if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) + if (!tdeApp->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) { kdWarning(5950) << "Error loading " << dcopService << endl; return false; } - if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) + if (!tdeApp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) { kdWarning(5950) << "Unable to access KOrganizer's " KORG_DCOP_OBJECT " DCOP object" << endl; return false; |