author | ulf69 <ulf69> | 2004-06-29 06:43:11 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-06-29 06:43:11 (UTC) |
commit | 627489ea2669d3997676bc3cee0f5d0d0c16c4d4 (patch) (unidiff) | |
tree | 022c32ccbb485458dc3c8887388aa4c5aa1eae59 /kabc | |
parent | 2d5b376ae1329d82d1ce1947b972b30866abff9b (diff) | |
download | kdepimpi-627489ea2669d3997676bc3cee0f5d0d0c16c4d4.zip kdepimpi-627489ea2669d3997676bc3cee0f5d0d0c16c4d4.tar.gz kdepimpi-627489ea2669d3997676bc3cee0f5d0d0c16c4d4.tar.bz2 |
*** empty log message ***
-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 | |||
@@ -39,6 +39,4 @@ static KStaticDeleter<FormatFactory> factoryDeleter; | |||
39 | FormatFactory *FormatFactory::self() | 39 | FormatFactory *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 ); |
diff --git a/kabc/formatplugin.h b/kabc/formatplugin.h index d784daf..40a6922 100644 --- a/kabc/formatplugin.h +++ b/kabc/formatplugin.h | |||
@@ -31,5 +31,5 @@ $Id$ | |||
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 | ||
@@ -47,6 +47,5 @@ class Addressee; | |||
47 | * @internal | 47 | * @internal |
48 | */ | 48 | */ |
49 | //US class FormatPlugin : public Plugin | 49 | class FormatPlugin : public Plugin |
50 | class FormatPlugin | ||
51 | { | 50 | { |
52 | public: | 51 | public: |
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro index 6a3bbf1..840afb9 100644 --- a/kabc/kabcE.pro +++ b/kabc/kabcE.pro | |||
@@ -4,5 +4,5 @@ TARGET = microkabc | |||
4 | 4 | ||
5 | 5 | ||
6 | INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../qtcompat | 6 | INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../qtcompat $(QPEDIR)/include |
7 | OBJECTS_DIR = obj/$(PLATFORM) | 7 | OBJECTS_DIR = obj/$(PLATFORM) |
8 | MOC_DIR = moc/$(PLATFORM) | 8 | MOC_DIR = moc/$(PLATFORM) |
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp index 8faaaef..144a9dc 100644 --- a/kabc/stdaddressbook.cpp +++ b/kabc/stdaddressbook.cpp | |||
@@ -34,4 +34,10 @@ $Id$ | |||
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> |