summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-23 17:33:10 (UTC)
committer zautrix <zautrix>2004-10-23 17:33:10 (UTC)
commit52b6fc17c0dcd1f13f701f698e0305440f26fc3e (patch) (unidiff)
treeb8d374e16c322f413e5809e55c45b8798190791d
parent13d274c37baaae48a1c93081077cf3035459c6a8 (diff)
downloadkdepimpi-52b6fc17c0dcd1f13f701f698e0305440f26fc3e.zip
kdepimpi-52b6fc17c0dcd1f13f701f698e0305440f26fc3e.tar.gz
kdepimpi-52b6fc17c0dcd1f13f701f698e0305440f26fc3e.tar.bz2
qtopia res windows fixes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kabc/plugins/qtopia/qtopia.pro4
-rw-r--r--kabc/plugins/qtopia/resourceqtopia.cpp9
-rw-r--r--kabc/plugins/qtopia/resourceqtopiaconfig.cpp2
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
@@ -31,7 +31,11 @@ MOC_DIR = moc/unix
31} 31}
32win32: { 32win32: {
33CONFIG += dll 33CONFIG += dll
34DEFINES += _WIN32_ 34DEFINES += _WIN32_
35OBJECTS_DIR = obj/win 35OBJECTS_DIR = obj/win
36MOC_DIR = moc/win 36MOC_DIR = moc/win
37LIBS += ../../../bin/microkdepim.lib
38LIBS += ../../../bin/microkcal.lib
39LIBS += ../../../bin/microkde.lib
40LIBS += ../../../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
@@ -23,13 +23,13 @@ Enhanced Version of the file for platform independent KDE tools.
23Copyright (c) 2004 Ulf Schenk 23Copyright (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>
@@ -49,19 +49,26 @@ $Id$
49 49
50#include "qtopiaconverter.h" 50#include "qtopiaconverter.h"
51 51
52#include "resourceqtopia.h" 52#include "resourceqtopia.h"
53 53
54using namespace KABC; 54using namespace KABC;
55
55extern "C" 56extern "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
63ResourceQtopia::ResourceQtopia( const KConfig *config ) 70ResourceQtopia::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";
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
@@ -30,13 +30,13 @@ $Id$
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"