summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-08-02 18:28:27 (UTC)
committer ulf69 <ulf69>2004-08-02 18:28:27 (UTC)
commit983127ce46c9ff6663d08dedd450da3fe7dd549b (patch) (unidiff)
treeb6c5bf6bffbddb80ef405a6fc322bfa8bfe13d98
parent09fe5a5325105b5051d22feb8dae6bb1f9875ff3 (diff)
downloadkdepimpi-983127ce46c9ff6663d08dedd450da3fe7dd549b.zip
kdepimpi-983127ce46c9ff6663d08dedd450da3fe7dd549b.tar.gz
kdepimpi-983127ce46c9ff6663d08dedd450da3fe7dd549b.tar.bz2
implemented the exportclasses for opie, qtopia and sharp as part of kaddressbook and not as additional libraries.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/kaddressbook.pro8
-rw-r--r--kaddressbook/kaddressbookE.pro8
-rw-r--r--kaddressbook/xxportmanager.cpp15
-rw-r--r--kaddressbook/xxportobject.cpp21
-rw-r--r--kaddressbook/xxportobject.h33
5 files changed, 77 insertions, 8 deletions
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index 77fce1b..0da5842 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -6,7 +6,7 @@ DESTDIR= ../bin
6include( ../variables.pri ) 6include( ../variables.pri )
7 7
8 8
9INCLUDEPATH += . ./details ./features ./kcmconfigs ./xxport ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../kabc ../ interfaces 9INCLUDEPATH += . ./details ./features ./kcmconfigs ./xxport ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces
10DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION 10DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION
11 11
12unix : { 12unix : {
@@ -97,6 +97,9 @@ xxport/vcard_xxport.h \
97xxport/kde2_xxport.h \ 97xxport/kde2_xxport.h \
98xxport/csv_xxport.h \ 98xxport/csv_xxport.h \
99xxport/csvimportdialog.h \ 99xxport/csvimportdialog.h \
100xxport/opie_xxport.h \
101xxport/qtopia_xxport.h \
102xxport/sharpdtm_xxport.h \
100#details/look_details.h \ 103#details/look_details.h \
101#mainwindoiw.h \ 104#mainwindoiw.h \
102# alarmclient.h \ 105# alarmclient.h \
@@ -160,6 +163,9 @@ xxport/vcard_xxport.cpp \
160xxport/kde2_xxport.cpp \ 163xxport/kde2_xxport.cpp \
161xxport/csv_xxport.cpp \ 164xxport/csv_xxport.cpp \
162xxport/csvimportdialog.cpp \ 165xxport/csvimportdialog.cpp \
166xxport/opie_xxport.cpp \
167xxport/qtopia_xxport.cpp \
168xxport/sharpdtm_xxport.cpp \
163#details/look_details.cpp \ 169#details/look_details.cpp \
164#mainwindow.cpp \ 170#mainwindow.cpp \
165# calendarview.cpp \ 171# calendarview.cpp \
diff --git a/kaddressbook/kaddressbookE.pro b/kaddressbook/kaddressbookE.pro
index dc4a2f2..95e6641 100644
--- a/kaddressbook/kaddressbookE.pro
+++ b/kaddressbook/kaddressbookE.pro
@@ -10,7 +10,7 @@ DESTDIR=$(QPEDIR)/bin
10#LFLAGS += -Wl,-export-dynamic 10#LFLAGS += -Wl,-export-dynamic
11 11
12 12
13INCLUDEPATH += . ./details ./features ./kcmconfigs ./xxport ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../kabc ../qtcompat ../ interfaces $(QPEDIR)/include 13INCLUDEPATH += . ./details ./features ./kcmconfigs ./xxport ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../qtcompat ../ interfaces $(QPEDIR)/include
14DEFINES += KAB_EMBEDDED KAB_NOSPLITTER 14DEFINES += KAB_EMBEDDED KAB_NOSPLITTER
15#DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOKABC KORG_NOARCHIVE KORG_NOMAIL 15#DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOKABC KORG_NOARCHIVE KORG_NOMAIL
16#DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER 16#DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
@@ -87,6 +87,9 @@ xxport/vcard_xxport.h \
87xxport/kde2_xxport.h \ 87xxport/kde2_xxport.h \
88xxport/csv_xxport.h \ 88xxport/csv_xxport.h \
89xxport/csvimportdialog.h \ 89xxport/csvimportdialog.h \
90xxport/opie_xxport.h \
91xxport/qtopia_xxport.h \
92xxport/sharpdtm_xxport.h \
90#details/look_details.h \ 93#details/look_details.h \
91#mainwindoiw.h \ 94#mainwindoiw.h \
92# alarmclient.h \ 95# alarmclient.h \
@@ -150,6 +153,9 @@ xxport/vcard_xxport.cpp \
150xxport/kde2_xxport.cpp \ 153xxport/kde2_xxport.cpp \
151xxport/csv_xxport.cpp \ 154xxport/csv_xxport.cpp \
152xxport/csvimportdialog.cpp \ 155xxport/csvimportdialog.cpp \
156xxport/opie_xxport.cpp \
157xxport/qtopia_xxport.cpp \
158xxport/sharpdtm_xxport.cpp \
153#details/look_details.cpp \ 159#details/look_details.cpp \
154#mainwindow.cpp \ 160#mainwindow.cpp \
155# calendarview.cpp \ 161# calendarview.cpp \
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 2962951..a6797c9 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -43,9 +43,12 @@ $Id$
43#else //KAB_EMBEDDED 43#else //KAB_EMBEDDED
44extern "C" 44extern "C"
45{ 45{
46 void* init_kaddrbk_csv_xxport(); 46 void* init_microkaddrbk_csv_xxport();
47 void* init_kaddrbk_kde2_xxport(); 47 void* init_microkaddrbk_kde2_xxport();
48 void* init_kaddrbk_vcard_xxport(); 48 void* init_microkaddrbk_vcard_xxport();
49 void* init_microkaddrbk_opie_xxport();
50 void* init_microkaddrbk_qtopia_xxport();
51 void* init_microkaddrbk_sharpdtm_xxport();
49} 52}
50#endif //KAB_EMBEDDED 53#endif //KAB_EMBEDDED
51 54
@@ -192,9 +195,9 @@ void XXPortManager::loadPlugins()
192 195
193#else //KAB_EMBEDDED 196#else //KAB_EMBEDDED
194 QList<XXPortFactory> factorylist; 197 QList<XXPortFactory> factorylist;
195 factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_csv_xxport())); 198 factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_csv_xxport()));
196 factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_kde2_xxport())); 199 factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_kde2_xxport()));
197 factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_vcard_xxport())); 200 factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_vcard_xxport()));
198 201
199 //add the opie import library dynamically 202 //add the opie import library dynamically
200 KLibFactory *factory = KLibLoader::self()->factory( "microkaddrbk_opie_xxport" ); 203 KLibFactory *factory = KLibLoader::self()->factory( "microkaddrbk_opie_xxport" );
diff --git a/kaddressbook/xxportobject.cpp b/kaddressbook/xxportobject.cpp
index 42ab0fb..bb985a6 100644
--- a/kaddressbook/xxportobject.cpp
+++ b/kaddressbook/xxportobject.cpp
@@ -147,6 +147,27 @@ void XXPortObject::slotImportActivated( const QString &data )
147 emit importActivated( identifier(), ( data == "<empty>" ? QString::null : data ) ); 147 emit importActivated( identifier(), ( data == "<empty>" ? QString::null : data ) );
148} 148}
149 149
150/********************************************************************
151 *
152 *******************************************************************/
153
154
155XXPortResourceObject::XXPortResourceObject( KABC::AddressBook *ab, QWidget *parent,
156 const char *name )
157 : XXPortObject( ab, parent, name ), mResource(0)
158{
159}
160
161XXPortResourceObject::~XXPortResourceObject()
162{
163}
164
165bool XXPortResourceObject::isAvailable()
166{
167 return (mResource != 0);
168}
169
170
150#ifndef KAB_EMBEDDED 171#ifndef KAB_EMBEDDED
151#include "xxportobject.moc" 172#include "xxportobject.moc"
152#endif //KAB_EMBEDDED 173#endif //KAB_EMBEDDED
diff --git a/kaddressbook/xxportobject.h b/kaddressbook/xxportobject.h
index fddc219..d547855 100644
--- a/kaddressbook/xxportobject.h
+++ b/kaddressbook/xxportobject.h
@@ -35,10 +35,14 @@ $Id$
35 35
36#include <kabc/addressbook.h> 36#include <kabc/addressbook.h>
37#include <kabc/addresseelist.h> 37#include <kabc/addresseelist.h>
38#include <kabc/resource.h>
38#include <kxmlguiclient.h> 39#include <kxmlguiclient.h>
39#include <klibloader.h> 40#include <klibloader.h>
40 41
41 42
43
44
45
42class XXPortObject : public QObject, virtual public KXMLGUIClient 46class XXPortObject : public QObject, virtual public KXMLGUIClient
43{ 47{
44 Q_OBJECT 48 Q_OBJECT
@@ -59,6 +63,13 @@ class XXPortObject : public QObject, virtual public KXMLGUIClient
59 */ 63 */
60 virtual bool requiresSorting() const { return false; } 64 virtual bool requiresSorting() const { return false; }
61 65
66 /**
67 Returns true if the XXPortObject can be used.
68 One case it can not be used is for example if a needed lib could not be loaded.
69 */
70 virtual bool isAvailable() const { return true; };
71
72
62 public slots: 73 public slots:
63 /** 74 /**
64 Reimplement this method for exporting the contacts. 75 Reimplement this method for exporting the contacts.
@@ -120,6 +131,28 @@ class XXPortObject : public QObject, virtual public KXMLGUIClient
120 XXPortObjectPrivate *d; 131 XXPortObjectPrivate *d;
121}; 132};
122 133
134
135
136class XXPortResourceObject : public XXPortObject
137{
138 Q_OBJECT
139
140 public:
141 XXPortResourceObject( KABC::AddressBook *ab, QWidget *parent, const char *name = 0 );
142 ~XXPortResourceObject();
143
144 /**
145 Returns true if the XXPortObject can be used.
146 One case it can not be used is for example if a needed lib could not be loaded.
147 */
148 virtual bool isAvailable();
149 protected:
150 KABC::Resource* mResource;
151};
152
153
154
155
123class XXPortFactory : public KLibFactory 156class XXPortFactory : public KLibFactory
124{ 157{
125 public: 158 public: