| -rw-r--r-- | kabc/formatfactory.cpp | 2 | ||||
| -rw-r--r-- | kabc/formatplugin.h | 5 | ||||
| -rw-r--r-- | kabc/kabcE.pro | 2 | ||||
| -rw-r--r-- | kabc/stdaddressbook.cpp | 6 |
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 @@ -35,14 +35,12 @@ using namespace KABC; FormatFactory *FormatFactory::mSelf = 0; 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 ); } return mSelf; } diff --git a/kabc/formatplugin.h b/kabc/formatplugin.h index d784daf..40a6922 100644 --- a/kabc/formatplugin.h +++ b/kabc/formatplugin.h @@ -27,13 +27,13 @@ $Id$ #ifndef KABC_FORMATPLUGIN_H #define KABC_FORMATPLUGIN_H #include <qfile.h> -//US #include "plugin.h" +#include "plugin.h" #include "resource.h" namespace KABC { class AddressBook; class Addressee; @@ -43,14 +43,13 @@ class Addressee; * * This class provides an abstract interface for ResourceFile and * ResourceDir formats. * * @internal */ -//US class FormatPlugin : public Plugin -class FormatPlugin +class FormatPlugin : public Plugin { public: /** * Load single addressee from file. */ diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro index 6a3bbf1..840afb9 100644 --- a/kabc/kabcE.pro +++ b/kabc/kabcE.pro @@ -1,12 +1,12 @@ TEMPLATE = lib 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 LIBS += -lmicrokde #LIBS += -lldap LIBS += -L$(QPEDIR)/lib diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp index 8faaaef..144a9dc 100644 --- a/kabc/stdaddressbook.cpp +++ b/kabc/stdaddressbook.cpp @@ -30,12 +30,18 @@ $Id$ #include <kapplication.h> #include <kcrash.h> #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> #include <klocale.h> #include <kstaticdeleter.h> #include <kstandarddirs.h> |