summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-08-10 19:35:18 (UTC)
committer zautrix <zautrix>2004-08-10 19:35:18 (UTC)
commit9f73ddc03d2b02934906193cf8db5ff0813fce0b (patch) (side-by-side diff)
tree6b6ea1a76481c677381419064c9a2d23e850db51
parentdc9010997d770229dbee6b023f41ea74e0809027 (diff)
downloadkdepimpi-9f73ddc03d2b02934906193cf8db5ff0813fce0b.zip
kdepimpi-9f73ddc03d2b02934906193cf8db5ff0813fce0b.tar.gz
kdepimpi-9f73ddc03d2b02934906193cf8db5ff0813fce0b.tar.bz2
Made externalapphandler compile on desktop
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--libkdepim/externalapphandler.cpp36
2 files changed, 22 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index ac1d5b7..2049dde 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
#############################################################################
# Makefile for building: kopi-desktop
-# Generated by qmake (1.07a) (Qt 3.3.3) on: Mon Aug 9 13:18:13 2004
+# Generated by qmake (1.07a) (Qt 3.3.3) on: Tue Aug 10 18:20:15 2004
# Project: kopi-desktop.pro
# Template: subdirs
# Command: $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kopi-desktop.pro
#############################################################################
MAKEFILE = Makefile
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 6f812d0..0128cf7 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -28,18 +28,20 @@ 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"
@@ -165,13 +167,14 @@ DefaultAppItem* ExternalAppHandler::getDefaultItem(Types type, int clientid)
//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;
@@ -195,31 +198,33 @@ bool ExternalAppHandler::mailAttachments( const QString& urls )
}
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;
@@ -254,24 +259,24 @@ bool ExternalAppHandler::mailToContacts( const QString& emails )
//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;
@@ -306,23 +311,23 @@ bool ExternalAppHandler::callByPhone( const QString& phonenumber )
//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;
@@ -357,23 +362,23 @@ bool ExternalAppHandler::callBySMS( const QString& phonenumber )
//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;
@@ -408,23 +413,23 @@ bool ExternalAppHandler::callByPager( const QString& pagernumber )
//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;
@@ -459,13 +464,13 @@ bool ExternalAppHandler::callByFax( const QString& faxnumber )
//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;
}
@@ -478,12 +483,13 @@ QString& ExternalAppHandler::translateMessage(QString& message, const QString& p
{
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);
@@ -515,12 +521,12 @@ void ExternalAppHandler::passParameter(QCopEnvelope* e, const QString& parameter
}
}
if (useValMap == true)
(*e) << valmap;
-
+#endif
}