diff options
Diffstat (limited to 'kalarm/messagewin.cpp')
| -rw-r--r-- | kalarm/messagewin.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index ef83847db..5c15fcd6e 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -576,7 +576,7 @@ void MessageWin::initView() mKMailButton = 0; // KAlarm button - TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1(kapp->aboutData()->appName()), TDEIcon::MainToolbar); + TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1(tdeApp->aboutData()->appName()), TDEIcon::MainToolbar); mKAlarmButton = new TQPushButton(topWidget); mKAlarmButton->setPixmap(pixmap); mKAlarmButton->setFixedSize(mKAlarmButton->sizeHint()); @@ -813,12 +813,12 @@ void MessageWin::playAudio() */ void MessageWin::slotSpeak() { - DCOPClient* client = kapp->dcopClient(); + DCOPClient* client = tdeApp->dcopClient(); if (!client->isApplicationRegistered("kttsd")) { // kttsd is not running, so start it TQString error; - if (kapp->startServiceByDesktopName("kttsd", TQStringList(), &error)) + if (tdeApp->startServiceByDesktopName("kttsd", TQStringList(), &error)) { kdDebug(5950) << "MessageWin::slotSpeak(): failed to start kttsd: " << error << endl; if (!haveErrorMessage(ErrMsg_Speak)) @@ -1117,7 +1117,7 @@ int MessageWin::getKMixVolume() TQByteArray data, replyData; TQCString replyType; TQDataStream arg(data, IO_WriteOnly); - if (!kapp->dcopClient()->call(mKMixName, KMIX_DCOP_OBJECT, "masterVolume()", data, replyType, replyData) + if (!tdeApp->dcopClient()->call(mKMixName, KMIX_DCOP_OBJECT, "masterVolume()", data, replyType, replyData) || replyType != "int") return -1; int result; @@ -1138,7 +1138,7 @@ void MessageWin::setKMixVolume(int percent) TQByteArray data; TQDataStream arg(data, IO_WriteOnly); arg << percent; - if (!kapp->dcopClient()->send(mKMixName, KMIX_DCOP_OBJECT, "setMasterVolume(int)", data)) + if (!tdeApp->dcopClient()->send(mKMixName, KMIX_DCOP_OBJECT, "setMasterVolume(int)", data)) kdError(5950) << "MessageWin::setKMixVolume(): kmix dcop call failed\n"; } #endif @@ -1438,7 +1438,7 @@ void MessageWin::slotShowKMailMessage() TQByteArray data, replyData; TQDataStream arg(data, IO_WriteOnly); arg << (TQ_UINT32)mKMailSerialNumber << TQString(); - if (kapp->dcopClient()->call("kmail", KMAIL_DCOP_OBJECT, "showMail(TQ_UINT32,TQString)", data, replyType, replyData) + if (tdeApp->dcopClient()->call("kmail", KMAIL_DCOP_OBJECT, "showMail(TQ_UINT32,TQString)", data, replyType, replyData) && replyType == "bool") { bool result; |