summaryrefslogtreecommitdiffabout
path: root/kabc
authorulf69 <ulf69>2004-06-29 06:43:11 (UTC)
committer ulf69 <ulf69>2004-06-29 06:43:11 (UTC)
commit627489ea2669d3997676bc3cee0f5d0d0c16c4d4 (patch) (unidiff)
tree022c32ccbb485458dc3c8887388aa4c5aa1eae59 /kabc
parent2d5b376ae1329d82d1ce1947b972b30866abff9b (diff)
downloadkdepimpi-627489ea2669d3997676bc3cee0f5d0d0c16c4d4.zip
kdepimpi-627489ea2669d3997676bc3cee0f5d0d0c16c4d4.tar.gz
kdepimpi-627489ea2669d3997676bc3cee0f5d0d0c16c4d4.tar.bz2
*** empty log message ***
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;
38 38
39FormatFactory *FormatFactory::self() 39FormatFactory *FormatFactory::self()
40{ 40{
41 kdDebug(5700) << "FormatFactory::self()" << endl;
42
43 if ( !mSelf ) { 41 if ( !mSelf ) {
44//US factoryDeleter.setObject( mSelf, new FormatFactory ); 42//US factoryDeleter.setObject( mSelf, new FormatFactory );
45 mSelf = factoryDeleter.setObject( new FormatFactory ); 43 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$
30 30
31#include <qfile.h> 31#include <qfile.h>
32 32
33//US #include "plugin.h" 33#include "plugin.h"
34#include "resource.h" 34#include "resource.h"
35 35
36namespace KABC { 36namespace KABC {
@@ -46,8 +46,7 @@ class Addressee;
46 * 46 *
47 * @internal 47 * @internal
48 */ 48 */
49//US class FormatPlugin : public Plugin 49class FormatPlugin : public Plugin
50class FormatPlugin
51{ 50{
52public: 51public:
53 52
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
3TARGET = microkabc 3TARGET = microkabc
4 4
5 5
6INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../qtcompat 6INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../qtcompat $(QPEDIR)/include
7OBJECTS_DIR = obj/$(PLATFORM) 7OBJECTS_DIR = obj/$(PLATFORM)
8MOC_DIR = moc/$(PLATFORM) 8MOC_DIR = moc/$(PLATFORM)
9DESTDIR = $(QPEDIR)/lib 9DESTDIR = $(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$
33#include <ksimpleconfig.h> 33#include <ksimpleconfig.h>
34*/ 34*/
35 35
36#ifndef DESKTOP_VERSION
37#include <qpe/global.h>
38#else
39#include <qdir.h>
40#endif
41
36#include "resource.h" 42#include "resource.h"
37#include <kresources/manager.h> 43#include <kresources/manager.h>
38#include <kdebug.h> 44#include <kdebug.h>