summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile566
-rw-r--r--kabc/plugins/dir/dir.pro2
-rw-r--r--kabc/plugins/file/file.pro2
-rw-r--r--kabc/plugins/qtopia/qtopia.pro2
-rw-r--r--kaddressbook/kaddressbook.pro11
-rw-r--r--korganizer/korganizer.pro14
-rw-r--r--microkde/kresources/factory.cpp26
-rw-r--r--microkde/kresources/managerimpl.cpp2
-rw-r--r--microkde/microkde.pro8
9 files changed, 246 insertions, 387 deletions
diff --git a/Makefile b/Makefile
index 594d47d..b873179 100644
--- a/Makefile
+++ b/Makefile
@@ -1,385 +1,183 @@
1export KDEPIMDIR = $(shell pwd) 1#############################################################################
2 2# Makefile for building: kdepim-desktop
3export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < version) 3# Generated by qmake (1.07a) (Qt 3.3.4) on: Sun Apr 3 21:52:20 2005
4 4# Project: kdepim-desktop.pro
5ifeq ($(PLATFORM) , zaurus) 5# Template: subdirs
6 BUILD_NO_LDAP_PLUGIN=1 6# Command: $(QMAKE) -o Makefile kdepim-desktop.pro
7endif 7#############################################################################
8 8
9ifneq ($(PLATFORM) , zaurus) 9 MAKEFILE =Makefile
10 BUILD_NO_SHARP_PLUGIN=1 10 QMAKE =qmake
11endif 11DEL_FILE = rm -f
12 12CHK_DIR_EXISTS= test -d
13#opie plugin is deprecated. The qtopia plugin handles the task from now on. 13MKDIR = mkdir -p
14BUILD_NO_OPIE_PLUGIN=1 14INSTALL_FILE=
15 15INSTALL_DIR =
16SUBDIRS_MICROKDE = \ 16 SUBTARGETS = \
17 libical/src/libical \ 17 sub-libical \
18 libical/src/libicalss \ 18 sub-libkcal \
19 qtcompat \ 19 sub-kabc \
20 microkde \ 20 sub-libkdepim \
21 libkcal \ 21 sub-microkde \
22 libkdepim \ 22 sub-korganizer \
23 kabc \ 23 sub-kaddressbook \
24 kabc/formats/binary \ 24 sub-kabc-plugins-file \
25 kabc/plugins/file \ 25 sub-kabc-plugins-dir \
26 kabc/plugins/dir \ 26 sub-kabc-plugins-qtopia \
27 korganizer \ 27 sub-gammu-emb-common \
28 kalarmd \ 28 sub-gammu-emb-gammu
29 kaddressbook 29
30 30first: all
31SUBDIRS_QTOPIA_PLUGIN = \ 31
32 kabc/plugins/qtopia 32all: Makefile $(SUBTARGETS)
33 33
34SUBDIRS_OPIE_PLUGIN = \ 34libical/$(MAKEFILE):
35 kabc/plugins/opie 35 @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
36 36 cd libical && $(QMAKE) libical.pro -o $(MAKEFILE)
37SUBDIRS_SHARP_PLUGIN = \ 37sub-libical: libical/$(MAKEFILE) FORCE
38 kabc/plugins/sharpdtm 38 cd libical && $(MAKE) -f $(MAKEFILE)
39 39
40SUBDIRS_LDAP_PLUGIN = \ 40libkcal/$(MAKEFILE):
41 kabc/plugins/ldap 41 @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
42 42 cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE)
43SUBDIRS_MICROMAIL = \ 43sub-libkcal: libkcal/$(MAKEFILE) FORCE
44 libetpan \ 44 cd libkcal && $(MAKE) -f $(MAKEFILE)
45 kmicromail/libmailwrapper \ 45
46 kmicromail 46kabc/$(MAKEFILE):
47 47 @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
48SUBDIRS_GAMMU = \ 48 cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE)
49 gammu/emb/common \ 49sub-kabc: kabc/$(MAKEFILE) FORCE
50 gammu/emb/gammu 50 cd kabc && $(MAKE) -f $(MAKEFILE)
51 51
52SUBDIRS_PWMANAGER = \ 52libkdepim/$(MAKEFILE):
53 pwmanager/libcrypt/mpi \ 53 @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
54 pwmanager/libcrypt/error \ 54 cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE)
55 pwmanager/libcrypt/cipher \ 55sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
56 pwmanager/libcrypt/zlib \ 56 cd libkdepim && $(MAKE) -f $(MAKEFILE)
57 pwmanager/pwmanager 57
58 58microkde/$(MAKEFILE):
59SUBDIRS = \ 59 @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
60 $(SUBDIRS_MICROKDE) \ 60 cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE)
61 $(SUBDIRS_QTOPIA_PLUGIN) \ 61sub-microkde: microkde/$(MAKEFILE) FORCE
62 $(SUBDIRS_OPIE_PLUGIN) \ 62 cd microkde && $(MAKE) -f $(MAKEFILE)
63 $(SUBDIRS_SHARP_PLUGIN) \ 63
64 $(SUBDIRS_LDAP_PLUGIN) \ 64korganizer/$(MAKEFILE):
65 $(SUBDIRS_MICROMAIL) \ 65 @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
66 $(SUBDIRS_GAMMU) \ 66 cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE)
67 $(SUBDIRS_PWMANAGER) 67sub-korganizer: korganizer/$(MAKEFILE) FORCE
68 68 cd korganizer && $(MAKE) -f $(MAKEFILE)
69 69
70all: build_microkde \ 70kaddressbook/$(MAKEFILE):
71 build_qtopia_plugin \ 71 @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
72 build_opie_plugin \ 72 cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE)
73 build_sharp_plugin \ 73sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
74 build_ldap_plugin \ 74 cd kaddressbook && $(MAKE) -f $(MAKEFILE)
75 build_micromail \ 75
76 build_gammu \ 76kabc/plugins/file/$(MAKEFILE):
77 build_pwmanager 77 @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
78 78 cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE)
79 79sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
80build_microkde: variable_test tmake 80 cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
81 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ 81
82 make -f Makefile$(PLATFORM) || exit 1; popd; \ 82kabc/plugins/dir/$(MAKEFILE):
83 done 83 @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
84 84 cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE)
85build_qtopia_plugin: build_microkde 85sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
86 ifdef BUILD_NO_QTOPIA_PLUGIN 86 cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
87 @echo == qtopia plugin not build. 87
88 else 88kabc/plugins/qtopia/$(MAKEFILE):
89 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ 89 @$(CHK_DIR_EXISTS) "kabc/plugins/qtopia" || $(MKDIR) "kabc/plugins/qtopia"
90 make -f Makefile$(PLATFORM) || exit 1; popd; \ 90 cd kabc/plugins/qtopia && $(QMAKE) qtopia.pro -o $(MAKEFILE)
91 done 91sub-kabc-plugins-qtopia: kabc/plugins/qtopia/$(MAKEFILE) FORCE
92 endif 92 cd kabc/plugins/qtopia && $(MAKE) -f $(MAKEFILE)
93 93
94build_opie_plugin: build_microkde 94gammu/emb/common/$(MAKEFILE):
95 ifdef BUILD_NO_OPIE_PLUGIN 95 @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common"
96 @echo == opie plugin not build. 96 cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE)
97 else 97sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE
98 for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \ 98 cd gammu/emb/common && $(MAKE) -f $(MAKEFILE)
99 make -f Makefile$(PLATFORM) || exit 1; popd; \ 99
100 done 100gammu/emb/gammu/$(MAKEFILE):
101 endif 101 @$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu"
102 102 cd gammu/emb/gammu && $(QMAKE) gammu.pro -o $(MAKEFILE)
103build_sharp_plugin: build_microkde 103sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE
104 ifdef BUILD_NO_SHARP_PLUGIN 104 cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE)
105 @echo == ldap plugin not build. 105
106 else 106Makefile: kdepim-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf variables.pri
107 for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \ 107 $(QMAKE) -o Makefile kdepim-desktop.pro
108 make -f Makefile$(PLATFORM) || exit 1; popd; \ 108qmake: qmake_all
109 done 109 @$(QMAKE) -o Makefile kdepim-desktop.pro
110 endif 110
111 111all: $(SUBTARGETS)
112build_ldap_plugin: build_microkde 112qmake_all: libical/$(MAKEFILE) libkcal/$(MAKEFILE) kabc/$(MAKEFILE) libkdepim/$(MAKEFILE) microkde/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE) kabc/plugins/qtopia/$(MAKEFILE) gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE)
113 ifdef BUILD_NO_LDAP_PLUGIN 113 ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
114 @echo == ldap plugin not build. 114 ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
115 else 115 ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
116 for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \ 116 ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
117 make -f Makefile$(PLATFORM) || exit 1; popd; \ 117 ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
118 done 118 ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
119 endif 119 ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
120 120 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
121 121 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
122build_micromail: build_microkde 122 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
123 ifdef BUILD_NO_MICROMAIL 123 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
124 @echo == kmicromail not build. 124 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
125 else 125clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
126 for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \ 126 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
127 make -f Makefile$(PLATFORM) || exit 1; popd; \ 127 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
128 done 128 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true
129 endif 129 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
130 130 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
131build_gammu: variable_test tmake 131 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true
132 ifdef BUILD_NO_GAMMU 132 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true
133 @echo == gammu not build. 133 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
134 else 134 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true
135 for i in $(SUBDIRS_GAMMU); do pushd $$i; \ 135 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; ) || true
136 make -f Makefile$(PLATFORM) || exit 1; popd; \ 136 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true
137 done 137 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true
138 endif 138uninstall_subdirs: qmake_all FORCE
139 139 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
140build_pwmanager: build_microkde 140 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
141 ifdef BUILD_NO_PWMANAGER 141 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
142 @echo == pwmanager not build. 142 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
143 else 143 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
144 for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \ 144 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
145 make -f Makefile$(PLATFORM) || exit 1; popd; \ 145 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
146 done 146 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
147 endif 147 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
148 148 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
149 149 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
150variable_info: 150 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
151 @echo -------------------------------------- 151install_subdirs: qmake_all FORCE
152 @echo KDEPIM buildsystem, variableinfo... 152 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
153 @echo KDEPIMDIR=$(KDEPIMDIR) 153 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
154 @echo QTDIR=$(QTDIR) 154 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true
155 @echo QPEDIR=$(QPEDIR) 155 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true
156 @echo OPIEDIR=$(OPIEDIR) 156 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true
157 @echo PLATFORM=$(PLATFORM) 157 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true
158 @echo RELEASE_DEBUG=$(RELEASE_DEBUG) 158 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true
159 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) 159 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
160 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) 160 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true
161 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) 161 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) install; ) || true
162 @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN) 162 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true
163 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) 163 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true
164 ifndef BUILD_NO_SHARP_PLUGIN 164distclean: qmake_all FORCE
165 @echo SHARPDTMSDK=$(SHARPDTMSDK) 165 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
166 endif 166 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
167 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) 167 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
168 @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER) 168 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
169 @echo -------------------------------------- 169 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
170 170 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
171variable_test: variable_info 171 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
172 @echo KDEPIM buildsystem, variablecheck... 172 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
173 ifndef KDEPIMDIR 173 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
174 @echo KDEPIMDIR is not defined. 174 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
175 $(error KDEPIMDIR is not defined) 175 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
176 endif 176 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
177 ifndef PLATFORM 177
178 @echo PLATFORM is not defined. 178install: install_subdirs
179 $(error PLATFORM is not defined) 179
180 endif 180uninstall: uninstall_subdirs
181 ifdef BUILD_NO_LDAP_PLUGIN 181
182 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) 182FORCE:
183 endif
184 ifdef BUILD_NO_OPIE_PLUGIN
185 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
186 endif
187 ifdef BUILD_NO_QTOPIA_PLUGIN
188 @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
189 endif
190 ifdef BUILD_NO_MICROMAIL
191 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
192 endif
193 ifdef BUILD_NO_SHARP_PLUGIN
194 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
195 else
196 ifndef SHARPDTMSDK
197 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
198 $(error SHARPDTMSDK is not defined)
199 endif
200 endif
201 ifdef BUILD_NO_GAMMU
202 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
203 endif
204 ifdef BUILD_NO_PWMANAGER
205 @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
206 endif
207 @echo --------------------------------------
208
209
210objects:
211 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
212 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
213 mkdir -p libical/lib/$(PLATFORM)
214 mkdir -p dest
215 mkdir -p dest$(LIBICAL_PATH)
216 mkdir -p pwmanager/libcrypt/$(PLATFORM)
217
218clean:
219 rm -rf libical/lib/$(PLATFORM)/*;
220 rm -rf pwmanager/libcrypt/$(PLATFORM)/*;
221 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
222 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
223 done
224
225pac:
226 rm -f $(QPEDIR)/lib/libmicro*
227 rm -f $(QPEDIR)/plugins/applets/libkopi*
228 make
229 make install
230 make dist
231install:
232
233 cd bin/kdepim; make install
234 cp -r Pim $(QPEDIR)/apps
235 cp db2file/db2file $(QPEDIR)/bin/db2file
236 chmod ugo+x $(QPEDIR)/bin/db2file
237 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
238 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
239 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
240 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
241
242dist:
243 @echo Dont forget to do "make install" before "make dist"
244 rm -f *arm.ipk
245 rm -f *ipk.zip
246 rm -rf ../kdepimpi_$(KDEPIM_VERSION)/*
247 rm -f *~
248 cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION)
249 cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk
250 cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
251 mkipks kmicrokdelibs.control
252 mkipks korganizer.control
253 mkipks kaddressbook.control
254 ifndef BUILD_NO_MICROMAIL
255 mkipks kopiemail.control
256 endif
257 ifndef BUILD_NO_SHARP_PLUGIN
258 mkipks ksharpPIM-DTMaccess.control
259 endif
260 mkipks korganizer-alarm.control
261 ifndef BUILD_NO_GAMMU
262 mkipks kmobilephoneaccess.control
263 endif
264 ifndef BUILD_NO_PWMANAGER
265 mkipks pwmanager.control
266 endif
267 mkipks pimTABicon.control
268 zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt
269 mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
270 mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
271 mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/
272
273tmake: objects \
274 qtcompat/Makefile$(PLATFORM) \
275 microkde/Makefile$(PLATFORM) \
276 libkcal/Makefile$(PLATFORM) \
277 libkdepim/Makefile$(PLATFORM) \
278 korganizer/Makefile$(PLATFORM) \
279 kalarmd/Makefile$(PLATFORM) \
280 libical/src/libical/Makefile$(PLATFORM) \
281 libical/src/libicalss/Makefile$(PLATFORM) \
282 kabc/Makefile$(PLATFORM) \
283 kabc/formats/binary/Makefile$(PLATFORM) \
284 kabc/plugins/file/Makefile$(PLATFORM) \
285 kabc/plugins/dir/Makefile$(PLATFORM) \
286 kabc/plugins/ldap/Makefile$(PLATFORM) \
287 kabc/plugins/opie/Makefile$(PLATFORM) \
288 kabc/plugins/qtopia/Makefile$(PLATFORM) \
289 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
290 kaddressbook/Makefile$(PLATFORM) \
291 kmicromail/Makefile$(PLATFORM) \
292 libetpan/Makefile$(PLATFORM) \
293 kmicromail/libmailwrapper/Makefile$(PLATFORM) \
294 gammu/emb/common/Makefile$(PLATFORM) \
295 gammu/emb/gammu/Makefile$(PLATFORM) \
296 pwmanager/pwmanager/Makefile$(PLATFORM) \
297 pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
298 pwmanager/libcrypt/error/Makefile$(PLATFORM) \
299 pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
300 pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
301
302qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
303 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
304
305microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
306 cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
307
308libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
309 cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
310
311
312libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
313 cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM)
314
315kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
316 cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM)
317
318korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
319 cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM)
320
321libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
322 cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM)
323
324libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
325 cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM)
326
327kabc/Makefile$(PLATFORM): kabc/kabcE.pro
328 cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM)
329
330kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
331 cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
332
333kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
334 cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM)
335
336kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
337 cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM)
338
339kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
340 cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM)
341
342kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
343 cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM)
344
345kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
346 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
347
348kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
349 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
350
351kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
352 cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
353
354kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
355 cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
356
357libetpan/Makefile$(PLATFORM): libetpan/libetpanE.pro
358 cd libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
359
360kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
361 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
362
363gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
364 cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
365
366gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
367 cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
368
369pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
370 cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
371
372
373pwmanager/libcrypt/mpi/Makefile$(PLATFORM): pwmanager/libcrypt/mpi/mpi.pro
374 cd pwmanager/libcrypt/mpi;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" mpi.pro -o Makefile$(PLATFORM)
375
376pwmanager/libcrypt/error/Makefile$(PLATFORM): pwmanager/libcrypt/error/error.pro
377 cd pwmanager/libcrypt/error;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" error.pro -o Makefile$(PLATFORM)
378
379pwmanager/libcrypt/cipher/Makefile$(PLATFORM): pwmanager/libcrypt/cipher/cipher.pro
380 cd pwmanager/libcrypt/cipher;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" cipher.pro -o Makefile$(PLATFORM)
381
382pwmanager/libcrypt/zlib/Makefile$(PLATFORM): pwmanager/libcrypt/zlib/zlib.pro
383 cd pwmanager/libcrypt/zlib;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" zlib.pro -o Makefile$(PLATFORM)
384
385 183
diff --git a/kabc/plugins/dir/dir.pro b/kabc/plugins/dir/dir.pro
index a7c1503..3e18594 100644
--- a/kabc/plugins/dir/dir.pro
+++ b/kabc/plugins/dir/dir.pro
@@ -1,34 +1,36 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3#release debug 3#release debug
4 4
5include( ../../../variables.pri )
6
5TARGET = microkabc_dir 7TARGET = microkabc_dir
6INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat 8INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
7DESTDIR = ../../../bin 9DESTDIR = ../../../bin
8#LIBS += -lmicrokde -lmicrokabc 10#LIBS += -lmicrokde -lmicrokabc
9#LIBS += -L$(QPEDIR)/lib 11#LIBS += -L$(QPEDIR)/lib
10 12
11INTERFACES = \ 13INTERFACES = \
12 14
13HEADERS = \ 15HEADERS = \
14 resourcedir.h \ 16 resourcedir.h \
15 resourcedirconfig.h 17 resourcedirconfig.h
16 18
17SOURCES = \ 19SOURCES = \
18 resourcedir.cpp \ 20 resourcedir.cpp \
19 resourcedirconfig.cpp 21 resourcedirconfig.cpp
20 22
21unix : { 23unix : {
22OBJECTS_DIR = obj/unix 24OBJECTS_DIR = obj/unix
23MOC_DIR = moc/unix 25MOC_DIR = moc/unix
24} 26}
25win32: { 27win32: {
26CONFIG += dll 28CONFIG += dll
27DEFINES += _WIN32_ 29DEFINES += _WIN32_
28OBJECTS_DIR = obj/win 30OBJECTS_DIR = obj/win
29MOC_DIR = moc/win 31MOC_DIR = moc/win
30LIBS += ../../../bin/microkdepim.lib 32LIBS += ../../../bin/microkdepim.lib
31LIBS += ../../../bin/microkcal.lib 33LIBS += ../../../bin/microkcal.lib
32LIBS += ../../../bin/microkde.lib 34LIBS += ../../../bin/microkde.lib
33LIBS += ../../../bin/microkabc.lib 35LIBS += ../../../bin/microkabc.lib
34} 36}
diff --git a/kabc/plugins/file/file.pro b/kabc/plugins/file/file.pro
index 154ef2a..2d17313 100644
--- a/kabc/plugins/file/file.pro
+++ b/kabc/plugins/file/file.pro
@@ -1,35 +1,37 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3#release debug 3#release debug
4 4
5include( ../../../variables.pri )
6
5TARGET = microkabc_file 7TARGET = microkabc_file
6INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat 8INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
7 9
8DESTDIR = ../../../bin 10DESTDIR = ../../../bin
9#LIBS += -lmicrokde -lmicrokabc 11#LIBS += -lmicrokde -lmicrokabc
10#LIBS += -L$(QPEDIR)/lib 12#LIBS += -L$(QPEDIR)/lib
11 13
12INTERFACES = \ 14INTERFACES = \
13 15
14HEADERS = \ 16HEADERS = \
15 resourcefile.h \ 17 resourcefile.h \
16 resourcefileconfig.h 18 resourcefileconfig.h
17 19
18SOURCES = \ 20SOURCES = \
19 resourcefile.cpp \ 21 resourcefile.cpp \
20 resourcefileconfig.cpp 22 resourcefileconfig.cpp
21 23
22unix : { 24unix : {
23OBJECTS_DIR = obj/unix 25OBJECTS_DIR = obj/unix
24MOC_DIR = moc/unix 26MOC_DIR = moc/unix
25} 27}
26win32: { 28win32: {
27CONFIG += dll 29CONFIG += dll
28DEFINES += _WIN32_ 30DEFINES += _WIN32_
29OBJECTS_DIR = obj/win 31OBJECTS_DIR = obj/win
30MOC_DIR = moc/win 32MOC_DIR = moc/win
31LIBS += ../../../bin/microkdepim.lib 33LIBS += ../../../bin/microkdepim.lib
32LIBS += ../../../bin/microkcal.lib 34LIBS += ../../../bin/microkcal.lib
33LIBS += ../../../bin/microkde.lib 35LIBS += ../../../bin/microkde.lib
34LIBS += ../../../bin/microkabc.lib 36LIBS += ../../../bin/microkabc.lib
35} 37}
diff --git a/kabc/plugins/qtopia/qtopia.pro b/kabc/plugins/qtopia/qtopia.pro
index 0360abf..64d1abc 100644
--- a/kabc/plugins/qtopia/qtopia.pro
+++ b/kabc/plugins/qtopia/qtopia.pro
@@ -1,41 +1,43 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3 3
4include( ../../../variables.pri )
5
4TARGET = microkabc_qtopia 6TARGET = microkabc_qtopia
5 7
6INCLUDEPATH += ../.. ../../.. ../../../kabc ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources 8INCLUDEPATH += ../.. ../../.. ../../../kabc ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources
7 9
8DESTDIR = ../../../bin 10DESTDIR = ../../../bin
9#LIBS += -lmicrokde 11#LIBS += -lmicrokde
10#LIBS += -lkamicrokabc 12#LIBS += -lkamicrokabc
11 13
12DEFINES += KAB_EMBEDDED DESKTOP_VERSION 14DEFINES += KAB_EMBEDDED DESKTOP_VERSION
13 15
14INTERFACES = \ 16INTERFACES = \
15 17
16HEADERS = \ 18HEADERS = \
17 resourceqtopia.h \ 19 resourceqtopia.h \
18 resourceqtopiaconfig.h \ 20 resourceqtopiaconfig.h \
19 qtopiaconverter.h 21 qtopiaconverter.h
20 22
21SOURCES = \ 23SOURCES = \
22 resourceqtopia.cpp \ 24 resourceqtopia.cpp \
23 resourceqtopiaconfig.cpp \ 25 resourceqtopiaconfig.cpp \
24 qtopiaconverter.cpp 26 qtopiaconverter.cpp
25 27
26 28
27 29
28unix : { 30unix : {
29OBJECTS_DIR = obj/unix 31OBJECTS_DIR = obj/unix
30MOC_DIR = moc/unix 32MOC_DIR = moc/unix
31} 33}
32win32: { 34win32: {
33CONFIG += dll 35CONFIG += dll
34DEFINES += _WIN32_ 36DEFINES += _WIN32_
35OBJECTS_DIR = obj/win 37OBJECTS_DIR = obj/win
36MOC_DIR = moc/win 38MOC_DIR = moc/win
37LIBS += ../../../bin/microkdepim.lib 39LIBS += ../../../bin/microkdepim.lib
38LIBS += ../../../bin/microkcal.lib 40LIBS += ../../../bin/microkcal.lib
39LIBS += ../../../bin/microkde.lib 41LIBS += ../../../bin/microkde.lib
40LIBS += ../../../bin/microkabc.lib 42LIBS += ../../../bin/microkabc.lib
41} 43}
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index 2534835..7203eb3 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -1,68 +1,79 @@
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 ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces
10DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION 10DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION
11 11
12unix : { 12unix : {
13 13
14staticlib: { 14staticlib: {
15LIBS += ../bin/libmicrokabc_qtopia.a
16LIBS += ../bin/libmicrokabc_file.a
17LIBS += ../bin/libmicrokabc_dir.a
18LIBS += ../bin/libmicrokdepim.a
19LIBS += ../bin/libmicrokcal.a
20LIBS += ../bin/libmicrokabc.a
21LIBS += ../bin/libmicrokde.a
22LIBS += ../bin/libmicrokabc_qtopia.a
23LIBS += ../bin/libmicrokabc_file.a
24LIBS += ../bin/libmicrokabc_dir.a
15LIBS += ../bin/libmicrokdepim.a 25LIBS += ../bin/libmicrokdepim.a
16LIBS += ../bin/libmicrokcal.a 26LIBS += ../bin/libmicrokcal.a
17LIBS += ../bin/libmicrokabc.a 27LIBS += ../bin/libmicrokabc.a
18LIBS += ../bin/libmicrokde.a 28LIBS += ../bin/libmicrokde.a
19LIBS += ../libical/lib/libical.a 29LIBS += ../libical/lib/libical.a
20LIBS += ../libical/lib/libicalss.a 30LIBS += ../libical/lib/libicalss.a
31
21} else { 32} else {
22LIBS += ../bin/libmicrokdepim.so 33LIBS += ../bin/libmicrokdepim.so
23LIBS += ../bin/libmicrokde.so 34LIBS += ../bin/libmicrokde.so
24LIBS += ../bin/libmicrokabc.so 35LIBS += ../bin/libmicrokabc.so
25LIBS += ../bin/libmicrokcal.so 36LIBS += ../bin/libmicrokcal.so
26#LIBS += -lldap 37#LIBS += -lldap
27} 38}
28OBJECTS_DIR = obj/unix 39OBJECTS_DIR = obj/unix
29MOC_DIR = moc/unix 40MOC_DIR = moc/unix
30} 41}
31win32: { 42win32: {
32RC_FILE = winicons.rc 43RC_FILE = winicons.rc
33DEFINES += _WIN32_ 44DEFINES += _WIN32_
34LIBS += ../bin/microkdepim.lib 45LIBS += ../bin/microkdepim.lib
35LIBS += ../bin/microkcal.lib 46LIBS += ../bin/microkcal.lib
36LIBS += ../bin/microkde.lib 47LIBS += ../bin/microkde.lib
37LIBS += ../bin/microkabc.lib 48LIBS += ../bin/microkabc.lib
38QMAKE_LINK += /NODEFAULTLIB:LIBC 49QMAKE_LINK += /NODEFAULTLIB:LIBC
39OBJECTS_DIR = obj/win 50OBJECTS_DIR = obj/win
40MOC_DIR = moc/win 51MOC_DIR = moc/win
41#olimport section 52#olimport section
42#blabla: { 53#blabla: {
43 54
44LIBS += mfc71u.lib 55LIBS += mfc71u.lib
45DEFINES += _OL_IMPORT_ 56DEFINES += _OL_IMPORT_
46HEADERS = ../outport/msoutl9.h \ 57HEADERS = ../outport/msoutl9.h \
47 kaimportoldialog.h 58 kaimportoldialog.h
48SOURCES = ../outport/msoutl9.cpp \ 59SOURCES = ../outport/msoutl9.cpp \
49 kaimportoldialog.cpp 60 kaimportoldialog.cpp
50#} 61#}
51#olimport section end 62#olimport section end
52} 63}
53 64
54INTERFACES = \ 65INTERFACES = \
55# filteredit_base.ui \ 66# filteredit_base.ui \
56# kofilterview_base.ui \ 67# kofilterview_base.ui \
57 68
58HEADERS += \ 69HEADERS += \
59features/mergewidget.h \ 70features/mergewidget.h \
60features/distributionlistwidget.h \ 71features/distributionlistwidget.h \
61kcmconfigs/addresseewidget.h \ 72kcmconfigs/addresseewidget.h \
62kcmconfigs/extensionconfigdialog.h \ 73kcmconfigs/extensionconfigdialog.h \
63kcmconfigs/kcmkabconfig.h \ 74kcmconfigs/kcmkabconfig.h \
64kcmconfigs/kabconfigwidget.h \ 75kcmconfigs/kabconfigwidget.h \
65addresseeeditordialog.h \ 76addresseeeditordialog.h \
66addresseeeditorwidget.h \ 77addresseeeditorwidget.h \
67addresseditwidget.h \ 78addresseditwidget.h \
68addresseeconfig.h \ 79addresseeconfig.h \
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 59a1a84..1a81c7d 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,66 +1,76 @@
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 ../libkdepim 10INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim
11#../qtcompat 11#../qtcompat
12DEFINES += KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL 12DEFINES += 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 KORG_NODND 14#KORG_NOPRINTER KORG_NOKABC KORG_NODND
15DEFINES += KORG_NOLVALTERNATION 15DEFINES += KORG_NOLVALTERNATION
16DEFINES += DESKTOP_VERSION 16DEFINES += DESKTOP_VERSION
17unix : { 17unix : {
18staticlib: { 18staticlib: {
19LIBS += ../bin/libmicrokabc_qtopia.a
20LIBS += ../bin/libmicrokabc_file.a
21LIBS += ../bin/libmicrokabc_dir.a
22LIBS += ../bin/libmicrokdepim.a
23LIBS += ../bin/libmicrokcal.a
24LIBS += ../bin/libmicrokabc.a
25LIBS += ../bin/libmicrokde.a
26LIBS += ../bin/libmicrokabc_qtopia.a
27LIBS += ../bin/libmicrokabc_file.a
28LIBS += ../bin/libmicrokabc_dir.a
19LIBS += ../bin/libmicrokdepim.a 29LIBS += ../bin/libmicrokdepim.a
20LIBS += ../bin/libmicrokcal.a 30LIBS += ../bin/libmicrokcal.a
21LIBS += ../bin/libmicrokabc.a 31LIBS += ../bin/libmicrokabc.a
22LIBS += ../bin/libmicrokde.a 32LIBS += ../bin/libmicrokde.a
23LIBS += ../libical/lib/libical.a 33LIBS += ../libical/lib/libical.a
24LIBS += ../libical/lib/libicalss.a 34LIBS += ../libical/lib/libicalss.a
25} else { 35} else {
26LIBS += ../bin/libmicrokdepim.so 36LIBS += ../bin/libmicrokdepim.so
27LIBS += ../bin/libmicrokcal.so 37LIBS += ../bin/libmicrokcal.so
28LIBS += ../bin/libmicrokde.so 38LIBS += ../bin/libmicrokde.so
29LIBS += ../bin/libmicrokabc.so 39LIBS += ../bin/libmicrokabc.so
30#LIBS += -lbluetooth 40#LIBS += -lbluetooth
31#LIBS += -lsdp 41#LIBS += -lsdp
32 42
33#LIBS += -lldap 43#LIBS += -lldap
34} 44}
35OBJECTS_DIR = obj/unix 45OBJECTS_DIR = obj/unix
36MOC_DIR = moc/unix 46MOC_DIR = moc/unix
37} 47}
38win32: { 48win32: {
39RC_FILE = winicons.rc 49RC_FILE = winicons.rc
40DEFINES += _WIN32_ 50DEFINES += _WIN32_
41LIBS += ../bin/microkdepim.lib 51LIBS += ../bin/microkdepim.lib
42LIBS += ../bin/microkcal.lib 52LIBS += ../bin/microkcal.lib
43LIBS += ../bin/microkde.lib 53LIBS += ../bin/microkde.lib
44LIBS += ../bin/microkabc.lib 54LIBS += ../bin/microkabc.lib
45LIBS += ../libical/lib/ical.lib 55LIBS += ../libical/lib/ical.lib
46LIBS += ../libical/lib/icalss.lib 56LIBS += ../libical/lib/icalss.lib
47#LIBS += atls.lib 57#LIBS += atls.lib
48QMAKE_LINK += /NODEFAULTLIB:LIBC 58QMAKE_LINK += /NODEFAULTLIB:LIBC
49#QMAKE_LINK += /NODEFAULTLIB:MSVCRT 59#QMAKE_LINK += /NODEFAULTLIB:MSVCRT
50#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib 60#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
51OBJECTS_DIR = obj/win 61OBJECTS_DIR = obj/win
52MOC_DIR = moc/win 62MOC_DIR = moc/win
53#olimport section 63#olimport section
54#blabla: { 64#blabla: {
55LIBS += mfc71u.lib 65LIBS += mfc71u.lib
56DEFINES += _OL_IMPORT_ 66DEFINES += _OL_IMPORT_
57 67
58HEADERS += ../outport/msoutl9.h \ 68HEADERS += ../outport/msoutl9.h \
59 koimportoldialog.h 69 koimportoldialog.h
60SOURCES += ../outport/msoutl9.cpp \ 70SOURCES += ../outport/msoutl9.cpp \
61 koimportoldialog.cpp 71 koimportoldialog.cpp
62#} 72#}
63#olimport section end 73#olimport section end
64 74
65} 75}
66 76
diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp
index a3b7fff..5fbfa68 100644
--- a/microkde/kresources/factory.cpp
+++ b/microkde/kresources/factory.cpp
@@ -1,84 +1,89 @@
1/* 1/*
2 This file is part of libkresources. 2 This file is part of libkresources.
3 3
4 Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> 4 Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
5 Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org> 5 Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
6 Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org> 6 Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
11 version 2 of the License, or (at your option) any later version. 11 version 2 of the License, or (at your option) any later version.
12 12
13 This library is distributed in the hope that it will be useful, 13 This library is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 Library General Public License for more details. 16 Library General Public License for more details.
17 17
18 You should have received a copy of the GNU Library General Public License 18 You should have received a copy of the GNU Library General Public License
19 along with this library; see the file COPYING.LIB. If not, write to 19 along with this library; see the file COPYING.LIB. If not, write to
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
21 Boston, MA 02111-1307, USA. 21 Boston, MA 02111-1307, USA.
22*/ 22*/
23 23
24#include <kdebug.h> 24#include <kdebug.h>
25#include <klocale.h> 25#include <klocale.h>
26#include <ksimpleconfig.h> 26#include <ksimpleconfig.h>
27#include <kstandarddirs.h> 27#include <kstandarddirs.h>
28#include <kstaticdeleter.h> 28#include <kstaticdeleter.h>
29//#ifndef DESKTOP_VERSION 29//#ifndef DESKTOP_VERSION
30#include <klibloader.h> 30#include <klibloader.h>
31//#endif 31//#endif
32#include <qfile.h> 32#include <qfile.h>
33 33
34#include "resource.h" 34#include "resource.h"
35#include "factory.h" 35#include "factory.h"
36 36
37#ifdef STATIC_RESOURCES
38#include <file/resourcefile.h>
39#include <dir/resourcedir.h>
40#include <qtopia/resourceqtopia.h>
41#endif
37using namespace KRES; 42using namespace KRES;
38 43
39QDict<Factory> *Factory::mSelves = 0; 44QDict<Factory> *Factory::mSelves = 0;
40static KStaticDeleter< QDict<Factory> > staticDeleter; 45static KStaticDeleter< QDict<Factory> > staticDeleter;
41 46
42Factory *Factory::self( const QString& resourceFamily) 47Factory *Factory::self( const QString& resourceFamily)
43{ 48{
44 49
45 50
46 Factory *factory = 0; 51 Factory *factory = 0;
47 if ( !mSelves ) 52 if ( !mSelves )
48 { 53 {
49 mSelves = staticDeleter.setObject( new QDict<Factory> ); 54 mSelves = staticDeleter.setObject( new QDict<Factory> );
50 } 55 }
51 56
52 factory = mSelves->find( resourceFamily ); 57 factory = mSelves->find( resourceFamily );
53 58
54 if ( !factory ) { 59 if ( !factory ) {
55 factory = new Factory( resourceFamily); 60 factory = new Factory( resourceFamily);
56 mSelves->insert( resourceFamily, factory ); 61 mSelves->insert( resourceFamily, factory );
57 } 62 }
58 63
59 return factory; 64 return factory;
60} 65}
61 66
62Factory::Factory( const QString& resourceFamily) : 67Factory::Factory( const QString& resourceFamily) :
63 mResourceFamily( resourceFamily ) 68 mResourceFamily( resourceFamily )
64{ 69{
65//US so far we have three types available for resourceFamily "contact" 70//US so far we have three types available for resourceFamily "contact"
66// and that are "file", "dir", "ldap" 71// and that are "file", "dir", "ldap"
67/*US 72/*US
68 73
69 KTrader::OfferList plugins = KTrader::self()->query( "KResources/Plugin", QString( "[X-KDE-ResourceFamily] == '%1'" ) 74 KTrader::OfferList plugins = KTrader::self()->query( "KResources/Plugin", QString( "[X-KDE-ResourceFamily] == '%1'" )
70 .arg( resourceFamily ) ); 75 .arg( resourceFamily ) );
71 KTrader::OfferList::ConstIterator it; 76 KTrader::OfferList::ConstIterator it;
72 for ( it = plugins.begin(); it != plugins.end(); ++it ) { 77 for ( it = plugins.begin(); it != plugins.end(); ++it ) {
73 QVariant type = (*it)->property( "X-KDE-ResourceType" ); 78 QVariant type = (*it)->property( "X-KDE-ResourceType" );
74 if ( !type.toString().isEmpty() ) 79 if ( !type.toString().isEmpty() )
75 mTypeMap.insert( type.toString(), *it ); 80 mTypeMap.insert( type.toString(), *it );
76 } 81 }
77*/ 82*/
78 83
79//US new 84//US new
80 PluginInfo* info = new PluginInfo; 85 PluginInfo* info = new PluginInfo;
81 info->library = "microkabc_file"; 86 info->library = "microkabc_file";
82 info->nameLabel = i18n( "file" ); 87 info->nameLabel = i18n( "file" );
83 info->descriptionLabel = i18n( "One file" ); 88 info->descriptionLabel = i18n( "One file" );
84 mTypeMap.insert( "file", info ); 89 mTypeMap.insert( "file", info );
@@ -174,83 +179,104 @@ ConfigWidget *Factory::configWidget( const QString& type, QWidget *parent )
174 179
175 if ( !pluginFactory ) { 180 if ( !pluginFactory ) {
176 qDebug("KRES::Factory::configWidget(): no plugin factory for library %s", pi->library.latin1()); 181 qDebug("KRES::Factory::configWidget(): no plugin factory for library %s", pi->library.latin1());
177 kdDebug() << "KRES::Factory::configWidget(): no plugin factory." << endl; 182 kdDebug() << "KRES::Factory::configWidget(): no plugin factory." << endl;
178 return 0; 183 return 0;
179 } 184 }
180 185
181 ConfigWidget *wdg = pluginFactory->configWidget( parent ); 186 ConfigWidget *wdg = pluginFactory->configWidget( parent );
182 if ( !wdg ) { 187 if ( !wdg ) {
183//US kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl; 188//US kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl;
184 qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1()); 189 qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1());
185 return 0; 190 return 0;
186 } 191 }
187 return wdg; 192 return wdg;
188 193
189} 194}
190 195
191QString Factory::typeName( const QString &type ) const 196QString Factory::typeName( const QString &type ) const
192{ 197{
193 if ( type.isEmpty() || !mTypeMap.contains( type ) ) 198 if ( type.isEmpty() || !mTypeMap.contains( type ) )
194 return QString(); 199 return QString();
195 200
196 201
197//US KService::Ptr ptr = mTypeMap[ type ]; 202//US KService::Ptr ptr = mTypeMap[ type ];
198//US return ptr->name(); 203//US return ptr->name();
199 PluginInfo* pi = mTypeMap[ type ]; 204 PluginInfo* pi = mTypeMap[ type ];
200 return pi->nameLabel; 205 return pi->nameLabel;
201 206
202} 207}
203 208
204QString Factory::typeDescription( const QString &type ) const 209QString Factory::typeDescription( const QString &type ) const
205{ 210{
206 if ( type.isEmpty() || !mTypeMap.contains( type ) ) 211 if ( type.isEmpty() || !mTypeMap.contains( type ) )
207 return QString(); 212 return QString();
208 213
209//US KService::Ptr ptr = mTypeMap[ type ]; 214//US KService::Ptr ptr = mTypeMap[ type ];
210//US return ptr->comment(); 215//US return ptr->comment();
211 PluginInfo* pi = mTypeMap[ type ]; 216 PluginInfo* pi = mTypeMap[ type ];
212 return pi->descriptionLabel; 217 return pi->descriptionLabel;
213} 218}
214 219
215Resource *Factory::resource( const QString& type, const KConfig *config ) 220Resource *Factory::resource( const QString& type, const KConfig *config )
216{ 221{
217 222
218 223
219 if ( type.isEmpty() || !mTypeMap.contains( type ) ) 224 if ( type.isEmpty() || !mTypeMap.contains( type ) )
220 return 0; 225 return 0;
221 226
227#ifdef STATIC_RESOURCES
228 qDebug("NEW STATIC RESOURCE %s", type.latin1());
229 Resource *resource = 0;
230 if ( type == "file" ) {
231 resource = (Resource *) new KABC::ResourceFile( config );
232 } else if ( type == "dir" ) {
233 resource = new KABC::ResourceDir( config );
234 } else if ( type == "qtopia" ) {
235 resource = new KABC::ResourceQtopia( config );
236 }
237 if ( !resource)
238 qDebug("Factory::resource:: resources are statically linked. resource type %s is not supported ",type.latin1() );
239 else
240 resource->setType( type );
241 return resource;
242#else
243
244
245
222/*US load the lib not dynamicly. !! 246/*US load the lib not dynamicly. !!
223 KService::Ptr ptr = mTypeMap[ type ]; 247 KService::Ptr ptr = mTypeMap[ type ];
224 KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() ); 248 KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() );
225 if ( !factory ) { 249 if ( !factory ) {
226 kdDebug() << "KRES::Factory::resource(): Factory creation failed" << endl; 250 kdDebug() << "KRES::Factory::resource(): Factory creation failed" << endl;
227 return 0; 251 return 0;
228 } 252 }
229*/ 253*/
230 PluginInfo* pi = mTypeMap[ type ]; 254 PluginInfo* pi = mTypeMap[ type ];
231 KLibFactory *factory = (KLibFactory *)KLibLoader::self()->factory( pi->library.latin1() ); 255 KLibFactory *factory = (KLibFactory *)KLibLoader::self()->factory( pi->library.latin1() );
232 if ( !factory ) { 256 if ( !factory ) {
233 qDebug("KRES::Factory::resource(): Factory creation failed for library %s", pi->library.latin1()); 257 qDebug("KRES::Factory::resource(): Factory creation failed for library %s", pi->library.latin1());
234 kdDebug() << "KRES::Factory::resource(): Factory creation failed" << endl; 258 kdDebug() << "KRES::Factory::resource(): Factory creation failed" << endl;
235 return 0; 259 return 0;
236 } 260 }
237 261
238 PluginFactoryBase *pluginFactory = static_cast<PluginFactoryBase *>( factory ); 262 PluginFactoryBase *pluginFactory = static_cast<PluginFactoryBase *>( factory );
239 263
240 if ( !pluginFactory ) { 264 if ( !pluginFactory ) {
241 qDebug("KRES::Factory::resource(): no plugin factory for library %s", pi->library.latin1()); 265 qDebug("KRES::Factory::resource(): no plugin factory for library %s", pi->library.latin1());
242 kdDebug() << "KRES::Factory::resource(): no plugin factory." << endl; 266 kdDebug() << "KRES::Factory::resource(): no plugin factory." << endl;
243 return 0; 267 return 0;
244 } 268 }
245 269
246 Resource *resource = pluginFactory->resource( config ); 270 Resource *resource = pluginFactory->resource( config );
247 if ( !resource ) { 271 if ( !resource ) {
248//US kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl; 272//US kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl;
249 qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1()); 273 qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1());
250 return 0; 274 return 0;
251 } 275 }
252 276
253 resource->setType( type ); 277 resource->setType( type );
254 278
255 return resource; 279 return resource;
280
281#endif
256} 282}
diff --git a/microkde/kresources/managerimpl.cpp b/microkde/kresources/managerimpl.cpp
index 566b8f4..a6d2007 100644
--- a/microkde/kresources/managerimpl.cpp
+++ b/microkde/kresources/managerimpl.cpp
@@ -1,90 +1,92 @@
1/* 1/*
2 This file is part of libkresources. 2 This file is part of libkresources.
3 3
4 Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> 4 Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
5 Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org> 5 Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
6 Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org> 6 Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
11 version 2 of the License, or (at your option) any later version. 11 version 2 of the License, or (at your option) any later version.
12 12
13 This library is distributed in the hope that it will be useful, 13 This library is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 Library General Public License for more details. 16 Library General Public License for more details.
17 17
18 You should have received a copy of the GNU Library General Public License 18 You should have received a copy of the GNU Library General Public License
19 along with this library; see the file COPYING.LIB. If not, write to 19 along with this library; see the file COPYING.LIB. If not, write to
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
21 Boston, MA 02111-1307, USA. 21 Boston, MA 02111-1307, USA.
22*/ 22*/
23 23
24/* 24/*
25Enhanced Version of the file for platform independent KDE tools. 25Enhanced Version of the file for platform independent KDE tools.
26Copyright (c) 2004 Ulf Schenk 26Copyright (c) 2004 Ulf Schenk
27 27
28$Id$ 28$Id$
29*/ 29*/
30 30
31#include <kglobal.h> 31#include <kglobal.h>
32 32
33#include <kapplication.h> 33#include <kapplication.h>
34#include <kdebug.h> 34#include <kdebug.h>
35#include <kconfig.h> 35#include <kconfig.h>
36#include <kstandarddirs.h> 36#include <kstandarddirs.h>
37#include <qfile.h> 37#include <qfile.h>
38 38
39#include "resource.h" 39#include "resource.h"
40#include "factory.h" 40#include "factory.h"
41#include "managerimpl.h" 41#include "managerimpl.h"
42 42
43
44
43using namespace KRES; 45using namespace KRES;
44 46
45ManagerImpl::ManagerImpl( const QString &family ) 47ManagerImpl::ManagerImpl( const QString &family )
46 : mFamily( family ), mConfig( 0 ), mStdConfig( 0 ), mStandard( 0 ), 48 : mFamily( family ), mConfig( 0 ), mStdConfig( 0 ), mStandard( 0 ),
47 mFactory( 0 ) 49 mFactory( 0 )
48 50
49{ 51{
50 kdDebug(5650) << "ManagerImpl::ManagerImpl()" << endl; 52 kdDebug(5650) << "ManagerImpl::ManagerImpl()" << endl;
51 53
52 54
53} 55}
54 56
55ManagerImpl::~ManagerImpl() 57ManagerImpl::~ManagerImpl()
56{ 58{
57 kdDebug(5650) << "ManagerImpl::~ManagerImpl()" << endl; 59 kdDebug(5650) << "ManagerImpl::~ManagerImpl()" << endl;
58 60
59 Resource::List::ConstIterator it; 61 Resource::List::ConstIterator it;
60 for ( it = mResources.begin(); it != mResources.end(); ++it ) { 62 for ( it = mResources.begin(); it != mResources.end(); ++it ) {
61 delete *it; 63 delete *it;
62 } 64 }
63 65
64 delete mStdConfig; 66 delete mStdConfig;
65} 67}
66 68
67void ManagerImpl::createStandardConfig() 69void ManagerImpl::createStandardConfig()
68{ 70{
69 if ( !mStdConfig ) { 71 if ( !mStdConfig ) {
70 QString file = locateLocal( "data", KGlobal::getAppName() 72 QString file = locateLocal( "data", KGlobal::getAppName()
71 + "/kresources/" + mFamily + "rc" ); 73 + "/kresources/" + mFamily + "rc" );
72 if ( mFamily == "tmpcontact" ) { 74 if ( mFamily == "tmpcontact" ) {
73 if (QFile::exists ( file ) ){ 75 if (QFile::exists ( file ) ){
74 QFile::remove ( file ); 76 QFile::remove ( file );
75 qDebug("removed tmp rc file: %s ", file.latin1()); 77 qDebug("removed tmp rc file: %s ", file.latin1());
76 } 78 }
77 } 79 }
78 mStdConfig = new KConfig( file ); 80 mStdConfig = new KConfig( file );
79 } 81 }
80 82
81 mConfig = mStdConfig; 83 mConfig = mStdConfig;
82} 84}
83 85
84void ManagerImpl::readConfig( KConfig *cfg ) 86void ManagerImpl::readConfig( KConfig *cfg )
85{ 87{
86 kdDebug(5650) << "ManagerImpl::readConfig()" << endl; 88 kdDebug(5650) << "ManagerImpl::readConfig()" << endl;
87 89
88 delete mFactory; 90 delete mFactory;
89 mFactory = Factory::self( mFamily ); 91 mFactory = Factory::self( mFamily );
90 92
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 9016260..783ec34 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -1,68 +1,74 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on 2 CONFIG += qt warn_on
3include( ../variables.pri )
3#INCLUDEPATH += $(QTDIR)/include . 4#INCLUDEPATH += $(QTDIR)/include .
4#DEPENDPATH += $(QTDIR)/include 5#DEPENDPATH += $(QTDIR)/include
5INCLUDEPATH += . ../ ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio 6INCLUDEPATH += . ../ ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio
6#LIBS += -lqtcompat 7#LIBS += -lqtcompat
7 8
8 TARGET = microkde 9 TARGET = microkde
9DESTDIR= ../bin 10DESTDIR= ../bin
10DEFINES += DESKTOP_VERSION KDE_QT_ONLY 11DEFINES += DESKTOP_VERSION KDE_QT_ONLY
11unix : { 12unix : {
13staticlib: {
14INCLUDEPATH += ../kabc/plugins
15DEFINES += STATIC_RESOURCES
16}
17
18
12OBJECTS_DIR = obj/unix 19OBJECTS_DIR = obj/unix
13MOC_DIR = moc/unix 20MOC_DIR = moc/unix
14} 21}
15win32: { 22win32: {
16DEFINES += _WIN32_ 23DEFINES += _WIN32_
17OBJECTS_DIR = obj/win 24OBJECTS_DIR = obj/win
18MOC_DIR = moc/win 25MOC_DIR = moc/win
19} 26}
20include( ../variables.pri )
21 27
22 28
23 29
24HEADERS = \ 30HEADERS = \
25qlayoutengine_p.h \ 31qlayoutengine_p.h \
26KDGanttMinimizeSplitter.h \ 32KDGanttMinimizeSplitter.h \
27 kapplication.h \ 33 kapplication.h \
28 kaudioplayer.h \ 34 kaudioplayer.h \
29 kcalendarsystem.h \ 35 kcalendarsystem.h \
30 kcalendarsystemgregorian.h \ 36 kcalendarsystemgregorian.h \
31 kcolorbutton.h \ 37 kcolorbutton.h \
32 kcolordialog.h \ 38 kcolordialog.h \
33 kcombobox.h \ 39 kcombobox.h \
34 kconfig.h \ 40 kconfig.h \
35 kdatetbl.h \ 41 kdatetbl.h \
36 kdebug.h \ 42 kdebug.h \
37 kdialog.h \ 43 kdialog.h \
38 kdialogbase.h \ 44 kdialogbase.h \
39 keditlistbox.h \ 45 keditlistbox.h \
40 kemailsettings.h \ 46 kemailsettings.h \
41 kfiledialog.h \ 47 kfiledialog.h \
42 kfontdialog.h \ 48 kfontdialog.h \
43 kglobal.h \ 49 kglobal.h \
44 kglobalsettings.h \ 50 kglobalsettings.h \
45 kiconloader.h \ 51 kiconloader.h \
46 klineedit.h \ 52 klineedit.h \
47 klineeditdlg.h \ 53 klineeditdlg.h \
48 kmessagebox.h \ 54 kmessagebox.h \
49 knotifyclient.h \ 55 knotifyclient.h \
50 kprinter.h \ 56 kprinter.h \
51 kprocess.h \ 57 kprocess.h \
52 krestrictedline.h \ 58 krestrictedline.h \
53 krun.h \ 59 krun.h \
54 ksimpleconfig.h \ 60 ksimpleconfig.h \
55 kstaticdeleter.h \ 61 kstaticdeleter.h \
56 ksystemtray.h \ 62 ksystemtray.h \
57 ktempfile.h \ 63 ktempfile.h \
58 ktextedit.h \ 64 ktextedit.h \
59 kunload.h \ 65 kunload.h \
60 kurl.h \ 66 kurl.h \
61 kdeui/kguiitem.h \ 67 kdeui/kguiitem.h \
62 kdeui/kcmodule.h \ 68 kdeui/kcmodule.h \
63 kdeui/kbuttonbox.h \ 69 kdeui/kbuttonbox.h \
64 kdeui/klistbox.h \ 70 kdeui/klistbox.h \
65 kdeui/klistview.h \ 71 kdeui/klistview.h \
66 kdeui/kjanuswidget.h \ 72 kdeui/kjanuswidget.h \
67 kdeui/kseparator.h \ 73 kdeui/kseparator.h \
68 kdeui/knuminput.h \ 74 kdeui/knuminput.h \