author | zautrix <zautrix> | 2004-10-23 17:33:10 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-23 17:33:10 (UTC) |
commit | 52b6fc17c0dcd1f13f701f698e0305440f26fc3e (patch) (side-by-side diff) | |
tree | b8d374e16c322f413e5809e55c45b8798190791d /kabc | |
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 : { OBJECTS_DIR = obj/unix MOC_DIR = moc/unix } win32: { CONFIG += dll DEFINES += _WIN32_ OBJECTS_DIR = obj/win MOC_DIR = moc/win +LIBS += ../../../bin/microkdepim.lib +LIBS += ../../../bin/microkcal.lib +LIBS += ../../../bin/microkde.lib +LIBS += ../../../bin/microkabc.lib } 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 @@ /* Enhanced Version of the file for platform independent KDE tools. Copyright (c) 2004 Ulf Schenk $Id$ */ #include <sys/types.h> #include <sys/stat.h> -#include <unistd.h> +//#include <unistd.h> #include <qdir.h> #include <qfile.h> #include <qtextstream.h> #include <qfileinfo.h> #include <qregexp.h> //US #include <qtimer.h> @@ -47,23 +47,30 @@ $Id$ #include "resourceqtopiaconfig.h" #include "stdaddressbook.h" #include "qtopiaconverter.h" #include "resourceqtopia.h" using namespace KABC; + extern "C" +#ifdef _WIN32_ +__declspec(dllexport) +#else { +#endif void *init_microkabc_qtopia() { return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig>(); } +#ifndef _WIN32_ } +#endif ResourceQtopia::ResourceQtopia( const KConfig *config ) : Resource( config ), mConverter (0) { // we can not choose the filename. Therefore use the default to display QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; init( fileName ); } 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$ #include <qlabel.h> #include <qlayout.h> #include <kdebug.h> #include <klocale.h> #include <kstandarddirs.h> #include <kdialog.h> -#include <unistd.h> +//#include <unistd.h> #include <qdir.h> #include <qfile.h> #include "resourceqtopia.h" #include "resourceqtopiaconfig.h" using namespace KABC; |