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
@@ -33,8 +33,10 @@ $Id$
 #include <qmap.h>
+#include <qregexp.h>
 
-
+#ifndef DESKTOP_VERSION
 #include <qtopia/qcopenvelope_qws.h>
-
+#endif
 
 #include <kstaticdeleter.h>
+#include <kmessagebox.h>
 
@@ -170,3 +172,4 @@ bool ExternalAppHandler::mailAttachments( const QString& urls )
 {
-#ifndef QT_NO_COP
+
+#ifndef DESKTOP_VERSION 
   QString channel;
@@ -200,2 +203,3 @@ bool ExternalAppHandler::mailAttachments( const QString& urls )
 
+
   QCopEnvelope e(channel.latin1(), message2.latin1());
@@ -206,4 +210,5 @@ 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
@@ -218,3 +223,3 @@ bool ExternalAppHandler::mailToContacts( const QString& emails )
 {
-#ifndef QT_NO_COP
+#ifndef DESKTOP_VERSION 
   QString channel;
@@ -259,3 +264,3 @@ 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
@@ -270,3 +275,3 @@ bool ExternalAppHandler::callByPhone( const QString& phonenumber )
 {
-#ifndef QT_NO_COP
+#ifndef DESKTOP_VERSION 
   QString channel;
@@ -311,3 +316,3 @@ 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
@@ -321,3 +326,3 @@ bool ExternalAppHandler::callBySMS( const QString& phonenumber )
 {
-#ifndef QT_NO_COP
+#ifndef DESKTOP_VERSION 
   QString channel;
@@ -362,3 +367,3 @@ 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
@@ -372,3 +377,3 @@ bool ExternalAppHandler::callByPager( const QString& pagernumber )
 {
-#ifndef QT_NO_COP
+#ifndef DESKTOP_VERSION 
   QString channel;
@@ -413,3 +418,3 @@ 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
@@ -423,3 +428,3 @@ bool ExternalAppHandler::callByFax( const QString& faxnumber )
 {
-#ifndef QT_NO_COP
+#ifndef DESKTOP_VERSION 
   QString channel;
@@ -464,3 +469,3 @@ 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
@@ -483,2 +488,3 @@ void ExternalAppHandler::passParameter(QCopEnvelope* e, const QString& parameter
 {
+#ifndef DESKTOP_VERSION 
   QMap<QString, QString> valmap;
@@ -520,3 +526,3 @@ void ExternalAppHandler::passParameter(QCopEnvelope* e, const QString& parameter
 
-
+#endif