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) (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
@@ -29,26 +29,24 @@
#include "vcardformatplugin.h"
#include "formatfactory.h"
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;
}
FormatFactory::FormatFactory()
{
mFormatList.setAutoDelete( true );
// dummy entry for default format
diff --git a/kabc/formatplugin.h b/kabc/formatplugin.h
index d784daf..40a6922 100644
--- a/kabc/formatplugin.h
+++ b/kabc/formatplugin.h
@@ -21,42 +21,41 @@
/*
Enhanced Version of the file for platform independent KDE tools.
Copyright (c) 2004 Ulf Schenk
$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;
/**
* @short Base class for address book formats.
*
* 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.
*/
virtual bool load( Addressee &, QFile *file ) = 0;
/**
* Load whole addressbook from file.
*/
virtual bool loadAll( AddressBook *, Resource *, QFile *file ) = 0;
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index 6a3bbf1..840afb9 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -1,18 +1,18 @@
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
DEFINES += KAB_EMBEDDED
INTERFACES = \
HEADERS = \
address.h \
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index 8faaaef..144a9dc 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -24,24 +24,30 @@ Copyright (c) 2004 Ulf Schenk
$Id$
*/
/*US
#include <stdlib.h>
#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>
#include "stdaddressbook.h"
using namespace KABC;
StdAddressBook *StdAddressBook::mSelf = 0;