author | zautrix <zautrix> | 2004-10-23 17:33:10 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-23 17:33:10 (UTC) |
commit | 52b6fc17c0dcd1f13f701f698e0305440f26fc3e (patch) (unidiff) | |
tree | b8d374e16c322f413e5809e55c45b8798190791d | |
parent | 13d274c37baaae48a1c93081077cf3035459c6a8 (diff) | |
download | kdepimpi-52b6fc17c0dcd1f13f701f698e0305440f26fc3e.zip kdepimpi-52b6fc17c0dcd1f13f701f698e0305440f26fc3e.tar.gz kdepimpi-52b6fc17c0dcd1f13f701f698e0305440f26fc3e.tar.bz2 |
qtopia res windows fixes
-rw-r--r-- | kabc/plugins/qtopia/qtopia.pro | 4 | ||||
-rw-r--r-- | kabc/plugins/qtopia/resourceqtopia.cpp | 9 | ||||
-rw-r--r-- | kabc/plugins/qtopia/resourceqtopiaconfig.cpp | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/kabc/plugins/qtopia/qtopia.pro b/kabc/plugins/qtopia/qtopia.pro index 6efb678..0360abf 100644 --- a/kabc/plugins/qtopia/qtopia.pro +++ b/kabc/plugins/qtopia/qtopia.pro | |||
@@ -29,9 +29,13 @@ unix : { | |||
29 | OBJECTS_DIR = obj/unix | 29 | OBJECTS_DIR = obj/unix |
30 | MOC_DIR = moc/unix | 30 | MOC_DIR = moc/unix |
31 | } | 31 | } |
32 | win32: { | 32 | win32: { |
33 | CONFIG += dll | 33 | CONFIG += dll |
34 | DEFINES += _WIN32_ | 34 | DEFINES += _WIN32_ |
35 | OBJECTS_DIR = obj/win | 35 | OBJECTS_DIR = obj/win |
36 | MOC_DIR = moc/win | 36 | MOC_DIR = moc/win |
37 | LIBS += ../../../bin/microkdepim.lib | ||
38 | LIBS += ../../../bin/microkcal.lib | ||
39 | LIBS += ../../../bin/microkde.lib | ||
40 | LIBS += ../../../bin/microkabc.lib | ||
37 | } | 41 | } |
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp index 95fa541..99e8618 100644 --- a/kabc/plugins/qtopia/resourceqtopia.cpp +++ b/kabc/plugins/qtopia/resourceqtopia.cpp | |||
@@ -21,17 +21,17 @@ | |||
21 | /* | 21 | /* |
22 | Enhanced Version of the file for platform independent KDE tools. | 22 | Enhanced Version of the file for platform independent KDE tools. |
23 | Copyright (c) 2004 Ulf Schenk | 23 | Copyright (c) 2004 Ulf Schenk |
24 | 24 | ||
25 | $Id$ | 25 | $Id$ |
26 | */ | 26 | */ |
27 | #include <sys/types.h> | 27 | #include <sys/types.h> |
28 | #include <sys/stat.h> | 28 | #include <sys/stat.h> |
29 | #include <unistd.h> | 29 | //#include <unistd.h> |
30 | 30 | ||
31 | #include <qdir.h> | 31 | #include <qdir.h> |
32 | #include <qfile.h> | 32 | #include <qfile.h> |
33 | #include <qtextstream.h> | 33 | #include <qtextstream.h> |
34 | #include <qfileinfo.h> | 34 | #include <qfileinfo.h> |
35 | #include <qregexp.h> | 35 | #include <qregexp.h> |
36 | //US #include <qtimer.h> | 36 | //US #include <qtimer.h> |
37 | 37 | ||
@@ -47,23 +47,30 @@ $Id$ | |||
47 | #include "resourceqtopiaconfig.h" | 47 | #include "resourceqtopiaconfig.h" |
48 | #include "stdaddressbook.h" | 48 | #include "stdaddressbook.h" |
49 | 49 | ||
50 | #include "qtopiaconverter.h" | 50 | #include "qtopiaconverter.h" |
51 | 51 | ||
52 | #include "resourceqtopia.h" | 52 | #include "resourceqtopia.h" |
53 | 53 | ||
54 | using namespace KABC; | 54 | using namespace KABC; |
55 | |||
55 | extern "C" | 56 | extern "C" |
57 | #ifdef _WIN32_ | ||
58 | __declspec(dllexport) | ||
59 | #else | ||
56 | { | 60 | { |
61 | #endif | ||
57 | void *init_microkabc_qtopia() | 62 | void *init_microkabc_qtopia() |
58 | { | 63 | { |
59 | return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig>(); | 64 | return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig>(); |
60 | } | 65 | } |
66 | #ifndef _WIN32_ | ||
61 | } | 67 | } |
68 | #endif | ||
62 | 69 | ||
63 | ResourceQtopia::ResourceQtopia( const KConfig *config ) | 70 | ResourceQtopia::ResourceQtopia( const KConfig *config ) |
64 | : Resource( config ), mConverter (0) | 71 | : Resource( config ), mConverter (0) |
65 | { | 72 | { |
66 | // we can not choose the filename. Therefore use the default to display | 73 | // we can not choose the filename. Therefore use the default to display |
67 | QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; | 74 | QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; |
68 | init( fileName ); | 75 | init( fileName ); |
69 | } | 76 | } |
diff --git a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp index 0505d0b..d5d6141 100644 --- a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp +++ b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp | |||
@@ -28,17 +28,17 @@ $Id$ | |||
28 | #include <qlabel.h> | 28 | #include <qlabel.h> |
29 | #include <qlayout.h> | 29 | #include <qlayout.h> |
30 | 30 | ||
31 | #include <kdebug.h> | 31 | #include <kdebug.h> |
32 | #include <klocale.h> | 32 | #include <klocale.h> |
33 | #include <kstandarddirs.h> | 33 | #include <kstandarddirs.h> |
34 | #include <kdialog.h> | 34 | #include <kdialog.h> |
35 | 35 | ||
36 | #include <unistd.h> | 36 | //#include <unistd.h> |
37 | 37 | ||
38 | #include <qdir.h> | 38 | #include <qdir.h> |
39 | #include <qfile.h> | 39 | #include <qfile.h> |
40 | #include "resourceqtopia.h" | 40 | #include "resourceqtopia.h" |
41 | 41 | ||
42 | #include "resourceqtopiaconfig.h" | 42 | #include "resourceqtopiaconfig.h" |
43 | 43 | ||
44 | using namespace KABC; | 44 | using namespace KABC; |