author | zautrix <zautrix> | 2004-07-09 22:18:33 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-07-09 22:18:33 (UTC) |
commit | 5135d0b47efac71ecb7a98d7d66314c868133021 (patch) (unidiff) | |
tree | acd4d56b155b6eb19bef9b5fe0737ca8e8e5e9d2 | |
parent | eb2b55ccbdbaa24fae2b799019e7082778961e5c (diff) | |
download | kdepimpi-5135d0b47efac71ecb7a98d7d66314c868133021.zip kdepimpi-5135d0b47efac71ecb7a98d7d66314c868133021.tar.gz kdepimpi-5135d0b47efac71ecb7a98d7d66314c868133021.tar.bz2 |
renamed lib to microX
-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,118 +1,122 @@ | |||
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 |
15 | for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done | 15 | for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done |
16 | mkdir -p libical/lib/$(PLATFORM) | 16 | mkdir -p libical/lib/$(PLATFORM) |
17 | 17 | ||
18 | clean: | 18 | clean: |
19 | rm -f libical/lib/$(PLATFORM)/*; | 19 | rm -f libical/lib/$(PLATFORM)/*; |
20 | for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ | 20 | for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ |
21 | rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ | 21 | rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ |
22 | done | 22 | done |
23 | install: | 23 | install: |
24 | cd bin/kdepim; make install | 24 | cd bin/kdepim; make install |
25 | cp db2file/db2file $(QPEDIR)/bin/db2file | 25 | cp db2file/db2file $(QPEDIR)/bin/db2file |
26 | cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop | 26 | cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop |
27 | cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop | 27 | cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop |
28 | cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop | 28 | cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop |
29 | 29 | ||
30 | dist: | 30 | dist: |
31 | @echo Dont forget to do "make install" before "make dist" | 31 | @echo Dont forget to do "make install" before "make dist" |
32 | rm -f *arm.ipk | 32 | rm -f *arm.ipk |
33 | rm -f *~ | 33 | rm -f *~ |
34 | cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim | 34 | cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim |
35 | mkipks kmicrokdelibs.control | 35 | mkipks kmicrokdelibs.control |
36 | mkipks korganizer.control | 36 | mkipks korganizer.control |
37 | mkipks kaddressbook.control | 37 | mkipks kaddressbook.control |
38 | mkipks kopiemail.control | 38 | mkipks kopiemail.control |
39 | mkipks korganizer-alarm.control | 39 | mkipks korganizer-alarm.control |
40 | 40 | ||
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) \ |
57 | kmicromail/libmailwrapper/Makefile$(PLATFORM) | 58 | kmicromail/libmailwrapper/Makefile$(PLATFORM) |
58 | 59 | ||
59 | 60 | ||
60 | 61 | ||
61 | qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro | 62 | qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro |
62 | cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM) | 63 | cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM) |
63 | 64 | ||
64 | microkde/Makefile$(PLATFORM): microkde/microkdeE.pro | 65 | microkde/Makefile$(PLATFORM): microkde/microkdeE.pro |
65 | cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM) | 66 | cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM) |
66 | 67 | ||
67 | libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro | 68 | libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro |
68 | cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM) | 69 | cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM) |
69 | 70 | ||
70 | 71 | ||
71 | libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro | 72 | libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro |
72 | cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" libkdepimE.pro -o Makefile$(PLATFORM) | 73 | cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" libkdepimE.pro -o Makefile$(PLATFORM) |
73 | 74 | ||
74 | kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro | 75 | kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro |
75 | cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" kalarmdE.pro -o Makefile$(PLATFORM) | 76 | cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" kalarmdE.pro -o Makefile$(PLATFORM) |
76 | 77 | ||
77 | korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro | 78 | korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro |
78 | cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM) | 79 | cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM) |
79 | 80 | ||
80 | libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro | 81 | libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro |
81 | cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM) | 82 | cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM) |
82 | 83 | ||
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 |
99 | cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_dirE.pro -o Makefile$(PLATFORM) | 103 | cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_dirE.pro -o Makefile$(PLATFORM) |
100 | 104 | ||
101 | kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/kabc_ldapE.pro | 105 | kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/kabc_ldapE.pro |
102 | cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_ldapE.pro -o Makefile$(PLATFORM) | 106 | cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_ldapE.pro -o Makefile$(PLATFORM) |
103 | 107 | ||
104 | kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/kabc_opieE.pro | 108 | kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/kabc_opieE.pro |
105 | cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_opieE.pro -o Makefile$(PLATFORM) | 109 | cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_opieE.pro -o Makefile$(PLATFORM) |
106 | 110 | ||
107 | 111 | ||
108 | kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro | 112 | kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro |
109 | cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM) | 113 | cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM) |
110 | 114 | ||
111 | 115 | ||
112 | kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro | 116 | kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro |
113 | cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM) | 117 | cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM) |
114 | kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro | 118 | kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro |
115 | cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" libetpanE.pro -o Makefile$(PLATFORM) | 119 | cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" libetpanE.pro -o Makefile$(PLATFORM) |
116 | kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro | 120 | kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro |
117 | cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM) | 121 | cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM) |
118 | 122 | ||
diff --git a/Makefile.EmbeddedMail b/Makefile.EmbeddedMail index d770a05..22ba681 100644 --- a/Makefile.EmbeddedMail +++ b/Makefile.EmbeddedMail | |||
@@ -1,118 +1,122 @@ | |||
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 |
15 | for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done | 15 | for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done |
16 | mkdir -p libical/lib/$(PLATFORM) | 16 | mkdir -p libical/lib/$(PLATFORM) |
17 | 17 | ||
18 | clean: | 18 | clean: |
19 | rm -f libical/lib/$(PLATFORM)/*; | 19 | rm -f libical/lib/$(PLATFORM)/*; |
20 | for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ | 20 | for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ |
21 | rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ | 21 | rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ |
22 | done | 22 | done |
23 | install: | 23 | install: |
24 | cd bin/kdepim; make install | 24 | cd bin/kdepim; make install |
25 | cp db2file/db2file $(QPEDIR)/bin/db2file | 25 | cp db2file/db2file $(QPEDIR)/bin/db2file |
26 | cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop | 26 | cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop |
27 | cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop | 27 | cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop |
28 | cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop | 28 | cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop |
29 | 29 | ||
30 | dist: | 30 | dist: |
31 | @echo Dont forget to do "make install" before "make dist" | 31 | @echo Dont forget to do "make install" before "make dist" |
32 | rm -f *arm.ipk | 32 | rm -f *arm.ipk |
33 | rm -f *~ | 33 | rm -f *~ |
34 | cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim | 34 | cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim |
35 | mkipks kmicrokdelibs.control | 35 | mkipks kmicrokdelibs.control |
36 | mkipks korganizer.control | 36 | mkipks korganizer.control |
37 | mkipks kaddressbook.control | 37 | mkipks kaddressbook.control |
38 | mkipks kopiemail.control | 38 | mkipks kopiemail.control |
39 | mkipks korganizer-alarm.control | 39 | mkipks korganizer-alarm.control |
40 | 40 | ||
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) \ |
57 | kmicromail/libmailwrapper/Makefile$(PLATFORM) | 58 | kmicromail/libmailwrapper/Makefile$(PLATFORM) |
58 | 59 | ||
59 | 60 | ||
60 | 61 | ||
61 | qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro | 62 | qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro |
62 | cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM) | 63 | cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM) |
63 | 64 | ||
64 | microkde/Makefile$(PLATFORM): microkde/microkdeE.pro | 65 | microkde/Makefile$(PLATFORM): microkde/microkdeE.pro |
65 | cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM) | 66 | cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM) |
66 | 67 | ||
67 | libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro | 68 | libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro |
68 | cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM) | 69 | cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM) |
69 | 70 | ||
70 | 71 | ||
71 | libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro | 72 | libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro |
72 | cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" libkdepimE.pro -o Makefile$(PLATFORM) | 73 | cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" libkdepimE.pro -o Makefile$(PLATFORM) |
73 | 74 | ||
74 | kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro | 75 | kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro |
75 | cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" kalarmdE.pro -o Makefile$(PLATFORM) | 76 | cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" kalarmdE.pro -o Makefile$(PLATFORM) |
76 | 77 | ||
77 | korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro | 78 | korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro |
78 | cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM) | 79 | cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM) |
79 | 80 | ||
80 | libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro | 81 | libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro |
81 | cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM) | 82 | cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM) |
82 | 83 | ||
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 |
99 | cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_dirE.pro -o Makefile$(PLATFORM) | 103 | cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_dirE.pro -o Makefile$(PLATFORM) |
100 | 104 | ||
101 | kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/kabc_ldapE.pro | 105 | kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/kabc_ldapE.pro |
102 | cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_ldapE.pro -o Makefile$(PLATFORM) | 106 | cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_ldapE.pro -o Makefile$(PLATFORM) |
103 | 107 | ||
104 | kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/kabc_opieE.pro | 108 | kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/kabc_opieE.pro |
105 | cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_opieE.pro -o Makefile$(PLATFORM) | 109 | cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_opieE.pro -o Makefile$(PLATFORM) |
106 | 110 | ||
107 | 111 | ||
108 | kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro | 112 | kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro |
109 | cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM) | 113 | cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM) |
110 | 114 | ||
111 | 115 | ||
112 | kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro | 116 | kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro |
113 | cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM) | 117 | cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM) |
114 | kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro | 118 | kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro |
115 | cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" libetpanE.pro -o Makefile$(PLATFORM) | 119 | cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" libetpanE.pro -o Makefile$(PLATFORM) |
116 | kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro | 120 | kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro |
117 | cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM) | 121 | cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM) |
118 | 122 | ||
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 | |||
@@ -1,170 +1,170 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KAddressbook. | 2 | This file is part of KAddressbook. |
3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> | 3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* | 24 | /* |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <qdir.h> | 31 | #include <qdir.h> |
32 | 32 | ||
33 | #include <kfiledialog.h> | 33 | #include <kfiledialog.h> |
34 | #include <kmessagebox.h> | 34 | #include <kmessagebox.h> |
35 | 35 | ||
36 | #include <opie/ocontactaccess.h> | 36 | #include <opie/ocontactaccess.h> |
37 | #include <opie/ocontactaccessbackend_xml.h> | 37 | #include <opie/ocontactaccessbackend_xml.h> |
38 | 38 | ||
39 | #include "stdaddressbook.h" | 39 | #include "stdaddressbook.h" |
40 | 40 | ||
41 | /*US | 41 | /*US |
42 | #include <qfile.h> | 42 | #include <qfile.h> |
43 | #include <qtextstream.h> | 43 | #include <qtextstream.h> |
44 | 44 | ||
45 | #include <kabc/vcardconverter.h> | 45 | #include <kabc/vcardconverter.h> |
46 | #ifndef KAB_EMBEDDED | 46 | #ifndef KAB_EMBEDDED |
47 | #include <kio/netaccess.h> | 47 | #include <kio/netaccess.h> |
48 | #endif //KAB_EMBEDDED | 48 | #endif //KAB_EMBEDDED |
49 | 49 | ||
50 | #include <klocale.h> | 50 | #include <klocale.h> |
51 | #include <kmessagebox.h> | 51 | #include <kmessagebox.h> |
52 | #include <ktempfile.h> | 52 | #include <ktempfile.h> |
53 | #include <kurl.h> | 53 | #include <kurl.h> |
54 | */ | 54 | */ |
55 | 55 | ||
56 | #include "xxportmanager.h" | 56 | #include "xxportmanager.h" |
57 | #include "opieconverter.h" | 57 | #include "opieconverter.h" |
58 | 58 | ||
59 | #include "opie_xxport.h" | 59 | #include "opie_xxport.h" |
60 | 60 | ||
61 | 61 | ||
62 | class OpieXXPortFactory : public XXPortFactory | 62 | class OpieXXPortFactory : public XXPortFactory |
63 | { | 63 | { |
64 | public: | 64 | public: |
65 | XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name ) | 65 | XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name ) |
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 ) |
83 | { | 83 | { |
84 | createImportAction( i18n( "Import Opie..." ) ); | 84 | createImportAction( i18n( "Import Opie..." ) ); |
85 | createExportAction( i18n( "Export Opie..." ) ); | 85 | createExportAction( i18n( "Export Opie..." ) ); |
86 | } | 86 | } |
87 | 87 | ||
88 | bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data ) | 88 | bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data ) |
89 | { | 89 | { |
90 | QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; | 90 | QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; |
91 | 91 | ||
92 | #ifndef KAB_EMBEDDED | 92 | #ifndef KAB_EMBEDDED |
93 | QString fileName = KFileDialog::getSaveFileName( name ); | 93 | QString fileName = KFileDialog::getSaveFileName( name ); |
94 | #else //KAB_EMBEDDED | 94 | #else //KAB_EMBEDDED |
95 | QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() ); | 95 | QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() ); |
96 | #endif //KAB_EMBEDDED | 96 | #endif //KAB_EMBEDDED |
97 | 97 | ||
98 | if ( fileName.isEmpty() ) | 98 | if ( fileName.isEmpty() ) |
99 | return true; | 99 | return true; |
100 | 100 | ||
101 | OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KA/Pi", fileName ); | 101 | OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KA/Pi", fileName ); |
102 | OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false); | 102 | OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false); |
103 | 103 | ||
104 | if ( !access ) { | 104 | if ( !access ) { |
105 | qDebug("Unable to access file() %s", fileName.latin1()); | 105 | qDebug("Unable to access file() %s", fileName.latin1()); |
106 | addressBook()->error( i18n( "Unable to access file '%1'." ).arg( fileName ) ); | 106 | addressBook()->error( i18n( "Unable to access file '%1'." ).arg( fileName ) ); |
107 | return false; | 107 | return false; |
108 | } | 108 | } |
109 | 109 | ||
110 | KABC::OpieConverter mConverter; | 110 | KABC::OpieConverter mConverter; |
111 | 111 | ||
112 | bool res = mConverter.init(); | 112 | bool res = mConverter.init(); |
113 | if (!res) | 113 | if (!res) |
114 | { | 114 | { |
115 | QString text( i18n( "Unable to initialize opie converter.<br>Most likely a problem with the category file." ) ); | 115 | QString text( i18n( "Unable to initialize opie converter.<br>Most likely a problem with the category file." ) ); |
116 | qDebug(text); | 116 | qDebug(text); |
117 | KMessageBox::error( parentWidget(), text ); | 117 | KMessageBox::error( parentWidget(), text ); |
118 | delete access; | 118 | delete access; |
119 | return false; | 119 | return false; |
120 | } | 120 | } |
121 | 121 | ||
122 | //Now check if the file has already entries, and ask the user if he wants to delete them first. | 122 | //Now check if the file has already entries, and ask the user if he wants to delete them first. |
123 | OContactAccess::List contactList = access->allRecords(); | 123 | OContactAccess::List contactList = access->allRecords(); |
124 | if (contactList.count() > 0) | 124 | if (contactList.count() > 0) |
125 | { | 125 | { |
126 | QString text( i18n( "Do you want to remove<br>all existing entries from<br>%1<br>before exporting.?" ) ); | 126 | QString text( i18n( "Do you want to remove<br>all existing entries from<br>%1<br>before exporting.?" ) ); |
127 | if ( KMessageBox::questionYesNo( parentWidget(), text.arg( fileName ) ) == KMessageBox::Yes ) { | 127 | if ( KMessageBox::questionYesNo( parentWidget(), text.arg( fileName ) ) == KMessageBox::Yes ) { |
128 | // Clean the database.. | 128 | // Clean the database.. |
129 | access->clear(); | 129 | access->clear(); |
130 | } | 130 | } |
131 | } | 131 | } |
132 | 132 | ||
133 | 133 | ||
134 | KABC::Addressee::List::ConstIterator it; | 134 | KABC::Addressee::List::ConstIterator it; |
135 | for ( it = list.begin(); it != list.end(); ++it ) { | 135 | for ( it = list.begin(); it != list.end(); ++it ) { |
136 | OContact c; | 136 | OContact c; |
137 | KABC::Addressee addressee = (*it); | 137 | KABC::Addressee addressee = (*it); |
138 | 138 | ||
139 | res = mConverter.addresseeToOpie( *it, c ); | 139 | res = mConverter.addresseeToOpie( *it, c ); |
140 | if (res == true) | 140 | if (res == true) |
141 | { | 141 | { |
142 | res = access->add(c); | 142 | res = access->add(c); |
143 | if (res == false) | 143 | if (res == false) |
144 | qDebug("Unable to append Contact %s", c.fullName().latin1()); | 144 | qDebug("Unable to append Contact %s", c.fullName().latin1()); |
145 | } | 145 | } |
146 | else | 146 | else |
147 | { | 147 | { |
148 | qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1()); | 148 | qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1()); |
149 | } | 149 | } |
150 | } | 150 | } |
151 | 151 | ||
152 | access->save(); | 152 | access->save(); |
153 | 153 | ||
154 | delete access; | 154 | delete access; |
155 | //US the deletion of the access object deletes the backend object as well. | 155 | //US the deletion of the access object deletes the backend object as well. |
156 | 156 | ||
157 | return true; | 157 | return true; |
158 | } | 158 | } |
159 | 159 | ||
160 | KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const | 160 | KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const |
161 | { | 161 | { |
162 | KABC::AddresseeList adrlst; | 162 | KABC::AddresseeList adrlst; |
163 | 163 | ||
164 | QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; | 164 | QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; |
165 | 165 | ||
166 | #ifndef KAB_EMBEDDED | 166 | #ifndef KAB_EMBEDDED |
167 | QString fileName = KFileDialog::getOpenFileName( name ); | 167 | QString fileName = KFileDialog::getOpenFileName( name ); |
168 | #else //KAB_EMBEDDED | 168 | #else //KAB_EMBEDDED |
169 | QString fileName = KFileDialog::getOpenFileName( name, i18n("Load file"), parentWidget() ); | 169 | QString fileName = KFileDialog::getOpenFileName( name, i18n("Load file"), parentWidget() ); |
170 | #endif //KAB_EMBEDDED | 170 | #endif //KAB_EMBEDDED |
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp index 20cde49..248fcab 100644 --- a/kaddressbook/xxportmanager.cpp +++ b/kaddressbook/xxportmanager.cpp | |||
@@ -104,142 +104,142 @@ void XXPortManager::importVCard( const QString &vCard, bool showPreview ) | |||
104 | importData = vCard; | 104 | importData = vCard; |
105 | mShowPreview = showPreview; | 105 | mShowPreview = showPreview; |
106 | slotImport( "vcard", "<empty>" ); | 106 | slotImport( "vcard", "<empty>" ); |
107 | mShowPreview = false; | 107 | mShowPreview = false; |
108 | importData = ""; | 108 | importData = ""; |
109 | } | 109 | } |
110 | 110 | ||
111 | void XXPortManager::slotImport( const QString &identifier, const QString &data ) | 111 | void XXPortManager::slotImport( const QString &identifier, const QString &data ) |
112 | { | 112 | { |
113 | XXPortObject *obj = mXXPortObjects[ identifier ]; | 113 | XXPortObject *obj = mXXPortObjects[ identifier ]; |
114 | if ( !obj ) { | 114 | if ( !obj ) { |
115 | KMessageBox::error( mCore, i18n( "<qt>No import plugin available for <b>%1</b>.</qt>" ).arg( identifier ) ); | 115 | KMessageBox::error( mCore, i18n( "<qt>No import plugin available for <b>%1</b>.</qt>" ).arg( identifier ) ); |
116 | return; | 116 | return; |
117 | } | 117 | } |
118 | 118 | ||
119 | KABC::Resource *resource = mCore->requestResource( mCore ); | 119 | KABC::Resource *resource = mCore->requestResource( mCore ); |
120 | if ( !resource ) | 120 | if ( !resource ) |
121 | return; | 121 | return; |
122 | 122 | ||
123 | KABC::AddresseeList list = obj->importContacts( data ); | 123 | KABC::AddresseeList list = obj->importContacts( data ); |
124 | KABC::AddresseeList::Iterator it; | 124 | KABC::AddresseeList::Iterator it; |
125 | bool imported = false; | 125 | bool imported = false; |
126 | for ( it = list.begin(); it != list.end(); ++it ) { | 126 | for ( it = list.begin(); it != list.end(); ++it ) { |
127 | if ( mShowPreview ) { | 127 | if ( mShowPreview ) { |
128 | PreviewDialog dlg( *it, mCore ); | 128 | PreviewDialog dlg( *it, mCore ); |
129 | if ( !dlg.exec() ) | 129 | if ( !dlg.exec() ) |
130 | continue; | 130 | continue; |
131 | } | 131 | } |
132 | 132 | ||
133 | (*it).setResource( resource ); | 133 | (*it).setResource( resource ); |
134 | // We use a PwNewCommand so the user can undo it. | 134 | // We use a PwNewCommand so the user can undo it. |
135 | PwNewCommand *command = new PwNewCommand( mCore->addressBook(), *it ); | 135 | PwNewCommand *command = new PwNewCommand( mCore->addressBook(), *it ); |
136 | UndoStack::instance()->push( command ); | 136 | UndoStack::instance()->push( command ); |
137 | RedoStack::instance()->clear(); | 137 | RedoStack::instance()->clear(); |
138 | imported = true; | 138 | imported = true; |
139 | } | 139 | } |
140 | 140 | ||
141 | if ( imported ) { | 141 | if ( imported ) { |
142 | KMessageBox::information( mCore, i18n( "contacts successfully imported." ) ); | 142 | KMessageBox::information( mCore, i18n( "contacts successfully imported." ) ); |
143 | 143 | ||
144 | emit modified(); | 144 | emit modified(); |
145 | } | 145 | } |
146 | } | 146 | } |
147 | 147 | ||
148 | void XXPortManager::slotExport( const QString &identifier, const QString &data ) | 148 | void XXPortManager::slotExport( const QString &identifier, const QString &data ) |
149 | { | 149 | { |
150 | XXPortObject *obj = mXXPortObjects[ identifier ]; | 150 | XXPortObject *obj = mXXPortObjects[ identifier ]; |
151 | if ( !obj ) { | 151 | if ( !obj ) { |
152 | KMessageBox::error( mCore, i18n( "<qt>No export plugin available for <b>%1</b>.</qt>" ).arg( identifier ) ); | 152 | KMessageBox::error( mCore, i18n( "<qt>No export plugin available for <b>%1</b>.</qt>" ).arg( identifier ) ); |
153 | return; | 153 | return; |
154 | } | 154 | } |
155 | 155 | ||
156 | KABC::AddresseeList addrList; | 156 | KABC::AddresseeList addrList; |
157 | XXPortSelectDialog dlg( mCore, obj->requiresSorting(), mCore ); | 157 | XXPortSelectDialog dlg( mCore, obj->requiresSorting(), mCore ); |
158 | if ( dlg.exec() ) | 158 | if ( dlg.exec() ) |
159 | addrList = dlg.contacts(); | 159 | addrList = dlg.contacts(); |
160 | else | 160 | else |
161 | return; | 161 | return; |
162 | 162 | ||
163 | if ( !obj->exportContacts( addrList, data ) ) | 163 | if ( !obj->exportContacts( addrList, data ) ) |
164 | KMessageBox::error( mCore, i18n( "Unable to export contacts." ) ); | 164 | KMessageBox::error( mCore, i18n( "Unable to export contacts." ) ); |
165 | else | 165 | else |
166 | KMessageBox::information( mCore, i18n( "contacts successfully exported." ) ); | 166 | KMessageBox::information( mCore, i18n( "contacts successfully exported." ) ); |
167 | } | 167 | } |
168 | 168 | ||
169 | void XXPortManager::loadPlugins() | 169 | void XXPortManager::loadPlugins() |
170 | { | 170 | { |
171 | mXXPortObjects.clear(); | 171 | mXXPortObjects.clear(); |
172 | 172 | ||
173 | #ifndef KAB_EMBEDDED | 173 | #ifndef KAB_EMBEDDED |
174 | KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/XXPort" ); | 174 | KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/XXPort" ); |
175 | KTrader::OfferList::ConstIterator it; | 175 | KTrader::OfferList::ConstIterator it; |
176 | for ( it = plugins.begin(); it != plugins.end(); ++it ) { | 176 | for ( it = plugins.begin(); it != plugins.end(); ++it ) { |
177 | if ( !(*it)->hasServiceType( "KAddressBook/XXPort" ) ) | 177 | if ( !(*it)->hasServiceType( "KAddressBook/XXPort" ) ) |
178 | continue; | 178 | continue; |
179 | 179 | ||
180 | KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() ); | 180 | KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() ); |
181 | if ( !factory ) { | 181 | if ( !factory ) { |
182 | kdDebug(5720) << "XXPortManager::loadExtensions(): Factory creation failed" << endl; | 182 | kdDebug(5720) << "XXPortManager::loadExtensions(): Factory creation failed" << endl; |
183 | continue; | 183 | continue; |
184 | } | 184 | } |
185 | 185 | ||
186 | XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory ); | 186 | XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory ); |
187 | 187 | ||
188 | if ( !xxportFactory ) { | 188 | if ( !xxportFactory ) { |
189 | kdDebug(5720) << "XXPortManager::loadExtensions(): Cast failed" << endl; | 189 | kdDebug(5720) << "XXPortManager::loadExtensions(): Cast failed" << endl; |
190 | continue; | 190 | continue; |
191 | } | 191 | } |
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 | { |
209 | XXPortFactory *xxportFactory = it.current(); | 209 | XXPortFactory *xxportFactory = it.current(); |
210 | #endif //KAB_EMBEDDED | 210 | #endif //KAB_EMBEDDED |
211 | 211 | ||
212 | XXPortObject *obj = xxportFactory->xxportObject( mCore->addressBook(), mCore ); | 212 | XXPortObject *obj = xxportFactory->xxportObject( mCore->addressBook(), mCore ); |
213 | if ( obj ) { | 213 | if ( obj ) { |
214 | mCore->addGUIClient( obj ); | 214 | mCore->addGUIClient( obj ); |
215 | mXXPortObjects.insert( obj->identifier(), obj ); | 215 | mXXPortObjects.insert( obj->identifier(), obj ); |
216 | connect( obj, SIGNAL( exportActivated( const QString&, const QString& ) ), | 216 | connect( obj, SIGNAL( exportActivated( const QString&, const QString& ) ), |
217 | this, SLOT( slotExport( const QString&, const QString& ) ) ); | 217 | this, SLOT( slotExport( const QString&, const QString& ) ) ); |
218 | connect( obj, SIGNAL( importActivated( const QString&, const QString& ) ), | 218 | connect( obj, SIGNAL( importActivated( const QString&, const QString& ) ), |
219 | this, SLOT( slotImport( const QString&, const QString& ) ) ); | 219 | this, SLOT( slotImport( const QString&, const QString& ) ) ); |
220 | } | 220 | } |
221 | } | 221 | } |
222 | 222 | ||
223 | } | 223 | } |
224 | 224 | ||
225 | 225 | ||
226 | PreviewDialog::PreviewDialog( const KABC::Addressee &addr, QWidget *parent, | 226 | PreviewDialog::PreviewDialog( const KABC::Addressee &addr, QWidget *parent, |
227 | const char *name ) | 227 | const char *name ) |
228 | : KDialogBase( Plain, i18n( "Contact Preview" ), Ok | Cancel, Ok, parent, | 228 | : KDialogBase( Plain, i18n( "Contact Preview" ), Ok | Cancel, Ok, parent, |
229 | name, true, true ) | 229 | name, true, true ) |
230 | { | 230 | { |
231 | QWidget *page = plainPage(); | 231 | QWidget *page = plainPage(); |
232 | QVBoxLayout *layout = new QVBoxLayout( page, marginHint(), spacingHint() ); | 232 | QVBoxLayout *layout = new QVBoxLayout( page, marginHint(), spacingHint() ); |
233 | 233 | ||
234 | KPIM::AddresseeView *view = new KPIM::AddresseeView( page ); | 234 | KPIM::AddresseeView *view = new KPIM::AddresseeView( page ); |
235 | view->setAddressee( addr ); | 235 | view->setAddressee( addr ); |
236 | 236 | ||
237 | layout->addWidget( view ); | 237 | layout->addWidget( view ); |
238 | 238 | ||
239 | resize( 400, 300 ); | 239 | resize( 400, 300 ); |
240 | } | 240 | } |
241 | 241 | ||
242 | #ifndef KAB_EMBEDDED | 242 | #ifndef KAB_EMBEDDED |
243 | #include "xxportmanager.moc" | 243 | #include "xxportmanager.moc" |
244 | #endif //KAB_EMBEDDED | 244 | #endif //KAB_EMBEDDED |
245 | 245 | ||