summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-06-29 06:43:11 (UTC)
committer ulf69 <ulf69>2004-06-29 06:43:11 (UTC)
commit627489ea2669d3997676bc3cee0f5d0d0c16c4d4 (patch) (side-by-side diff)
tree022c32ccbb485458dc3c8887388aa4c5aa1eae59
parent2d5b376ae1329d82d1ce1947b972b30866abff9b (diff)
downloadkdepimpi-627489ea2669d3997676bc3cee0f5d0d0c16c4d4.zip
kdepimpi-627489ea2669d3997676bc3cee0f5d0d0c16c4d4.tar.gz
kdepimpi-627489ea2669d3997676bc3cee0f5d0d0c16c4d4.tar.bz2
*** empty log message ***
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kabc/formatfactory.cpp2
-rw-r--r--kabc/formatplugin.h5
-rw-r--r--kabc/kabcE.pro2
-rw-r--r--kabc/stdaddressbook.cpp6
4 files changed, 9 insertions, 6 deletions
diff --git a/kabc/formatfactory.cpp b/kabc/formatfactory.cpp
index f107ebf..f2f03c6 100644
--- a/kabc/formatfactory.cpp
+++ b/kabc/formatfactory.cpp
@@ -40,4 +40,2 @@ FormatFactory *FormatFactory::self()
{
- kdDebug(5700) << "FormatFactory::self()" << endl;
-
if ( !mSelf ) {
diff --git a/kabc/formatplugin.h b/kabc/formatplugin.h
index d784daf..40a6922 100644
--- a/kabc/formatplugin.h
+++ b/kabc/formatplugin.h
@@ -32,3 +32,3 @@ $Id$
-//US #include "plugin.h"
+#include "plugin.h"
#include "resource.h"
@@ -48,4 +48,3 @@ class Addressee;
*/
-//US class FormatPlugin : public Plugin
-class FormatPlugin
+class FormatPlugin : public Plugin
{
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index 6a3bbf1..840afb9 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -5,3 +5,3 @@ TARGET = microkabc
-INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../qtcompat
+INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../qtcompat $(QPEDIR)/include
OBJECTS_DIR = obj/$(PLATFORM)
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index 8faaaef..144a9dc 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -35,2 +35,8 @@ $Id$
+#ifndef DESKTOP_VERSION
+#include <qpe/global.h>
+#else
+#include <qdir.h>
+#endif
+
#include "resource.h"