-rw-r--r-- | Makefile | 6 | ||||
-rw-r--r-- | Makefile.EmbeddedMail | 6 | ||||
-rw-r--r-- | kaddressbook/xxport/opie/opie_xxport.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/xxportmanager.cpp | 2 |
4 files changed, 12 insertions, 4 deletions
@@ -1,14 +1,14 @@ | |||
1 | DISTPATH = $(shell pwd) | 1 | DISTPATH = $(shell pwd) |
2 | DISTDIR = $(shell basename $(DISTPATH)) | 2 | DISTDIR = $(shell basename $(DISTPATH)) |
3 | 3 | ||
4 | SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \ | 4 | SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \ |
5 | libkcal libkdepim kabc kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir \ | 5 | libkcal libkdepim kabc kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir \ |
6 | kabc/plugins/opie \ | 6 | kabc/plugins/opie kaddressbook/xxport/opie \ |
7 | korganizer kalarmd kaddressbook kmicromail/libetpan kmicromail/libmailwrapper kmicromail | 7 | korganizer kalarmd kaddressbook kmicromail/libetpan kmicromail/libmailwrapper kmicromail |
8 | all: tmake | 8 | all: tmake |
9 | for i in $(SUBDIRS); do pushd $$i; \ | 9 | for i in $(SUBDIRS); do pushd $$i; \ |
10 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 10 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
11 | done | 11 | done |
12 | 12 | ||
13 | objects: | 13 | objects: |
14 | for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done | 14 | for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done |
@@ -41,16 +41,17 @@ dist: | |||
41 | tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \ | 41 | tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \ |
42 | libkcal/Makefile$(PLATFORM) \ | 42 | libkcal/Makefile$(PLATFORM) \ |
43 | libkdepim/Makefile$(PLATFORM) korganizer/Makefile$(PLATFORM) \ | 43 | libkdepim/Makefile$(PLATFORM) korganizer/Makefile$(PLATFORM) \ |
44 | kalarmd/Makefile$(PLATFORM) \ | 44 | kalarmd/Makefile$(PLATFORM) \ |
45 | libical/src/libical/Makefile$(PLATFORM) \ | 45 | libical/src/libical/Makefile$(PLATFORM) \ |
46 | libical/src/libicalss/Makefile$(PLATFORM) \ | 46 | libical/src/libicalss/Makefile$(PLATFORM) \ |
47 | kabc/Makefile$(PLATFORM) \ | 47 | kabc/Makefile$(PLATFORM) \ |
48 | kabc/converter/opie/Makefile$(PLATFORM) \ | 48 | kabc/converter/opie/Makefile$(PLATFORM) \ |
49 | kaddressbook/xxport/opie/Makefile$(PLATFORM) \ | ||
49 | kabc/formats/binary/Makefile$(PLATFORM) \ | 50 | kabc/formats/binary/Makefile$(PLATFORM) \ |
50 | kabc/plugins/file/Makefile$(PLATFORM) \ | 51 | kabc/plugins/file/Makefile$(PLATFORM) \ |
51 | kabc/plugins/dir/Makefile$(PLATFORM) \ | 52 | kabc/plugins/dir/Makefile$(PLATFORM) \ |
52 | kabc/plugins/ldap/Makefile$(PLATFORM) \ | 53 | kabc/plugins/ldap/Makefile$(PLATFORM) \ |
53 | kabc/plugins/opie/Makefile$(PLATFORM) \ | 54 | kabc/plugins/opie/Makefile$(PLATFORM) \ |
54 | kaddressbook/Makefile$(PLATFORM) \ | 55 | kaddressbook/Makefile$(PLATFORM) \ |
55 | kmicromail/Makefile$(PLATFORM) \ | 56 | kmicromail/Makefile$(PLATFORM) \ |
56 | kmicromail/libetpan/Makefile$(PLATFORM) \ | 57 | kmicromail/libetpan/Makefile$(PLATFORM) \ |
@@ -83,16 +84,19 @@ libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro | |||
83 | libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro | 84 | libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro |
84 | cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM) | 85 | cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM) |
85 | 86 | ||
86 | kabc/Makefile$(PLATFORM): kabc/kabcE.pro | 87 | kabc/Makefile$(PLATFORM): kabc/kabcE.pro |
87 | cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM) | 88 | cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM) |
88 | 89 | ||
89 | kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro | 90 | kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro |
90 | cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieconverterE.pro -o Makefile$(PLATFORM) | 91 | cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieconverterE.pro -o Makefile$(PLATFORM) |
92 | |||
93 | kaddressbook/xxport/opie/Makefile$(PLATFORM): kaddressbook/xxport/opie/opieE.pro | ||
94 | cd kaddressbook/xxport/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM) | ||
91 | 95 | ||
92 | kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro | 96 | kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro |
93 | cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) | 97 | cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) |
94 | 98 | ||
95 | kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/kabc_fileE.pro | 99 | kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/kabc_fileE.pro |
96 | cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_fileE.pro -o Makefile$(PLATFORM) | 100 | cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_fileE.pro -o Makefile$(PLATFORM) |
97 | 101 | ||
98 | kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/kabc_dirE.pro | 102 | kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/kabc_dirE.pro |
diff --git a/Makefile.EmbeddedMail b/Makefile.EmbeddedMail index d770a05..22ba681 100644 --- a/Makefile.EmbeddedMail +++ b/Makefile.EmbeddedMail | |||
@@ -1,14 +1,14 @@ | |||
1 | DISTPATH = $(shell pwd) | 1 | DISTPATH = $(shell pwd) |
2 | DISTDIR = $(shell basename $(DISTPATH)) | 2 | DISTDIR = $(shell basename $(DISTPATH)) |
3 | 3 | ||
4 | SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \ | 4 | SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \ |
5 | libkcal libkdepim kabc kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir \ | 5 | libkcal libkdepim kabc kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir \ |
6 | kabc/plugins/opie \ | 6 | kabc/plugins/opie kaddressbook/xxport/opie \ |
7 | korganizer kalarmd kaddressbook kmicromail/libetpan kmicromail/libmailwrapper kmicromail | 7 | korganizer kalarmd kaddressbook kmicromail/libetpan kmicromail/libmailwrapper kmicromail |
8 | all: tmake | 8 | all: tmake |
9 | for i in $(SUBDIRS); do pushd $$i; \ | 9 | for i in $(SUBDIRS); do pushd $$i; \ |
10 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 10 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
11 | done | 11 | done |
12 | 12 | ||
13 | objects: | 13 | objects: |
14 | for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done | 14 | for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done |
@@ -41,16 +41,17 @@ dist: | |||
41 | tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \ | 41 | tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \ |
42 | libkcal/Makefile$(PLATFORM) \ | 42 | libkcal/Makefile$(PLATFORM) \ |
43 | libkdepim/Makefile$(PLATFORM) korganizer/Makefile$(PLATFORM) \ | 43 | libkdepim/Makefile$(PLATFORM) korganizer/Makefile$(PLATFORM) \ |
44 | kalarmd/Makefile$(PLATFORM) \ | 44 | kalarmd/Makefile$(PLATFORM) \ |
45 | libical/src/libical/Makefile$(PLATFORM) \ | 45 | libical/src/libical/Makefile$(PLATFORM) \ |
46 | libical/src/libicalss/Makefile$(PLATFORM) \ | 46 | libical/src/libicalss/Makefile$(PLATFORM) \ |
47 | kabc/Makefile$(PLATFORM) \ | 47 | kabc/Makefile$(PLATFORM) \ |
48 | kabc/converter/opie/Makefile$(PLATFORM) \ | 48 | kabc/converter/opie/Makefile$(PLATFORM) \ |
49 | kaddressbook/xxport/opie/Makefile$(PLATFORM) \ | ||
49 | kabc/formats/binary/Makefile$(PLATFORM) \ | 50 | kabc/formats/binary/Makefile$(PLATFORM) \ |
50 | kabc/plugins/file/Makefile$(PLATFORM) \ | 51 | kabc/plugins/file/Makefile$(PLATFORM) \ |
51 | kabc/plugins/dir/Makefile$(PLATFORM) \ | 52 | kabc/plugins/dir/Makefile$(PLATFORM) \ |
52 | kabc/plugins/ldap/Makefile$(PLATFORM) \ | 53 | kabc/plugins/ldap/Makefile$(PLATFORM) \ |
53 | kabc/plugins/opie/Makefile$(PLATFORM) \ | 54 | kabc/plugins/opie/Makefile$(PLATFORM) \ |
54 | kaddressbook/Makefile$(PLATFORM) \ | 55 | kaddressbook/Makefile$(PLATFORM) \ |
55 | kmicromail/Makefile$(PLATFORM) \ | 56 | kmicromail/Makefile$(PLATFORM) \ |
56 | kmicromail/libetpan/Makefile$(PLATFORM) \ | 57 | kmicromail/libetpan/Makefile$(PLATFORM) \ |
@@ -83,16 +84,19 @@ libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro | |||
83 | libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro | 84 | libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro |
84 | cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM) | 85 | cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM) |
85 | 86 | ||
86 | kabc/Makefile$(PLATFORM): kabc/kabcE.pro | 87 | kabc/Makefile$(PLATFORM): kabc/kabcE.pro |
87 | cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM) | 88 | cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM) |
88 | 89 | ||
89 | kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro | 90 | kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro |
90 | cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieconverterE.pro -o Makefile$(PLATFORM) | 91 | cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieconverterE.pro -o Makefile$(PLATFORM) |
92 | |||
93 | kaddressbook/xxport/opie/Makefile$(PLATFORM): kaddressbook/xxport/opie/opieE.pro | ||
94 | cd kaddressbook/xxport/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM) | ||
91 | 95 | ||
92 | kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro | 96 | kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro |
93 | cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) | 97 | cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) |
94 | 98 | ||
95 | kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/kabc_fileE.pro | 99 | kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/kabc_fileE.pro |
96 | cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_fileE.pro -o Makefile$(PLATFORM) | 100 | cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_fileE.pro -o Makefile$(PLATFORM) |
97 | 101 | ||
98 | kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/kabc_dirE.pro | 102 | kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/kabc_dirE.pro |
diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp index 8ee0725..12c83af 100644 --- a/kaddressbook/xxport/opie/opie_xxport.cpp +++ b/kaddressbook/xxport/opie/opie_xxport.cpp | |||
@@ -66,17 +66,17 @@ class OpieXXPortFactory : public XXPortFactory | |||
66 | { | 66 | { |
67 | return new OpieXXPort( ab, parent, name ); | 67 | return new OpieXXPort( ab, parent, name ); |
68 | } | 68 | } |
69 | }; | 69 | }; |
70 | 70 | ||
71 | 71 | ||
72 | extern "C" | 72 | extern "C" |
73 | { | 73 | { |
74 | void *init_kaddrbk_opie_xxport() | 74 | void *init_microkaddrbk_opie_xxport() |
75 | { | 75 | { |
76 | return ( new OpieXXPortFactory() ); | 76 | return ( new OpieXXPortFactory() ); |
77 | } | 77 | } |
78 | } | 78 | } |
79 | 79 | ||
80 | 80 | ||
81 | OpieXXPort::OpieXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name ) | 81 | OpieXXPort::OpieXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name ) |
82 | : XXPortObject( ab, parent, name ) | 82 | : XXPortObject( ab, parent, name ) |
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp index 20cde49..248fcab 100644 --- a/kaddressbook/xxportmanager.cpp +++ b/kaddressbook/xxportmanager.cpp | |||
@@ -192,17 +192,17 @@ void XXPortManager::loadPlugins() | |||
192 | 192 | ||
193 | #else //KAB_EMBEDDED | 193 | #else //KAB_EMBEDDED |
194 | QList<XXPortFactory> factorylist; | 194 | QList<XXPortFactory> factorylist; |
195 | factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_csv_xxport())); | 195 | factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_csv_xxport())); |
196 | factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_kde2_xxport())); | 196 | factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_kde2_xxport())); |
197 | factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_vcard_xxport())); | 197 | factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_vcard_xxport())); |
198 | 198 | ||
199 | //now add the opie import library dynamically | 199 | //now add the opie import library dynamically |
200 | KLibFactory *factory = KLibLoader::self()->factory( "kaddrbk_opie_xxport" ); | 200 | KLibFactory *factory = KLibLoader::self()->factory( "microkaddrbk_opie_xxport" ); |
201 | if ( factory ) { | 201 | if ( factory ) { |
202 | XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory ); | 202 | XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory ); |
203 | factorylist.append(xxportFactory); | 203 | factorylist.append(xxportFactory); |
204 | } | 204 | } |
205 | 205 | ||
206 | QListIterator<XXPortFactory> it(factorylist); | 206 | QListIterator<XXPortFactory> it(factorylist); |
207 | for ( ; it.current(); ++it ) | 207 | for ( ; it.current(); ++it ) |
208 | { | 208 | { |