summaryrefslogtreecommitdiffabout
path: root/kabc
Side-by-side diff
Diffstat (limited to 'kabc') (more/less context) (ignore 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
@@ -38,8 +38,6 @@ static KStaticDeleter<FormatFactory> factoryDeleter;
FormatFactory *FormatFactory::self()
{
- kdDebug(5700) << "FormatFactory::self()" << endl;
-
if ( !mSelf ) {
//US factoryDeleter.setObject( mSelf, new FormatFactory );
mSelf = factoryDeleter.setObject( new FormatFactory );
diff --git a/kabc/formatplugin.h b/kabc/formatplugin.h
index d784daf..40a6922 100644
--- a/kabc/formatplugin.h
+++ b/kabc/formatplugin.h
@@ -30,7 +30,7 @@ $Id$
#include <qfile.h>
-//US #include "plugin.h"
+#include "plugin.h"
#include "resource.h"
namespace KABC {
@@ -46,8 +46,7 @@ class Addressee;
*
* @internal
*/
-//US class FormatPlugin : public Plugin
-class FormatPlugin
+class FormatPlugin : public Plugin
{
public:
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index 6a3bbf1..840afb9 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -3,7 +3,7 @@ CONFIG += qt warn_on
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)
MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index 8faaaef..144a9dc 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -33,6 +33,12 @@ $Id$
#include <ksimpleconfig.h>
*/
+#ifndef DESKTOP_VERSION
+#include <qpe/global.h>
+#else
+#include <qdir.h>
+#endif
+
#include "resource.h"
#include <kresources/manager.h>
#include <kdebug.h>