summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore 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,5 +1,5 @@
#############################################################################
# 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
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 6f812d0..0128cf7 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -32,10 +32,12 @@ $Id$
#include <qfile.h>
#include <qmap.h>
+#include <qregexp.h>
-
+#ifndef DESKTOP_VERSION
#include <qtopia/qcopenvelope_qws.h>
-
+#endif
#include <kstaticdeleter.h>
+#include <kmessagebox.h>
@@ -169,5 +171,6 @@ DefaultAppItem* ExternalAppHandler::getDefaultItem(Types type, int clientid)
bool ExternalAppHandler::mailAttachments( const QString& urls )
{
-#ifndef QT_NO_COP
+
+#ifndef DESKTOP_VERSION
QString channel;
QString message2;
@@ -199,4 +202,5 @@ bool ExternalAppHandler::mailAttachments( const QString& urls )
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
@@ -205,6 +209,7 @@ bool ExternalAppHandler::mailAttachments( const QString& 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
@@ -217,5 +222,5 @@ bool ExternalAppHandler::mailAttachments( const QString& urls )
bool ExternalAppHandler::mailToContacts( const QString& emails )
{
-#ifndef QT_NO_COP
+#ifndef DESKTOP_VERSION
QString channel;
QString message;
@@ -258,5 +263,5 @@ bool ExternalAppHandler::mailToContacts( const QString& 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
@@ -269,5 +274,5 @@ bool ExternalAppHandler::mailToContacts( const QString& emails )
bool ExternalAppHandler::callByPhone( const QString& phonenumber )
{
-#ifndef QT_NO_COP
+#ifndef DESKTOP_VERSION
QString channel;
QString message;
@@ -310,5 +315,5 @@ bool ExternalAppHandler::callByPhone( const QString& phonenumber )
#else
- KMessageBox::sorry( this, i18n( "This version does not support phonecalls." ) );
+ KMessageBox::sorry( 0, i18n( "This version does not support phonecalls." ) );
#endif
@@ -320,5 +325,5 @@ bool ExternalAppHandler::callByPhone( const QString& phonenumber )
bool ExternalAppHandler::callBySMS( const QString& phonenumber )
{
-#ifndef QT_NO_COP
+#ifndef DESKTOP_VERSION
QString channel;
QString message;
@@ -361,5 +366,5 @@ bool ExternalAppHandler::callBySMS( const QString& 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
@@ -371,5 +376,5 @@ bool ExternalAppHandler::callBySMS( const QString& phonenumber )
bool ExternalAppHandler::callByPager( const QString& pagernumber )
{
-#ifndef QT_NO_COP
+#ifndef DESKTOP_VERSION
QString channel;
QString message;
@@ -412,5 +417,5 @@ bool ExternalAppHandler::callByPager( const QString& pagernumber )
#else
- KMessageBox::sorry( this, i18n( "This version does not support paging." ) );
+ KMessageBox::sorry( 0, i18n( "This version does not support paging." ) );
#endif
@@ -422,5 +427,5 @@ bool ExternalAppHandler::callByPager( const QString& pagernumber )
bool ExternalAppHandler::callByFax( const QString& faxnumber )
{
-#ifndef QT_NO_COP
+#ifndef DESKTOP_VERSION
QString channel;
QString message;
@@ -463,5 +468,5 @@ bool ExternalAppHandler::callByFax( const QString& 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
@@ -482,4 +487,5 @@ QString& ExternalAppHandler::translateMessage(QString& message, const QString& p
void ExternalAppHandler::passParameter(QCopEnvelope* e, const QString& parameters, const QString& param1) const
{
+#ifndef DESKTOP_VERSION
QMap<QString, QString> valmap;
bool useValMap = false;
@@ -519,5 +525,5 @@ void ExternalAppHandler::passParameter(QCopEnvelope* e, const QString& parameter
(*e) << valmap;
-
+#endif
}