| -rw-r--r-- | libkdepim/externalapphandler.cpp | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index 6f812d0..0128cf7 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp @@ -26,22 +26,24 @@ Enhanced Version of the file for platform independent KDE tools. Copyright (c) 2004 Ulf Schenk $Id$ */ #include <stdlib.h> #include <qfile.h> #include <qmap.h> +#include <qregexp.h> - +#ifndef DESKTOP_VERSION #include <qtopia/qcopenvelope_qws.h> - +#endif #include <kstaticdeleter.h> +#include <kmessagebox.h> #include "externalapphandler.h" #include "kpimglobalprefs.h" @@ -163,17 +165,18 @@ DefaultAppItem* ExternalAppHandler::getDefaultItem(Types type, int clientid) return 0; } //calls the emailapplication with a number of attachments that need to be send (Seperated by Comma) bool ExternalAppHandler::mailAttachments( const QString& urls ) { -#ifndef QT_NO_COP + +#ifndef DESKTOP_VERSION QString channel; QString message2; QString parameters2; int client = KPimGlobalPrefs::instance()->mEmailClient; if (client == KPimGlobalPrefs::OTHER_EMC) { @@ -193,35 +196,37 @@ bool ExternalAppHandler::mailAttachments( const QString& urls ) message2 = dai->_message2; parameters2 = dai->_parameters2; } qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message2.latin1()); qDebug("passing attachmenturls:(%s) as parameter in the form %s to QCopEnvelope", urls.latin1(), parameters2.latin1()); + QCopEnvelope e(channel.latin1(), message2.latin1()); //US we need no names in the To field. The emailadresses are enough passParameter(&e, parameters2, urls); + #else - KMessageBox::sorry( this, i18n( "This version does not support the sending of emails." ) ); + KMessageBox::sorry( 0, i18n( "This version does not support the sending of emails." ) ); #endif return true; } //calls the emailapplication and creates a mail with parameter emails as recipients bool ExternalAppHandler::mailToContacts( const QString& emails ) { -#ifndef QT_NO_COP +#ifndef DESKTOP_VERSION QString channel; QString message; QString parameters; int client = KPimGlobalPrefs::instance()->mEmailClient; if (client == KPimGlobalPrefs::OTHER_EMC) { @@ -252,28 +257,28 @@ bool ExternalAppHandler::mailToContacts( const QString& emails ) QCopEnvelope e(channel.latin1(), message.latin1()); //US we need no names in the To field. The emailadresses are enough passParameter(&e, parameters, emails); #else - KMessageBox::sorry( this, i18n( "This version does not support the sending of emails." ) ); + KMessageBox::sorry( 0, i18n( "This version does not support the sending of emails." ) ); #endif return true; } //calls the phoneapplication with the number bool ExternalAppHandler::callByPhone( const QString& phonenumber ) { -#ifndef QT_NO_COP +#ifndef DESKTOP_VERSION QString channel; QString message; QString parameters; int client = KPimGlobalPrefs::instance()->mPhoneClient; if (client == KPimGlobalPrefs::OTHER_PHC) { @@ -304,27 +309,27 @@ bool ExternalAppHandler::callByPhone( const QString& phonenumber ) QCopEnvelope e(channel.latin1(), message.latin1()); //US we need no names in the To field. The emailadresses are enough passParameter(&e, parameters, phonenumber); #else - KMessageBox::sorry( this, i18n( "This version does not support phonecalls." ) ); + KMessageBox::sorry( 0, i18n( "This version does not support phonecalls." ) ); #endif return true; } //calls the smsapplication with the number bool ExternalAppHandler::callBySMS( const QString& phonenumber ) { -#ifndef QT_NO_COP +#ifndef DESKTOP_VERSION QString channel; QString message; QString parameters; int client = KPimGlobalPrefs::instance()->mSMSClient; if (client == KPimGlobalPrefs::OTHER_SMC) { @@ -355,27 +360,27 @@ bool ExternalAppHandler::callBySMS( const QString& phonenumber ) QCopEnvelope e(channel.latin1(), message.latin1()); //US we need no names in the To field. The emailadresses are enough passParameter(&e, parameters, phonenumber); #else - KMessageBox::sorry( this, i18n( "This version does not support the sending of sms." ) ); + KMessageBox::sorry( 0, i18n( "This version does not support the sending of sms." ) ); #endif return true; } //calls the pagerapplication with the number bool ExternalAppHandler::callByPager( const QString& pagernumber ) { -#ifndef QT_NO_COP +#ifndef DESKTOP_VERSION QString channel; QString message; QString parameters; int client = KPimGlobalPrefs::instance()->mPagerClient; if (client == KPimGlobalPrefs::OTHER_PAC) { @@ -406,27 +411,27 @@ bool ExternalAppHandler::callByPager( const QString& pagernumber ) QCopEnvelope e(channel.latin1(), message.latin1()); //US we need no names in the To field. The emailadresses are enough passParameter(&e, parameters, pagernumber); #else - KMessageBox::sorry( this, i18n( "This version does not support paging." ) ); + KMessageBox::sorry( 0, i18n( "This version does not support paging." ) ); #endif return true; } //calls the faxapplication with the number bool ExternalAppHandler::callByFax( const QString& faxnumber ) { -#ifndef QT_NO_COP +#ifndef DESKTOP_VERSION QString channel; QString message; QString parameters; int client = KPimGlobalPrefs::instance()->mFaxClient; if (client == KPimGlobalPrefs::OTHER_FAC) { @@ -457,17 +462,17 @@ bool ExternalAppHandler::callByFax( const QString& faxnumber ) QCopEnvelope e(channel.latin1(), message.latin1()); //US we need no names in the To field. The emailadresses are enough passParameter(&e, parameters, faxnumber); #else - KMessageBox::sorry( this, i18n( "This version does not support the sending of faxes." ) ); + KMessageBox::sorry( 0, i18n( "This version does not support the sending of faxes." ) ); #endif return true; } @@ -476,16 +481,17 @@ bool ExternalAppHandler::callByFax( const QString& faxnumber ) QString& ExternalAppHandler::translateMessage(QString& message, const QString& param1) const { return message.replace( QRegExp("%1"), param1 ); } void ExternalAppHandler::passParameter(QCopEnvelope* e, const QString& parameters, const QString& param1) const { +#ifndef DESKTOP_VERSION QMap<QString, QString> valmap; bool useValMap = false; // first extract all parts of the parameters. QStringList paramlist = QStringList::split(";", parameters); //Now check how many parts we have. //=0 :no params to pass @@ -513,14 +519,14 @@ void ExternalAppHandler::passParameter(QCopEnvelope* e, const QString& parameter { (*e) << key.latin1(); } } if (useValMap == true) (*e) << valmap; - +#endif } |