diff options
Diffstat (limited to 'kalarm/kamail.cpp')
| -rw-r--r-- | kalarm/kamail.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp index 0c33a3ae7..b86b8262d 100644 --- a/kalarm/kamail.cpp +++ b/kalarm/kamail.cpp @@ -30,11 +30,11 @@ #include <tqfile.h> #include <tqregexp.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <dcopclient.h> #include <dcopref.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <tdeaboutdata.h> #include <tdefileitem.h> @@ -242,7 +242,7 @@ TQString KAMail::sendKMail(const KAMailData& data) // KMail is now running. Determine which DCOP call to use. bool useSend = false; TQCString sendFunction = "sendMessage(TQString,TQString,TQString,TQString,TQString,TQString,KURL::List)"; - QCStringList funcs = kapp->dcopClient()->remoteFunctions("kmail", "MailTransportServiceIface"); + QCStringList funcs = tdeApp->dcopClient()->remoteFunctions("kmail", "MailTransportServiceIface"); for (QCStringList::Iterator it=funcs.begin(); it != funcs.end() && !useSend; ++it) { TQCString func = DCOPClient::normalizeFunctionSignature(*it); @@ -337,7 +337,7 @@ bool KAMail::callKMail(const TQByteArray& callData, const TQCString& iface, cons { TQCString replyType; TQByteArray replyData; - if (!kapp->dcopClient()->call("kmail", iface, function, callData, replyType, replyData) + if (!tdeApp->dcopClient()->call("kmail", iface, function, callData, replyType, replyData) || replyType != funcType) { TQCString funcname = function; @@ -394,7 +394,7 @@ TQString KAMail::initHeaders(const KAMailData& data, bool dateId) if (!data.bcc.isEmpty()) message += TQString::fromLatin1("\nBcc: ") + data.bcc; message += TQString::fromLatin1("\nSubject: ") + data.event.emailSubject(); - message += TQString::fromLatin1("\nX-Mailer: %1/" KALARM_VERSION).arg(kapp->aboutData()->programName()); + message += TQString::fromLatin1("\nX-Mailer: %1/" KALARM_VERSION).arg(tdeApp->aboutData()->programName()); return message; } @@ -943,7 +943,7 @@ TQString KAMail::getMailBody(TQ_UINT32 serialNumber) arg << serialNumber; arg << (int)0; TQString body; - if (kapp->dcopClient()->call("kmail", "KMailIface", "getDecodedBodyPart(TQ_UINT32,int)", data, replyType, replyData) + if (tdeApp->dcopClient()->call("kmail", "KMailIface", "getDecodedBodyPart(TQ_UINT32,int)", data, replyType, replyData) && replyType == "TQString") { TQDataStream reply_stream(replyData, IO_ReadOnly); |