summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-08-12 17:09:11 (UTC)
committer ulf69 <ulf69>2004-08-12 17:09:11 (UTC)
commitafb21584fdb4dcc201fca13b4c5129fdf2e90154 (patch) (unidiff)
tree8db9ee9d00c8e1d432f3eed7c35be251932c4bd4
parent945f620dd57338d5b920f4ada3ff8e9e8d1cfe74 (diff)
downloadkdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.zip
kdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.tar.gz
kdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.tar.bz2
implemented new include strategy for makefiles
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.Embedded10
-rw-r--r--kabc/kabc.pro2
-rw-r--r--kabc/kabcE.pro2
-rw-r--r--kaddressbook/kaddressbook.pro2
-rw-r--r--kmicromail/kmicromailE.pro2
-rw-r--r--korganizer/korganizer.pro2
-rw-r--r--korganizer/korganizerE.pro5
-rw-r--r--libkcal/libkcal.pro4
-rw-r--r--libkdepim/categoryeditdialog.h2
-rw-r--r--libkdepim/categoryselectdialog.cpp2
-rw-r--r--libkdepim/categoryselectdialog.h2
-rw-r--r--libkdepim/libkdepim.pro2
-rw-r--r--libkdepim/libkdepimE.pro3
-rw-r--r--microkde/microkde.pro5
-rw-r--r--microkde/microkdeE.pro2
15 files changed, 23 insertions, 24 deletions
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 38fd000..9b55ecf 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -1,255 +1,259 @@
1DISTPATH = $(shell pwd) 1export KDEPIMDIR = $(shell pwd)
2DISTDIR = $(shell basename $(DISTPATH))
3 2
4 3
5ifeq ($(PLATFORM) , zaurus) 4ifeq ($(PLATFORM) , zaurus)
6 BUILD_NO_LDAP_PLUGIN=1 5 BUILD_NO_LDAP_PLUGIN=1
7endif 6endif
8 7
9ifneq ($(PLATFORM) , zaurus) 8ifneq ($(PLATFORM) , zaurus)
10 BUILD_NO_SHARP_PLUGIN=1 9 BUILD_NO_SHARP_PLUGIN=1
11endif 10endif
12 11
13SUBDIRS_MICROKDE = \ 12SUBDIRS_MICROKDE = \
14 libical/src/libical \ 13 libical/src/libical \
15 libical/src/libicalss \ 14 libical/src/libicalss \
16 qtcompat \ 15 qtcompat \
17 microkde \ 16 microkde \
18 libkcal \ 17 libkcal \
19 libkdepim \ 18 libkdepim \
20 kabc \ 19 kabc \
21 kabc/formats/binary \ 20 kabc/formats/binary \
22 kabc/plugins/file \ 21 kabc/plugins/file \
23 kabc/plugins/dir \ 22 kabc/plugins/dir \
24 korganizer \ 23 korganizer \
25 kalarmd \ 24 kalarmd \
26 kaddressbook 25 kaddressbook
27 26
28SUBDIRS_QTOPIA_PLUGIN = \ 27SUBDIRS_QTOPIA_PLUGIN = \
29 kabc/plugins/qtopia 28 kabc/plugins/qtopia
30 29
31SUBDIRS_OPIE_PLUGIN = \ 30SUBDIRS_OPIE_PLUGIN = \
32 kabc/plugins/opie 31 kabc/plugins/opie
33 32
34SUBDIRS_SHARP_PLUGIN = \ 33SUBDIRS_SHARP_PLUGIN = \
35 kabc/plugins/sharpdtm 34 kabc/plugins/sharpdtm
36 35
37SUBDIRS_LDAP_PLUGIN = \ 36SUBDIRS_LDAP_PLUGIN = \
38 kabc/plugins/ldap 37 kabc/plugins/ldap
39 38
40SUBDIRS_MICROMAIL = \ 39SUBDIRS_MICROMAIL = \
41 kmicromail/libetpan \ 40 kmicromail/libetpan \
42 kmicromail/libmailwrapper \ 41 kmicromail/libmailwrapper \
43 kmicromail 42 kmicromail
44 43
45SUBDIRS = \ 44SUBDIRS = \
46 $(SUBDIRS_MICROKDE) \ 45 $(SUBDIRS_MICROKDE) \
47 $(SUBDIRS_QTOPIA_PLUGIN) \ 46 $(SUBDIRS_QTOPIA_PLUGIN) \
48 $(SUBDIRS_OPIE_PLUGIN) \ 47 $(SUBDIRS_OPIE_PLUGIN) \
49 $(SUBDIRS_SHARP_PLUGIN) \ 48 $(SUBDIRS_SHARP_PLUGIN) \
50 $(SUBDIRS_LDAP_PLUGIN) \ 49 $(SUBDIRS_LDAP_PLUGIN) \
51 $(SUBDIRS_MICROMAIL) 50 $(SUBDIRS_MICROMAIL)
52 51
53 52
54all: build_microkde \ 53all: build_microkde \
55 build_qtopia_plugin \ 54 build_qtopia_plugin \
56 build_opie_plugin \ 55 build_opie_plugin \
57 build_sharp_plugin \ 56 build_sharp_plugin \
58 build_ldap_plugin \ 57 build_ldap_plugin \
59 build_micromail 58 build_micromail
60 59
61 60
62build_microkde: variable_test tmake 61build_microkde: variable_test tmake
63 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ 62 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
64 make -f Makefile$(PLATFORM) || exit 1; popd; \ 63 make -f Makefile$(PLATFORM) || exit 1; popd; \
65 done 64 done
66 65
67build_qtopia_plugin: build_microkde 66build_qtopia_plugin: build_microkde
68 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ 67 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
69 make -f Makefile$(PLATFORM) || exit 1; popd; \ 68 make -f Makefile$(PLATFORM) || exit 1; popd; \
70 done 69 done
71 70
72build_opie_plugin: build_microkde 71build_opie_plugin: build_microkde
73 ifdef BUILD_NO_OPIE_PLUGIN 72 ifdef BUILD_NO_OPIE_PLUGIN
74 @echo ---> opie plugin not build. 73 @echo ---> opie plugin not build.
75 else 74 else
76 for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \ 75 for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
77 make -f Makefile$(PLATFORM) || exit 1; popd; \ 76 make -f Makefile$(PLATFORM) || exit 1; popd; \
78 done 77 done
79 endif 78 endif
80 79
81build_sharp_plugin: build_microkde 80build_sharp_plugin: build_microkde
82 ifdef BUILD_NO_SHARP_PLUGIN 81 ifdef BUILD_NO_SHARP_PLUGIN
83 @echo ---> ldap plugin not build. 82 @echo ---> ldap plugin not build.
84 else 83 else
85 for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \ 84 for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
86 make -f Makefile$(PLATFORM) || exit 1; popd; \ 85 make -f Makefile$(PLATFORM) || exit 1; popd; \
87 done 86 done
88 endif 87 endif
89 88
90build_ldap_plugin: build_microkde 89build_ldap_plugin: build_microkde
91 ifdef BUILD_NO_LDAP_PLUGIN 90 ifdef BUILD_NO_LDAP_PLUGIN
92 @echo ---> ldap plugin not build. 91 @echo ---> ldap plugin not build.
93 else 92 else
94 for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \ 93 for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
95 make -f Makefile$(PLATFORM) || exit 1; popd; \ 94 make -f Makefile$(PLATFORM) || exit 1; popd; \
96 done 95 done
97 endif 96 endif
98 97
99 98
100build_micromail: build_microkde 99build_micromail: build_microkde
101 ifdef BUILD_NO_MICROMAIL 100 ifdef BUILD_NO_MICROMAIL
102 @echo ---> micromail not build. 101 @echo ---> micromail not build.
103 else 102 else
104 for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \ 103 for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
105 make -f Makefile$(PLATFORM) || exit 1; popd; \ 104 make -f Makefile$(PLATFORM) || exit 1; popd; \
106 done 105 done
107 endif 106 endif
108 107
109 108
110variable_info: 109variable_info:
111 @echo -------------------------------------- 110 @echo --------------------------------------
112 @echo KDEPIM buildsystem, variableinfo... 111 @echo KDEPIM buildsystem, variableinfo...
112 @echo KDEPIMDIR=$(KDEPIMDIR)
113 @echo QTDIR=$(QTDIR) 113 @echo QTDIR=$(QTDIR)
114 @echo QPEDIR=$(QPEDIR) 114 @echo QPEDIR=$(QPEDIR)
115 @echo OPIEDIR=$(OPIEDIR) 115 @echo OPIEDIR=$(OPIEDIR)
116 @echo PLATFORM=$(PLATFORM) 116 @echo PLATFORM=$(PLATFORM)
117 @echo RELEASE_DEBUG=$(RELEASE_DEBUG) 117 @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
118 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) 118 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
119 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) 119 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
120 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) 120 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
121 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) 121 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
122 ifndef BUILD_NO_SHARP_PLUGIN 122 ifndef BUILD_NO_SHARP_PLUGIN
123 @echo SHARPDTMSDK=$(SHARPDTMSDK) 123 @echo SHARPDTMSDK=$(SHARPDTMSDK)
124 endif 124 endif
125 @echo -------------------------------------- 125 @echo --------------------------------------
126 126
127variable_test: variable_info 127variable_test: variable_info
128 @echo KDEPIM buildsystem, variablecheck... 128 @echo KDEPIM buildsystem, variablecheck...
129 ifndef KDEPIMDIR
130 @echo KDEPIMDIR is not defined.
131 $(error KDEPIMDIR is not defined)
132 endif
129 ifndef PLATFORM 133 ifndef PLATFORM
130 @echo PLATFORM is not defined. 134 @echo PLATFORM is not defined.
131 $(error PLATFORM is not defined) 135 $(error PLATFORM is not defined)
132 endif 136 endif
133 ifdef BUILD_NO_LDAP_PLUGIN 137 ifdef BUILD_NO_LDAP_PLUGIN
134 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) 138 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
135 endif 139 endif
136 ifdef BUILD_NO_OPIE_PLUGIN 140 ifdef BUILD_NO_OPIE_PLUGIN
137 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) 141 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
138 endif 142 endif
139 ifdef BUILD_NO_MICROMAIL 143 ifdef BUILD_NO_MICROMAIL
140 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) 144 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
141 endif 145 endif
142 ifdef BUILD_NO_SHARP_PLUGIN 146 ifdef BUILD_NO_SHARP_PLUGIN
143 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) 147 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
144 else 148 else
145 ifndef SHARPDTMSDK 149 ifndef SHARPDTMSDK
146 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) 150 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
147 $(error SHARPDTMSDK is not defined) 151 $(error SHARPDTMSDK is not defined)
148 endif 152 endif
149 endif 153 endif
150 @echo -------------------------------------- 154 @echo --------------------------------------
151 155
152 156
153objects: 157objects:
154 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done 158 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
155 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done 159 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
156 mkdir -p libical/lib/$(PLATFORM) 160 mkdir -p libical/lib/$(PLATFORM)
157 161
158clean: 162clean:
159 rm -f libical/lib/$(PLATFORM)/*; 163 rm -rf libical/lib/$(PLATFORM)/*;
160 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ 164 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
161 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ 165 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
162 done 166 done
163install: 167install:
164 cd bin/kdepim; make install 168 cd bin/kdepim; make install
165 cp db2file/db2file $(QPEDIR)/bin/db2file 169 cp db2file/db2file $(QPEDIR)/bin/db2file
166 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop 170 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
167 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop 171 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
168 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop 172 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop
169 173
170dist: 174dist:
171 @echo Dont forget to do "make install" before "make dist" 175 @echo Dont forget to do "make install" before "make dist"
172 rm -f *arm.ipk 176 rm -f *arm.ipk
173 rm -f *~ 177 rm -f *~
174 cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim 178 cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim
175 ./mkipks kmicrokdelibs.control 179 ./mkipks kmicrokdelibs.control
176 ./mkipks korganizer.control 180 ./mkipks korganizer.control
177 ./mkipks kaddressbook.control 181 ./mkipks kaddressbook.control
178 ifndef BUILD_NO_MICROMAIL 182 ifndef BUILD_NO_MICROMAIL
179 ./mkipks kopiemail.control 183 ./mkipks kopiemail.control
180 endif 184 endif
181 ./mkipks korganizer-alarm.control 185 ./mkipks korganizer-alarm.control
182 186
183tmake: objects \ 187tmake: objects \
184 qtcompat/Makefile$(PLATFORM) \ 188 qtcompat/Makefile$(PLATFORM) \
185 microkde/Makefile$(PLATFORM) \ 189 microkde/Makefile$(PLATFORM) \
186 libkcal/Makefile$(PLATFORM) \ 190 libkcal/Makefile$(PLATFORM) \
187 libkdepim/Makefile$(PLATFORM) \ 191 libkdepim/Makefile$(PLATFORM) \
188 korganizer/Makefile$(PLATFORM) \ 192 korganizer/Makefile$(PLATFORM) \
189 kalarmd/Makefile$(PLATFORM) \ 193 kalarmd/Makefile$(PLATFORM) \
190 libical/src/libical/Makefile$(PLATFORM) \ 194 libical/src/libical/Makefile$(PLATFORM) \
191 libical/src/libicalss/Makefile$(PLATFORM) \ 195 libical/src/libicalss/Makefile$(PLATFORM) \
192 kabc/Makefile$(PLATFORM) \ 196 kabc/Makefile$(PLATFORM) \
193 kabc/formats/binary/Makefile$(PLATFORM) \ 197 kabc/formats/binary/Makefile$(PLATFORM) \
194 kabc/plugins/file/Makefile$(PLATFORM) \ 198 kabc/plugins/file/Makefile$(PLATFORM) \
195 kabc/plugins/dir/Makefile$(PLATFORM) \ 199 kabc/plugins/dir/Makefile$(PLATFORM) \
196 kabc/plugins/ldap/Makefile$(PLATFORM) \ 200 kabc/plugins/ldap/Makefile$(PLATFORM) \
197 kabc/plugins/opie/Makefile$(PLATFORM) \ 201 kabc/plugins/opie/Makefile$(PLATFORM) \
198 kabc/plugins/qtopia/Makefile$(PLATFORM) \ 202 kabc/plugins/qtopia/Makefile$(PLATFORM) \
199 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \ 203 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
200 kaddressbook/Makefile$(PLATFORM) \ 204 kaddressbook/Makefile$(PLATFORM) \
201 kmicromail/Makefile$(PLATFORM) \ 205 kmicromail/Makefile$(PLATFORM) \
202 kmicromail/libetpan/Makefile$(PLATFORM) \ 206 kmicromail/libetpan/Makefile$(PLATFORM) \
203 kmicromail/libmailwrapper/Makefile$(PLATFORM) 207 kmicromail/libmailwrapper/Makefile$(PLATFORM)
204 208
205 209
206 210
207 211
208qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro 212qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
209 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM) 213 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM)
210 214
211microkde/Makefile$(PLATFORM): microkde/microkdeE.pro 215microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
212 cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM) 216 cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM)
213 217
214libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro 218libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
215 cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM) 219 cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM)
216 220
217 221
218libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro 222libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
219 cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" libkdepimE.pro -o Makefile$(PLATFORM) 223 cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" libkdepimE.pro -o Makefile$(PLATFORM)
220 224
221kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro 225kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
222 cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" kalarmdE.pro -o Makefile$(PLATFORM) 226 cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" kalarmdE.pro -o Makefile$(PLATFORM)
223 227
224korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro 228korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
225 cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM) 229 cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM)
226 230
227libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro 231libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
228 cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM) 232 cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM)
229 233
230libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro 234libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
231 cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM) 235 cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM)
232 236
233kabc/Makefile$(PLATFORM): kabc/kabcE.pro 237kabc/Makefile$(PLATFORM): kabc/kabcE.pro
234 cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM) 238 cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM)
235 239
236kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro 240kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
237 cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) 241 cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
238 242
239kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro 243kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
240 cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" fileE.pro -o Makefile$(PLATFORM) 244 cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" fileE.pro -o Makefile$(PLATFORM)
241 245
242kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro 246kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
243 cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" dirE.pro -o Makefile$(PLATFORM) 247 cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" dirE.pro -o Makefile$(PLATFORM)
244 248
245kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro 249kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
246 cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" ldapE.pro -o Makefile$(PLATFORM) 250 cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" ldapE.pro -o Makefile$(PLATFORM)
247 251
248kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro 252kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
249 cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM) 253 cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM)
250 254
251kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro 255kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
252 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM) 256 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM)
253 257
254kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro 258kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
255 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" sharpdtmE.pro -o Makefile$(PLATFORM) 259 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" sharpdtmE.pro -o Makefile$(PLATFORM)
diff --git a/kabc/kabc.pro b/kabc/kabc.pro
index 95ebd68..71087aa 100644
--- a/kabc/kabc.pro
+++ b/kabc/kabc.pro
@@ -1,106 +1,106 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3#release debug 3#release debug
4DESTDIR=../bin 4DESTDIR=../bin
5 5
6TARGET = microkabc 6TARGET = microkabc
7 7
8include( ../variables.pri ) 8include( ../variables.pri )
9 9
10INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat ../microkde/kdeui .. 10INCLUDEPATH += . vcard/include vcard/include/generated $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde/kdeui
11 11
12#LIBS += -lmicrokde -lldap 12#LIBS += -lmicrokde -lldap
13LIBS += -L$(QPEDIR)/lib 13LIBS += -L$(QPEDIR)/lib
14DEFINES += KAB_EMBEDDED DESKTOP_VERSION 14DEFINES += KAB_EMBEDDED DESKTOP_VERSION
15unix : { 15unix : {
16 16
17OBJECTS_DIR = obj/unix 17OBJECTS_DIR = obj/unix
18MOC_DIR = moc/unix 18MOC_DIR = moc/unix
19} 19}
20win32: { 20win32: {
21DEFINES += _WIN32_ 21DEFINES += _WIN32_
22OBJECTS_DIR = obj/win 22OBJECTS_DIR = obj/win
23MOC_DIR = moc/win 23MOC_DIR = moc/win
24} 24}
25INTERFACES = \ 25INTERFACES = \
26 26
27 27
28HEADERS = \ 28HEADERS = \
29 resource.h \ 29 resource.h \
30 stdaddressbook.h \ 30 stdaddressbook.h \
31 agent.h \ 31 agent.h \
32 geo.h \ 32 geo.h \
33 key.h \ 33 key.h \
34 field.h \ 34 field.h \
35 plugin.h \ 35 plugin.h \
36 address.h \ 36 address.h \
37 addresseelist.h \ 37 addresseelist.h \
38formatfactory.h \ 38formatfactory.h \
39 formatplugin.h \ 39 formatplugin.h \
40 phonenumber.h \ 40 phonenumber.h \
41distributionlist.h \ 41distributionlist.h \
42distributionlistdialog.h \ 42distributionlistdialog.h \
43distributionlisteditor.h \ 43distributionlisteditor.h \
44vcardformatplugin.h \ 44vcardformatplugin.h \
45formats/vcardformatplugin2.h \ 45formats/vcardformatplugin2.h \
46 picture.h \ 46 picture.h \
47 secrecy.h \ 47 secrecy.h \
48 sound.h \ 48 sound.h \
49 addressbook.h \ 49 addressbook.h \
50 syncprefwidget.h \ 50 syncprefwidget.h \
51 timezone.h \ 51 timezone.h \
52 tmpaddressbook.h \ 52 tmpaddressbook.h \
53 addressee.h \ 53 addressee.h \
54 addresseedialog.h \ 54 addresseedialog.h \
55 vcardconverter.h \ 55 vcardconverter.h \
56 vcard21parser.h \ 56 vcard21parser.h \
57 vcardformatimpl.h \ 57 vcardformatimpl.h \
58 plugins/file/resourcefile.h \ 58 plugins/file/resourcefile.h \
59 plugins/file/resourcefileconfig.h \ 59 plugins/file/resourcefileconfig.h \
60 plugins/dir/resourcedir.h \ 60 plugins/dir/resourcedir.h \
61 plugins/dir/resourcedirconfig.h \ 61 plugins/dir/resourcedirconfig.h \
62 vcardparser/vcardline.h \ 62 vcardparser/vcardline.h \
63 vcardparser/vcard.h \ 63 vcardparser/vcard.h \
64 vcardparser/vcardtool.h \ 64 vcardparser/vcardtool.h \
65 vcardparser/vcardparser.h \ 65 vcardparser/vcardparser.h \
66vcard/include/VCardAdrParam.h \ 66vcard/include/VCardAdrParam.h \
67vcard/include/VCardAdrValue.h \ 67vcard/include/VCardAdrValue.h \
68vcard/include/VCardAgentParam.h \ 68vcard/include/VCardAgentParam.h \
69vcard/include/VCardContentLine.h \ 69vcard/include/VCardContentLine.h \
70vcard/include/VCardDateParam.h \ 70vcard/include/VCardDateParam.h \
71vcard/include/VCardDateValue.h \ 71vcard/include/VCardDateValue.h \
72vcard/include/VCardEmailParam.h \ 72vcard/include/VCardEmailParam.h \
73vcard/include/VCardGeoValue.h \ 73vcard/include/VCardGeoValue.h \
74vcard/include/VCardGroup.h \ 74vcard/include/VCardGroup.h \
75vcard/include/VCardImageParam.h \ 75vcard/include/VCardImageParam.h \
76vcard/include/VCardImageValue.h \ 76vcard/include/VCardImageValue.h \
77vcard/include/VCardLangValue.h \ 77vcard/include/VCardLangValue.h \
78vcard/include/VCardNValue.h \ 78vcard/include/VCardNValue.h \
79vcard/include/VCardParam.h \ 79vcard/include/VCardParam.h \
80vcard/include/VCardPhoneNumberValue.h \ 80vcard/include/VCardPhoneNumberValue.h \
81vcard/include/VCardSourceParam.h \ 81vcard/include/VCardSourceParam.h \
82vcard/include/VCardTelParam.h \ 82vcard/include/VCardTelParam.h \
83vcard/include/VCardTextParam.h \ 83vcard/include/VCardTextParam.h \
84vcard/include/VCardTextNSParam.h \ 84vcard/include/VCardTextNSParam.h \
85vcard/include/VCardTextValue.h \ 85vcard/include/VCardTextValue.h \
86vcard/include/VCardTextBinParam.h \ 86vcard/include/VCardTextBinParam.h \
87vcard/include/VCardURIValue.h \ 87vcard/include/VCardURIValue.h \
88vcard/include/VCardVCard.h \ 88vcard/include/VCardVCard.h \
89vcard/include/VCardEntity.h \ 89vcard/include/VCardEntity.h \
90vcard/include/VCardValue.h \ 90vcard/include/VCardValue.h \
91vcard/include/VCardSoundValue.h \ 91vcard/include/VCardSoundValue.h \
92vcard/include/VCardAgentValue.h \ 92vcard/include/VCardAgentValue.h \
93vcard/include/VCardTelValue.h \ 93vcard/include/VCardTelValue.h \
94vcard/include/VCardTextBinValue.h \ 94vcard/include/VCardTextBinValue.h \
95vcard/include/VCardOrgValue.h \ 95vcard/include/VCardOrgValue.h \
96vcard/include/VCardUTCValue.h \ 96vcard/include/VCardUTCValue.h \
97vcard/include/VCardClassValue.h \ 97vcard/include/VCardClassValue.h \
98vcard/include/VCardFloatValue.h \ 98vcard/include/VCardFloatValue.h \
99vcard/include/VCardTextListValue.h \ 99vcard/include/VCardTextListValue.h \
100vcard/include/generated/AdrParam-generated.h \ 100vcard/include/generated/AdrParam-generated.h \
101vcard/include/generated/AdrValue-generated.h \ 101vcard/include/generated/AdrValue-generated.h \
102vcard/include/generated/AgentParam-generated.h \ 102vcard/include/generated/AgentParam-generated.h \
103vcard/include/generated/ContentLine-generated.h \ 103vcard/include/generated/ContentLine-generated.h \
104vcard/include/generated/DateParam-generated.h \ 104vcard/include/generated/DateParam-generated.h \
105vcard/include/generated/DateValue-generated.h \ 105vcard/include/generated/DateValue-generated.h \
106vcard/include/generated/EmailParam-generated.h \ 106vcard/include/generated/EmailParam-generated.h \
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index 62a66eb..dfdbcff 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -1,102 +1,102 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3TARGET = microkabc 3TARGET = microkabc
4 4
5 5
6INCLUDEPATH += . .. ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat $(QPEDIR)/include 6INCLUDEPATH += . $(KDEPIMDIR) vcard/include vcard/include/generated $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
7OBJECTS_DIR = obj/$(PLATFORM) 7OBJECTS_DIR = obj/$(PLATFORM)
8MOC_DIR = moc/$(PLATFORM) 8MOC_DIR = moc/$(PLATFORM)
9DESTDIR = $(QPEDIR)/lib 9DESTDIR = $(QPEDIR)/lib
10LIBS += -lmicrokde 10LIBS += -lmicrokde
11LIBS += -lmicrokdepim 11LIBS += -lmicrokdepim
12#LIBS += -lldap 12#LIBS += -lldap
13LIBS += -L$(QPEDIR)/lib 13LIBS += -L$(QPEDIR)/lib
14DEFINES += KAB_EMBEDDED 14DEFINES += KAB_EMBEDDED
15 15
16INTERFACES = \ 16INTERFACES = \
17 17
18HEADERS = \ 18HEADERS = \
19 address.h \ 19 address.h \
20 addressbook.h \ 20 addressbook.h \
21 addressee.h \ 21 addressee.h \
22 addresseedialog.h \ 22 addresseedialog.h \
23 addresseelist.h \ 23 addresseelist.h \
24 agent.h \ 24 agent.h \
25 distributionlist.h \ 25 distributionlist.h \
26 distributionlistdialog.h \ 26 distributionlistdialog.h \
27 distributionlisteditor.h \ 27 distributionlisteditor.h \
28 field.h \ 28 field.h \
29 formatfactory.h \ 29 formatfactory.h \
30 formatplugin.h \ 30 formatplugin.h \
31 geo.h \ 31 geo.h \
32 key.h \ 32 key.h \
33 phonenumber.h \ 33 phonenumber.h \
34 picture.h \ 34 picture.h \
35 plugin.h \ 35 plugin.h \
36 resource.h \ 36 resource.h \
37 secrecy.h \ 37 secrecy.h \
38 sound.h \ 38 sound.h \
39 stdaddressbook.h \ 39 stdaddressbook.h \
40 syncprefwidget.h \ 40 syncprefwidget.h \
41 timezone.h \ 41 timezone.h \
42 tmpaddressbook.h \ 42 tmpaddressbook.h \
43 vcardconverter.h \ 43 vcardconverter.h \
44 vcard21parser.h \ 44 vcard21parser.h \
45 vcardformatimpl.h \ 45 vcardformatimpl.h \
46 vcardformatplugin.h \ 46 vcardformatplugin.h \
47 vcardparser/vcardline.h \ 47 vcardparser/vcardline.h \
48 vcardparser/vcard.h \ 48 vcardparser/vcard.h \
49 vcardparser/vcardtool.h \ 49 vcardparser/vcardtool.h \
50 vcardparser/vcardparser.h \ 50 vcardparser/vcardparser.h \
51 vcard/include/VCardAdrParam.h \ 51 vcard/include/VCardAdrParam.h \
52 vcard/include/VCardAdrValue.h \ 52 vcard/include/VCardAdrValue.h \
53 vcard/include/VCardAgentParam.h \ 53 vcard/include/VCardAgentParam.h \
54 vcard/include/VCardContentLine.h \ 54 vcard/include/VCardContentLine.h \
55 vcard/include/VCardDateParam.h \ 55 vcard/include/VCardDateParam.h \
56 vcard/include/VCardDateValue.h \ 56 vcard/include/VCardDateValue.h \
57 vcard/include/VCardEmailParam.h \ 57 vcard/include/VCardEmailParam.h \
58 vcard/include/VCardGeoValue.h \ 58 vcard/include/VCardGeoValue.h \
59 vcard/include/VCardGroup.h \ 59 vcard/include/VCardGroup.h \
60 vcard/include/VCardImageParam.h \ 60 vcard/include/VCardImageParam.h \
61 vcard/include/VCardImageValue.h \ 61 vcard/include/VCardImageValue.h \
62 vcard/include/VCardLangValue.h \ 62 vcard/include/VCardLangValue.h \
63 vcard/include/VCardNValue.h \ 63 vcard/include/VCardNValue.h \
64 vcard/include/VCardParam.h \ 64 vcard/include/VCardParam.h \
65 vcard/include/VCardPhoneNumberValue.h \ 65 vcard/include/VCardPhoneNumberValue.h \
66 vcard/include/VCardSourceParam.h \ 66 vcard/include/VCardSourceParam.h \
67 vcard/include/VCardTelParam.h \ 67 vcard/include/VCardTelParam.h \
68 vcard/include/VCardTextParam.h \ 68 vcard/include/VCardTextParam.h \
69 vcard/include/VCardTextNSParam.h \ 69 vcard/include/VCardTextNSParam.h \
70 vcard/include/VCardTextValue.h \ 70 vcard/include/VCardTextValue.h \
71 vcard/include/VCardTextBinParam.h \ 71 vcard/include/VCardTextBinParam.h \
72 vcard/include/VCardURIValue.h \ 72 vcard/include/VCardURIValue.h \
73 vcard/include/VCardVCard.h \ 73 vcard/include/VCardVCard.h \
74 vcard/include/VCardEntity.h \ 74 vcard/include/VCardEntity.h \
75 vcard/include/VCardValue.h \ 75 vcard/include/VCardValue.h \
76 vcard/include/VCardSoundValue.h \ 76 vcard/include/VCardSoundValue.h \
77 vcard/include/VCardAgentValue.h \ 77 vcard/include/VCardAgentValue.h \
78 vcard/include/VCardTelValue.h \ 78 vcard/include/VCardTelValue.h \
79 vcard/include/VCardTextBinValue.h \ 79 vcard/include/VCardTextBinValue.h \
80 vcard/include/VCardOrgValue.h \ 80 vcard/include/VCardOrgValue.h \
81 vcard/include/VCardUTCValue.h \ 81 vcard/include/VCardUTCValue.h \
82 vcard/include/VCardClassValue.h \ 82 vcard/include/VCardClassValue.h \
83 vcard/include/VCardFloatValue.h \ 83 vcard/include/VCardFloatValue.h \
84 vcard/include/VCardTextListValue.h \ 84 vcard/include/VCardTextListValue.h \
85 vcard/include/generated/AdrParam-generated.h \ 85 vcard/include/generated/AdrParam-generated.h \
86 vcard/include/generated/AdrValue-generated.h \ 86 vcard/include/generated/AdrValue-generated.h \
87 vcard/include/generated/AgentParam-generated.h \ 87 vcard/include/generated/AgentParam-generated.h \
88 vcard/include/generated/ContentLine-generated.h \ 88 vcard/include/generated/ContentLine-generated.h \
89 vcard/include/generated/DateParam-generated.h \ 89 vcard/include/generated/DateParam-generated.h \
90 vcard/include/generated/DateValue-generated.h \ 90 vcard/include/generated/DateValue-generated.h \
91 vcard/include/generated/EmailParam-generated.h \ 91 vcard/include/generated/EmailParam-generated.h \
92 vcard/include/generated/GeoValue-generated.h \ 92 vcard/include/generated/GeoValue-generated.h \
93 vcard/include/generated/Group-generated.h \ 93 vcard/include/generated/Group-generated.h \
94 vcard/include/generated/ImageParam-generated.h \ 94 vcard/include/generated/ImageParam-generated.h \
95 vcard/include/generated/ImageValue-generated.h \ 95 vcard/include/generated/ImageValue-generated.h \
96 vcard/include/generated/LangValue-generated.h \ 96 vcard/include/generated/LangValue-generated.h \
97 vcard/include/generated/NValue-generated.h \ 97 vcard/include/generated/NValue-generated.h \
98 vcard/include/generated/Param-generated.h \ 98 vcard/include/generated/Param-generated.h \
99 vcard/include/generated/PhoneNumberValue-generated.h \ 99 vcard/include/generated/PhoneNumberValue-generated.h \
100 vcard/include/generated/SourceParam-generated.h \ 100 vcard/include/generated/SourceParam-generated.h \
101 vcard/include/generated/TelParam-generated.h \ 101 vcard/include/generated/TelParam-generated.h \
102 vcard/include/generated/TextParam-generated.h \ 102 vcard/include/generated/TextParam-generated.h \
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index fec2341..7e9752d 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -1,105 +1,105 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on 2 CONFIG = qt warn_on
3 TARGET = kapi 3 TARGET = kapi
4DESTDIR= ../bin 4DESTDIR= ../bin
5 5
6include( ../variables.pri ) 6include( ../variables.pri )
7 7
8 8
9INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces 9INCLUDEPATH += . details features xxport $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kutils $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/kabc $(KDEPIMDIR) interfaces
10DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION 10DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION
11 11
12unix : { 12unix : {
13LIBS += ../bin/libmicrokdepim.so 13LIBS += ../bin/libmicrokdepim.so
14LIBS += ../bin/libmicrokde.so 14LIBS += ../bin/libmicrokde.so
15LIBS += ../bin/libmicrokabc.so 15LIBS += ../bin/libmicrokabc.so
16LIBS += ../bin/libmicrokcal.so 16LIBS += ../bin/libmicrokcal.so
17LIBS += ../bin/libmicrogammu.so 17LIBS += ../bin/libmicrogammu.so
18LIBS += -lbluetooth 18LIBS += -lbluetooth
19LIBS += -lsdp 19LIBS += -lsdp
20LIBS += -lldap 20LIBS += -lldap
21OBJECTS_DIR = obj/unix 21OBJECTS_DIR = obj/unix
22MOC_DIR = moc/unix 22MOC_DIR = moc/unix
23} 23}
24win32: { 24win32: {
25DEFINES += _WIN32_ 25DEFINES += _WIN32_
26LIBS += ../bin/microkdepim.lib 26LIBS += ../bin/microkdepim.lib
27LIBS += ../bin/microkcal.lib 27LIBS += ../bin/microkcal.lib
28LIBS += ../bin/microkde.lib 28LIBS += ../bin/microkde.lib
29LIBS += ../bin/microkabc.lib 29LIBS += ../bin/microkabc.lib
30QMAKE_LINK += /NODEFAULTLIB:LIBC 30QMAKE_LINK += /NODEFAULTLIB:LIBC
31OBJECTS_DIR = obj/win 31OBJECTS_DIR = obj/win
32MOC_DIR = moc/win 32MOC_DIR = moc/win
33LIBS += mfc71u.lib 33LIBS += mfc71u.lib
34} 34}
35 35
36 36
37 37
38 38
39 39
40 40
41 41
42 42
43INTERFACES = \ 43INTERFACES = \
44# filteredit_base.ui \ 44# filteredit_base.ui \
45# kofilterview_base.ui \ 45# kofilterview_base.ui \
46 46
47HEADERS = \ 47HEADERS = \
48features/mergewidget.h \ 48features/mergewidget.h \
49features/distributionlistwidget.h \ 49features/distributionlistwidget.h \
50kcmconfigs/addresseewidget.h \ 50kcmconfigs/addresseewidget.h \
51kcmconfigs/extensionconfigdialog.h \ 51kcmconfigs/extensionconfigdialog.h \
52kcmconfigs/kcmkabconfig.h \ 52kcmconfigs/kcmkabconfig.h \
53kcmconfigs/kabconfigwidget.h \ 53kcmconfigs/kabconfigwidget.h \
54addresseeeditordialog.h \ 54addresseeeditordialog.h \
55addresseeeditorwidget.h \ 55addresseeeditorwidget.h \
56addresseditwidget.h \ 56addresseditwidget.h \
57addresseeconfig.h \ 57addresseeconfig.h \
58addresseeutil.h \ 58addresseeutil.h \
59emaileditwidget.h \ 59emaileditwidget.h \
60filtereditdialog.h \ 60filtereditdialog.h \
61kaddressbookmain.h \ 61kaddressbookmain.h \
62kabprefs.h \ 62kabprefs.h \
63kabcore.h \ 63kabcore.h \
64viewmanager.h \ 64viewmanager.h \
65extensionmanager.h \ 65extensionmanager.h \
66extensionwidget.h \ 66extensionwidget.h \
67kaddressbookview.h \ 67kaddressbookview.h \
68geowidget.h \ 68geowidget.h \
69imagewidget.h \ 69imagewidget.h \
70incsearchwidget.h \ 70incsearchwidget.h \
71jumpbuttonbar.h \ 71jumpbuttonbar.h \
72phoneeditwidget.h \ 72phoneeditwidget.h \
73secrecywidget.h \ 73secrecywidget.h \
74keywidget.h \ 74keywidget.h \
75nameeditdialog.h \ 75nameeditdialog.h \
76filter.h \ 76filter.h \
77addviewdialog.h \ 77addviewdialog.h \
78configurewidget.h \ 78configurewidget.h \
79viewconfigurewidget.h \ 79viewconfigurewidget.h \
80viewconfigurefieldspage.h \ 80viewconfigurefieldspage.h \
81viewconfigurefilterpage.h \ 81viewconfigurefilterpage.h \
82typecombo.h \ 82typecombo.h \
83undo.h \ 83undo.h \
84undocmds.h \ 84undocmds.h \
85xxportmanager.h \ 85xxportmanager.h \
86xxportobject.h \ 86xxportobject.h \
87xxportselectdialog.h \ 87xxportselectdialog.h \
88details/detailsviewcontainer.h \ 88details/detailsviewcontainer.h \
89details/look_basic.h \ 89details/look_basic.h \
90details/look_html.h \ 90details/look_html.h \
91views/kaddressbookiconview.h \ 91views/kaddressbookiconview.h \
92views/kaddressbooktableview.h \ 92views/kaddressbooktableview.h \
93views/kaddressbookcardview.h \ 93views/kaddressbookcardview.h \
94views/configuretableviewdialog.h \ 94views/configuretableviewdialog.h \
95views/configurecardviewdialog.h \ 95views/configurecardviewdialog.h \
96views/cardview.h \ 96views/cardview.h \
97views/colorlistbox.h \ 97views/colorlistbox.h \
98views/contactlistview.h \ 98views/contactlistview.h \
99xxport/vcard_xxport.h \ 99xxport/vcard_xxport.h \
100xxport/kde2_xxport.h \ 100xxport/kde2_xxport.h \
101xxport/csv_xxport.h \ 101xxport/csv_xxport.h \
102xxport/csvimportdialog.h \ 102xxport/csvimportdialog.h \
103xxport/opie_xxport.h \ 103xxport/opie_xxport.h \
104xxport/qtopia_xxport.h \ 104xxport/qtopia_xxport.h \
105xxport/sharpdtm_xxport.h \ 105xxport/sharpdtm_xxport.h \
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index 962f788..c026808 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -1,69 +1,69 @@
1CONFIG += qt warn_on 1CONFIG += qt warn_on
2 TEMPLATE= app 2 TEMPLATE= app
3HEADERS = defines.h \ 3HEADERS = defines.h \
4 editaccounts.h \ 4 editaccounts.h \
5 composemail.h \ 5 composemail.h \
6 accountview.h \ 6 accountview.h \
7 accountitem.h \ 7 accountitem.h \
8 mainwindow.h \ 8 mainwindow.h \
9 viewmail.h \ 9 viewmail.h \
10 viewmailbase.h \ 10 viewmailbase.h \
11 opiemail.h \ 11 opiemail.h \
12 mailistviewitem.h \ 12 mailistviewitem.h \
13 settingsdialog.h \ 13 settingsdialog.h \
14 statuswidget.h \ 14 statuswidget.h \
15 newmaildir.h \ 15 newmaildir.h \
16 selectstore.h \ 16 selectstore.h \
17 selectsmtp.h \ 17 selectsmtp.h \
18 nntpgroups.h \ 18 nntpgroups.h \
19 nntpgroupsdlg.h 19 nntpgroupsdlg.h
20 20
21SOURCES = main.cpp \ 21SOURCES = main.cpp \
22 opiemail.cpp \ 22 opiemail.cpp \
23 mainwindow.cpp \ 23 mainwindow.cpp \
24 accountview.cpp \ 24 accountview.cpp \
25 accountitem.cpp \ 25 accountitem.cpp \
26 composemail.cpp \ 26 composemail.cpp \
27 editaccounts.cpp \ 27 editaccounts.cpp \
28 viewmail.cpp \ 28 viewmail.cpp \
29 viewmailbase.cpp \ 29 viewmailbase.cpp \
30 mailistviewitem.cpp \ 30 mailistviewitem.cpp \
31 settingsdialog.cpp \ 31 settingsdialog.cpp \
32 statuswidget.cpp \ 32 statuswidget.cpp \
33 newmaildir.cpp \ 33 newmaildir.cpp \
34 selectstore.cpp \ 34 selectstore.cpp \
35 selectsmtp.cpp \ 35 selectsmtp.cpp \
36 nntpgroups.cpp \ 36 nntpgroups.cpp \
37 nntpgroupsdlg.cpp 37 nntpgroupsdlg.cpp
38 38
39INTERFACES = editaccountsui.ui \ 39INTERFACES = editaccountsui.ui \
40 selectmailtypeui.ui \ 40 selectmailtypeui.ui \
41 imapconfigui.ui \ 41 imapconfigui.ui \
42 pop3configui.ui \ 42 pop3configui.ui \
43 nntpconfigui.ui \ 43 nntpconfigui.ui \
44 smtpconfigui.ui \ 44 smtpconfigui.ui \
45 composemailui.ui \ 45 composemailui.ui \
46 settingsdialogui.ui \ 46 settingsdialogui.ui \
47 statuswidgetui.ui \ 47 statuswidgetui.ui \
48 newmaildirui.ui \ 48 newmaildirui.ui \
49 selectstoreui.ui \ 49 selectstoreui.ui \
50 nntpgroupsui.ui 50 nntpgroupsui.ui
51 51
52 52
53INCLUDEPATH += ../microkde ../microkde/kdecore ./libetpan/include $(QPEDIR)/include . .. ../microkde/kdeui ../qtcompat 53INCLUDEPATH += . $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include
54LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokde -lmicroqtcompat -lmicrokabc -lmicrokcal -lmicrokdepim 54LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokde -lmicroqtcompat -lmicrokabc -lmicrokcal -lmicrokdepim
55LIBS += $(QTOPIALIB) 55LIBS += $(QTOPIALIB)
56#LIBS += -lqtopia 56#LIBS += -lqtopia
57#next line for Zaurus only 57#next line for Zaurus only
58#LIBS += -luuid 58#LIBS += -luuid
59 59
60LIBS += -lmicrogammu 60LIBS += -lmicrogammu
61LIBS += -lbluetooth 61LIBS += -lbluetooth
62LIBS += -lsdp 62LIBS += -lsdp
63# 63#
64OBJECTS_DIR = obj/$(PLATFORM) 64OBJECTS_DIR = obj/$(PLATFORM)
65MOC_DIR = moc/$(PLATFORM) 65MOC_DIR = moc/$(PLATFORM)
66DESTDIR=$(QPEDIR)/bin 66DESTDIR=$(QPEDIR)/bin
67TARGET = ompi 67TARGET = ompi
68 68
69 69
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index e501d88..ca69e14 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,106 +1,106 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on 2 CONFIG = qt warn_on
3 TARGET = kopi 3 TARGET = kopi
4OBJECTS_DIR = _obj/ 4OBJECTS_DIR = _obj/
5MOC_DIR = _moc 5MOC_DIR = _moc
6DESTDIR= ../bin 6DESTDIR= ../bin
7 7
8include( ../variables.pri ) 8include( ../variables.pri )
9 9
10INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio 10INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/microkde interfaces $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio
11#../qtcompat 11#../qtcompat
12DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL 12DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL
13DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER 13DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
14#KORG_NOPRINTER KORG_NOKABC 14#KORG_NOPRINTER KORG_NOKABC
15DEFINES += KORG_NOLVALTERNATION 15DEFINES += KORG_NOLVALTERNATION
16DEFINES += DESKTOP_VERSION 16DEFINES += DESKTOP_VERSION
17unix : { 17unix : {
18LIBS += ../bin/libmicrokdepim.so 18LIBS += ../bin/libmicrokdepim.so
19LIBS += ../bin/libmicrokcal.so 19LIBS += ../bin/libmicrokcal.so
20LIBS += ../bin/libmicrokde.so 20LIBS += ../bin/libmicrokde.so
21LIBS += ../bin/libmicrokabc.so 21LIBS += ../bin/libmicrokabc.so
22LIBS += ../bin/libmicrogammu.so 22LIBS += ../bin/libmicrogammu.so
23LIBS += -lbluetooth 23LIBS += -lbluetooth
24LIBS += -lsdp 24LIBS += -lsdp
25 25
26LIBS += -lldap 26LIBS += -lldap
27OBJECTS_DIR = obj/unix 27OBJECTS_DIR = obj/unix
28MOC_DIR = moc/unix 28MOC_DIR = moc/unix
29} 29}
30win32: { 30win32: {
31DEFINES += _WIN32_ 31DEFINES += _WIN32_
32LIBS += ../bin/microkdepim.lib 32LIBS += ../bin/microkdepim.lib
33LIBS += ../bin/microkcal.lib 33LIBS += ../bin/microkcal.lib
34LIBS += ../bin/microkde.lib 34LIBS += ../bin/microkde.lib
35LIBS += ../bin/microkabc.lib 35LIBS += ../bin/microkabc.lib
36LIBS += ../libical/lib/ical.lib 36LIBS += ../libical/lib/ical.lib
37LIBS += ../libical/lib/icalss.lib 37LIBS += ../libical/lib/icalss.lib
38#LIBS += atls.lib 38#LIBS += atls.lib
39LIBS += mfc71u.lib 39LIBS += mfc71u.lib
40QMAKE_LINK += /NODEFAULTLIB:LIBC 40QMAKE_LINK += /NODEFAULTLIB:LIBC
41#QMAKE_LINK += /NODEFAULTLIB:MSVCRT 41#QMAKE_LINK += /NODEFAULTLIB:MSVCRT
42#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib 42#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
43OBJECTS_DIR = obj/win 43OBJECTS_DIR = obj/win
44MOC_DIR = moc/win 44MOC_DIR = moc/win
45} 45}
46 46
47 47
48INTERFACES = kofilterview_base.ui 48INTERFACES = kofilterview_base.ui
49# filteredit_base.ui 49# filteredit_base.ui
50 50
51# kdateedit.h \ 51# kdateedit.h \
52 52
53HEADERS = \ 53HEADERS = \
54 filteredit_base.h \ 54 filteredit_base.h \
55 alarmclient.h \ 55 alarmclient.h \
56 calendarview.h \ 56 calendarview.h \
57 customlistviewitem.h \ 57 customlistviewitem.h \
58 datenavigator.h \ 58 datenavigator.h \
59 docprefs.h \ 59 docprefs.h \
60 filtereditdialog.h \ 60 filtereditdialog.h \
61 incomingdialog.h \ 61 incomingdialog.h \
62 incomingdialog_base.h \ 62 incomingdialog_base.h \
63 interfaces/korganizer/baseview.h \ 63 interfaces/korganizer/baseview.h \
64 interfaces/korganizer/calendarviewbase.h \ 64 interfaces/korganizer/calendarviewbase.h \
65 journalentry.h \ 65 journalentry.h \
66 kdatenavigator.h \ 66 kdatenavigator.h \
67 koagenda.h \ 67 koagenda.h \
68 koagendaitem.h \ 68 koagendaitem.h \
69 koagendaview.h \ 69 koagendaview.h \
70 kocounterdialog.h \ 70 kocounterdialog.h \
71 kodaymatrix.h \ 71 kodaymatrix.h \
72 kodialogmanager.h \ 72 kodialogmanager.h \
73 koeditordetails.h \ 73 koeditordetails.h \
74 koeditorgeneral.h \ 74 koeditorgeneral.h \
75 koeditorgeneralevent.h \ 75 koeditorgeneralevent.h \
76 koeditorgeneraltodo.h \ 76 koeditorgeneraltodo.h \
77 koeditorrecurrence.h \ 77 koeditorrecurrence.h \
78 koeventeditor.h \ 78 koeventeditor.h \
79 koeventpopupmenu.h \ 79 koeventpopupmenu.h \
80 koeventview.h \ 80 koeventview.h \
81 koeventviewer.h \ 81 koeventviewer.h \
82 koeventviewerdialog.h \ 82 koeventviewerdialog.h \
83 kofilterview.h \ 83 kofilterview.h \
84 koglobals.h \ 84 koglobals.h \
85 koincidenceeditor.h \ 85 koincidenceeditor.h \
86 kojournalview.h \ 86 kojournalview.h \
87 kolistview.h \ 87 kolistview.h \
88 kolocationbox.h \ 88 kolocationbox.h \
89 komonthview.h \ 89 komonthview.h \
90 koprefs.h \ 90 koprefs.h \
91 koprefsdialog.h \ 91 koprefsdialog.h \
92 kotimespanview.h \ 92 kotimespanview.h \
93 kotodoeditor.h \ 93 kotodoeditor.h \
94 kotodoview.h \ 94 kotodoview.h \
95 kotodoviewitem.h \ 95 kotodoviewitem.h \
96 koviewmanager.h \ 96 koviewmanager.h \
97 kowhatsnextview.h \ 97 kowhatsnextview.h \
98 ktimeedit.h \ 98 ktimeedit.h \
99 lineview.h \ 99 lineview.h \
100 mainwindow.h \ 100 mainwindow.h \
101 navigatorbar.h \ 101 navigatorbar.h \
102 outgoingdialog.h \ 102 outgoingdialog.h \
103 outgoingdialog_base.h \ 103 outgoingdialog_base.h \
104 publishdialog.h \ 104 publishdialog.h \
105 publishdialog_base.h \ 105 publishdialog_base.h \
106 savetemplatedialog.h \ 106 savetemplatedialog.h \
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro
index b39de35..16c27d1 100644
--- a/korganizer/korganizerE.pro
+++ b/korganizer/korganizerE.pro
@@ -1,115 +1,114 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on 2 CONFIG += qt warn_on
3 TARGET = kopi 3 TARGET = kopi
4OBJECTS_DIR = obj/$(PLATFORM) 4OBJECTS_DIR = obj/$(PLATFORM)
5MOC_DIR = moc/$(PLATFORM) 5MOC_DIR = moc/$(PLATFORM)
6DESTDIR=$(QPEDIR)/bin 6DESTDIR=$(QPEDIR)/bin
7 7
8INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../qtcompat ../ interfaces ../kabc $(QPEDIR)/include 8INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/libkdepim interfaces $(KDEPIMDIR)/kabc $(QPEDIR)/include
9#../libkabcwrap 9
10DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL 10DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL
11DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER 11DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
12DEFINES += KORG_NOLVALTERNATION 12DEFINES += KORG_NOLVALTERNATION
13#KORG_NOKABC 13#KORG_NOKABC
14LIBS += -lmicrokdepim 14LIBS += -lmicrokdepim
15LIBS += -lmicrokcal 15LIBS += -lmicrokcal
16LIBS += -lmicrokde 16LIBS += -lmicrokde
17LIBS += -lmicroqtcompat 17LIBS += -lmicroqtcompat
18LIBS += -lmicrokabc 18LIBS += -lmicrokabc
19#LIBS += -lmicrokabcwrap
20 19
21#LIBS += $(QPEDIR)/lib/gammu 20#LIBS += $(QPEDIR)/lib/gammu
22LIBS += -lmicrogammu 21LIBS += -lmicrogammu
23LIBS += -lbluetooth 22LIBS += -lbluetooth
24LIBS += -lsdp 23LIBS += -lsdp
25 24
26 25
27LIBS += -lqpe 26LIBS += -lqpe
28LIBS += -ljpeg 27LIBS += -ljpeg
29LIBS += $(QTOPIALIB) 28LIBS += $(QTOPIALIB)
30LIBS += -L$(QPEDIR)/lib 29LIBS += -L$(QPEDIR)/lib
31 30
32INTERFACES = kofilterview_base.ui 31INTERFACES = kofilterview_base.ui
33#filteredit_base.ui 32#filteredit_base.ui
34 33
35HEADERS = \ 34HEADERS = \
36 wordsgerman.h \ 35 wordsgerman.h \
37 filteredit_base.h \ 36 filteredit_base.h \
38 alarmclient.h \ 37 alarmclient.h \
39 calendarview.h \ 38 calendarview.h \
40 customlistviewitem.h \ 39 customlistviewitem.h \
41 datenavigator.h \ 40 datenavigator.h \
42 docprefs.h \ 41 docprefs.h \
43 filtereditdialog.h \ 42 filtereditdialog.h \
44 incomingdialog.h \ 43 incomingdialog.h \
45 incomingdialog_base.h \ 44 incomingdialog_base.h \
46 interfaces/korganizer/baseview.h \ 45 interfaces/korganizer/baseview.h \
47 interfaces/korganizer/calendarviewbase.h \ 46 interfaces/korganizer/calendarviewbase.h \
48 journalentry.h \ 47 journalentry.h \
49 kdateedit.h \ 48 kdateedit.h \
50 kdatenavigator.h \ 49 kdatenavigator.h \
51 koagenda.h \ 50 koagenda.h \
52 koagendaitem.h \ 51 koagendaitem.h \
53 koagendaview.h \ 52 koagendaview.h \
54 kocounterdialog.h \ 53 kocounterdialog.h \
55 kodaymatrix.h \ 54 kodaymatrix.h \
56 kodialogmanager.h \ 55 kodialogmanager.h \
57 koeditordetails.h \ 56 koeditordetails.h \
58 koeditorgeneral.h \ 57 koeditorgeneral.h \
59 koeditorgeneralevent.h \ 58 koeditorgeneralevent.h \
60 koeditorgeneraltodo.h \ 59 koeditorgeneraltodo.h \
61 koeditorrecurrence.h \ 60 koeditorrecurrence.h \
62 koeventeditor.h \ 61 koeventeditor.h \
63 koeventpopupmenu.h \ 62 koeventpopupmenu.h \
64 koeventview.h \ 63 koeventview.h \
65 koeventviewer.h \ 64 koeventviewer.h \
66 koeventviewerdialog.h \ 65 koeventviewerdialog.h \
67 kofilterview.h \ 66 kofilterview.h \
68 koglobals.h \ 67 koglobals.h \
69 koincidenceeditor.h \ 68 koincidenceeditor.h \
70 kojournalview.h \ 69 kojournalview.h \
71 kolistview.h \ 70 kolistview.h \
72 kolocationbox.h \ 71 kolocationbox.h \
73 komonthview.h \ 72 komonthview.h \
74 koprefs.h \ 73 koprefs.h \
75 koprefsdialog.h \ 74 koprefsdialog.h \
76 kotimespanview.h \ 75 kotimespanview.h \
77 kotodoeditor.h \ 76 kotodoeditor.h \
78 kotodoview.h \ 77 kotodoview.h \
79 kotodoviewitem.h \ 78 kotodoviewitem.h \
80 koviewmanager.h \ 79 koviewmanager.h \
81 kowhatsnextview.h \ 80 kowhatsnextview.h \
82 ktimeedit.h \ 81 ktimeedit.h \
83 lineview.h \ 82 lineview.h \
84 mainwindow.h \ 83 mainwindow.h \
85 navigatorbar.h \ 84 navigatorbar.h \
86 outgoingdialog.h \ 85 outgoingdialog.h \
87 outgoingdialog_base.h \ 86 outgoingdialog_base.h \
88 publishdialog.h \ 87 publishdialog.h \
89 publishdialog_base.h \ 88 publishdialog_base.h \
90 savetemplatedialog.h \ 89 savetemplatedialog.h \
91 searchdialog.h \ 90 searchdialog.h \
92 simplealarmclient.h \ 91 simplealarmclient.h \
93 statusdialog.h \ 92 statusdialog.h \
94 timeline.h \ 93 timeline.h \
95 timespanview.h \ 94 timespanview.h \
96 version.h \ 95 version.h \
97 ../kalarmd/alarmdialog.h 96 ../kalarmd/alarmdialog.h
98 97
99SOURCES = \ 98SOURCES = \
100 filteredit_base.cpp \ 99 filteredit_base.cpp \
101 calendarview.cpp \ 100 calendarview.cpp \
102 datenavigator.cpp \ 101 datenavigator.cpp \
103 docprefs.cpp \ 102 docprefs.cpp \
104 filtereditdialog.cpp \ 103 filtereditdialog.cpp \
105 incomingdialog.cpp \ 104 incomingdialog.cpp \
106 incomingdialog_base.cpp \ 105 incomingdialog_base.cpp \
107 journalentry.cpp \ 106 journalentry.cpp \
108 kdatenavigator.cpp \ 107 kdatenavigator.cpp \
109 koagenda.cpp \ 108 koagenda.cpp \
110 koagendaitem.cpp \ 109 koagendaitem.cpp \
111 koagendaview.cpp \ 110 koagendaview.cpp \
112 kocounterdialog.cpp \ 111 kocounterdialog.cpp \
113 kodaymatrix.cpp \ 112 kodaymatrix.cpp \
114 kodialogmanager.cpp \ 113 kodialogmanager.cpp \
115 koeditordetails.cpp \ 114 koeditordetails.cpp \
diff --git a/libkcal/libkcal.pro b/libkcal/libkcal.pro
index d02f080..95dd611 100644
--- a/libkcal/libkcal.pro
+++ b/libkcal/libkcal.pro
@@ -1,104 +1,104 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on 2 CONFIG += qt warn_on
3 TARGET = microkcal 3 TARGET = microkcal
4 4
5include( ../variables.pri ) 5include( ../variables.pri )
6 6
7INCLUDEPATH += ../microkde versit ../microkde/kdecore 7INCLUDEPATH += $(KDEPIMDIR)/microkde versit $(KDEPIMDIR)/microkde/kdecore
8#../qtcompat 8
9INCLUDEPATH += ../libical/src/libical 9INCLUDEPATH += ../libical/src/libical
10INCLUDEPATH += ../libical/src/libicalss 10INCLUDEPATH += ../libical/src/libicalss
11DESTDIR = ../bin 11DESTDIR = ../bin
12DEFINES += DESKTOP_VERSION 12DEFINES += DESKTOP_VERSION
13unix: { 13unix: {
14LIBS += ../libical/lib/libical.a 14LIBS += ../libical/lib/libical.a
15LIBS += ../libical/lib/libicalss.a 15LIBS += ../libical/lib/libicalss.a
16OBJECTS_DIR = obj/unix 16OBJECTS_DIR = obj/unix
17MOC_DIR = moc/unix 17MOC_DIR = moc/unix
18} 18}
19win32: { 19win32: {
20DEFINES += _WIN32_ 20DEFINES += _WIN32_
21 21
22LIBS += ../libical/lib/ical.lib 22LIBS += ../libical/lib/ical.lib
23LIBS += ../libical/lib/icalss.lib 23LIBS += ../libical/lib/icalss.lib
24OBJECTS_DIR = obj/win 24OBJECTS_DIR = obj/win
25MOC_DIR = moc/win 25MOC_DIR = moc/win
26 26
27} 27}
28 28
29INTERFACES = \ 29INTERFACES = \
30 30
31HEADERS = \ 31HEADERS = \
32 alarm.h \ 32 alarm.h \
33 attachment.h \ 33 attachment.h \
34 attendee.h \ 34 attendee.h \
35 calendar.h \ 35 calendar.h \
36 calendarlocal.h \ 36 calendarlocal.h \
37 calfilter.h \ 37 calfilter.h \
38 calformat.h \ 38 calformat.h \
39 calstorage.h \ 39 calstorage.h \
40 compat.h \ 40 compat.h \
41 customproperties.h \ 41 customproperties.h \
42 dummyscheduler.h \ 42 dummyscheduler.h \
43 duration.h \ 43 duration.h \
44 event.h \ 44 event.h \
45 exceptions.h \ 45 exceptions.h \
46 filestorage.h \ 46 filestorage.h \
47 freebusy.h \ 47 freebusy.h \
48 icaldrag.h \ 48 icaldrag.h \
49 icalformat.h \ 49 icalformat.h \
50 icalformatimpl.h \ 50 icalformatimpl.h \
51 imipscheduler.h \ 51 imipscheduler.h \
52 incidence.h \ 52 incidence.h \
53 incidencebase.h \ 53 incidencebase.h \
54 journal.h \ 54 journal.h \
55 period.h \ 55 period.h \
56 person.h \ 56 person.h \
57 qtopiaformat.h \ 57 qtopiaformat.h \
58 recurrence.h \ 58 recurrence.h \
59 scheduler.h \ 59 scheduler.h \
60 todo.h \ 60 todo.h \
61 vcaldrag.h \ 61 vcaldrag.h \
62 vcalformat.h \ 62 vcalformat.h \
63 versit/port.h \ 63 versit/port.h \
64 versit/vcc.h \ 64 versit/vcc.h \
65 versit/vobject.h \ 65 versit/vobject.h \
66 phoneformat.h \ 66 phoneformat.h \
67 67
68 68
69 69
70SOURCES = \ 70SOURCES = \
71 alarm.cpp \ 71 alarm.cpp \
72 attachment.cpp \ 72 attachment.cpp \
73 attendee.cpp \ 73 attendee.cpp \
74 calendar.cpp \ 74 calendar.cpp \
75 calendarlocal.cpp \ 75 calendarlocal.cpp \
76 calfilter.cpp \ 76 calfilter.cpp \
77 calformat.cpp \ 77 calformat.cpp \
78 compat.cpp \ 78 compat.cpp \
79 customproperties.cpp \ 79 customproperties.cpp \
80 dummyscheduler.cpp \ 80 dummyscheduler.cpp \
81 duration.cpp \ 81 duration.cpp \
82 event.cpp \ 82 event.cpp \
83 exceptions.cpp \ 83 exceptions.cpp \
84 filestorage.cpp \ 84 filestorage.cpp \
85 freebusy.cpp \ 85 freebusy.cpp \
86 icaldrag.cpp \ 86 icaldrag.cpp \
87 icalformat.cpp \ 87 icalformat.cpp \
88 icalformatimpl.cpp \ 88 icalformatimpl.cpp \
89 imipscheduler.cpp \ 89 imipscheduler.cpp \
90 incidence.cpp \ 90 incidence.cpp \
91 incidencebase.cpp \ 91 incidencebase.cpp \
92 journal.cpp \ 92 journal.cpp \
93 period.cpp \ 93 period.cpp \
94 person.cpp \ 94 person.cpp \
95 qtopiaformat.cpp \ 95 qtopiaformat.cpp \
96 recurrence.cpp \ 96 recurrence.cpp \
97 scheduler.cpp \ 97 scheduler.cpp \
98 todo.cpp \ 98 todo.cpp \
99 vcaldrag.cpp \ 99 vcaldrag.cpp \
100 vcalformat.cpp \ 100 vcalformat.cpp \
101 versit/vcc.c \ 101 versit/vcc.c \
102 versit/vobject.c \ 102 versit/vobject.c \
103 phoneformat.cpp \ 103 phoneformat.cpp \
104 104
diff --git a/libkdepim/categoryeditdialog.h b/libkdepim/categoryeditdialog.h
index 027cb98..4ebc802 100644
--- a/libkdepim/categoryeditdialog.h
+++ b/libkdepim/categoryeditdialog.h
@@ -1,62 +1,62 @@
1/* 1/*
2 This file is part of libkdepim. 2 This file is part of libkdepim.
3 Copyright (c) 2000, 2001, 2002 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2000, 2001, 2002 Cornelius Schumacher <schumacher@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#ifndef KPIM_CATEGORYEDITDIALOG_H 23#ifndef KPIM_CATEGORYEDITDIALOG_H
24#define KPIM_CATEGORYEDITDIALOG_H 24#define KPIM_CATEGORYEDITDIALOG_H
25 25
26#include <libkdepim/categoryeditdialog_base.h> 26#include <categoryeditdialog_base.h>
27 27
28class KPimPrefs; 28class KPimPrefs;
29 29
30namespace KPIM { 30namespace KPIM {
31 31
32class CategoryEditDialog : public CategoryEditDialog_base 32class CategoryEditDialog : public CategoryEditDialog_base
33{ 33{
34 Q_OBJECT 34 Q_OBJECT
35 public: 35 public:
36 CategoryEditDialog( KPimPrefs *prefs, QWidget* parent = 0, 36 CategoryEditDialog( KPimPrefs *prefs, QWidget* parent = 0,
37 const char* name = 0, 37 const char* name = 0,
38 bool modal = FALSE, WFlags fl = 0 ); 38 bool modal = FALSE, WFlags fl = 0 );
39 ~CategoryEditDialog(); 39 ~CategoryEditDialog();
40 40
41 public slots: 41 public slots:
42 void add(); 42 void add();
43 void remove(); 43 void remove();
44 void modify(); 44 void modify();
45 void accept(); 45 void accept();
46 46
47 void slotOk(); 47 void slotOk();
48 void slotApply(); 48 void slotApply();
49 49
50 signals: 50 signals:
51 void categoryConfigChanged(); 51 void categoryConfigChanged();
52 52
53 private slots: 53 private slots:
54 void editItem(QListViewItem *item); 54 void editItem(QListViewItem *item);
55 void slotTextChanged(const QString &text); 55 void slotTextChanged(const QString &text);
56 56
57 KPimPrefs *mPrefs; 57 KPimPrefs *mPrefs;
58}; 58};
59 59
60} 60}
61 61
62#endif 62#endif
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp
index 943d35c..40b46cf 100644
--- a/libkdepim/categoryselectdialog.cpp
+++ b/libkdepim/categoryselectdialog.cpp
@@ -1,127 +1,127 @@
1/* 1/*
2 This file is part of libkdepim. 2 This file is part of libkdepim.
3 Copyright (c) 2000, 2001, 2002 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2000, 2001, 2002 Cornelius Schumacher <schumacher@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#include <qlistview.h> 24#include <qlistview.h>
25#include <qpushbutton.h> 25#include <qpushbutton.h>
26#include <qheader.h> 26#include <qheader.h>
27#include <qapp.h> 27#include <qapp.h>
28#include <qmessagebox.h> 28#include <qmessagebox.h>
29 29
30 30
31#include <libkdepim/categoryeditdialog.h> 31#include "categoryeditdialog.h"
32#include "categoryselectdialog.h" 32#include "categoryselectdialog.h"
33 33
34#include "kpimprefs.h" 34#include "kpimprefs.h"
35 35
36using namespace KPIM; 36using namespace KPIM;
37 37
38CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent, 38CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent,
39 const char* name, 39 const char* name,
40 bool modal, WFlags fl ) 40 bool modal, WFlags fl )
41 : CategorySelectDialog_base( parent, name, true, fl ), 41 : CategorySelectDialog_base( parent, name, true, fl ),
42 mPrefs( prefs ) 42 mPrefs( prefs )
43{ 43{
44 mCategories->header()->hide(); 44 mCategories->header()->hide();
45 45
46 setCategories(); 46 setCategories();
47 47
48 connect(mButtonEdit,SIGNAL(clicked()),this, SLOT(editCategoriesDialog())); 48 connect(mButtonEdit,SIGNAL(clicked()),this, SLOT(editCategoriesDialog()));
49 if ( qApp->desktop()->height() < 321 ) 49 if ( qApp->desktop()->height() < 321 )
50 setMaximumHeight( QApplication::desktop()->height() - 50 ); 50 setMaximumHeight( QApplication::desktop()->height() - 50 );
51 else 51 else
52 setMaximumHeight( QApplication::desktop()->height() - 80 ); 52 setMaximumHeight( QApplication::desktop()->height() - 80 );
53 if ( QApplication::desktop()->width() > 460 ) 53 if ( QApplication::desktop()->width() > 460 )
54 resize( 260, 360 ); 54 resize( 260, 360 );
55} 55}
56void CategorySelectDialog::editCategoriesDialog() 56void CategorySelectDialog::editCategoriesDialog()
57{ 57{
58 KPIM::CategoryEditDialog* ced = new KPIM::CategoryEditDialog(mPrefs,this ); 58 KPIM::CategoryEditDialog* ced = new KPIM::CategoryEditDialog(mPrefs,this );
59 59
60 ced->exec(); 60 ced->exec();
61 delete ced; 61 delete ced;
62 setCategories(); 62 setCategories();
63} 63}
64void CategorySelectDialog::setCategories() 64void CategorySelectDialog::setCategories()
65{ 65{
66 mCategories->clear(); 66 mCategories->clear();
67 mCategoryList.clear(); 67 mCategoryList.clear();
68 68
69 QStringList::Iterator it; 69 QStringList::Iterator it;
70 70
71 for (it = mPrefs->mCustomCategories.begin(); 71 for (it = mPrefs->mCustomCategories.begin();
72 it != mPrefs->mCustomCategories.end(); ++it ) { 72 it != mPrefs->mCustomCategories.end(); ++it ) {
73 new QCheckListItem(mCategories,*it,QCheckListItem::CheckBox); 73 new QCheckListItem(mCategories,*it,QCheckListItem::CheckBox);
74 } 74 }
75} 75}
76 76
77CategorySelectDialog::~CategorySelectDialog() 77CategorySelectDialog::~CategorySelectDialog()
78{ 78{
79} 79}
80 80
81void CategorySelectDialog::setSelected(const QStringList &selList) 81void CategorySelectDialog::setSelected(const QStringList &selList)
82{ 82{
83 clear(); 83 clear();
84 84
85 QStringList::ConstIterator it; 85 QStringList::ConstIterator it;
86 QStringList notFound; 86 QStringList notFound;
87 bool found = false; 87 bool found = false;
88 for (it=selList.begin();it!=selList.end();++it) { 88 for (it=selList.begin();it!=selList.end();++it) {
89 //qDebug(" CategorySelectDialog::setSelected("); 89 //qDebug(" CategorySelectDialog::setSelected(");
90 QCheckListItem *item = (QCheckListItem *)mCategories->firstChild(); 90 QCheckListItem *item = (QCheckListItem *)mCategories->firstChild();
91 while (item) { 91 while (item) {
92 if (item->text() == *it) { 92 if (item->text() == *it) {
93 item->setOn(true); 93 item->setOn(true);
94 found = true; 94 found = true;
95 break; 95 break;
96 } 96 }
97 item = (QCheckListItem *)item->nextSibling(); 97 item = (QCheckListItem *)item->nextSibling();
98 } 98 }
99// if ( ! found ) { 99// if ( ! found ) {
100 100
101//emit updateCategoriesGlobal(); 101//emit updateCategoriesGlobal();
102// QMessageBox::information( this, "KO/E: Information!", 102// QMessageBox::information( this, "KO/E: Information!",
103// "Categories found, which were not\n" 103// "Categories found, which were not\n"
104// "in list of categories!\n" 104// "in list of categories!\n"
105// "message", 105// "message",
106// "OK", "", 0, 106// "OK", "", 0,
107// 0, 1 ); 107// 0, 1 );
108// setSelected(selList); 108// setSelected(selList);
109// return; 109// return;
110// } 110// }
111 } 111 }
112} 112}
113 113
114QStringList CategorySelectDialog::selectedCategories() const 114QStringList CategorySelectDialog::selectedCategories() const
115{ 115{
116 return mCategoryList; 116 return mCategoryList;
117} 117}
118 118
119void CategorySelectDialog::slotApply() 119void CategorySelectDialog::slotApply()
120{ 120{
121 QStringList categories; 121 QStringList categories;
122 QCheckListItem *item = (QCheckListItem *)mCategories->firstChild(); 122 QCheckListItem *item = (QCheckListItem *)mCategories->firstChild();
123 while (item) { 123 while (item) {
124 if (item->isOn()) { 124 if (item->isOn()) {
125 categories.append(item->text()); 125 categories.append(item->text());
126 } 126 }
127 item = (QCheckListItem *)item->nextSibling(); 127 item = (QCheckListItem *)item->nextSibling();
diff --git a/libkdepim/categoryselectdialog.h b/libkdepim/categoryselectdialog.h
index 8507dc4..9b6261c 100644
--- a/libkdepim/categoryselectdialog.h
+++ b/libkdepim/categoryselectdialog.h
@@ -1,69 +1,69 @@
1/* 1/*
2 This file is part of libkdepim. 2 This file is part of libkdepim.
3 Copyright (c) 2000, 2001, 2002 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2000, 2001, 2002 Cornelius Schumacher <schumacher@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#ifndef KPIM_CATEGORYSELECTDIALOG_H 23#ifndef KPIM_CATEGORYSELECTDIALOG_H
24#define KPIM_CATEGORYSELECTDIALOG_H 24#define KPIM_CATEGORYSELECTDIALOG_H
25 25
26#include <libkdepim/categoryselectdialog_base.h> 26#include <categoryselectdialog_base.h>
27 27
28class KPimPrefs; 28class KPimPrefs;
29 29
30namespace KPIM { 30namespace KPIM {
31 31
32class CategorySelectDialog : public CategorySelectDialog_base 32class CategorySelectDialog : public CategorySelectDialog_base
33{ 33{
34 Q_OBJECT 34 Q_OBJECT
35 public: 35 public:
36 CategorySelectDialog( KPimPrefs *prefs, QWidget* parent = 0, 36 CategorySelectDialog( KPimPrefs *prefs, QWidget* parent = 0,
37 const char* name = 0, 37 const char* name = 0,
38 bool modal = FALSE, WFlags fl = 0 ); 38 bool modal = FALSE, WFlags fl = 0 );
39 ~CategorySelectDialog(); 39 ~CategorySelectDialog();
40 40
41 void setCategories(); 41 void setCategories();
42 void setSelected(const QStringList &selList); 42 void setSelected(const QStringList &selList);
43 43
44 QStringList selectedCategories() const; 44 QStringList selectedCategories() const;
45 45
46 public slots: 46 public slots:
47 void slotOk(); 47 void slotOk();
48 void slotApply(); 48 void slotApply();
49 void clear(); 49 void clear();
50 void accept(); 50 void accept();
51 void editCategoriesDialog(); 51 void editCategoriesDialog();
52 void updateCategoryConfig(); 52 void updateCategoryConfig();
53 53
54 signals: 54 signals:
55 void categoriesSelected(const QString &); 55 void categoriesSelected(const QString &);
56 void categoriesSelected(const QStringList &); 56 void categoriesSelected(const QStringList &);
57 void editCategories(); 57 void editCategories();
58 58
59 private: 59 private:
60 KPimPrefs *mPrefs; 60 KPimPrefs *mPrefs;
61 QStringList mCategoryList; 61 QStringList mCategoryList;
62 62
63 class CategorySelectDialogPrivate; 63 class CategorySelectDialogPrivate;
64 CategorySelectDialogPrivate *d; 64 CategorySelectDialogPrivate *d;
65}; 65};
66 66
67} 67}
68 68
69#endif 69#endif
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro
index 060145e..d1d52a4 100644
--- a/libkdepim/libkdepim.pro
+++ b/libkdepim/libkdepim.pro
@@ -1,59 +1,59 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG = qt warn_on 2 CONFIG = qt warn_on
3DEFINES +=KORG_NOKABC 3DEFINES +=KORG_NOKABC
4TARGET = microkdepim 4TARGET = microkdepim
5INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kdeui . .. 5INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui
6DESTDIR=../bin 6DESTDIR=../bin
7 7
8DEFINES += DESKTOP_VERSION 8DEFINES += DESKTOP_VERSION
9include( ../variables.pri ) 9include( ../variables.pri )
10unix : { 10unix : {
11OBJECTS_DIR = obj/unix 11OBJECTS_DIR = obj/unix
12MOC_DIR = moc/unix 12MOC_DIR = moc/unix
13} 13}
14win32: { 14win32: {
15DEFINES += _WIN32_ 15DEFINES += _WIN32_
16OBJECTS_DIR = obj/win 16OBJECTS_DIR = obj/win
17MOC_DIR = moc/win 17MOC_DIR = moc/win
18} 18}
19INTERFACES = \ 19INTERFACES = \
20 20
21HEADERS = \ 21HEADERS = \
22 categoryeditdialog.h \ 22 categoryeditdialog.h \
23 categoryeditdialog_base.h \ 23 categoryeditdialog_base.h \
24 categoryselectdialog.h \ 24 categoryselectdialog.h \
25 categoryselectdialog_base.h \ 25 categoryselectdialog_base.h \
26 externalapphandler.h \ 26 externalapphandler.h \
27 kdateedit.h \ 27 kdateedit.h \
28 kdatepicker.h \ 28 kdatepicker.h \
29 kinputdialog.h \ 29 kinputdialog.h \
30 kincidenceformatter.h \ 30 kincidenceformatter.h \
31 kpimprefs.h \ 31 kpimprefs.h \
32 kpimglobalprefs.h \ 32 kpimglobalprefs.h \
33 kprefsdialog.h \ 33 kprefsdialog.h \
34 addresseeview.h \ 34 addresseeview.h \
35 ksyncprofile.h \ 35 ksyncprofile.h \
36 ksyncprefsdialog.h \ 36 ksyncprefsdialog.h \
37 kcmconfigs/kcmkdepimconfig.h \ 37 kcmconfigs/kcmkdepimconfig.h \
38 kcmconfigs/kdepimconfigwidget.h 38 kcmconfigs/kdepimconfigwidget.h
39 39
40SOURCES = \ 40SOURCES = \
41 categoryeditdialog.cpp \ 41 categoryeditdialog.cpp \
42 categoryeditdialog_base.cpp \ 42 categoryeditdialog_base.cpp \
43 categoryselectdialog.cpp \ 43 categoryselectdialog.cpp \
44 categoryselectdialog_base.cpp \ 44 categoryselectdialog_base.cpp \
45 externalapphandler.cpp \ 45 externalapphandler.cpp \
46 kdateedit.cpp \ 46 kdateedit.cpp \
47 kdatepicker.cpp \ 47 kdatepicker.cpp \
48 kinputdialog.cpp \ 48 kinputdialog.cpp \
49 kincidenceformatter.cpp \ 49 kincidenceformatter.cpp \
50 kpimprefs.cpp \ 50 kpimprefs.cpp \
51 kpimglobalprefs.cpp \ 51 kpimglobalprefs.cpp \
52 kprefsdialog.cpp \ 52 kprefsdialog.cpp \
53 addresseeview.cpp \ 53 addresseeview.cpp \
54 ksyncprofile.cpp \ 54 ksyncprofile.cpp \
55 ksyncprefsdialog.cpp \ 55 ksyncprefsdialog.cpp \
56 kcmconfigs/kcmkdepimconfig.cpp \ 56 kcmconfigs/kcmkdepimconfig.cpp \
57 kcmconfigs/kdepimconfigwidget.cpp 57 kcmconfigs/kdepimconfigwidget.cpp
58 58
59 59
diff --git a/libkdepim/libkdepimE.pro b/libkdepim/libkdepimE.pro
index 196044b..b455a3e 100644
--- a/libkdepim/libkdepimE.pro
+++ b/libkdepim/libkdepimE.pro
@@ -1,54 +1,53 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on 2 CONFIG += qt warn_on
3TARGET = microkdepim 3TARGET = microkdepim
4INCLUDEPATH += ../microkde ../qtcompat ../microkde/kdecore ../microkde/kdeui $(QPEDIR)/include 4INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include
5INCLUDEPATH += . ..
6LIBS += -lmicrokde 5LIBS += -lmicrokde
7LIBS += -lmicrokcal 6LIBS += -lmicrokcal
8LIBS += -L$(QPEDIR)/lib 7LIBS += -L$(QPEDIR)/lib
9OBJECTS_DIR = obj/$(PLATFORM) 8OBJECTS_DIR = obj/$(PLATFORM)
10MOC_DIR = moc/$(PLATFORM) 9MOC_DIR = moc/$(PLATFORM)
11DESTDIR=$(QPEDIR)/lib 10DESTDIR=$(QPEDIR)/lib
12 11
13 12
14INTERFACES = \ 13INTERFACES = \
15 14
16HEADERS = \ 15HEADERS = \
17 categoryeditdialog.h \ 16 categoryeditdialog.h \
18 categoryeditdialog_base.h \ 17 categoryeditdialog_base.h \
19 categoryselectdialog.h \ 18 categoryselectdialog.h \
20 categoryselectdialog_base.h \ 19 categoryselectdialog_base.h \
21 externalapphandler.h \ 20 externalapphandler.h \
22 kdateedit.h \ 21 kdateedit.h \
23 kdatepicker.h \ 22 kdatepicker.h \
24 kinputdialog.h \ 23 kinputdialog.h \
25 kincidenceformatter.h \ 24 kincidenceformatter.h \
26 kpimprefs.h \ 25 kpimprefs.h \
27 kpimglobalprefs.h \ 26 kpimglobalprefs.h \
28 kprefsdialog.h \ 27 kprefsdialog.h \
29 addresseeview.h \ 28 addresseeview.h \
30 ksyncprofile.h \ 29 ksyncprofile.h \
31 ksyncprefsdialog.h \ 30 ksyncprefsdialog.h \
32 kcmconfigs/kcmkdepimconfig.h \ 31 kcmconfigs/kcmkdepimconfig.h \
33 kcmconfigs/kdepimconfigwidget.h 32 kcmconfigs/kdepimconfigwidget.h
34 33
35 34
36 35
37SOURCES = \ 36SOURCES = \
38 categoryeditdialog.cpp \ 37 categoryeditdialog.cpp \
39 categoryeditdialog_base.cpp \ 38 categoryeditdialog_base.cpp \
40 categoryselectdialog.cpp \ 39 categoryselectdialog.cpp \
41 categoryselectdialog_base.cpp \ 40 categoryselectdialog_base.cpp \
42 externalapphandler.cpp \ 41 externalapphandler.cpp \
43 kdateedit.cpp \ 42 kdateedit.cpp \
44 kinputdialog.cpp \ 43 kinputdialog.cpp \
45 kdatepicker.cpp \ 44 kdatepicker.cpp \
46 kincidenceformatter.cpp \ 45 kincidenceformatter.cpp \
47 kpimprefs.cpp \ 46 kpimprefs.cpp \
48 kpimglobalprefs.cpp \ 47 kpimglobalprefs.cpp \
49 kprefsdialog.cpp \ 48 kprefsdialog.cpp \
50 addresseeview.cpp \ 49 addresseeview.cpp \
51 ksyncprofile.cpp \ 50 ksyncprofile.cpp \
52 ksyncprefsdialog.cpp \ 51 ksyncprefsdialog.cpp \
53 kcmconfigs/kcmkdepimconfig.cpp \ 52 kcmconfigs/kcmkdepimconfig.cpp \
54 kcmconfigs/kdepimconfigwidget.cpp 53 kcmconfigs/kdepimconfigwidget.cpp
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 71d662b..f132e9a 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -1,102 +1,99 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on 2 CONFIG += qt warn_on
3#INCLUDEPATH += $(QTDIR)/include . 3INCLUDEPATH += . $(KDEPIMDIR)/kabc kdecore kdeui kio/kfile kio/kio
4#DEPENDPATH += $(QTDIR)/include
5INCLUDEPATH += . ../ ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio
6#LIBS += -lqtcompat
7 4
8 TARGET = microkde 5 TARGET = microkde
9DESTDIR= ../bin 6DESTDIR= ../bin
10DEFINES += DESKTOP_VERSION KDE_QT_ONLY 7DEFINES += DESKTOP_VERSION KDE_QT_ONLY
11unix : { 8unix : {
12OBJECTS_DIR = obj/unix 9OBJECTS_DIR = obj/unix
13MOC_DIR = moc/unix 10MOC_DIR = moc/unix
14} 11}
15win32: { 12win32: {
16DEFINES += _WIN32_ 13DEFINES += _WIN32_
17OBJECTS_DIR = obj/win 14OBJECTS_DIR = obj/win
18MOC_DIR = moc/win 15MOC_DIR = moc/win
19} 16}
20include( ../variables.pri ) 17include( ../variables.pri )
21 18
22 19
23 20
24HEADERS = \ 21HEADERS = \
25qlayoutengine_p.h \ 22qlayoutengine_p.h \
26KDGanttMinimizeSplitter.h \ 23KDGanttMinimizeSplitter.h \
27 kapplication.h \ 24 kapplication.h \
28 kaudioplayer.h \ 25 kaudioplayer.h \
29 kcalendarsystem.h \ 26 kcalendarsystem.h \
30 kcalendarsystemgregorian.h \ 27 kcalendarsystemgregorian.h \
31 kcolorbutton.h \ 28 kcolorbutton.h \
32 kcolordialog.h \ 29 kcolordialog.h \
33 kcombobox.h \ 30 kcombobox.h \
34 kconfig.h \ 31 kconfig.h \
35 kdatetbl.h \ 32 kdatetbl.h \
36 kdebug.h \ 33 kdebug.h \
37 kdialog.h \ 34 kdialog.h \
38 kdialogbase.h \ 35 kdialogbase.h \
39 keditlistbox.h \ 36 keditlistbox.h \
40 kemailsettings.h \ 37 kemailsettings.h \
41 kfiledialog.h \ 38 kfiledialog.h \
42 kfontdialog.h \ 39 kfontdialog.h \
43 kglobal.h \ 40 kglobal.h \
44 kglobalsettings.h \ 41 kglobalsettings.h \
45 kiconloader.h \ 42 kiconloader.h \
46 klineedit.h \ 43 klineedit.h \
47 klineeditdlg.h \ 44 klineeditdlg.h \
48 kmessagebox.h \ 45 kmessagebox.h \
49 knotifyclient.h \ 46 knotifyclient.h \
50 kprinter.h \ 47 kprinter.h \
51 kprocess.h \ 48 kprocess.h \
52 krestrictedline.h \ 49 krestrictedline.h \
53 krun.h \ 50 krun.h \
54 ksimpleconfig.h \ 51 ksimpleconfig.h \
55 kstaticdeleter.h \ 52 kstaticdeleter.h \
56 ksystemtray.h \ 53 ksystemtray.h \
57 ktempfile.h \ 54 ktempfile.h \
58 ktextedit.h \ 55 ktextedit.h \
59 kunload.h \ 56 kunload.h \
60 kurl.h \ 57 kurl.h \
61 kdeui/kguiitem.h \ 58 kdeui/kguiitem.h \
62 kdeui/kcmodule.h \ 59 kdeui/kcmodule.h \
63 kdeui/kbuttonbox.h \ 60 kdeui/kbuttonbox.h \
64 kdeui/klistbox.h \ 61 kdeui/klistbox.h \
65 kdeui/klistview.h \ 62 kdeui/klistview.h \
66 kdeui/kjanuswidget.h \ 63 kdeui/kjanuswidget.h \
67 kdeui/kseparator.h \ 64 kdeui/kseparator.h \
68 kdeui/knuminput.h \ 65 kdeui/knuminput.h \
69 kdeui/knumvalidator.h \ 66 kdeui/knumvalidator.h \
70 kdeui/ksqueezedtextlabel.h \ 67 kdeui/ksqueezedtextlabel.h \
71 kio/job.h \ 68 kio/job.h \
72 kio/kio/kdirwatch.h \ 69 kio/kio/kdirwatch.h \
73 kio/kio/kdirwatch_p.h \ 70 kio/kio/kdirwatch_p.h \
74 kio/kfile/kurlrequester.h \ 71 kio/kfile/kurlrequester.h \
75 kresources/resource.h \ 72 kresources/resource.h \
76 kresources/factory.h \ 73 kresources/factory.h \
77 kresources/managerimpl.h \ 74 kresources/managerimpl.h \
78 kresources/manager.h \ 75 kresources/manager.h \
79 kresources/selectdialog.h \ 76 kresources/selectdialog.h \
80 kresources/configpage.h \ 77 kresources/configpage.h \
81 kresources/configwidget.h \ 78 kresources/configwidget.h \
82 kresources/configdialog.h \ 79 kresources/configdialog.h \
83 kresources/kcmkresources.h \ 80 kresources/kcmkresources.h \
84 kresources/syncwidget.h \ 81 kresources/syncwidget.h \
85 kdecore/kmdcodec.h \ 82 kdecore/kmdcodec.h \
86 kdecore/kconfigbase.h \ 83 kdecore/kconfigbase.h \
87 kdecore/klocale.h \ 84 kdecore/klocale.h \
88 kdecore/kcatalogue.h \ 85 kdecore/kcatalogue.h \
89 kdecore/ksharedptr.h \ 86 kdecore/ksharedptr.h \
90 kdecore/kshell.h \ 87 kdecore/kshell.h \
91 kdecore/kstandarddirs.h \ 88 kdecore/kstandarddirs.h \
92 kdecore/kstringhandler.h \ 89 kdecore/kstringhandler.h \
93 kdecore/kshortcut.h \ 90 kdecore/kshortcut.h \
94 kutils/kcmultidialog.h \ 91 kutils/kcmultidialog.h \
95 kdeui/kxmlguiclient.h \ 92 kdeui/kxmlguiclient.h \
96 kdeui/kstdaction.h \ 93 kdeui/kstdaction.h \
97 kdeui/kmainwindow.h \ 94 kdeui/kmainwindow.h \
98 kdeui/ktoolbar.h \ 95 kdeui/ktoolbar.h \
99 kdeui/ktoolbarbutton.h \ 96 kdeui/ktoolbarbutton.h \
100 kdeui/ktoolbarhandler.h \ 97 kdeui/ktoolbarhandler.h \
101 kdeui/kaction.h \ 98 kdeui/kaction.h \
102 kdeui/kactionclasses.h \ 99 kdeui/kactionclasses.h \
diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro
index fc80c03..df914ce 100644
--- a/microkde/microkdeE.pro
+++ b/microkde/microkdeE.pro
@@ -1,99 +1,99 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3INCLUDEPATH += . ../qtcompat ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio $(QPEDIR)/include 3INCLUDEPATH += . $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/kabc kdecore kdeui kio/kfile kio/kio $(QPEDIR)/include
4 4
5DEPENDPATH += $(QPEDIR)/include 5DEPENDPATH += $(QPEDIR)/include
6LIBS += -lmicroqtcompat -L$(QPEDIR)/lib 6LIBS += -lmicroqtcompat -L$(QPEDIR)/lib
7 7
8DEFINES += KDE_QT_ONLY 8DEFINES += KDE_QT_ONLY
9 9
10 TARGET = microkde 10 TARGET = microkde
11OBJECTS_DIR = obj/$(PLATFORM) 11OBJECTS_DIR = obj/$(PLATFORM)
12MOC_DIR = moc/$(PLATFORM) 12MOC_DIR = moc/$(PLATFORM)
13DESTDIR=$(QPEDIR)/lib 13DESTDIR=$(QPEDIR)/lib
14 14
15 15
16INTERFACES = \ 16INTERFACES = \
17 17
18HEADERS = \ 18HEADERS = \
19qlayoutengine_p.h \ 19qlayoutengine_p.h \
20KDGanttMinimizeSplitter.h \ 20KDGanttMinimizeSplitter.h \
21 kapplication.h \ 21 kapplication.h \
22 kaudioplayer.h \ 22 kaudioplayer.h \
23 kcalendarsystem.h \ 23 kcalendarsystem.h \
24 kcalendarsystemgregorian.h \ 24 kcalendarsystemgregorian.h \
25 kcolorbutton.h \ 25 kcolorbutton.h \
26 kcolordialog.h \ 26 kcolordialog.h \
27 kcombobox.h \ 27 kcombobox.h \
28 kconfig.h \ 28 kconfig.h \
29 kdatetbl.h \ 29 kdatetbl.h \
30 kdebug.h \ 30 kdebug.h \
31 kdialog.h \ 31 kdialog.h \
32 kdialogbase.h \ 32 kdialogbase.h \
33 keditlistbox.h \ 33 keditlistbox.h \
34 kemailsettings.h \ 34 kemailsettings.h \
35 kfiledialog.h \ 35 kfiledialog.h \
36 kfontdialog.h \ 36 kfontdialog.h \
37 kglobal.h \ 37 kglobal.h \
38 kglobalsettings.h \ 38 kglobalsettings.h \
39 kiconloader.h \ 39 kiconloader.h \
40 klineedit.h \ 40 klineedit.h \
41 klineeditdlg.h \ 41 klineeditdlg.h \
42 kmessagebox.h \ 42 kmessagebox.h \
43 knotifyclient.h \ 43 knotifyclient.h \
44 kprinter.h \ 44 kprinter.h \
45 kprocess.h \ 45 kprocess.h \
46 krestrictedline.h \ 46 krestrictedline.h \
47 krun.h \ 47 krun.h \
48 ksimpleconfig.h \ 48 ksimpleconfig.h \
49 kstaticdeleter.h \ 49 kstaticdeleter.h \
50 ksystemtray.h \ 50 ksystemtray.h \
51 ktempfile.h \ 51 ktempfile.h \
52 ktextedit.h \ 52 ktextedit.h \
53 kunload.h \ 53 kunload.h \
54 kurl.h \ 54 kurl.h \
55 ofileselector_p.h \ 55 ofileselector_p.h \
56 ofontselector.h \ 56 ofontselector.h \
57oprocctrl.h \ 57oprocctrl.h \
58oprocess.h \ 58oprocess.h \
59osmartpointer.h \ 59osmartpointer.h \
60 kdeui/kguiitem.h \ 60 kdeui/kguiitem.h \
61 kdeui/kaction.h \ 61 kdeui/kaction.h \
62 kdeui/kactionclasses.h \ 62 kdeui/kactionclasses.h \
63 kdeui/kactioncollection.h \ 63 kdeui/kactioncollection.h \
64 kdeui/kcmodule.h \ 64 kdeui/kcmodule.h \
65 kdeui/kstdaction.h \ 65 kdeui/kstdaction.h \
66 kdeui/kbuttonbox.h \ 66 kdeui/kbuttonbox.h \
67 kdeui/klistbox.h \ 67 kdeui/klistbox.h \
68 kdeui/klistview.h \ 68 kdeui/klistview.h \
69 kdeui/kjanuswidget.h \ 69 kdeui/kjanuswidget.h \
70 kdeui/kseparator.h \ 70 kdeui/kseparator.h \
71 kdeui/kmainwindow.h \ 71 kdeui/kmainwindow.h \
72 kdeui/knuminput.h \ 72 kdeui/knuminput.h \
73 kdeui/knumvalidator.h \ 73 kdeui/knumvalidator.h \
74 kdeui/ksqueezedtextlabel.h \ 74 kdeui/ksqueezedtextlabel.h \
75 kdeui/ktoolbar.h \ 75 kdeui/ktoolbar.h \
76 kdeui/ktoolbarbutton.h \ 76 kdeui/ktoolbarbutton.h \
77 kdeui/ktoolbarhandler.h \ 77 kdeui/ktoolbarhandler.h \
78 kdeui/kxmlguiclient.h \ 78 kdeui/kxmlguiclient.h \
79 kio/job.h \ 79 kio/job.h \
80 kio/kio/kdirwatch.h \ 80 kio/kio/kdirwatch.h \
81 kio/kio/kdirwatch_p.h \ 81 kio/kio/kdirwatch_p.h \
82 kio/kfile/kurlrequester.h \ 82 kio/kfile/kurlrequester.h \
83 kresources/resource.h \ 83 kresources/resource.h \
84 kresources/factory.h \ 84 kresources/factory.h \
85 kresources/managerimpl.h \ 85 kresources/managerimpl.h \
86 kresources/manager.h \ 86 kresources/manager.h \
87 kresources/selectdialog.h \ 87 kresources/selectdialog.h \
88 kresources/configpage.h \ 88 kresources/configpage.h \
89 kresources/configwidget.h \ 89 kresources/configwidget.h \
90 kresources/configdialog.h \ 90 kresources/configdialog.h \
91 kresources/kcmkresources.h \ 91 kresources/kcmkresources.h \
92 kresources/syncwidget.h \ 92 kresources/syncwidget.h \
93 kdecore/kmdcodec.h \ 93 kdecore/kmdcodec.h \
94 kdecore/kconfigbase.h \ 94 kdecore/kconfigbase.h \
95 kdecore/klocale.h \ 95 kdecore/klocale.h \
96 kdecore/klibloader.h \ 96 kdecore/klibloader.h \
97 kdecore/kcatalogue.h \ 97 kdecore/kcatalogue.h \
98 kdecore/kprefs.h \ 98 kdecore/kprefs.h \
99 kdecore/ksharedptr.h \ 99 kdecore/ksharedptr.h \