summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-01-31 18:35:48 (UTC)
committer kergoth <kergoth>2002-01-31 18:35:48 (UTC)
commit2802e5a2b474101a50bf95e707061ca5542876fd (patch) (unidiff)
treea1015514ef9e48df091903cccf0d3174e272f663
parent48a922e687e82dc8ebe2bc3cb17dcaa8dcae62bd (diff)
downloadopie-2802e5a2b474101a50bf95e707061ca5542876fd.zip
opie-2802e5a2b474101a50bf95e707061ca5542876fd.tar.gz
opie-2802e5a2b474101a50bf95e707061ca5542876fd.tar.bz2
*** empty log message ***
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xconfigure19
-rw-r--r--core/applets/clipboardapplet/Makefile.in8
-rw-r--r--core/apps/embeddedkonsole/Makefile.in14
-rw-r--r--core/launcher/launcher.pro2
-rw-r--r--core/launcher/launcherview.cpp27
-rw-r--r--core/multimedia/opieplayer/Makefile.in64
-rw-r--r--core/multimedia/opieplayer/libflash/Makefile.in9
-rw-r--r--core/multimedia/opieplayer/libmad/Makefile.in11
-rw-r--r--core/multimedia/opieplayer/libmpeg3/Makefile.in13
-rw-r--r--core/multimedia/opieplayer/wavplugin/Makefile.in13
-rw-r--r--core/pim/datebook/Makefile.in119
-rw-r--r--docs/start.doc51
-rw-r--r--library/Makefile.in125
-rw-r--r--library/global.cpp2
-rw-r--r--library/library.pro10
-rw-r--r--noncore/games/chess/Makefile.in16
-rw-r--r--noncore/games/go/Makefile.in15
17 files changed, 159 insertions, 359 deletions
diff --git a/configure b/configure
index 7824e36..3b474c6 100755
--- a/configure
+++ b/configure
@@ -1,270 +1,275 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# Configures to build the Qtopia Environment 3# Configures to build the Qtopia Environment
4# 4#
5# Copyright 1999-2000 Trolltech AS. All rights reserved. 5# Copyright 1999-2000 Trolltech AS. All rights reserved.
6# 6#
7 7
8PLATFORM=linux-generic-g++ 8PLATFORM=generic
9SHARING=shared 9SHARING=shared
10DEBUG= 10DEBUG=
11QCONFIGARG= 11QCONFIGARG=
12 12
13touch .test.qpe. 13touch .test.qpe.
14if [ '!' -f ${OPIEDIR}/.test.qpe. ]; 14if [ '!' -f ${OPIEDIR}/.test.qpe. ];
15then 15then
16 rm .test.qpe. 16 rm .test.qpe.
17 echo 17 echo
18 echo 18 echo
19 echo ' The environment variable $OPIEDIR is not set correctly. It is currently' 19 echo ' The environment variable $OPIEDIR is not set correctly. It is currently'
20 echo ' set to "'$OPIEDIR'", but it should be set to this directory,' 20 echo ' set to "'$OPIEDIR'", but it should be set to this directory,'
21 echo ' which is "'`pwd`'".' 21 echo ' which is "'`pwd`'".'
22 echo 22 echo
23 echo ' Please read the INSTALL file for instructions on how to set $OPIEDIR' 23 echo ' Please read the INSTALL file for instructions on how to set $OPIEDIR'
24 echo ' correctly. If you have set $OPIEDIR in your .profile or .login, you ' 24 echo ' correctly. If you have set $OPIEDIR in your .profile or .login, you '
25 echo ' will need to log out and log in again to make the setting effective.' 25 echo ' will need to log out and log in again to make the setting effective.'
26 echo 26 echo
27 echo 27 echo
28 exit 1 28 exit 1
29fi 29fi
30rm .test.qpe. 30rm .test.qpe.
31 31
32mkdir -p include/qpe 32VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <library/version.h)
33( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) 33VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <library/version.h)
34 34VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <library/version.h)
35VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <include/qpe/version.h)
36VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <include/qpe/version.h)
37VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <include/qpe/version.h)
38 35
39TOMAKE= 36TOMAKE=
40 37
41if grep -q 'VERSION_STR.*"3' $QTDIR/include/qglobal.h 38if grep -q 'VERSION_STR.*"3' $QTDIR/include/qglobal.h
42then 39then
43 QT3=yes 40 QT3=yes
44else 41else
45 QT3=no 42 QT3=no
46fi 43fi
47 44
48# Parse the arguments, setting things to "yes" or "no". 45# Parse the arguments, setting things to "yes" or "no".
49 46
50while [ -n "$1" ]; do 47while [ -n "$1" ]; do
51 case $1 in 48 case $1 in
52 -platform|-xplatform) # No difference since we don't need to build moc, etc. 49 -platform|-xplatform) # No difference since we don't need to build moc, etc.
53 shift; PLATFORM=$1 50 shift; PLATFORM=$1
54 ;; 51 ;;
55 -release) 52 -release)
56 DEBUG= 53 DEBUG=
57 ;; 54 ;;
58 -debug) 55 -debug)
59 DEBUG=-debug 56 DEBUG=-debug
60 ;; 57 ;;
61 -shared) 58 -shared)
62 SHARING=shared 59 SHARING=shared
63 ;; 60 ;;
64 -static) 61 -static)
65 SHARING=static 62 SHARING=static
66 ;; 63 ;;
67 -qconfig) 64 -qconfig)
68 # optional way to specify the qconfig-qpe.h is to pass -qconfig qpe 65 # optional way to specify the qconfig-qpe.h is to pass -qconfig qpe
69 shift; QCONFIGARG=DEFINES+=QCONFIG='\"'$1'\"' # Don't quote me on that. 66 shift; QCONFIGARG=DEFINES+=QCONFIG='\"'$1'\"' # Don't quote me on that.
70 ;; 67 ;;
71 -make) 68 -make)
72 shift; TOMAKE="$TOMAKE $1" 69 shift; TOMAKE="$TOMAKE $1"
73 ;; 70 ;;
74 -qt3) 71 -qt3)
75 QT3=yes 72 QT3=yes
76 ;; 73 ;;
77 *) 74 *)
78 HELP=yes;; 75 HELP=yes;;
79 esac 76 esac
80 shift 77 shift
81done 78done
82 79
83TARGET=configs/$PLATFORM-$SHARING$DEBUG 80TARGET=configs/$PLATFORM-$SHARING$DEBUG
84 81
85if [ '!' -f $TARGET ] 82if [ '!' -f $TARGET ]
86then 83then
87 if [ -f configs/linux-$PLATFORM-g++-$SHARING$DEBUG ] 84 if [ -f configs/linux-$PLATFORM-g++-$SHARING$DEBUG ]
88 then 85 then
89 TARGET=configs/linux-$PLATFORM-g++-$SHARING$DEBUG 86 TARGET=configs/linux-$PLATFORM-g++-$SHARING$DEBUG
90 else 87 else
91 echo 88 echo
92 echo ' The specified platform/compiler not supported: ' $TARGET 89 echo ' The specified platform/compiler not supported: ' $TARGET
93 echo 90 echo
94 exit 2 91 exit 2
95 fi 92 fi
96fi 93fi
97 94
98# Next, emit a usage message if something failed. 95# Next, emit a usage message if something failed.
99 96
100if [ "$HELP" = "yes" ]; then 97if [ "$HELP" = "yes" ]; then
101 cat <<EOF 98 cat <<EOF
102Usage: $0 [-debug] [-release] [-shared] [-static] [-qt3] [-platform ...] 99Usage: $0 [-debug] [-release] [-shared] [-static] [-qt3] [-platform ...]
103 100
104The defaults (*) are usually acceptable. Here is a short explanation of 101The defaults (*) are usually acceptable. Here is a short explanation of
105each option: 102each option:
106 103
107 * -release ........... Compile and link Qt with debugging turned off. 104 * -release ........... Compile and link Qt with debugging turned off.
108 -debug ............. Compile and link Qt with debugging turned on. 105 -debug ............. Compile and link Qt with debugging turned on.
109 106
110 * -shared ............ Create and use a shared Qt library (libqt.so) 107 * -shared ............ Create and use a shared Qt library (libqt.so)
111 -static ............ Create and use a static Qt library (libqt.a) 108 -static ............ Create and use a static Qt library (libqt.a)
112 109
113 -qt3 ............... Configure for use with Qt 3.x 110 -qt3 ............... Configure for use with Qt 3.x
114 111
115 -platform target ... The platform you are building on ($PLATFORM) 112 -platform target ... The platform you are building on ($PLATFORM)
116EOF 113EOF
117 exit 0; 114 exit 0;
118fi 115fi
119 116
117if [ -f library/custom-$PLATFORM.h ]
118then
119 rm -f library/custom.h
120 ln -s custom-$PLATFORM.h library/custom.h
121fi
122
123mkdir -p include/qpe
124( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; )
120 125
121echo Creating makefiles... 126echo Creating makefiles...
122 127
123sed -e 's/^\(VERSION.*= \).*/\1'$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT/ <library/library.pro >library/library.pro-v 128sed -e 's/^\(VERSION.*= \).*/\1'$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT/ <library/library.pro >library/library.pro-v
124mv library/library.pro-v library/library.pro 129mv library/library.pro-v library/library.pro
125 130
126if [ "$QT3" = yes ] 131if [ "$QT3" = yes ]
127then 132then
128 VCONFIG="CONFIG+=qt3" 133 VCONFIG="CONFIG+=qt3"
129else 134else
130 VCONFIG="CONFIG+=qt2" 135 VCONFIG="CONFIG+=qt2"
131fi 136fi
132 137
133if [ -f $TMAKEPATH/tmake.conf ] 138if [ -f $TMAKEPATH/tmake.conf ]
134then 139then
135 # You have tmake. We'll regenerate the file for you... 140 # You have tmake. We'll regenerate the file for you...
136 echo "Makefiles will be regenerated." 141 echo "Makefiles will be regenerated."
137fi 142fi
138 143
139H=`pwd` 144H=`pwd`
140if [ -z "$TOMAKE" ] 145if [ -z "$TOMAKE" ]
141then 146then
142 TOMAKE=`make showcomponents` 147 TOMAKE=`make showcomponents`
143fi 148fi
144 149
145for a in $TOMAKE ; do 150for a in $TOMAKE ; do
146 N=$a/Makefile 151 N=$a/Makefile
147 M=$a/Makefile.in 152 M=$a/Makefile.in
148 O=$a/Makefile.add 153 O=$a/Makefile.add
149 f=`basename $a` 154 f=`basename $a`
150 155
151 if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ] 156 if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ]
152 then 157 then
153 ( cd $a; 158 ( cd $a;
154 TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ 159 TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \
155 tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ 160 tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \
156 -t $H/qt/tmake/propagate.t $f.pro | 161 -t $H/qt/tmake/propagate.t $f.pro |
157 sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; 162 sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in;
158 ) 163 )
159 echo -n "." 164 echo -n "."
160 appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` 165 appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'`
161 translation=`grep '^TRANSLATION' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` 166 translation=`grep '^TRANSLATION' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' `
162 if [ -n "$translation" -a -n "$appname" ] 167 if [ -n "$translation" -a -n "$appname" ]
163 then 168 then
164 if [ $appname != $translation ] 169 if [ $appname != $translation ]
165 then 170 then
166 echo 171 echo
167 echo "Warning: translation and appname disagree in $a/$f.pro" 172 echo "Warning: translation and appname disagree in $a/$f.pro"
168 fi 173 fi
169 fi 174 fi
170 175
171 fi 176 fi
172 177
173 cat > $N <<EOF 178 cat > $N <<EOF
174############################################################################# 179#############################################################################
175# Automatically generated from $M 180# Automatically generated from $M
176# Build options from $1 181# Build options from $1
177############################################################################# 182#############################################################################
178 183
179EOF 184EOF
180 185
181 SED= 186 SED=
182 PLATFORM_CFLAGS= 187 PLATFORM_CFLAGS=
183 188
184 if [ "$f" = "embeddedkonsole" ] 189 if [ "$f" = "embeddedkonsole" ]
185 then 190 then
186 case $PLATFORM in 191 case $PLATFORM in
187 *x86*|*generic*|*ipaq*) 192 *x86*|*generic*|*ipaq*)
188 SED="$SED /^LIBS.*=/s/\$/ -lutil/;" 193 SED="$SED /^LIBS.*=/s/\$/ -lutil/;"
189 PLATFORM_CFLAGS="-DHAVE_OPENPTY" 194 PLATFORM_CFLAGS="-DHAVE_OPENPTY"
190 ;; *) 195 ;; *)
191 SED= 196 SED=
192 esac 197 esac
193 elif [ "$f" = "libmpeg3" ] 198 elif [ "$f" = "libmpeg3" ]
194 then 199 then
195 # Patch our Makefile.in file with the platform specifics for the libmpeg3 library 200 # Patch our Makefile.in file with the platform specifics for the libmpeg3 library
196 # Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code) 201 # Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code)
197 SED='s/\$(CC)/\$(CXX)/;' 202 SED='s/\$(CC)/\$(CXX)/;'
198 case $PLATFORM 203 case $PLATFORM
199 in 204 in
200 # For x86 turn on using floating point, compile mmx and css code 205 # For x86 turn on using floating point, compile mmx and css code
201 *x86*) 206 *x86*)
202 # "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486" 207 # "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486"
203 PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS" 208 PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS"
204 SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;" 209 SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;"
205 # For generic turn on using floating point 210 # For generic turn on using floating point
206 ;; *generic*) 211 ;; *generic*)
207 PLATFORM_CFLAGS="" 212 PLATFORM_CFLAGS=""
208 # For the ipaq use fixed point maths, don't compile the mmx or css code 213 # For the ipaq use fixed point maths, don't compile the mmx or css code
209 ;; *ipaq*) 214 ;; *ipaq*)
210 PLATFORM_CFLAGS="-DUSE_FIXED_POINT" 215 PLATFORM_CFLAGS="-DUSE_FIXED_POINT"
211 ;; *) 216 ;; *)
212 # For 'other platforms', turn off optimizations and use fixed point 217 # For 'other platforms', turn off optimizations and use fixed point
213 PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT" 218 PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT"
214 esac 219 esac
215 elif [ "$f" = "libmad" ] 220 elif [ "$f" = "libmad" ]
216 then 221 then
217 # Patch our Makefile.in file with the platform specifics for the libmad library 222 # Patch our Makefile.in file with the platform specifics for the libmad library
218 case $PLATFORM 223 case $PLATFORM
219 in 224 in
220 # For x86 use intel optimizations 225 # For x86 use intel optimizations
221 *x86*) 226 *x86*)
222 PLATFORM_CFLAGS="-DFPM_INTEL" 227 PLATFORM_CFLAGS="-DFPM_INTEL"
223 # For the ipaq use ARM asm optimizations 228 # For the ipaq use ARM asm optimizations
224 ;; *ipaq*) 229 ;; *ipaq*)
225 PLATFORM_CFLAGS="-DFPM_ARM" 230 PLATFORM_CFLAGS="-DFPM_ARM"
226 SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" 231 SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;"
227 # For generic platforms use the C 64-bit implementation 232 # For generic platforms use the C 64-bit implementation
228 ;; *generic*) 233 ;; *generic*)
229 PLATFORM_CFLAGS="-DFPM_64BIT" 234 PLATFORM_CFLAGS="-DFPM_64BIT"
230 # For 'other platforms' use the ARM code 235 # For 'other platforms' use the ARM code
231 ;; *) 236 ;; *)
232 PLATFORM_CFLAGS="-DFPM_ARM" 237 PLATFORM_CFLAGS="-DFPM_ARM"
233 SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" 238 SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;"
234 esac 239 esac
235 fi 240 fi
236 if [ -n "$PLATFORM_CFLAGS" ] 241 if [ -n "$PLATFORM_CFLAGS" ]
237 then 242 then
238 # Append the addition c-flags we have defined 243 # Append the addition c-flags we have defined
239 SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" 244 SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;"
240 SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" 245 SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;"
241 fi 246 fi
242 cat $TARGET >> $N 247 cat $TARGET >> $N
243 if [ -n "$SED" ] 248 if [ -n "$SED" ]
244 then 249 then
245 sed -e "$SED" $M >> $N 250 sed -e "$SED" $M >> $N
246 else 251 else
247 cat $M >> $N 252 cat $M >> $N
248 fi 253 fi
249 254
250 cat >> $N <<EOF 255 cat >> $N <<EOF
251 256
252lupdate: 257lupdate:
253 lupdate $f.pro 258 lupdate $f.pro
254 259
255lrelease: 260lrelease:
256 lrelease $f.pro 261 lrelease $f.pro
257 262
258EOF 263EOF
259 if [ -f "$O" ] 264 if [ -f "$O" ]
260 then 265 then
261 cat >> $N $O 266 cat >> $N $O
262 fi 267 fi
263 268
264done 269done
265 270
266MAKE=make 271MAKE=make
267echo 272echo
268echo "QPE is now configured for building. Just run $MAKE (or $MAKE single)." 273echo "QPE is now configured for building. Just run $MAKE (or $MAKE single)."
269echo "To reconfigure, run $MAKE clean and configure." 274echo "To reconfigure, run $MAKE clean and configure."
270echo 275echo
diff --git a/core/applets/clipboardapplet/Makefile.in b/core/applets/clipboardapplet/Makefile.in
index 2ddeb42..c42404e 100644
--- a/core/applets/clipboardapplet/Makefile.in
+++ b/core/applets/clipboardapplet/Makefile.in
@@ -1,115 +1,117 @@
1############################################################################# 1#############################################################################
2 2
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
13 UIC =$(SYSCONF_UIC) 13 UIC =$(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = ../../plugins/applets/ 17DESTDIR = ../../plugins/applets/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= clipboardapplet 21 TARGET= clipboardapplet
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =clipboard.h \ 26 HEADERS =clipboard.h \
27 clipboardappletimpl.h 27 clipboardappletimpl.h
28 SOURCES =clipboard.cpp \ 28 SOURCES =clipboard.cpp \
29 clipboardappletimpl.cpp 29 clipboardappletimpl.cpp
30 OBJECTS =clipboard.o \ 30 OBJECTS =clipboard.o \
31 clipboardappletimpl.o 31 clipboardappletimpl.o
32INTERFACES = 32INTERFACES =
33UICDECLS = 33UICDECLS =
34UICIMPLS = 34UICIMPLS =
35 SRCMOC =moc_clipboard.cpp 35 SRCMOC =moc_clipboard.cpp
36 OBJMOC =moc_clipboard.o 36 OBJMOC =moc_clipboard.o
37 37
38 38
39####### Implicit rules 39####### Implicit rules
40 40
41.SUFFIXES: .cpp .cxx .cc .C .c 41.SUFFIXES: .cpp .cxx .cc .C .c
42 42
43.cpp.o: 43.cpp.o:
44 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 44 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
45 45
46.cxx.o: 46.cxx.o:
47 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 47 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
48 48
49.cc.o: 49.cc.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51 51
52.C.o: 52.C.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54 54
55.c.o: 55.c.o:
56 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 56 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
57 57
58####### Build rules 58####### Build rules
59 59
60 60
61all: $(DESTDIR)$(SYSCONF_LINK_TARGET) 61all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
62 62
63$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 63$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
64 $(SYSCONF_LINK_LIB) 64 $(SYSCONF_LINK_LIB)
65 65
66moc: $(SRCMOC) 66moc: $(SRCMOC)
67 67
68tmake: 68tmake: Makefile.in
69 tmake clipboardapplet.pro 69
70Makefile.in: clipboardapplet.pro
71 tmake clipboardapplet.pro -o Makefile.in
70 72
71clean: 73clean:
72 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
73 -rm -f *~ core 75 -rm -f *~ core
74 -rm -f allmoc.cpp 76 -rm -f allmoc.cpp
75 77
76####### Extension Modules 78####### Extension Modules
77 79
78listpromodules: 80listpromodules:
79 @echo 81 @echo
80 82
81listallmodules: 83listallmodules:
82 @echo 84 @echo
83 85
84listaddonpromodules: 86listaddonpromodules:
85 @echo 87 @echo
86 88
87listaddonentmodules: 89listaddonentmodules:
88 @echo 90 @echo
89 91
90 92
91REQUIRES= 93REQUIRES=
92 94
93####### Sub-libraries 95####### Sub-libraries
94 96
95 97
96###### Combined headers 98###### Combined headers
97 99
98 100
99 101
100####### Compile 102####### Compile
101 103
102clipboard.o: clipboard.cpp \ 104clipboard.o: clipboard.cpp \
103 clipboard.h 105 clipboard.h
104 106
105clipboardappletimpl.o: clipboardappletimpl.cpp \ 107clipboardappletimpl.o: clipboardappletimpl.cpp \
106 clipboard.h \ 108 clipboard.h \
107 clipboardappletimpl.h 109 clipboardappletimpl.h
108 110
109moc_clipboard.o: moc_clipboard.cpp \ 111moc_clipboard.o: moc_clipboard.cpp \
110 clipboard.h 112 clipboard.h
111 113
112moc_clipboard.cpp: clipboard.h 114moc_clipboard.cpp: clipboard.h
113 $(MOC) clipboard.h -o moc_clipboard.cpp 115 $(MOC) clipboard.h -o moc_clipboard.cpp
114 116
115 117
diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in
index 8a69557..0da49d7 100644
--- a/core/apps/embeddedkonsole/Makefile.in
+++ b/core/apps/embeddedkonsole/Makefile.in
@@ -1,286 +1,282 @@
1############################################################################# 1#############################################################################
2 2
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(OPIEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
13 UIC =$(SYSCONF_UIC) 13 UIC =$(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(OPIEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= embeddedkonsole 21 TARGET= embeddedkonsole
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =TEWidget.h \ 26 HEADERS =TEWidget.h \
27 TEScreen.h \ 27 TEScreen.h \
28 TECommon.h \ 28 TECommon.h \
29 TEHistory.h \ 29 TEHistory.h \
30 TEmulation.h \ 30 TEmulation.h \
31 TEmuVt102.h \ 31 TEmuVt102.h \
32 session.h \ 32 session.h \
33 keytrans.h \ 33 keytrans.h \
34 konsole.h \ 34 konsole.h \
35 MyPty.h 35 MyPty.h
36 SOURCES =TEScreen.cpp \ 36 SOURCES =TEScreen.cpp \
37 TEWidget.cpp \ 37 TEWidget.cpp \
38 TEHistory.cpp \ 38 TEHistory.cpp \
39 TEmulation.cpp \ 39 TEmulation.cpp \
40 TEmuVt102.cpp \ 40 TEmuVt102.cpp \
41 session.cpp \ 41 session.cpp \
42 keytrans.cpp \ 42 keytrans.cpp \
43 konsole.cpp \ 43 konsole.cpp \
44 main.cpp \ 44 main.cpp \
45 MyPty.cpp 45 MyPty.cpp
46 OBJECTS =TEScreen.o \ 46 OBJECTS =TEScreen.o \
47 TEWidget.o \ 47 TEWidget.o \
48 TEHistory.o \ 48 TEHistory.o \
49 TEmulation.o \ 49 TEmulation.o \
50 TEmuVt102.o \ 50 TEmuVt102.o \
51 session.o \ 51 session.o \
52 keytrans.o \ 52 keytrans.o \
53 konsole.o \ 53 konsole.o \
54 main.o \ 54 main.o \
55 MyPty.o 55 MyPty.o
56INTERFACES = 56INTERFACES =
57UICDECLS = 57UICDECLS =
58UICIMPLS = 58UICIMPLS =
59 SRCMOC =moc_TEWidget.cpp \ 59 SRCMOC =moc_TEWidget.cpp \
60 moc_TEmulation.cpp \ 60 moc_TEmulation.cpp \
61 moc_TEmuVt102.cpp \ 61 moc_TEmuVt102.cpp \
62 moc_session.cpp \ 62 moc_session.cpp \
63 moc_konsole.cpp \ 63 moc_konsole.cpp \
64 moc_MyPty.cpp 64 moc_MyPty.cpp
65 OBJMOC =moc_TEWidget.o \ 65 OBJMOC =moc_TEWidget.o \
66 moc_TEmulation.o \ 66 moc_TEmulation.o \
67 moc_TEmuVt102.o \ 67 moc_TEmuVt102.o \
68 moc_session.o \ 68 moc_session.o \
69 moc_konsole.o \ 69 moc_konsole.o \
70 moc_MyPty.o 70 moc_MyPty.o
71 71
72 72
73####### Implicit rules 73####### Implicit rules
74 74
75.SUFFIXES: .cpp .cxx .cc .C .c 75.SUFFIXES: .cpp .cxx .cc .C .c
76 76
77.cpp.o: 77.cpp.o:
78 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 78 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
79 79
80.cxx.o: 80.cxx.o:
81 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 81 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
82 82
83.cc.o: 83.cc.o:
84 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 84 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
85 85
86.C.o: 86.C.o:
87 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 87 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
88 88
89.c.o: 89.c.o:
90 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 90 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
91 91
92####### Build rules 92####### Build rules
93 93
94 94
95all: $(DESTDIR)$(TARGET) 95all: $(DESTDIR)$(TARGET)
96 96
97$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 97$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
98 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 98 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
99 99
100moc: $(SRCMOC) 100moc: $(SRCMOC)
101 101
102tmake: 102tmake: Makefile.in
103 tmake embeddedkonsole.pro 103
104Makefile.in: embeddedkonsole.pro
105 tmake embeddedkonsole.pro -o Makefile.in
104 106
105clean: 107clean:
106 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 108 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
107 -rm -f *~ core 109 -rm -f *~ core
108 -rm -f allmoc.cpp 110 -rm -f allmoc.cpp
109 111
110####### Extension Modules 112####### Extension Modules
111 113
112listpromodules: 114listpromodules:
113 @echo 115 @echo
114 116
115listallmodules: 117listallmodules:
116 @echo 118 @echo
117 119
118listaddonpromodules: 120listaddonpromodules:
119 @echo 121 @echo
120 122
121listaddonentmodules: 123listaddonentmodules:
122 @echo 124 @echo
123 125
124 126
125REQUIRES=embeddedkonsole 127REQUIRES=embeddedkonsole
126 128
127####### Sub-libraries 129####### Sub-libraries
128 130
129 131
130###### Combined headers 132###### Combined headers
131 133
132 134
133 135
134####### Compile 136####### Compile
135 137
136TEScreen.o: TEScreen.cpp \ 138TEScreen.o: TEScreen.cpp \
137 TEScreen.h \ 139 TEScreen.h \
138 TECommon.h \ 140 TECommon.h \
139 TEHistory.h 141 TEHistory.h
140 142
141TEWidget.o: TEWidget.cpp \ 143TEWidget.o: TEWidget.cpp \
142 TEWidget.h \ 144 TEWidget.h \
143 TECommon.h \ 145 TECommon.h \
144 session.h \ 146 session.h \
145 MyPty.h \ 147 MyPty.h \
146 TEmuVt102.h \ 148 TEmuVt102.h \
147 TEScreen.h \ 149 TEScreen.h \
148 TEHistory.h \ 150 TEHistory.h \
149 TEmulation.h \ 151 TEmulation.h \
150 keytrans.h 152 keytrans.h
151 153
152TEHistory.o: TEHistory.cpp \ 154TEHistory.o: TEHistory.cpp \
153 TEHistory.h \ 155 TEHistory.h \
154 TECommon.h 156 TECommon.h
155 157
156TEmulation.o: TEmulation.cpp \ 158TEmulation.o: TEmulation.cpp \
157 TEmulation.h \ 159 TEmulation.h \
158 TEWidget.h \ 160 TEWidget.h \
159 TECommon.h \ 161 TECommon.h \
160 TEScreen.h \ 162 TEScreen.h \
161 TEHistory.h \ 163 TEHistory.h \
162 keytrans.h 164 keytrans.h
163 165
164TEmuVt102.o: TEmuVt102.cpp \ 166TEmuVt102.o: TEmuVt102.cpp \
165 TEmuVt102.h \ 167 TEmuVt102.h \
166 TEWidget.h \ 168 TEWidget.h \
167 TECommon.h \ 169 TECommon.h \
168 TEScreen.h \ 170 TEScreen.h \
169 TEHistory.h \ 171 TEHistory.h \
170 TEmulation.h \ 172 TEmulation.h \
171 keytrans.h 173 keytrans.h
172 174
173session.o: session.cpp \ 175session.o: session.cpp \
174 session.h \ 176 session.h \
175 MyPty.h \ 177 MyPty.h \
176 TEWidget.h \ 178 TEWidget.h \
177 TECommon.h \ 179 TECommon.h \
178 TEmuVt102.h \ 180 TEmuVt102.h \
179 TEScreen.h \ 181 TEScreen.h \
180 TEHistory.h \ 182 TEHistory.h \
181 TEmulation.h \ 183 TEmulation.h \
182 keytrans.h 184 keytrans.h
183 185
184keytrans.o: keytrans.cpp \ 186keytrans.o: keytrans.cpp \
185 keytrans.h \ 187 keytrans.h \
186 $(OPIEDIR)/include/qpe/qpeapplication.h \
187 default.keytab.h 188 default.keytab.h
188 189
189konsole.o: konsole.cpp \ 190konsole.o: konsole.cpp \
190 $(OPIEDIR)/include/qpe/resource.h \
191 $(OPIEDIR)/include/qpe/qpetoolbar.h \
192 $(OPIEDIR)/include/qpe/qpemenubar.h \
193 $(OPIEDIR)/include/qpe/config.h \
194 konsole.h \ 191 konsole.h \
195 MyPty.h \ 192 MyPty.h \
196 TEWidget.h \ 193 TEWidget.h \
197 TECommon.h \ 194 TECommon.h \
198 TEmuVt102.h \ 195 TEmuVt102.h \
199 TEScreen.h \ 196 TEScreen.h \
200 TEHistory.h \ 197 TEHistory.h \
201 TEmulation.h \ 198 TEmulation.h \
202 keytrans.h \ 199 keytrans.h \
203 session.h 200 session.h
204 201
205main.o: main.cpp \ 202main.o: main.cpp \
206 konsole.h \ 203 konsole.h \
207 MyPty.h \ 204 MyPty.h \
208 TEWidget.h \ 205 TEWidget.h \
209 TECommon.h \ 206 TECommon.h \
210 TEmuVt102.h \ 207 TEmuVt102.h \
211 TEScreen.h \ 208 TEScreen.h \
212 TEHistory.h \ 209 TEHistory.h \
213 TEmulation.h \ 210 TEmulation.h \
214 keytrans.h \ 211 keytrans.h \
215 session.h \ 212 session.h
216 $(OPIEDIR)/include/qpe/qpeapplication.h
217 213
218MyPty.o: MyPty.cpp \ 214MyPty.o: MyPty.cpp \
219 MyPty.h 215 MyPty.h
220 216
221moc_TEWidget.o: moc_TEWidget.cpp \ 217moc_TEWidget.o: moc_TEWidget.cpp \
222 TEWidget.h \ 218 TEWidget.h \
223 TECommon.h 219 TECommon.h
224 220
225moc_TEmulation.o: moc_TEmulation.cpp \ 221moc_TEmulation.o: moc_TEmulation.cpp \
226 TEmulation.h \ 222 TEmulation.h \
227 TEWidget.h \ 223 TEWidget.h \
228 TECommon.h \ 224 TECommon.h \
229 TEScreen.h \ 225 TEScreen.h \
230 TEHistory.h \ 226 TEHistory.h \
231 keytrans.h 227 keytrans.h
232 228
233moc_TEmuVt102.o: moc_TEmuVt102.cpp \ 229moc_TEmuVt102.o: moc_TEmuVt102.cpp \
234 TEmuVt102.h \ 230 TEmuVt102.h \
235 TEWidget.h \ 231 TEWidget.h \
236 TECommon.h \ 232 TECommon.h \
237 TEScreen.h \ 233 TEScreen.h \
238 TEHistory.h \ 234 TEHistory.h \
239 TEmulation.h \ 235 TEmulation.h \
240 keytrans.h 236 keytrans.h
241 237
242moc_session.o: moc_session.cpp \ 238moc_session.o: moc_session.cpp \
243 session.h \ 239 session.h \
244 MyPty.h \ 240 MyPty.h \
245 TEWidget.h \ 241 TEWidget.h \
246 TECommon.h \ 242 TECommon.h \
247 TEmuVt102.h \ 243 TEmuVt102.h \
248 TEScreen.h \ 244 TEScreen.h \
249 TEHistory.h \ 245 TEHistory.h \
250 TEmulation.h \ 246 TEmulation.h \
251 keytrans.h 247 keytrans.h
252 248
253moc_konsole.o: moc_konsole.cpp \ 249moc_konsole.o: moc_konsole.cpp \
254 konsole.h \ 250 konsole.h \
255 MyPty.h \ 251 MyPty.h \
256 TEWidget.h \ 252 TEWidget.h \
257 TECommon.h \ 253 TECommon.h \
258 TEmuVt102.h \ 254 TEmuVt102.h \
259 TEScreen.h \ 255 TEScreen.h \
260 TEHistory.h \ 256 TEHistory.h \
261 TEmulation.h \ 257 TEmulation.h \
262 keytrans.h \ 258 keytrans.h \
263 session.h 259 session.h
264 260
265moc_MyPty.o: moc_MyPty.cpp \ 261moc_MyPty.o: moc_MyPty.cpp \
266 MyPty.h 262 MyPty.h
267 263
268moc_TEWidget.cpp: TEWidget.h 264moc_TEWidget.cpp: TEWidget.h
269 $(MOC) TEWidget.h -o moc_TEWidget.cpp 265 $(MOC) TEWidget.h -o moc_TEWidget.cpp
270 266
271moc_TEmulation.cpp: TEmulation.h 267moc_TEmulation.cpp: TEmulation.h
272 $(MOC) TEmulation.h -o moc_TEmulation.cpp 268 $(MOC) TEmulation.h -o moc_TEmulation.cpp
273 269
274moc_TEmuVt102.cpp: TEmuVt102.h 270moc_TEmuVt102.cpp: TEmuVt102.h
275 $(MOC) TEmuVt102.h -o moc_TEmuVt102.cpp 271 $(MOC) TEmuVt102.h -o moc_TEmuVt102.cpp
276 272
277moc_session.cpp: session.h 273moc_session.cpp: session.h
278 $(MOC) session.h -o moc_session.cpp 274 $(MOC) session.h -o moc_session.cpp
279 275
280moc_konsole.cpp: konsole.h 276moc_konsole.cpp: konsole.h
281 $(MOC) konsole.h -o moc_konsole.cpp 277 $(MOC) konsole.h -o moc_konsole.cpp
282 278
283moc_MyPty.cpp: MyPty.h 279moc_MyPty.cpp: MyPty.h
284 $(MOC) MyPty.h -o moc_MyPty.cpp 280 $(MOC) MyPty.h -o moc_MyPty.cpp
285 281
286 282
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index 0078faf..32cb95f 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -1,110 +1,112 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 2
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 4
5 DESTDIR = $(OPIEDIR)/bin 5 DESTDIR = $(OPIEDIR)/bin
6 6
7 HEADERS = background.h \ 7 HEADERS = background.h \
8 desktop.h \ 8 desktop.h \
9 qprocess.h \
9 info.h \ 10 info.h \
10 appicons.h \ 11 appicons.h \
11 taskbar.h \ 12 taskbar.h \
12 sidething.h \ 13 sidething.h \
13 mrulist.h \ 14 mrulist.h \
14 stabmon.h \ 15 stabmon.h \
15 inputmethods.h \ 16 inputmethods.h \
16 systray.h \ 17 systray.h \
17 wait.h \ 18 wait.h \
18 shutdownimpl.h \ 19 shutdownimpl.h \
19 launcher.h \ 20 launcher.h \
20 launcherview.h \ 21 launcherview.h \
21 ../calibrate/calibrate.h \ 22 ../calibrate/calibrate.h \
22 startmenu.h \ 23 startmenu.h \
23 transferserver.h \ 24 transferserver.h \
24 qcopbridge.h \ 25 qcopbridge.h \
25 packageslave.h \ 26 packageslave.h \
26 irserver.h \ 27 irserver.h \
27 $(OPIEDIR)/rsync/buf.h \ 28 $(OPIEDIR)/rsync/buf.h \
28 $(OPIEDIR)/rsync/checksum.h \ 29 $(OPIEDIR)/rsync/checksum.h \
29 $(OPIEDIR)/rsync/command.h \ 30 $(OPIEDIR)/rsync/command.h \
30 $(OPIEDIR)/rsync/emit.h \ 31 $(OPIEDIR)/rsync/emit.h \
31 $(OPIEDIR)/rsync/job.h \ 32 $(OPIEDIR)/rsync/job.h \
32 $(OPIEDIR)/rsync/netint.h \ 33 $(OPIEDIR)/rsync/netint.h \
33 $(OPIEDIR)/rsync/protocol.h \ 34 $(OPIEDIR)/rsync/protocol.h \
34 $(OPIEDIR)/rsync/prototab.h \ 35 $(OPIEDIR)/rsync/prototab.h \
35 $(OPIEDIR)/rsync/rsync.h \ 36 $(OPIEDIR)/rsync/rsync.h \
36 $(OPIEDIR)/rsync/search.h \ 37 $(OPIEDIR)/rsync/search.h \
37 $(OPIEDIR)/rsync/stream.h \ 38 $(OPIEDIR)/rsync/stream.h \
38 $(OPIEDIR)/rsync/sumset.h \ 39 $(OPIEDIR)/rsync/sumset.h \
39 $(OPIEDIR)/rsync/trace.h \ 40 $(OPIEDIR)/rsync/trace.h \
40 $(OPIEDIR)/rsync/types.h \ 41 $(OPIEDIR)/rsync/types.h \
41 $(OPIEDIR)/rsync/util.h \ 42 $(OPIEDIR)/rsync/util.h \
42 $(OPIEDIR)/rsync/whole.h \ 43 $(OPIEDIR)/rsync/whole.h \
43 $(OPIEDIR)/rsync/config_rsync.h \ 44 $(OPIEDIR)/rsync/config_rsync.h \
44 $(OPIEDIR)/rsync/qrsync.h 45 $(OPIEDIR)/rsync/qrsync.h
45 # quicklauncher.h \ 46 # quicklauncher.h \
46 47
47 SOURCES = background.cpp \ 48 SOURCES = background.cpp \
48 desktop.cpp \ 49 desktop.cpp \
50 qprocess.cpp qprocess_unix.cpp \
49 info.cpp \ 51 info.cpp \
50 appicons.cpp \ 52 appicons.cpp \
51 taskbar.cpp \ 53 taskbar.cpp \
52 sidething.cpp \ 54 sidething.cpp \
53 mrulist.cpp \ 55 mrulist.cpp \
54 stabmon.cpp \ 56 stabmon.cpp \
55 inputmethods.cpp \ 57 inputmethods.cpp \
56 systray.cpp \ 58 systray.cpp \
57 wait.cpp \ 59 wait.cpp \
58 shutdownimpl.cpp \ 60 shutdownimpl.cpp \
59 launcher.cpp \ 61 launcher.cpp \
60 launcherview.cpp \ 62 launcherview.cpp \
61 $(OPIEDIR)/calibrate/calibrate.cpp \ 63 $(OPIEDIR)/calibrate/calibrate.cpp \
62 transferserver.cpp \ 64 transferserver.cpp \
63 packageslave.cpp \ 65 packageslave.cpp \
64 irserver.cpp \ 66 irserver.cpp \
65 qcopbridge.cpp \ 67 qcopbridge.cpp \
66 startmenu.cpp \ 68 startmenu.cpp \
67 main.cpp \ 69 main.cpp \
68 $(OPIEDIR)/rsync/base64.c \ 70 $(OPIEDIR)/rsync/base64.c \
69 $(OPIEDIR)/rsync/buf.c \ 71 $(OPIEDIR)/rsync/buf.c \
70 $(OPIEDIR)/rsync/checksum.c \ 72 $(OPIEDIR)/rsync/checksum.c \
71 $(OPIEDIR)/rsync/command.c \ 73 $(OPIEDIR)/rsync/command.c \
72 $(OPIEDIR)/rsync/delta.c \ 74 $(OPIEDIR)/rsync/delta.c \
73 $(OPIEDIR)/rsync/emit.c \ 75 $(OPIEDIR)/rsync/emit.c \
74 $(OPIEDIR)/rsync/hex.c \ 76 $(OPIEDIR)/rsync/hex.c \
75 $(OPIEDIR)/rsync/job.c \ 77 $(OPIEDIR)/rsync/job.c \
76 $(OPIEDIR)/rsync/mdfour.c \ 78 $(OPIEDIR)/rsync/mdfour.c \
77 $(OPIEDIR)/rsync/mksum.c \ 79 $(OPIEDIR)/rsync/mksum.c \
78 $(OPIEDIR)/rsync/msg.c \ 80 $(OPIEDIR)/rsync/msg.c \
79 $(OPIEDIR)/rsync/netint.c \ 81 $(OPIEDIR)/rsync/netint.c \
80 $(OPIEDIR)/rsync/patch.c \ 82 $(OPIEDIR)/rsync/patch.c \
81 $(OPIEDIR)/rsync/prototab.c \ 83 $(OPIEDIR)/rsync/prototab.c \
82 $(OPIEDIR)/rsync/readsums.c \ 84 $(OPIEDIR)/rsync/readsums.c \
83 $(OPIEDIR)/rsync/scoop.c \ 85 $(OPIEDIR)/rsync/scoop.c \
84 $(OPIEDIR)/rsync/search.c \ 86 $(OPIEDIR)/rsync/search.c \
85 $(OPIEDIR)/rsync/stats.c \ 87 $(OPIEDIR)/rsync/stats.c \
86 $(OPIEDIR)/rsync/stream.c \ 88 $(OPIEDIR)/rsync/stream.c \
87 $(OPIEDIR)/rsync/sumset.c \ 89 $(OPIEDIR)/rsync/sumset.c \
88 $(OPIEDIR)/rsync/trace.c \ 90 $(OPIEDIR)/rsync/trace.c \
89 $(OPIEDIR)/rsync/tube.c \ 91 $(OPIEDIR)/rsync/tube.c \
90 $(OPIEDIR)/rsync/util.c \ 92 $(OPIEDIR)/rsync/util.c \
91 $(OPIEDIR)/rsync/version.c \ 93 $(OPIEDIR)/rsync/version.c \
92 $(OPIEDIR)/rsync/whole.c \ 94 $(OPIEDIR)/rsync/whole.c \
93 $(OPIEDIR)/rsync/qrsync.cpp 95 $(OPIEDIR)/rsync/qrsync.cpp
94 96
95 INTERFACES= shutdown.ui syncdialog.ui 97 INTERFACES= shutdown.ui syncdialog.ui
96 98
97INCLUDEPATH += $(OPIEDIR)/include 99INCLUDEPATH += $(OPIEDIR)/include
98 DEPENDPATH+= $(OPIEDIR)/include . 100 DEPENDPATH+= $(OPIEDIR)/include .
99 101
100INCLUDEPATH += $(OPIEDIR)/calibrate 102INCLUDEPATH += $(OPIEDIR)/calibrate
101 DEPENDPATH+= $(OPIEDIR)/calibrate 103 DEPENDPATH+= $(OPIEDIR)/calibrate
102 104
103INCLUDEPATH += $(OPIEDIR)/rsync 105INCLUDEPATH += $(OPIEDIR)/rsync
104 DEPENDPATH+= $(OPIEDIR)/rsync 106 DEPENDPATH+= $(OPIEDIR)/rsync
105 107
106 TARGET = qpe 108 TARGET = qpe
107 109
108 LIBS += -lqpe -lcrypt 110 LIBS += -lqpe -lcrypt
109 111
110TRANSLATIONS = ../i18n/de/qpe.ts 112TRANSLATIONS = ../i18n/de/qpe.ts
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index ed39720..e8741a2 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -1,596 +1,603 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include "launcherview.h" 21#include "launcherview.h"
22 22
23#include <qpe/qpeapplication.h> 23#include <qpe/qpeapplication.h>
24#include <qpe/applnk.h> 24#include <qpe/applnk.h>
25#include <qpe/qpedebug.h> 25#include <qpe/qpedebug.h>
26#include <qpe/categories.h> 26#include <qpe/categories.h>
27#include <qpe/categoryselect.h> 27#include <qpe/categoryselect.h>
28#include <qpe/menubutton.h> 28#include <qpe/menubutton.h>
29#include <qpe/resource.h> 29#include <qpe/resource.h>
30#include <qpe/qpetoolbar.h> 30#include <qpe/qpetoolbar.h>
31 31
32#include <qtimer.h> 32#include <qtimer.h>
33#include <qdict.h> 33#include <qdict.h>
34#include <qfile.h> 34#include <qfile.h>
35#include <qfileinfo.h> 35#include <qfileinfo.h>
36#include <qhbox.h> 36#include <qhbox.h>
37#include <qiconview.h> 37#include <qiconview.h>
38#include <qpainter.h> 38#include <qpainter.h>
39#include <qregexp.h> 39#include <qregexp.h>
40#include <qtoolbutton.h> 40#include <qtoolbutton.h>
41 41
42class LauncherIconView : public QIconView { 42class LauncherIconView : public QIconView {
43public: 43public:
44 LauncherIconView( QWidget* parent, const char* name=0 ) : 44 LauncherIconView( QWidget* parent, const char* name=0 ) :
45 QIconView(parent,name), 45 QIconView(parent,name),
46 tf(""), 46 tf(""),
47 cf(0), 47 cf(0),
48 bsy(0) 48 bsy(0)
49 { 49 {
50 sortmeth = Name; 50 sortmeth = Name;
51 hidden.setAutoDelete(TRUE); 51 hidden.setAutoDelete(TRUE);
52 ike = FALSE; 52 ike = FALSE;
53 } 53 }
54 54
55 ~LauncherIconView() 55 ~LauncherIconView()
56 { 56 {
57#if 0 // debuggery 57#if 0 // debuggery
58 QListIterator<AppLnk> it(hidden); 58 QListIterator<AppLnk> it(hidden);
59 AppLnk* l; 59 AppLnk* l;
60 while ((l=it.current())) { 60 while ((l=it.current())) {
61 ++it; 61 ++it;
62 //qDebug("%p: hidden (should remove)",l); 62 //qDebug("%p: hidden (should remove)",l);
63 } 63 }
64#endif 64#endif
65 } 65 }
66 66
67 QIconViewItem* busyItem() const { return bsy; } 67 QIconViewItem* busyItem() const { return bsy; }
68 68
69 void updateCategoriesAndMimeTypes(); 69 void updateCategoriesAndMimeTypes();
70 70
71 void doAutoScroll() 71 void doAutoScroll()
72 { 72 {
73 // We don't want rubberbanding (yet) 73 // We don't want rubberbanding (yet)
74 } 74 }
75 75
76 void setBusy(bool on) 76 void setBusy(bool on)
77 { 77 {
78 QIconViewItem *c = on ? currentItem() : 0; 78 QIconViewItem *c = on ? currentItem() : 0;
79 if ( bsy != c ) { 79 if ( bsy != c ) {
80 QIconViewItem* o = bsy; 80 QIconViewItem* o = bsy;
81 bsy = c; 81 bsy = c;
82 if ( o ) o->repaint(); 82 if ( o ) o->repaint();
83 if ( c ) c->repaint(); 83 if ( c ) c->repaint();
84 } 84 }
85 } 85 }
86 86
87 bool inKeyEvent() const { return ike; } 87 bool inKeyEvent() const { return ike; }
88 void keyPressEvent(QKeyEvent* e) 88 void keyPressEvent(QKeyEvent* e)
89 { 89 {
90 ike = TRUE; 90 ike = TRUE;
91 if ( e->key() == Key_F33 ) { 91 if ( e->key() == Key_F33 ) {
92 // "OK" button 92 // "OK" button
93 returnPressed(currentItem()); 93 returnPressed(currentItem());
94 } 94 }
95 QIconView::keyPressEvent(e); 95 QIconView::keyPressEvent(e);
96 ike = FALSE; 96 ike = FALSE;
97 } 97 }
98 98
99 void addItem(AppLnk* app, bool resort=TRUE); 99 void addItem(AppLnk* app, bool resort=TRUE);
100 bool removeLink(const QString& linkfile); 100 bool removeLink(const QString& linkfile);
101 101
102 QStringList mimeTypes() const; 102 QStringList mimeTypes() const;
103 QStringList categories() const; 103 QStringList categories() const;
104 104
105 void clear() 105 void clear()
106 { 106 {
107 mimes.clear(); 107 mimes.clear();
108 cats.clear(); 108 cats.clear();
109 QIconView::clear(); 109 QIconView::clear();
110 hidden.clear(); 110 hidden.clear();
111 } 111 }
112 112
113 void addCatsAndMimes(AppLnk* app) 113 void addCatsAndMimes(AppLnk* app)
114 { 114 {
115 // QStringList c = app->categories(); 115 // QStringList c = app->categories();
116 // for (QStringList::ConstIterator cit=c.begin(); cit!=c.end(); ++cit) { 116 // for (QStringList::ConstIterator cit=c.begin(); cit!=c.end(); ++cit) {
117 // cats.replace(*cit,(void*)1); 117 // cats.replace(*cit,(void*)1);
118 // } 118 // }
119 QString maj=app->type(); 119 QString maj=app->type();
120 int sl=maj.find('/'); 120 int sl=maj.find('/');
121 if (sl>=0) { 121 if (sl>=0) {
122 QString k = maj.left(sl); 122 QString k = maj.left(sl);
123 mimes.replace(k,(void*)1); 123 mimes.replace(k,(void*)1);
124 } 124 }
125 } 125 }
126 126
127 void drawBackground( QPainter *p, const QRect &r ) 127 void drawBackground( QPainter *p, const QRect &r )
128 { 128 {
129 int backgroundMode = QPixmap::defaultDepth() >= 12 ? 1 : 0; 129 int backgroundMode = QPixmap::defaultDepth() >= 12 ? 1 : 0;
130 //int backgroundMode = 2; 130 //int backgroundMode = 2;
131 131
132 if ( backgroundMode == 1 ) { 132 if ( backgroundMode == 1 ) {
133 133
134 // Double buffer the background 134 // Double buffer the background
135 static QPixmap *bg = NULL; 135 static QPixmap *bg = NULL;
136 static QColor bgColor; 136 static QColor bgColor;
137 137
138 if ( (bg == NULL) || (bgColor != colorGroup().button()) ) { 138 if ( (bg == NULL) || (bgColor != colorGroup().button()) ) {
139 // Create a new background double buffer 139 // Create a new background double buffer
140 if (bg == NULL) 140 if (bg == NULL)
141 bg = new QPixmap( width(), height() ); 141 bg = new QPixmap( width(), height() );
142 bgColor = colorGroup().button(); 142 bgColor = colorGroup().button();
143 QPainter painter( bg ); 143 QPainter painter( bg );
144 144
145 painter.fillRect( QRect( 0, 0, width(), height() ), colorGroup().background().light(110)); 145 painter.fillRect( QRect( 0, 0, width(), height() ), colorGroup().background().light(110));
146 146
147 // Overlay the Qtopia logo in the center 147 // Overlay the Qtopia logo in the center
148 QImage logo = Resource::loadImage( "qpe-background" ); 148 QImage logo = Resource::loadImage( "qpe-background" );
149 if ( !logo.isNull() ) 149 if ( !logo.isNull() )
150 painter.drawImage( (width() - logo.width()) / 2, 150 painter.drawImage( (width() - logo.width()) / 2,
151 (height() - logo.height()) / 2, logo ); 151 (height() - logo.height()) / 2, logo );
152 } 152 }
153 153
154 // Draw the double buffer to the widget (it is tiled for when the icon view is large) 154 // Draw the double buffer to the widget (it is tiled for when the icon view is large)
155 p->drawTiledPixmap( r, *bg, QPoint( (r.x() + contentsX()) % bg->width(), 155 p->drawTiledPixmap( r, *bg, QPoint( (r.x() + contentsX()) % bg->width(),
156 (r.y() + contentsY()) % bg->height() ) ); 156 (r.y() + contentsY()) % bg->height() ) );
157 } else if ( backgroundMode == 2 ) { 157 } else if ( backgroundMode == 2 ) {
158 static QPixmap *bg = 0; 158 static QPixmap *bg = 0;
159 static QColor bgColor; 159 static QColor bgColor;
160 if ( !bg || (bgColor != colorGroup().background()) ) { 160 if ( !bg || (bgColor != colorGroup().background()) ) {
161 bgColor = colorGroup().background(); 161 bgColor = colorGroup().background();
162 bg = new QPixmap( width(), 9 ); 162 bg = new QPixmap( width(), 9 );
163 QPainter painter( bg ); 163 QPainter painter( bg );
164 for ( int i = 0; i < 3; i++ ) { 164 for ( int i = 0; i < 3; i++ ) {
165 painter.setPen( colorGroup().background().light(130) ); 165 painter.setPen( colorGroup().background().light(130) );
166 painter.drawLine( 0, i*3, width()-1, i*3 ); 166 painter.drawLine( 0, i*3, width()-1, i*3 );
167 painter.drawLine( 0, i*3+1, width()-1, i*3+1 ); 167 painter.drawLine( 0, i*3+1, width()-1, i*3+1 );
168 painter.setPen( colorGroup().background().light(105) ); 168 painter.setPen( colorGroup().background().light(105) );
169 painter.drawLine( 0, i*3+2, width()-1, i*3+2 ); 169 painter.drawLine( 0, i*3+2, width()-1, i*3+2 );
170 } 170 }
171 } 171 }
172 p->drawTiledPixmap( r, *bg, QPoint( (r.x() + contentsX()) % bg->width(), 172 p->drawTiledPixmap( r, *bg, QPoint( (r.x() + contentsX()) % bg->width(),
173 (r.y() + contentsY()) % bg->height() ) ); 173 (r.y() + contentsY()) % bg->height() ) );
174 } else { 174 } else {
175 p->fillRect( r, QBrush( colorGroup().background().light(110) ) ); 175 p->fillRect( r, QBrush( colorGroup().background().light(110) ) );
176 } 176 }
177 } 177 }
178 178
179 void hideOrShowItems(bool resort); 179 void hideOrShowItems(bool resort);
180 180
181 void setTypeFilter(const QString& typefilter, bool resort) 181 void setTypeFilter(const QString& typefilter, bool resort)
182 { 182 {
183 tf = QRegExp(typefilter,FALSE,TRUE); 183 tf = QRegExp(typefilter,FALSE,TRUE);
184 hideOrShowItems(resort); 184 hideOrShowItems(resort);
185 } 185 }
186 186
187 void setCategoryFilter( int catfilter, bool resort ) 187 void setCategoryFilter( int catfilter, bool resort )
188 { 188 {
189 Categories cat; 189 Categories cat;
190 cat.load( categoryFileName() ); 190 cat.load( categoryFileName() );
191 QString str; 191 QString str;
192 if ( catfilter == -2 ) 192 if ( catfilter == -2 )
193 cf = 0; 193 cf = 0;
194 else 194 else
195 cf = catfilter; 195 cf = catfilter;
196 hideOrShowItems(resort); 196 hideOrShowItems(resort);
197 } 197 }
198 198
199 enum SortMethod { Name, Date, Type }; 199 enum SortMethod { Name, Date, Type };
200 200
201 void setSortMethod( SortMethod m ) 201 void setSortMethod( SortMethod m )
202 { 202 {
203 if ( sortmeth != m ) { 203 if ( sortmeth != m ) {
204 sortmeth = m; 204 sortmeth = m;
205 sort(); 205 sort();
206 } 206 }
207 } 207 }
208 208
209 int compare(const AppLnk* a, const AppLnk* b) 209 int compare(const AppLnk* a, const AppLnk* b)
210 { 210 {
211 switch (sortmeth) { 211 switch (sortmeth) {
212 case Name: 212 case Name:
213 return a->name().compare(b->name()); 213 return a->name().compare(b->name());
214 case Date: { 214 case Date: {
215 QFileInfo fa(a->linkFile()); 215 QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
216 if ( !fa.exists() ) fa.setFile(a->file()); 216 QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file());
217 QFileInfo fb(b->linkFile());
218 if ( !fb.exists() ) fb.setFile(b->file());
219 return fa.lastModified().secsTo(fb.lastModified()); 217 return fa.lastModified().secsTo(fb.lastModified());
220 } 218 }
221 case Type: 219 case Type:
222 return a->type().compare(b->type()); 220 return a->type().compare(b->type());
223 } 221 }
224 return 0; 222 return 0;
225 } 223 }
226 224
227protected: 225protected:
228 226
229 void styleChange( QStyle &old ) 227 void styleChange( QStyle &old )
230 { 228 {
231 QIconView::styleChange( old ); 229 QIconView::styleChange( old );
232 //### duplicated code from LauncherView constructor 230 //### duplicated code from LauncherView constructor
233 int dw = QApplication::desktop()->width(); 231 int dw = QApplication::desktop()->width();
234 setGridX( (dw-13-style().scrollBarExtent().width())/3 ); // tweaked for 8pt+dw=176 and 10pt+dw=240 232 setGridX( (dw-13-style().scrollBarExtent().width())/3 ); // tweaked for 8pt+dw=176 and 10pt+dw=240
235 } 233 }
236 234
237private: 235private:
238 QList<AppLnk> hidden; 236 QList<AppLnk> hidden;
239 QDict<void> mimes; 237 QDict<void> mimes;
240 QDict<void> cats; 238 QDict<void> cats;
241 SortMethod sortmeth; 239 SortMethod sortmeth;
242 QRegExp tf; 240 QRegExp tf;
243 int cf; 241 int cf;
244 QIconViewItem* bsy; 242 QIconViewItem* bsy;
245 bool ike; 243 bool ike;
246 244
247}; 245};
248 246
249 247
250bool LauncherView::bsy=FALSE; 248bool LauncherView::bsy=FALSE;
251 249
252void LauncherView::setBusy(bool on) 250void LauncherView::setBusy(bool on)
253{ 251{
254 icons->setBusy(on); 252 icons->setBusy(on);
255} 253}
256 254
257class LauncherItem : public QIconViewItem 255class LauncherItem : public QIconViewItem
258{ 256{
259public: 257public:
260 LauncherItem( QIconView *parent, AppLnk* applnk ); 258 LauncherItem( QIconView *parent, AppLnk* applnk );
261 ~LauncherItem() 259 ~LauncherItem()
262 { 260 {
263 LauncherIconView* liv = (LauncherIconView*)iconView(); 261 LauncherIconView* liv = (LauncherIconView*)iconView();
264 if ( liv->busyItem() == this ) 262 if ( liv->busyItem() == this )
265 liv->setBusy(FALSE); 263 liv->setBusy(FALSE);
266 delete app; 264 delete app;
267 } 265 }
268 266
269 AppLnk* appLnk() const { return app; } 267 AppLnk* appLnk() const { return app; }
270 AppLnk* takeAppLnk() { AppLnk* r=app; app=0; return r; } 268 AppLnk* takeAppLnk() { AppLnk* r=app; app=0; return r; }
271 269
272 virtual int compare ( QIconViewItem * i ) const; 270 virtual int compare ( QIconViewItem * i ) const;
273 271
274 void paintItem( QPainter *p, const QColorGroup &cg ) 272 void paintItem( QPainter *p, const QColorGroup &cg )
275 { 273 {
276 LauncherIconView* liv = (LauncherIconView*)iconView(); 274 LauncherIconView* liv = (LauncherIconView*)iconView();
277 QBrush oldBrush( liv->itemTextBackground() ); 275 QBrush oldBrush( liv->itemTextBackground() );
278 QColorGroup mycg( cg ); 276 QColorGroup mycg( cg );
279 if ( liv->currentItem() == this ) { 277 if ( liv->currentItem() == this ) {
280 liv->setItemTextBackground( cg.brush( QColorGroup::Highlight ) ); 278 liv->setItemTextBackground( cg.brush( QColorGroup::Highlight ) );
281 mycg.setColor( QColorGroup::Text, cg.color( QColorGroup::HighlightedText ) ); 279 mycg.setColor( QColorGroup::Text, cg.color( QColorGroup::HighlightedText ) );
282 } 280 }
283 QIconViewItem::paintItem(p,mycg); 281 QIconViewItem::paintItem(p,mycg);
284 if ( liv->currentItem() == this ) 282 if ( liv->currentItem() == this )
285 liv->setItemTextBackground( oldBrush ); 283 liv->setItemTextBackground( oldBrush );
286 if ( liv->busyItem() == this ) { 284 if ( liv->busyItem() == this ) {
287 static QPixmap* busypm=0; 285 static QPixmap* busypm=0;
288 if ( !busypm ) 286 if ( !busypm )
289 busypm = new QPixmap(Resource::loadPixmap("launching")); 287 busypm = new QPixmap(Resource::loadPixmap("launching"));
290 p->drawPixmap(x()+(width()-busypm->width())/2, y(),*busypm); 288 p->drawPixmap(x()+(width()-busypm->width())/2, y(),*busypm);
291 } 289 }
292 } 290 }
293 291
294protected: 292protected:
295 AppLnk* app; 293 AppLnk* app;
296}; 294};
297 295
298 296
299LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk ) 297LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk )
300 : QIconViewItem( parent, applnk->name(), applnk->bigPixmap() ), 298 : QIconViewItem( parent, applnk->name(), applnk->bigPixmap() ),
301 app(applnk) // Takes ownership 299 app(applnk) // Takes ownership
302{ 300{
303} 301}
304 302
305int LauncherItem::compare ( QIconViewItem * i ) const 303int LauncherItem::compare ( QIconViewItem * i ) const
306{ 304{
307 LauncherIconView* view = (LauncherIconView*)iconView(); 305 LauncherIconView* view = (LauncherIconView*)iconView();
308 return view->compare(app,((LauncherItem *)i)->appLnk()); 306 return view->compare(app,((LauncherItem *)i)->appLnk());
309} 307}
310 308
311QStringList LauncherIconView::mimeTypes() const 309QStringList LauncherIconView::mimeTypes() const
312{ 310{
313 QStringList r; 311 QStringList r;
314 QDictIterator<void> it(mimes); 312 QDictIterator<void> it(mimes);
315 while (it.current()) { 313 while (it.current()) {
316 r.append(it.currentKey()); 314 r.append(it.currentKey());
317 ++it; 315 ++it;
318 } 316 }
319 r.sort(); 317 r.sort();
320 return r; 318 return r;
321} 319}
322 320
323void LauncherIconView::addItem(AppLnk* app, bool resort) 321void LauncherIconView::addItem(AppLnk* app, bool resort)
324{ 322{
325 addCatsAndMimes(app); 323 addCatsAndMimes(app);
326 324
327 if ( (tf.isEmpty() || tf.match(app->type()) >= 0) 325 if ( (tf.isEmpty() || tf.match(app->type()) >= 0)
328 && (cf == 0 || app->categories().contains(cf) 326 && (cf == 0 || app->categories().contains(cf)
329 || cf == -1 && app->categories().count() == 0 ) ) 327 || cf == -1 && app->categories().count() == 0 ) )
330 (void) new LauncherItem( this, app ); 328 (void) new LauncherItem( this, app );
331 else 329 else
332 hidden.append(app); 330 hidden.append(app);
333 if ( resort ) 331 if ( resort )
334 sort(); 332 sort();
335} 333}
336 334
337void LauncherIconView::updateCategoriesAndMimeTypes() 335void LauncherIconView::updateCategoriesAndMimeTypes()
338{ 336{
339 mimes.clear(); 337 mimes.clear();
340 cats.clear(); 338 cats.clear();
341 LauncherItem* item = (LauncherItem*)firstItem(); 339 LauncherItem* item = (LauncherItem*)firstItem();
342 while (item) { 340 while (item) {
343 addCatsAndMimes(item->appLnk()); 341 addCatsAndMimes(item->appLnk());
344 item = (LauncherItem*)item->nextItem(); 342 item = (LauncherItem*)item->nextItem();
345 } 343 }
346 QListIterator<AppLnk> it(hidden); 344 QListIterator<AppLnk> it(hidden);
347 AppLnk* l; 345 AppLnk* l;
348 while ((l=it.current())) { 346 while ((l=it.current())) {
349 addCatsAndMimes(l); 347 addCatsAndMimes(l);
350 ++it; 348 ++it;
351 } 349 }
352} 350}
353 351
354void LauncherIconView::hideOrShowItems(bool resort) 352void LauncherIconView::hideOrShowItems(bool resort)
355{ 353{
356 hidden.setAutoDelete(FALSE); 354 hidden.setAutoDelete(FALSE);
357 QList<AppLnk> links=hidden; 355 QList<AppLnk> links=hidden;
358 hidden.clear(); 356 hidden.clear();
359 hidden.setAutoDelete(TRUE); 357 hidden.setAutoDelete(TRUE);
360 LauncherItem* item = (LauncherItem*)firstItem(); 358 LauncherItem* item = (LauncherItem*)firstItem();
361 while (item) { 359 while (item) {
362 links.append(item->takeAppLnk()); 360 links.append(item->takeAppLnk());
363 item = (LauncherItem*)item->nextItem(); 361 item = (LauncherItem*)item->nextItem();
364 } 362 }
363 bool oldAutoArrange = autoArrange();
364 setAutoArrange( FALSE );
365 clear(); 365 clear();
366 QListIterator<AppLnk> it(links); 366 QListIterator<AppLnk> it(links);
367 AppLnk* l; 367 AppLnk* l;
368 while ((l=it.current())) { 368 while ((l=it.current())) {
369 addItem(l,FALSE); 369 addItem(l,FALSE);
370 ++it; 370 ++it;
371 } 371 }
372 if ( resort ) 372 if ( resort )
373 sort(); 373 sort();
374 setAutoArrange( oldAutoArrange );
374} 375}
375 376
376bool LauncherIconView::removeLink(const QString& linkfile) 377bool LauncherIconView::removeLink(const QString& linkfile)
377{ 378{
378 LauncherItem* item = (LauncherItem*)firstItem(); 379 LauncherItem* item = (LauncherItem*)firstItem();
380 AppLnk* l;
381 bool did = FALSE;
382 DocLnk dl(linkfile);
379 while (item) { 383 while (item) {
380 if ( item->appLnk()->linkFile() == linkfile ) { 384 l = item->appLnk();
385 if ( l->linkFileKnown() && l->linkFile() == linkfile || l->file() == linkfile
386 || dl.isValid() && dl.file() == l->file() ) {
381 delete item; 387 delete item;
382 return TRUE; 388 did = TRUE;
383 } 389 }
384 item = (LauncherItem*)item->nextItem(); 390 item = (LauncherItem*)item->nextItem();
385 } 391 }
386 QListIterator<AppLnk> it(hidden); 392 QListIterator<AppLnk> it(hidden);
387 AppLnk* l;
388 while ((l=it.current())) { 393 while ((l=it.current())) {
389 ++it; 394 ++it;
390 if ( l->linkFile() == linkfile ) { 395 if ( l->linkFileKnown() && l->linkFile() == linkfile
396 || l->file() == linkfile
397 || dl.isValid() && dl.file() == l->file() ) {
391 hidden.removeRef(l); 398 hidden.removeRef(l);
392 return TRUE; 399 did = TRUE;
393 } 400 }
394 } 401 }
395 return FALSE; 402 return did;
396} 403}
397 404
398LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl ) 405LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
399 : QVBox( parent, name, fl ) 406 : QVBox( parent, name, fl )
400{ 407{
401 icons = new LauncherIconView( this ); 408 icons = new LauncherIconView( this );
402 setFocusProxy(icons); 409 setFocusProxy(icons);
403 QPEApplication::setStylusOperation( icons->viewport(), QPEApplication::RightOnHold ); 410 QPEApplication::setStylusOperation( icons->viewport(), QPEApplication::RightOnHold );
404 411
405 int dw = QApplication::desktop()->width(); 412 int dw = QApplication::desktop()->width();
406 icons->setItemsMovable( FALSE ); 413 icons->setItemsMovable( FALSE );
407 icons->setAutoArrange( TRUE ); 414 icons->setAutoArrange( TRUE );
408 icons->setSorting( TRUE ); 415 icons->setSorting( TRUE );
409 icons->setGridX( (dw-13-style().scrollBarExtent().width())/3 ); // tweaked for 8pt+dw=176 and 10pt+dw=240 416 icons->setGridX( (dw-13-style().scrollBarExtent().width())/3 ); // tweaked for 8pt+dw=176 and 10pt+dw=240
410 icons->setGridY( fontMetrics().height()*2+24 ); 417 icons->setGridY( fontMetrics().height()*2+24 );
411 icons->setFrameStyle( QFrame::NoFrame ); 418 icons->setFrameStyle( QFrame::NoFrame );
412 icons->setSpacing( 4 ); 419 icons->setSpacing( 4 );
413 icons->setMargin( 0 ); 420 icons->setMargin( 0 );
414 icons->setSelectionMode( QIconView::Multi ); 421 icons->setSelectionMode( QIconView::Multi );
415 icons->setBackgroundMode( PaletteBase ); 422 icons->setBackgroundMode( PaletteBase );
416 423
417 connect( icons, SIGNAL(mouseButtonClicked(int, QIconViewItem *, const QPoint&)), 424 connect( icons, SIGNAL(mouseButtonClicked(int, QIconViewItem *, const QPoint&)),
418 SLOT(itemClicked(int, QIconViewItem *)) ); 425 SLOT(itemClicked(int, QIconViewItem *)) );
419 connect( icons, SIGNAL(selectionChanged()), 426 connect( icons, SIGNAL(selectionChanged()),
420 SLOT(selectionChanged()) ); 427 SLOT(selectionChanged()) );
421 connect( icons, SIGNAL(returnPressed(QIconViewItem *)), 428 connect( icons, SIGNAL(returnPressed(QIconViewItem *)),
422 SLOT(returnPressed(QIconViewItem *)) ); 429 SLOT(returnPressed(QIconViewItem *)) );
423 connect( icons, SIGNAL(mouseButtonPressed(int, QIconViewItem *, const QPoint&)), 430 connect( icons, SIGNAL(mouseButtonPressed(int, QIconViewItem *, const QPoint&)),
424 SLOT(itemPressed(int, QIconViewItem *)) ); 431 SLOT(itemPressed(int, QIconViewItem *)) );
425 432
426 tools = 0; 433 tools = 0;
427} 434}
428 435
429LauncherView::~LauncherView() 436LauncherView::~LauncherView()
430{ 437{
431} 438}
432 439
433void LauncherView::setToolsEnabled(bool y) 440void LauncherView::setToolsEnabled(bool y)
434{ 441{
435 if ( !y != !tools ) { 442 if ( !y != !tools ) {
436 if ( y ) { 443 if ( y ) {
437 tools = new QHBox(this); 444 tools = new QHBox(this);
438 445
439 // Type filter 446 // Type filter
440 typemb = new MenuButton(tools); 447 typemb = new MenuButton(tools);
441 typemb->setLabel(tr("Type: %1")); 448 typemb->setLabel(tr("Type: %1"));
442 449
443 // Category filter 450 // Category filter
444 catmb = new CategorySelect(tools); 451 catmb = new CategorySelect(tools);
445 452
446 updateTools(); 453 updateTools();
447 tools->show(); 454 tools->show();
448 } else { 455 } else {
449 delete tools; 456 delete tools;
450 tools = 0; 457 tools = 0;
451 } 458 }
452 } 459 }
453} 460}
454 461
455void LauncherView::updateTools() 462void LauncherView::updateTools()
456{ 463{
457 disconnect( typemb, SIGNAL(selected(const QString&)), 464 disconnect( typemb, SIGNAL(selected(const QString&)),
458 this, SLOT(showType(const QString&)) ); 465 this, SLOT(showType(const QString&)) );
459 disconnect( catmb, SIGNAL(signalSelected(int)), 466 disconnect( catmb, SIGNAL(signalSelected(int)),
460 this, SLOT(showCategory(int)) ); 467 this, SLOT(showCategory(int)) );
461 468
462 icons->updateCategoriesAndMimeTypes(); 469 icons->updateCategoriesAndMimeTypes();
463 470
464 QString prev; 471 QString prev;
465 472
466 // Type filter 473 // Type filter
467 QStringList types; 474 QStringList types;
468 types << tr("All"); 475 types << tr("All");
469 types << "--"; 476 types << "--";
470 types += icons->mimeTypes(); 477 types += icons->mimeTypes();
471 prev = typemb->currentText(); 478 prev = typemb->currentText();
472 typemb->clear(); 479 typemb->clear();
473 typemb->insertItems(types); 480 typemb->insertItems(types);
474 typemb->select(prev); 481 typemb->select(prev);
475 482
476 Categories cats( 0 ); 483 Categories cats( 0 );
477 cats.load( categoryFileName() ); 484 cats.load( categoryFileName() );
478 QArray<int> vl( 0 ); 485 QArray<int> vl( 0 );
479 catmb->setCategories( vl, "Document View", tr("Document View") ); 486 catmb->setCategories( vl, "Document View", tr("Document View") );
480 catmb->setRemoveCategoryEdit( TRUE ); 487 catmb->setRemoveCategoryEdit( TRUE );
481 catmb->setAllCategories( TRUE ); 488 catmb->setAllCategories( TRUE );
482 489
483 connect(typemb, SIGNAL(selected(const QString&)), this, SLOT(showType(const QString&))); 490 connect(typemb, SIGNAL(selected(const QString&)), this, SLOT(showType(const QString&)));
484 connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int))); 491 connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int)));
485} 492}
486 493
487void LauncherView::sortBy(int s) 494void LauncherView::sortBy(int s)
488{ 495{
489 icons->setSortMethod((LauncherIconView::SortMethod)s); 496 icons->setSortMethod((LauncherIconView::SortMethod)s);
490} 497}
491 498
492void LauncherView::showType(const QString& t) 499void LauncherView::showType(const QString& t)
493{ 500{
494 if ( t == tr("All") ) { 501 if ( t == tr("All") ) {
495 icons->setTypeFilter("",TRUE); 502 icons->setTypeFilter("",TRUE);
496 } else { 503 } else {
497 icons->setTypeFilter(t+"/*",TRUE); 504 icons->setTypeFilter(t+"/*",TRUE);
498 } 505 }
499} 506}
500 507
501void LauncherView::showCategory( int c ) 508void LauncherView::showCategory( int c )
502{ 509{
503 icons->setCategoryFilter( c, TRUE ); 510 icons->setCategoryFilter( c, TRUE );
504} 511}
505 512
506void LauncherView::resizeEvent(QResizeEvent *e) 513void LauncherView::resizeEvent(QResizeEvent *e)
507{ 514{
508 QVBox::resizeEvent( e ); 515 QVBox::resizeEvent( e );
509 if ( e->size().width() != e->oldSize().width() ) 516 if ( e->size().width() != e->oldSize().width() )
510 sort(); 517 sort();
511} 518}
512 519
513void LauncherView::populate( AppLnkSet *folder, const QString& typefilter ) 520void LauncherView::populate( AppLnkSet *folder, const QString& typefilter )
514{ 521{
515 icons->clear(); 522 icons->clear();
516 internalPopulate( folder, typefilter ); 523 internalPopulate( folder, typefilter );
517} 524}
518 525
519void LauncherView::selectionChanged() 526void LauncherView::selectionChanged()
520{ 527{
521 QIconViewItem* item = icons->currentItem(); 528 QIconViewItem* item = icons->currentItem();
522 if ( item && item->isSelected() ) { 529 if ( item && item->isSelected() ) {
523 AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); 530 AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
524 if ( icons->inKeyEvent() ) // not for mouse press 531 if ( icons->inKeyEvent() ) // not for mouse press
525 emit clicked( appLnk ); 532 emit clicked( appLnk );
526 item->setSelected(FALSE); 533 item->setSelected(FALSE);
527 } 534 }
528} 535}
529 536
530void LauncherView::returnPressed( QIconViewItem *item ) 537void LauncherView::returnPressed( QIconViewItem *item )
531{ 538{
532 if ( item ) { 539 if ( item ) {
533 AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); 540 AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
534 emit clicked( appLnk ); 541 emit clicked( appLnk );
535 } 542 }
536} 543}
537 544
538void LauncherView::itemClicked( int btn, QIconViewItem *item ) 545void LauncherView::itemClicked( int btn, QIconViewItem *item )
539{ 546{
540 if ( item ) { 547 if ( item ) {
541 AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); 548 AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
542 if ( btn == LeftButton ) { 549 if ( btn == LeftButton ) {
543 // Make sure it's the item we execute that gets highlighted 550 // Make sure it's the item we execute that gets highlighted
544 icons->setCurrentItem( item ); 551 icons->setCurrentItem( item );
545 emit clicked( appLnk ); 552 emit clicked( appLnk );
546 } 553 }
547 item->setSelected(FALSE); 554 item->setSelected(FALSE);
548 } 555 }
549} 556}
550 557
551void LauncherView::itemPressed( int btn, QIconViewItem *item ) 558void LauncherView::itemPressed( int btn, QIconViewItem *item )
552{ 559{
553 if ( item ) { 560 if ( item ) {
554 AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); 561 AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
555 if ( btn == RightButton ) 562 if ( btn == RightButton )
556 emit rightPressed( appLnk ); 563 emit rightPressed( appLnk );
557/* 564/*
558 else if ( btn == LeftButton ) 565 else if ( btn == LeftButton )
559 emit clicked( appLnk ); 566 emit clicked( appLnk );
560*/ 567*/
561 item->setSelected(FALSE); 568 item->setSelected(FALSE);
562 } 569 }
563} 570}
564 571
565void LauncherView::internalPopulate( AppLnkSet *folder, const QString& typefilter ) 572void LauncherView::internalPopulate( AppLnkSet *folder, const QString& typefilter )
566{ 573{
567 QListIterator<AppLnk> it( folder->children() ); 574 QListIterator<AppLnk> it( folder->children() );
568 icons->setTypeFilter(typefilter,FALSE); 575 icons->setTypeFilter(typefilter,FALSE);
569 576
570 while ( it.current() ) { 577 while ( it.current() ) {
571 icons->addItem(*it,FALSE); 578 icons->addItem(*it,FALSE);
572 ++it; 579 ++it;
573 } 580 }
574 581
575 icons->sort(); 582 icons->sort();
576} 583}
577 584
578bool LauncherView::removeLink(const QString& linkfile) 585bool LauncherView::removeLink(const QString& linkfile)
579{ 586{
580 return icons->removeLink(linkfile); 587 return icons->removeLink(linkfile);
581} 588}
582 589
583void LauncherView::sort() 590void LauncherView::sort()
584{ 591{
585 icons->sort(); 592 icons->sort();
586} 593}
587 594
588void LauncherView::addItem(AppLnk* app, bool resort) 595void LauncherView::addItem(AppLnk* app, bool resort)
589{ 596{
590 icons->addItem(app,resort); 597 icons->addItem(app,resort);
591} 598}
592 599
593void LauncherView::setFileSystems(const QList<FileSystem> &) 600void LauncherView::setFileSystems(const QList<FileSystem> &)
594{ 601{
595 // ### does nothing now... 602 // ### does nothing now...
596} 603}
diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in
index 6e007ec..3e1f9fc 100644
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/core/multimedia/opieplayer/Makefile.in
@@ -1,280 +1,234 @@
1############################################################################# 1#############################################################################
2 2
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(OPIEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe -lpthread $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe -lpthread $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
13 UIC =$(SYSCONF_UIC) 13 UIC =$(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(OPIEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= mpegplayer 21 TARGET= mpegplayer
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =loopcontrol.h \ 26 HEADERS =loopcontrol.h \
27 mediaplayerplugininterface.h \ 27 mediaplayerplugininterface.h \
28 playlistselection.h \ 28 playlistselection.h \
29 mediaplayerstate.h \ 29 mediaplayerstate.h \
30 videowidget.h \ 30 videowidget.h \
31 audiowidget.h \ 31 audiowidget.h \
32 playlistwidget.h \ 32 playlistwidget.h \
33 mediaplayer.h \ 33 mediaplayer.h \
34 audiodevice.h 34 audiodevice.h
35 SOURCES =main.cpp \ 35 SOURCES =main.cpp \
36 loopcontrol.cpp \ 36 loopcontrol.cpp \
37 playlistselection.cpp \ 37 playlistselection.cpp \
38 mediaplayerstate.cpp \ 38 mediaplayerstate.cpp \
39 videowidget.cpp \ 39 videowidget.cpp \
40 audiowidget.cpp \ 40 audiowidget.cpp \
41 playlistwidget.cpp \ 41 playlistwidget.cpp \
42 mediaplayer.cpp \ 42 mediaplayer.cpp \
43 audiodevice.cpp 43 audiodevice.cpp
44 OBJECTS =main.o \ 44 OBJECTS =main.o \
45 loopcontrol.o \ 45 loopcontrol.o \
46 playlistselection.o \ 46 playlistselection.o \
47 mediaplayerstate.o \ 47 mediaplayerstate.o \
48 videowidget.o \ 48 videowidget.o \
49 audiowidget.o \ 49 audiowidget.o \
50 playlistwidget.o \ 50 playlistwidget.o \
51 mediaplayer.o \ 51 mediaplayer.o \
52 audiodevice.o 52 audiodevice.o
53INTERFACES = 53INTERFACES =
54UICDECLS = 54UICDECLS =
55UICIMPLS = 55UICIMPLS =
56 SRCMOC =moc_loopcontrol.cpp \ 56 SRCMOC =moc_loopcontrol.cpp \
57 moc_playlistselection.cpp \ 57 moc_playlistselection.cpp \
58 moc_mediaplayerstate.cpp \ 58 moc_mediaplayerstate.cpp \
59 moc_videowidget.cpp \ 59 moc_videowidget.cpp \
60 moc_audiowidget.cpp \ 60 moc_audiowidget.cpp \
61 moc_playlistwidget.cpp \ 61 moc_playlistwidget.cpp \
62 moc_mediaplayer.cpp \ 62 moc_mediaplayer.cpp \
63 moc_audiodevice.cpp 63 moc_audiodevice.cpp
64 OBJMOC =moc_loopcontrol.o \ 64 OBJMOC =moc_loopcontrol.o \
65 moc_playlistselection.o \ 65 moc_playlistselection.o \
66 moc_mediaplayerstate.o \ 66 moc_mediaplayerstate.o \
67 moc_videowidget.o \ 67 moc_videowidget.o \
68 moc_audiowidget.o \ 68 moc_audiowidget.o \
69 moc_playlistwidget.o \ 69 moc_playlistwidget.o \
70 moc_mediaplayer.o \ 70 moc_mediaplayer.o \
71 moc_audiodevice.o 71 moc_audiodevice.o
72 72
73 73
74####### Implicit rules 74####### Implicit rules
75 75
76.SUFFIXES: .cpp .cxx .cc .C .c 76.SUFFIXES: .cpp .cxx .cc .C .c
77 77
78.cpp.o: 78.cpp.o:
79 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 79 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
80 80
81.cxx.o: 81.cxx.o:
82 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 82 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
83 83
84.cc.o: 84.cc.o:
85 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 85 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
86 86
87.C.o: 87.C.o:
88 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 88 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
89 89
90.c.o: 90.c.o:
91 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 91 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
92 92
93####### Build rules 93####### Build rules
94 94
95 95
96all: $(DESTDIR)$(TARGET) 96all: $(DESTDIR)$(TARGET)
97 97
98$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 98$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
99 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 99 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
100 100
101moc: $(SRCMOC) 101moc: $(SRCMOC)
102 102
103tmake: 103tmake: Makefile.in
104 tmake mpegplayer.pro 104
105Makefile.in: mpegplayer.pro
106 tmake mpegplayer.pro -o Makefile.in
105 107
106clean: 108clean:
107 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 109 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
108 -rm -f *~ core 110 -rm -f *~ core
109 -rm -f allmoc.cpp 111 -rm -f allmoc.cpp
110 112
111####### Extension Modules 113####### Extension Modules
112 114
113listpromodules: 115listpromodules:
114 @echo 116 @echo
115 117
116listallmodules: 118listallmodules:
117 @echo 119 @echo
118 120
119listaddonpromodules: 121listaddonpromodules:
120 @echo 122 @echo
121 123
122listaddonentmodules: 124listaddonentmodules:
123 @echo 125 @echo
124 126
125 127
126REQUIRES= 128REQUIRES=
127 129
128####### Sub-libraries 130####### Sub-libraries
129 131
130 132
131###### Combined headers 133###### Combined headers
132 134
133 135
134 136
135####### Compile 137####### Compile
136 138
137main.o: main.cpp \ 139main.o: main.cpp \
138 $(OPIEDIR)/include/qpe/qpeapplication.h \
139 mediaplayerstate.h \ 140 mediaplayerstate.h \
140 playlistwidget.h \ 141 playlistwidget.h \
141 $(OPIEDIR)/include/qpe/applnk.h \
142 audiowidget.h \ 142 audiowidget.h \
143 videowidget.h \ 143 videowidget.h \
144 loopcontrol.h \ 144 loopcontrol.h \
145 mediaplayer.h \ 145 mediaplayer.h
146 $(OPIEDIR)/include/qpe/qlibrary.h \
147 $(OPIEDIR)/include/qpe/qcom.h \
148 $(OPIEDIR)/include/qpe/quuid.h \
149 mediaplayerplugininterface.h
150 146
151loopcontrol.o: loopcontrol.cpp \ 147loopcontrol.o: loopcontrol.cpp \
152 $(OPIEDIR)/include/qpe/qpeapplication.h \
153 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
154 loopcontrol.h \ 148 loopcontrol.h \
155 videowidget.h \ 149 videowidget.h \
156 audiodevice.h \ 150 audiodevice.h \
157 mediaplayerplugininterface.h \
158 $(OPIEDIR)/include/qpe/qcom.h \
159 $(OPIEDIR)/include/qpe/quuid.h \
160 mediaplayerstate.h 151 mediaplayerstate.h
161 152
162playlistselection.o: playlistselection.cpp \ 153playlistselection.o: playlistselection.cpp \
163 $(OPIEDIR)/include/qpe/applnk.h \
164 $(OPIEDIR)/include/qpe/resource.h \
165 playlistselection.h 154 playlistselection.h
166 155
167mediaplayerstate.o: mediaplayerstate.cpp \ 156mediaplayerstate.o: mediaplayerstate.cpp \
168 $(OPIEDIR)/include/qpe/qpeapplication.h \
169 $(OPIEDIR)/include/qpe/qlibrary.h \
170 $(OPIEDIR)/include/qpe/qcom.h \
171 $(OPIEDIR)/include/qpe/quuid.h \
172 $(OPIEDIR)/include/qpe/config.h \
173 mediaplayerplugininterface.h \
174 mediaplayerstate.h \ 157 mediaplayerstate.h \
175 libmad/libmadpluginimpl.h \ 158 libmad/libmadpluginimpl.h \
176 libmpeg3/libmpeg3pluginimpl.h \ 159 libmpeg3/libmpeg3pluginimpl.h \
177 wavplugin/wavpluginimpl.h 160 wavplugin/wavpluginimpl.h
178 161
179videowidget.o: videowidget.cpp \ 162videowidget.o: videowidget.cpp \
180 $(OPIEDIR)/include/qpe/resource.h \
181 videowidget.h \ 163 videowidget.h \
182 mediaplayerplugininterface.h \
183 $(OPIEDIR)/include/qpe/qcom.h \
184 $(OPIEDIR)/include/qpe/quuid.h \
185 mediaplayerstate.h 164 mediaplayerstate.h
186 165
187audiowidget.o: audiowidget.cpp \ 166audiowidget.o: audiowidget.cpp \
188 $(OPIEDIR)/include/qpe/resource.h \
189 audiowidget.h \ 167 audiowidget.h \
190 mediaplayerstate.h 168 mediaplayerstate.h
191 169
192playlistwidget.o: playlistwidget.cpp \ 170playlistwidget.o: playlistwidget.cpp \
193 $(OPIEDIR)/include/qpe/qpemenubar.h \
194 $(OPIEDIR)/include/qpe/qpetoolbar.h \
195 $(OPIEDIR)/include/qpe/fileselector.h \
196 $(OPIEDIR)/include/qpe/applnk.h \
197 $(OPIEDIR)/include/qpe/config.h \
198 $(OPIEDIR)/include/qpe/global.h \
199 $(OPIEDIR)/include/qpe/resource.h \
200 playlistselection.h \ 171 playlistselection.h \
201 playlistwidget.h \ 172 playlistwidget.h \
202 mediaplayerstate.h 173 mediaplayerstate.h
203 174
204mediaplayer.o: mediaplayer.cpp \ 175mediaplayer.o: mediaplayer.cpp \
205 $(OPIEDIR)/include/qpe/qpeapplication.h \
206 $(OPIEDIR)/include/qpe/qlibrary.h \
207 $(OPIEDIR)/include/qpe/qcom.h \
208 $(OPIEDIR)/include/qpe/quuid.h \
209 $(OPIEDIR)/include/qpe/resource.h \
210 $(OPIEDIR)/include/qpe/config.h \
211 mediaplayer.h \ 176 mediaplayer.h \
212 mediaplayerplugininterface.h \
213 playlistwidget.h \ 177 playlistwidget.h \
214 $(OPIEDIR)/include/qpe/applnk.h \
215 audiowidget.h \ 178 audiowidget.h \
216 loopcontrol.h \ 179 loopcontrol.h \
217 audiodevice.h \ 180 audiodevice.h \
218 mediaplayerstate.h 181 mediaplayerstate.h
219 182
220audiodevice.o: audiodevice.cpp \ 183audiodevice.o: audiodevice.cpp \
221 $(OPIEDIR)/include/qpe/qpeapplication.h \ 184 audiodevice.h
222 $(OPIEDIR)/include/qpe/config.h \
223 audiodevice.h \
224 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
225 185
226moc_loopcontrol.o: moc_loopcontrol.cpp \ 186moc_loopcontrol.o: moc_loopcontrol.cpp \
227 loopcontrol.h 187 loopcontrol.h
228 188
229moc_playlistselection.o: moc_playlistselection.cpp \ 189moc_playlistselection.o: moc_playlistselection.cpp \
230 playlistselection.h \ 190 playlistselection.h
231 $(OPIEDIR)/include/qpe/applnk.h
232 191
233moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \ 192moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \
234 mediaplayerstate.h 193 mediaplayerstate.h
235 194
236moc_videowidget.o: moc_videowidget.cpp \ 195moc_videowidget.o: moc_videowidget.cpp \
237 videowidget.h 196 videowidget.h
238 197
239moc_audiowidget.o: moc_audiowidget.cpp \ 198moc_audiowidget.o: moc_audiowidget.cpp \
240 audiowidget.h 199 audiowidget.h
241 200
242moc_playlistwidget.o: moc_playlistwidget.cpp \ 201moc_playlistwidget.o: moc_playlistwidget.cpp \
243 playlistwidget.h \ 202 playlistwidget.h
244 $(OPIEDIR)/include/qpe/applnk.h
245 203
246moc_mediaplayer.o: moc_mediaplayer.cpp \ 204moc_mediaplayer.o: moc_mediaplayer.cpp \
247 mediaplayer.h \ 205 mediaplayer.h
248 $(OPIEDIR)/include/qpe/qlibrary.h \
249 $(OPIEDIR)/include/qpe/qcom.h \
250 $(OPIEDIR)/include/qpe/quuid.h \
251 mediaplayerplugininterface.h
252 206
253moc_audiodevice.o: moc_audiodevice.cpp \ 207moc_audiodevice.o: moc_audiodevice.cpp \
254 audiodevice.h 208 audiodevice.h
255 209
256moc_loopcontrol.cpp: loopcontrol.h 210moc_loopcontrol.cpp: loopcontrol.h
257 $(MOC) loopcontrol.h -o moc_loopcontrol.cpp 211 $(MOC) loopcontrol.h -o moc_loopcontrol.cpp
258 212
259moc_playlistselection.cpp: playlistselection.h 213moc_playlistselection.cpp: playlistselection.h
260 $(MOC) playlistselection.h -o moc_playlistselection.cpp 214 $(MOC) playlistselection.h -o moc_playlistselection.cpp
261 215
262moc_mediaplayerstate.cpp: mediaplayerstate.h 216moc_mediaplayerstate.cpp: mediaplayerstate.h
263 $(MOC) mediaplayerstate.h -o moc_mediaplayerstate.cpp 217 $(MOC) mediaplayerstate.h -o moc_mediaplayerstate.cpp
264 218
265moc_videowidget.cpp: videowidget.h 219moc_videowidget.cpp: videowidget.h
266 $(MOC) videowidget.h -o moc_videowidget.cpp 220 $(MOC) videowidget.h -o moc_videowidget.cpp
267 221
268moc_audiowidget.cpp: audiowidget.h 222moc_audiowidget.cpp: audiowidget.h
269 $(MOC) audiowidget.h -o moc_audiowidget.cpp 223 $(MOC) audiowidget.h -o moc_audiowidget.cpp
270 224
271moc_playlistwidget.cpp: playlistwidget.h 225moc_playlistwidget.cpp: playlistwidget.h
272 $(MOC) playlistwidget.h -o moc_playlistwidget.cpp 226 $(MOC) playlistwidget.h -o moc_playlistwidget.cpp
273 227
274moc_mediaplayer.cpp: mediaplayer.h 228moc_mediaplayer.cpp: mediaplayer.h
275 $(MOC) mediaplayer.h -o moc_mediaplayer.cpp 229 $(MOC) mediaplayer.h -o moc_mediaplayer.cpp
276 230
277moc_audiodevice.cpp: audiodevice.h 231moc_audiodevice.cpp: audiodevice.h
278 $(MOC) audiodevice.h -o moc_audiodevice.cpp 232 $(MOC) audiodevice.h -o moc_audiodevice.cpp
279 233
280 234
diff --git a/core/multimedia/opieplayer/libflash/Makefile.in b/core/multimedia/opieplayer/libflash/Makefile.in
index 52c8557..0947454 100644
--- a/core/multimedia/opieplayer/libflash/Makefile.in
+++ b/core/multimedia/opieplayer/libflash/Makefile.in
@@ -1,540 +1,537 @@
1############################################################################# 1#############################################################################
2 2
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include -I..
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
13 UIC =$(SYSCONF_UIC) 13 UIC =$(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = ../../plugins/codecs/ 17DESTDIR = ../../plugins/codecs/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= flashplugin 21 TARGET= flashplugin
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =libflashplugin.h \ 26 HEADERS =libflashplugin.h \
27 libflashpluginimpl.h 27 libflashpluginimpl.h
28 SOURCES =libflashplugin.cpp \ 28 SOURCES =libflashplugin.cpp \
29 libflashpluginimpl.cpp \ 29 libflashpluginimpl.cpp \
30 adpcm.cc \ 30 adpcm.cc \
31 character.cc \ 31 character.cc \
32 flash.cc \ 32 flash.cc \
33 graphic16.cc \ 33 graphic16.cc \
34 matrix.cc \ 34 matrix.cc \
35 script.cc \ 35 script.cc \
36 sprite.cc \ 36 sprite.cc \
37 bitmap.cc \ 37 bitmap.cc \
38 cxform.cc \ 38 cxform.cc \
39 font.cc \ 39 font.cc \
40 graphic24.cc \ 40 graphic24.cc \
41 movie.cc \ 41 movie.cc \
42 shape.cc \ 42 shape.cc \
43 sqrt.cc \ 43 sqrt.cc \
44 button.cc \ 44 button.cc \
45 displaylist.cc \ 45 displaylist.cc \
46 graphic.cc \ 46 graphic.cc \
47 graphic32.cc \ 47 graphic32.cc \
48 program.cc \ 48 program.cc \
49 sound.cc \ 49 sound.cc \
50 text.cc 50 text.cc
51 OBJECTS =libflashplugin.o \ 51 OBJECTS =libflashplugin.o \
52 libflashpluginimpl.o \ 52 libflashpluginimpl.o \
53 adpcm.o \ 53 adpcm.o \
54 character.o \ 54 character.o \
55 flash.o \ 55 flash.o \
56 graphic16.o \ 56 graphic16.o \
57 matrix.o \ 57 matrix.o \
58 script.o \ 58 script.o \
59 sprite.o \ 59 sprite.o \
60 bitmap.o \ 60 bitmap.o \
61 cxform.o \ 61 cxform.o \
62 font.o \ 62 font.o \
63 graphic24.o \ 63 graphic24.o \
64 movie.o \ 64 movie.o \
65 shape.o \ 65 shape.o \
66 sqrt.o \ 66 sqrt.o \
67 button.o \ 67 button.o \
68 displaylist.o \ 68 displaylist.o \
69 graphic.o \ 69 graphic.o \
70 graphic32.o \ 70 graphic32.o \
71 program.o \ 71 program.o \
72 sound.o \ 72 sound.o \
73 text.o 73 text.o
74INTERFACES = 74INTERFACES =
75UICDECLS = 75UICDECLS =
76UICIMPLS = 76UICIMPLS =
77 SRCMOC = 77 SRCMOC =
78 OBJMOC = 78 OBJMOC =
79 79
80 80
81####### Implicit rules 81####### Implicit rules
82 82
83.SUFFIXES: .cpp .cxx .cc .C .c 83.SUFFIXES: .cpp .cxx .cc .C .c
84 84
85.cpp.o: 85.cpp.o:
86 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 86 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
87 87
88.cxx.o: 88.cxx.o:
89 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 89 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
90 90
91.cc.o: 91.cc.o:
92 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 92 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
93 93
94.C.o: 94.C.o:
95 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 95 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
96 96
97.c.o: 97.c.o:
98 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 98 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
99 99
100####### Build rules 100####### Build rules
101 101
102 102
103all: $(DESTDIR)$(SYSCONF_LINK_TARGET) 103all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
104 104
105$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 105$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
106 $(SYSCONF_LINK_LIB) 106 $(SYSCONF_LINK_LIB)
107 107
108moc: $(SRCMOC) 108moc: $(SRCMOC)
109 109
110tmake: Makefile.in 110tmake: Makefile.in
111 111
112Makefile.in: libflash.pro 112Makefile.in: libflash.pro
113 tmake libflash.pro -o Makefile.in 113 tmake libflash.pro -o Makefile.in
114 114
115clean: 115clean:
116 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 116 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
117 -rm -f *~ core 117 -rm -f *~ core
118 -rm -f allmoc.cpp 118 -rm -f allmoc.cpp
119 119
120####### Extension Modules 120####### Extension Modules
121 121
122listpromodules: 122listpromodules:
123 @echo 123 @echo
124 124
125listallmodules: 125listallmodules:
126 @echo 126 @echo
127 127
128listaddonpromodules: 128listaddonpromodules:
129 @echo 129 @echo
130 130
131listaddonentmodules: 131listaddonentmodules:
132 @echo 132 @echo
133 133
134 134
135REQUIRES= 135REQUIRES=
136 136
137####### Sub-libraries 137####### Sub-libraries
138 138
139 139
140###### Combined headers 140###### Combined headers
141 141
142 142
143 143
144####### Compile 144####### Compile
145 145
146libflashplugin.o: libflashplugin.cpp \ 146libflashplugin.o: libflashplugin.cpp \
147 libflashplugin.h \ 147 libflashplugin.h \
148 flash.h \ 148 flash.h
149 ../mediaplayerplugininterface.h
150 149
151libflashpluginimpl.o: libflashpluginimpl.cpp \ 150libflashpluginimpl.o: libflashpluginimpl.cpp \
152 libflashplugin.h \ 151 libflashplugin.h \
153 flash.h \ 152 flash.h \
154 ../mediaplayerplugininterface.h \ 153 libflashpluginimpl.h
155 libflashpluginimpl.h \
156 ../mediaplayerplugininterface.h
157 154
158adpcm.o: adpcm.cc \ 155adpcm.o: adpcm.cc \
159 swf.h \ 156 swf.h \
160 flash.h \ 157 flash.h \
161 matrix.h \ 158 matrix.h \
162 cxform.h \ 159 cxform.h \
163 rect.h \ 160 rect.h \
164 jpeglib.h \ 161 jpeglib.h \
165 jconfig.h \ 162 jconfig.h \
166 jmorecfg.h \ 163 jmorecfg.h \
167 jerror.h \ 164 jerror.h \
168 graphic.h \ 165 graphic.h \
169 character.h \ 166 character.h \
170 bitmap.h \ 167 bitmap.h \
171 shape.h \ 168 shape.h \
172 displaylist.h \ 169 displaylist.h \
173 sound.h \ 170 sound.h \
174 button.h \ 171 button.h \
175 font.h \ 172 font.h \
176 text.h \ 173 text.h \
177 adpcm.h \ 174 adpcm.h \
178 program.h \ 175 program.h \
179 sprite.h \ 176 sprite.h \
180 script.h \ 177 script.h \
181 movie.h 178 movie.h
182 179
183character.o: character.cc \ 180character.o: character.cc \
184 swf.h \ 181 swf.h \
185 flash.h \ 182 flash.h \
186 matrix.h \ 183 matrix.h \
187 cxform.h \ 184 cxform.h \
188 rect.h \ 185 rect.h \
189 jpeglib.h \ 186 jpeglib.h \
190 jconfig.h \ 187 jconfig.h \
191 jmorecfg.h \ 188 jmorecfg.h \
192 jerror.h \ 189 jerror.h \
193 graphic.h \ 190 graphic.h \
194 character.h \ 191 character.h \
195 bitmap.h \ 192 bitmap.h \
196 shape.h \ 193 shape.h \
197 displaylist.h \ 194 displaylist.h \
198 sound.h \ 195 sound.h \
199 button.h \ 196 button.h \
200 font.h \ 197 font.h \
201 text.h \ 198 text.h \
202 adpcm.h \ 199 adpcm.h \
203 program.h \ 200 program.h \
204 sprite.h \ 201 sprite.h \
205 script.h \ 202 script.h \
206 movie.h 203 movie.h
207 204
208flash.o: flash.cc \ 205flash.o: flash.cc \
209 swf.h \ 206 swf.h \
210 flash.h \ 207 flash.h \
211 matrix.h \ 208 matrix.h \
212 cxform.h \ 209 cxform.h \
213 rect.h \ 210 rect.h \
214 jpeglib.h \ 211 jpeglib.h \
215 jconfig.h \ 212 jconfig.h \
216 jmorecfg.h \ 213 jmorecfg.h \
217 jerror.h \ 214 jerror.h \
218 graphic.h \ 215 graphic.h \
219 character.h \ 216 character.h \
220 bitmap.h \ 217 bitmap.h \
221 shape.h \ 218 shape.h \
222 displaylist.h \ 219 displaylist.h \
223 sound.h \ 220 sound.h \
224 button.h \ 221 button.h \
225 font.h \ 222 font.h \
226 text.h \ 223 text.h \
227 adpcm.h \ 224 adpcm.h \
228 program.h \ 225 program.h \
229 sprite.h \ 226 sprite.h \
230 script.h \ 227 script.h \
231 movie.h \ 228 movie.h \
232 graphic16.h \ 229 graphic16.h \
233 graphic24.h \ 230 graphic24.h \
234 graphic32.h 231 graphic32.h
235 232
236graphic16.o: graphic16.cc \ 233graphic16.o: graphic16.cc \
237 swf.h \ 234 swf.h \
238 flash.h \ 235 flash.h \
239 matrix.h \ 236 matrix.h \
240 cxform.h \ 237 cxform.h \
241 rect.h \ 238 rect.h \
242 jpeglib.h \ 239 jpeglib.h \
243 jconfig.h \ 240 jconfig.h \
244 jmorecfg.h \ 241 jmorecfg.h \
245 jerror.h \ 242 jerror.h \
246 graphic.h \ 243 graphic.h \
247 character.h \ 244 character.h \
248 bitmap.h \ 245 bitmap.h \
249 shape.h \ 246 shape.h \
250 displaylist.h \ 247 displaylist.h \
251 sound.h \ 248 sound.h \
252 button.h \ 249 button.h \
253 font.h \ 250 font.h \
254 text.h \ 251 text.h \
255 adpcm.h \ 252 adpcm.h \
256 program.h \ 253 program.h \
257 sprite.h \ 254 sprite.h \
258 script.h \ 255 script.h \
259 movie.h \ 256 movie.h \
260 graphic16.h 257 graphic16.h
261 258
262matrix.o: matrix.cc \ 259matrix.o: matrix.cc \
263 matrix.h 260 matrix.h
264 261
265script.o: script.cc \ 262script.o: script.cc \
266 swf.h \ 263 swf.h \
267 flash.h \ 264 flash.h \
268 matrix.h \ 265 matrix.h \
269 cxform.h \ 266 cxform.h \
270 rect.h \ 267 rect.h \
271 jpeglib.h \ 268 jpeglib.h \
272 jconfig.h \ 269 jconfig.h \
273 jmorecfg.h \ 270 jmorecfg.h \
274 jerror.h \ 271 jerror.h \
275 graphic.h \ 272 graphic.h \
276 character.h \ 273 character.h \
277 bitmap.h \ 274 bitmap.h \
278 shape.h \ 275 shape.h \
279 displaylist.h \ 276 displaylist.h \
280 sound.h \ 277 sound.h \
281 button.h \ 278 button.h \
282 font.h \ 279 font.h \
283 text.h \ 280 text.h \
284 adpcm.h \ 281 adpcm.h \
285 program.h \ 282 program.h \
286 sprite.h \ 283 sprite.h \
287 script.h \ 284 script.h \
288 movie.h 285 movie.h
289 286
290sprite.o: sprite.cc \ 287sprite.o: sprite.cc \
291 swf.h \ 288 swf.h \
292 flash.h \ 289 flash.h \
293 matrix.h \ 290 matrix.h \
294 cxform.h \ 291 cxform.h \
295 rect.h \ 292 rect.h \
296 jpeglib.h \ 293 jpeglib.h \
297 jconfig.h \ 294 jconfig.h \
298 jmorecfg.h \ 295 jmorecfg.h \
299 jerror.h \ 296 jerror.h \
300 graphic.h \ 297 graphic.h \
301 character.h \ 298 character.h \
302 bitmap.h \ 299 bitmap.h \
303 shape.h \ 300 shape.h \
304 displaylist.h \ 301 displaylist.h \
305 sound.h \ 302 sound.h \
306 button.h \ 303 button.h \
307 font.h \ 304 font.h \
308 text.h \ 305 text.h \
309 adpcm.h \ 306 adpcm.h \
310 program.h \ 307 program.h \
311 sprite.h \ 308 sprite.h \
312 script.h \ 309 script.h \
313 movie.h 310 movie.h
314 311
315bitmap.o: bitmap.cc \ 312bitmap.o: bitmap.cc \
316 swf.h \ 313 swf.h \
317 flash.h \ 314 flash.h \
318 matrix.h \ 315 matrix.h \
319 cxform.h \ 316 cxform.h \
320 rect.h \ 317 rect.h \
321 jpeglib.h \ 318 jpeglib.h \
322 jconfig.h \ 319 jconfig.h \
323 jmorecfg.h \ 320 jmorecfg.h \
324 jerror.h \ 321 jerror.h \
325 graphic.h \ 322 graphic.h \
326 character.h \ 323 character.h \
327 bitmap.h \ 324 bitmap.h \
328 shape.h \ 325 shape.h \
329 displaylist.h \ 326 displaylist.h \
330 sound.h \ 327 sound.h \
331 button.h \ 328 button.h \
332 font.h \ 329 font.h \
333 text.h \ 330 text.h \
334 adpcm.h \ 331 adpcm.h \
335 program.h \ 332 program.h \
336 sprite.h \ 333 sprite.h \
337 script.h \ 334 script.h \
338 movie.h 335 movie.h
339 336
340cxform.o: cxform.cc \ 337cxform.o: cxform.cc \
341 swf.h \ 338 swf.h \
342 flash.h \ 339 flash.h \
343 matrix.h \ 340 matrix.h \
344 cxform.h \ 341 cxform.h \
345 rect.h \ 342 rect.h \
346 jpeglib.h \ 343 jpeglib.h \
347 jconfig.h \ 344 jconfig.h \
348 jmorecfg.h \ 345 jmorecfg.h \
349 jerror.h \ 346 jerror.h \
350 graphic.h \ 347 graphic.h \
351 character.h \ 348 character.h \
352 bitmap.h \ 349 bitmap.h \
353 shape.h \ 350 shape.h \
354 displaylist.h \ 351 displaylist.h \
355 sound.h \ 352 sound.h \
356 button.h \ 353 button.h \
357 font.h \ 354 font.h \
358 text.h \ 355 text.h \
359 adpcm.h \ 356 adpcm.h \
360 program.h \ 357 program.h \
361 sprite.h \ 358 sprite.h \
362 script.h \ 359 script.h \
363 movie.h 360 movie.h
364 361
365font.o: font.cc \ 362font.o: font.cc \
366 swf.h \ 363 swf.h \
367 flash.h \ 364 flash.h \
368 matrix.h \ 365 matrix.h \
369 cxform.h \ 366 cxform.h \
370 rect.h \ 367 rect.h \
371 jpeglib.h \ 368 jpeglib.h \
372 jconfig.h \ 369 jconfig.h \
373 jmorecfg.h \ 370 jmorecfg.h \
374 jerror.h \ 371 jerror.h \
375 graphic.h \ 372 graphic.h \
376 character.h \ 373 character.h \
377 bitmap.h \ 374 bitmap.h \
378 shape.h \ 375 shape.h \
379 displaylist.h \ 376 displaylist.h \
380 sound.h \ 377 sound.h \
381 button.h \ 378 button.h \
382 font.h \ 379 font.h \
383 text.h \ 380 text.h \
384 adpcm.h \ 381 adpcm.h \
385 program.h \ 382 program.h \
386 sprite.h \ 383 sprite.h \
387 script.h \ 384 script.h \
388 movie.h 385 movie.h
389 386
390graphic24.o: graphic24.cc \ 387graphic24.o: graphic24.cc \
391 swf.h \ 388 swf.h \
392 flash.h \ 389 flash.h \
393 matrix.h \ 390 matrix.h \
394 cxform.h \ 391 cxform.h \
395 rect.h \ 392 rect.h \
396 jpeglib.h \ 393 jpeglib.h \
397 jconfig.h \ 394 jconfig.h \
398 jmorecfg.h \ 395 jmorecfg.h \
399 jerror.h \ 396 jerror.h \
400 graphic.h \ 397 graphic.h \
401 character.h \ 398 character.h \
402 bitmap.h \ 399 bitmap.h \
403 shape.h \ 400 shape.h \
404 displaylist.h \ 401 displaylist.h \
405 sound.h \ 402 sound.h \
406 button.h \ 403 button.h \
407 font.h \ 404 font.h \
408 text.h \ 405 text.h \
409 adpcm.h \ 406 adpcm.h \
410 program.h \ 407 program.h \
411 sprite.h \ 408 sprite.h \
412 script.h \ 409 script.h \
413 movie.h \ 410 movie.h \
414 graphic24.h 411 graphic24.h
415 412
416movie.o: movie.cc \ 413movie.o: movie.cc \
417 movie.h \ 414 movie.h \
418 swf.h \ 415 swf.h \
419 flash.h \ 416 flash.h \
420 matrix.h \ 417 matrix.h \
421 cxform.h \ 418 cxform.h \
422 rect.h \ 419 rect.h \
423 jpeglib.h \ 420 jpeglib.h \
424 jconfig.h \ 421 jconfig.h \
425 jmorecfg.h \ 422 jmorecfg.h \
426 jerror.h \ 423 jerror.h \
427 graphic.h \ 424 graphic.h \
428 character.h \ 425 character.h \
429 bitmap.h \ 426 bitmap.h \
430 shape.h \ 427 shape.h \
431 displaylist.h \ 428 displaylist.h \
432 sound.h \ 429 sound.h \
433 button.h \ 430 button.h \
434 font.h \ 431 font.h \
435 text.h \ 432 text.h \
436 adpcm.h \ 433 adpcm.h \
437 program.h \ 434 program.h \
438 sprite.h \ 435 sprite.h \
439 script.h 436 script.h
440 437
441shape.o: shape.cc \ 438shape.o: shape.cc \
442 swf.h \ 439 swf.h \
443 flash.h \ 440 flash.h \
444 matrix.h \ 441 matrix.h \
445 cxform.h \ 442 cxform.h \
446 rect.h \ 443 rect.h \
447 jpeglib.h \ 444 jpeglib.h \
448 jconfig.h \ 445 jconfig.h \
449 jmorecfg.h \ 446 jmorecfg.h \
450 jerror.h \ 447 jerror.h \
451 graphic.h \ 448 graphic.h \
452 character.h \ 449 character.h \
453 bitmap.h \ 450 bitmap.h \
454 shape.h \ 451 shape.h \
455 displaylist.h \ 452 displaylist.h \
456 sound.h \ 453 sound.h \
457 button.h \ 454 button.h \
458 font.h \ 455 font.h \
459 text.h \ 456 text.h \
460 adpcm.h \ 457 adpcm.h \
461 program.h \ 458 program.h \
462 sprite.h \ 459 sprite.h \
463 script.h \ 460 script.h \
464 movie.h 461 movie.h
465 462
466sqrt.o: sqrt.cc 463sqrt.o: sqrt.cc
467 464
468button.o: button.cc \ 465button.o: button.cc \
469 swf.h \ 466 swf.h \
470 flash.h \ 467 flash.h \
471 matrix.h \ 468 matrix.h \
472 cxform.h \ 469 cxform.h \
473 rect.h \ 470 rect.h \
474 jpeglib.h \ 471 jpeglib.h \
475 jconfig.h \ 472 jconfig.h \
476 jmorecfg.h \ 473 jmorecfg.h \
477 jerror.h \ 474 jerror.h \
478 graphic.h \ 475 graphic.h \
479 character.h \ 476 character.h \
480 bitmap.h \ 477 bitmap.h \
481 shape.h \ 478 shape.h \
482 displaylist.h \ 479 displaylist.h \
483 sound.h \ 480 sound.h \
484 button.h \ 481 button.h \
485 font.h \ 482 font.h \
486 text.h \ 483 text.h \
487 adpcm.h \ 484 adpcm.h \
488 program.h \ 485 program.h \
489 sprite.h \ 486 sprite.h \
490 script.h \ 487 script.h \
491 movie.h 488 movie.h
492 489
493displaylist.o: displaylist.cc \ 490displaylist.o: displaylist.cc \
494 swf.h \ 491 swf.h \
495 flash.h \ 492 flash.h \
496 matrix.h \ 493 matrix.h \
497 cxform.h \ 494 cxform.h \
498 rect.h \ 495 rect.h \
499 jpeglib.h \ 496 jpeglib.h \
500 jconfig.h \ 497 jconfig.h \
501 jmorecfg.h \ 498 jmorecfg.h \
502 jerror.h \ 499 jerror.h \
503 graphic.h \ 500 graphic.h \
504 character.h \ 501 character.h \
505 bitmap.h \ 502 bitmap.h \
506 shape.h \ 503 shape.h \
507 displaylist.h \ 504 displaylist.h \
508 sound.h \ 505 sound.h \
509 button.h \ 506 button.h \
510 font.h \ 507 font.h \
511 text.h \ 508 text.h \
512 adpcm.h \ 509 adpcm.h \
513 program.h \ 510 program.h \
514 sprite.h \ 511 sprite.h \
515 script.h \ 512 script.h \
516 movie.h 513 movie.h
517 514
518graphic.o: graphic.cc \ 515graphic.o: graphic.cc \
519 swf.h \ 516 swf.h \
520 flash.h \ 517 flash.h \
521 matrix.h \ 518 matrix.h \
522 cxform.h \ 519 cxform.h \
523 rect.h \ 520 rect.h \
524 jpeglib.h \ 521 jpeglib.h \
525 jconfig.h \ 522 jconfig.h \
526 jmorecfg.h \ 523 jmorecfg.h \
527 jerror.h \ 524 jerror.h \
528 graphic.h \ 525 graphic.h \
529 character.h \ 526 character.h \
530 bitmap.h \ 527 bitmap.h \
531 shape.h \ 528 shape.h \
532 displaylist.h \ 529 displaylist.h \
533 sound.h \ 530 sound.h \
534 button.h \ 531 button.h \
535 font.h \ 532 font.h \
536 text.h \ 533 text.h \
537 adpcm.h \ 534 adpcm.h \
538 program.h \ 535 program.h \
539 sprite.h \ 536 sprite.h \
540 script.h \ 537 script.h \
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index 19ded26..d2e1cda 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -1,226 +1,225 @@
1############################################################################# 1#############################################################################
2 2
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(OPIEDIR)/include -I.. 9 INCPATH =-I$(OPIEDIR)/include -I..
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
13 UIC =$(SYSCONF_UIC) 13 UIC =$(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = ../../plugins/codecs/ 17DESTDIR = ../../plugins/codecs/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= madplugin 21 TARGET= madplugin
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =libmad_version.h \ 26 HEADERS =libmad_version.h \
27 fixed.h \ 27 fixed.h \
28 bit.h \ 28 bit.h \
29 timer.h \ 29 timer.h \
30 stream.h \ 30 stream.h \
31 frame.h \ 31 frame.h \
32 synth.h \ 32 synth.h \
33 decoder.h \ 33 decoder.h \
34 layer12.h \ 34 layer12.h \
35 layer3.h \ 35 layer3.h \
36 huffman.h \ 36 huffman.h \
37 libmad_global.h \ 37 libmad_global.h \
38 mad.h \ 38 mad.h \
39 libmadplugin.h \ 39 libmadplugin.h \
40 libmadpluginimpl.h 40 libmadpluginimpl.h
41 SOURCES =version.c \ 41 SOURCES =version.c \
42 fixed.c \ 42 fixed.c \
43 bit.c \ 43 bit.c \
44 timer.c \ 44 timer.c \
45 stream.c \ 45 stream.c \
46 frame.c \ 46 frame.c \
47 synth.c \ 47 synth.c \
48 decoder.c \ 48 decoder.c \
49 layer12.c \ 49 layer12.c \
50 layer3.c \ 50 layer3.c \
51 huffman.c \ 51 huffman.c \
52 libmadplugin.cpp \ 52 libmadplugin.cpp \
53 libmadpluginimpl.cpp 53 libmadpluginimpl.cpp
54 OBJECTS =version.o \ 54 OBJECTS =version.o \
55 fixed.o \ 55 fixed.o \
56 bit.o \ 56 bit.o \
57 timer.o \ 57 timer.o \
58 stream.o \ 58 stream.o \
59 frame.o \ 59 frame.o \
60 synth.o \ 60 synth.o \
61 decoder.o \ 61 decoder.o \
62 layer12.o \ 62 layer12.o \
63 layer3.o \ 63 layer3.o \
64 huffman.o \ 64 huffman.o \
65 libmadplugin.o \ 65 libmadplugin.o \
66 libmadpluginimpl.o 66 libmadpluginimpl.o
67INTERFACES = 67INTERFACES =
68UICDECLS = 68UICDECLS =
69UICIMPLS = 69UICIMPLS =
70 SRCMOC = 70 SRCMOC =
71 OBJMOC = 71 OBJMOC =
72 72
73 73
74####### Implicit rules 74####### Implicit rules
75 75
76.SUFFIXES: .cpp .cxx .cc .C .c 76.SUFFIXES: .cpp .cxx .cc .C .c
77 77
78.cpp.o: 78.cpp.o:
79 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 79 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
80 80
81.cxx.o: 81.cxx.o:
82 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 82 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
83 83
84.cc.o: 84.cc.o:
85 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 85 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
86 86
87.C.o: 87.C.o:
88 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 88 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
89 89
90.c.o: 90.c.o:
91 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 91 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
92 92
93####### Build rules 93####### Build rules
94 94
95 95
96all: $(DESTDIR)$(SYSCONF_LINK_TARGET) 96all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
97 97
98$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 98$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
99 $(SYSCONF_LINK_LIB) 99 $(SYSCONF_LINK_LIB)
100 100
101moc: $(SRCMOC) 101moc: $(SRCMOC)
102 102
103tmake: 103tmake: Makefile.in
104 tmake libmad.pro 104
105Makefile.in: libmad.pro
106 tmake libmad.pro -o Makefile.in
105 107
106clean: 108clean:
107 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 109 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
108 -rm -f *~ core 110 -rm -f *~ core
109 -rm -f allmoc.cpp 111 -rm -f allmoc.cpp
110 112
111####### Extension Modules 113####### Extension Modules
112 114
113listpromodules: 115listpromodules:
114 @echo 116 @echo
115 117
116listallmodules: 118listallmodules:
117 @echo 119 @echo
118 120
119listaddonpromodules: 121listaddonpromodules:
120 @echo 122 @echo
121 123
122listaddonentmodules: 124listaddonentmodules:
123 @echo 125 @echo
124 126
125 127
126REQUIRES= 128REQUIRES=
127 129
128####### Sub-libraries 130####### Sub-libraries
129 131
130 132
131###### Combined headers 133###### Combined headers
132 134
133 135
134 136
135####### Compile 137####### Compile
136 138
137version.o: version.c \ 139version.o: version.c \
138 libmad_global.h \ 140 libmad_global.h \
139 libmad_version.h 141 libmad_version.h
140 142
141fixed.o: fixed.c \ 143fixed.o: fixed.c \
142 libmad_global.h \ 144 libmad_global.h \
143 fixed.h 145 fixed.h
144 146
145bit.o: bit.c \ 147bit.o: bit.c \
146 libmad_global.h \ 148 libmad_global.h \
147 bit.h 149 bit.h
148 150
149timer.o: timer.c \ 151timer.o: timer.c \
150 libmad_global.h \ 152 libmad_global.h \
151 timer.h 153 timer.h
152 154
153stream.o: stream.c \ 155stream.o: stream.c \
154 libmad_global.h \ 156 libmad_global.h \
155 bit.h \ 157 bit.h \
156 stream.h 158 stream.h
157 159
158frame.o: frame.c \ 160frame.o: frame.c \
159 libmad_global.h \ 161 libmad_global.h \
160 bit.h \ 162 bit.h \
161 stream.h \ 163 stream.h \
162 frame.h \ 164 frame.h \
163 fixed.h \ 165 fixed.h \
164 timer.h \ 166 timer.h \
165 layer12.h \ 167 layer12.h \
166 layer3.h 168 layer3.h
167 169
168synth.o: synth.c \ 170synth.o: synth.c \
169 libmad_global.h \ 171 libmad_global.h \
170 fixed.h \ 172 fixed.h \
171 frame.h \ 173 frame.h \
172 timer.h \ 174 timer.h \
173 stream.h \ 175 stream.h \
174 bit.h \ 176 bit.h \
175 synth.h \ 177 synth.h \
176 D.dat 178 D.dat
177 179
178decoder.o: decoder.c \ 180decoder.o: decoder.c \
179 libmad_global.h \ 181 libmad_global.h \
180 stream.h \ 182 stream.h \
181 bit.h \ 183 bit.h \
182 frame.h \ 184 frame.h \
183 fixed.h \ 185 fixed.h \
184 timer.h \ 186 timer.h \
185 synth.h \ 187 synth.h \
186 decoder.h 188 decoder.h
187 189
188layer12.o: layer12.c \ 190layer12.o: layer12.c \
189 libmad_global.h \ 191 libmad_global.h \
190 fixed.h \ 192 fixed.h \
191 bit.h \ 193 bit.h \
192 stream.h \ 194 stream.h \
193 frame.h \ 195 frame.h \
194 timer.h \ 196 timer.h \
195 layer12.h \ 197 layer12.h \
196 sf_table.dat \ 198 sf_table.dat \
197 qc_table.dat 199 qc_table.dat
198 200
199layer3.o: layer3.c \ 201layer3.o: layer3.c \
200 libmad_global.h \ 202 libmad_global.h \
201 fixed.h \ 203 fixed.h \
202 bit.h \ 204 bit.h \
203 stream.h \ 205 stream.h \
204 frame.h \ 206 frame.h \
205 timer.h \ 207 timer.h \
206 huffman.h \ 208 huffman.h \
207 layer3.h \ 209 layer3.h \
208 rq_table.dat \ 210 rq_table.dat \
209 imdct_s.dat 211 imdct_s.dat
210 212
211huffman.o: huffman.c \ 213huffman.o: huffman.c \
212 libmad_global.h \ 214 libmad_global.h \
213 huffman.h 215 huffman.h
214 216
215libmadplugin.o: libmadplugin.cpp \ 217libmadplugin.o: libmadplugin.cpp \
216 libmadplugin.h \ 218 libmadplugin.h \
217 ../mediaplayerplugininterface.h \
218 mad.h 219 mad.h
219 220
220libmadpluginimpl.o: libmadpluginimpl.cpp \ 221libmadpluginimpl.o: libmadpluginimpl.cpp \
221 libmadplugin.h \ 222 libmadplugin.h \
222 ../mediaplayerplugininterface.h \ 223 libmadpluginimpl.h
223 libmadpluginimpl.h \
224 ../mediaplayerplugininterface.h
225 224
226 225
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 9881815..4ccdb8c 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -1,582 +1,581 @@
1############################################################################# 1#############################################################################
2 2
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(OPIEDIR)/include -I.. 9 INCPATH =-I$(OPIEDIR)/include -I..
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe -lpthread -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe -lpthread -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
13 UIC =$(SYSCONF_UIC) 13 UIC =$(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = ../../plugins/codecs/ 17DESTDIR = ../../plugins/codecs/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= mpeg3plugin 21 TARGET= mpeg3plugin
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =libmpeg3plugin.h \ 26 HEADERS =libmpeg3plugin.h \
27 libmpeg3pluginimpl.h 27 libmpeg3pluginimpl.h
28 SOURCES =libmpeg3plugin.cpp \ 28 SOURCES =libmpeg3plugin.cpp \
29 libmpeg3pluginimpl.cpp \ 29 libmpeg3pluginimpl.cpp \
30 bitstream.c \ 30 bitstream.c \
31 libmpeg3.c \ 31 libmpeg3.c \
32 mpeg3atrack.c \ 32 mpeg3atrack.c \
33 mpeg3css.c \ 33 mpeg3css.c \
34 mpeg3demux.c \ 34 mpeg3demux.c \
35 mpeg3io.c \ 35 mpeg3io.c \
36 mpeg3title.c \ 36 mpeg3title.c \
37 mpeg3vtrack.c \ 37 mpeg3vtrack.c \
38 audio/ac3.c \ 38 audio/ac3.c \
39 audio/bit_allocation.c \ 39 audio/bit_allocation.c \
40 audio/dct.c \ 40 audio/dct.c \
41 audio/exponents.c \ 41 audio/exponents.c \
42 audio/header.c \ 42 audio/header.c \
43 audio/layer2.c \ 43 audio/layer2.c \
44 audio/layer3.c \ 44 audio/layer3.c \
45 audio/mantissa.c \ 45 audio/mantissa.c \
46 audio/mpeg3audio.c \ 46 audio/mpeg3audio.c \
47 audio/pcm.c \ 47 audio/pcm.c \
48 audio/synthesizers.c \ 48 audio/synthesizers.c \
49 audio/tables.c \ 49 audio/tables.c \
50 video/getpicture.c \ 50 video/getpicture.c \
51 video/headers.c \ 51 video/headers.c \
52 video/idct.c \ 52 video/idct.c \
53 video/macroblocks.c \ 53 video/macroblocks.c \
54 video/mmxtest.c \ 54 video/mmxtest.c \
55 video/motion.c \ 55 video/motion.c \
56 video/mpeg3video.c \ 56 video/mpeg3video.c \
57 video/output.c \ 57 video/output.c \
58 video/reconstruct.c \ 58 video/reconstruct.c \
59 video/seek.c \ 59 video/seek.c \
60 video/slice.c \ 60 video/slice.c \
61 video/vlc.c 61 video/vlc.c
62 OBJECTS =libmpeg3plugin.o \ 62 OBJECTS =libmpeg3plugin.o \
63 libmpeg3pluginimpl.o \ 63 libmpeg3pluginimpl.o \
64 bitstream.o \ 64 bitstream.o \
65 libmpeg3.o \ 65 libmpeg3.o \
66 mpeg3atrack.o \ 66 mpeg3atrack.o \
67 mpeg3css.o \ 67 mpeg3css.o \
68 mpeg3demux.o \ 68 mpeg3demux.o \
69 mpeg3io.o \ 69 mpeg3io.o \
70 mpeg3title.o \ 70 mpeg3title.o \
71 mpeg3vtrack.o \ 71 mpeg3vtrack.o \
72 audio/ac3.o \ 72 audio/ac3.o \
73 audio/bit_allocation.o \ 73 audio/bit_allocation.o \
74 audio/dct.o \ 74 audio/dct.o \
75 audio/exponents.o \ 75 audio/exponents.o \
76 audio/header.o \ 76 audio/header.o \
77 audio/layer2.o \ 77 audio/layer2.o \
78 audio/layer3.o \ 78 audio/layer3.o \
79 audio/mantissa.o \ 79 audio/mantissa.o \
80 audio/mpeg3audio.o \ 80 audio/mpeg3audio.o \
81 audio/pcm.o \ 81 audio/pcm.o \
82 audio/synthesizers.o \ 82 audio/synthesizers.o \
83 audio/tables.o \ 83 audio/tables.o \
84 video/getpicture.o \ 84 video/getpicture.o \
85 video/headers.o \ 85 video/headers.o \
86 video/idct.o \ 86 video/idct.o \
87 video/macroblocks.o \ 87 video/macroblocks.o \
88 video/mmxtest.o \ 88 video/mmxtest.o \
89 video/motion.o \ 89 video/motion.o \
90 video/mpeg3video.o \ 90 video/mpeg3video.o \
91 video/output.o \ 91 video/output.o \
92 video/reconstruct.o \ 92 video/reconstruct.o \
93 video/seek.o \ 93 video/seek.o \
94 video/slice.o \ 94 video/slice.o \
95 video/vlc.o 95 video/vlc.o
96INTERFACES = 96INTERFACES =
97UICDECLS = 97UICDECLS =
98UICIMPLS = 98UICIMPLS =
99 SRCMOC = 99 SRCMOC =
100 OBJMOC = 100 OBJMOC =
101 101
102 102
103####### Implicit rules 103####### Implicit rules
104 104
105.SUFFIXES: .cpp .cxx .cc .C .c 105.SUFFIXES: .cpp .cxx .cc .C .c
106 106
107.cpp.o: 107.cpp.o:
108 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 108 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
109 109
110.cxx.o: 110.cxx.o:
111 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 111 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
112 112
113.cc.o: 113.cc.o:
114 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 114 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
115 115
116.C.o: 116.C.o:
117 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 117 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
118 118
119.c.o: 119.c.o:
120 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 120 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
121 121
122####### Build rules 122####### Build rules
123 123
124 124
125all: $(DESTDIR)$(SYSCONF_LINK_TARGET) 125all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
126 126
127$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 127$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
128 $(SYSCONF_LINK_LIB) 128 $(SYSCONF_LINK_LIB)
129 129
130moc: $(SRCMOC) 130moc: $(SRCMOC)
131 131
132tmake: 132tmake: Makefile.in
133 tmake libmpeg3.pro 133
134Makefile.in: libmpeg3.pro
135 tmake libmpeg3.pro -o Makefile.in
134 136
135clean: 137clean:
136 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 138 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
137 -rm -f *~ core 139 -rm -f *~ core
138 -rm -f allmoc.cpp 140 -rm -f allmoc.cpp
139 141
140####### Extension Modules 142####### Extension Modules
141 143
142listpromodules: 144listpromodules:
143 @echo 145 @echo
144 146
145listallmodules: 147listallmodules:
146 @echo 148 @echo
147 149
148listaddonpromodules: 150listaddonpromodules:
149 @echo 151 @echo
150 152
151listaddonentmodules: 153listaddonentmodules:
152 @echo 154 @echo
153 155
154 156
155REQUIRES= 157REQUIRES=
156 158
157####### Sub-libraries 159####### Sub-libraries
158 160
159 161
160###### Combined headers 162###### Combined headers
161 163
162 164
163 165
164####### Compile 166####### Compile
165 167
166libmpeg3plugin.o: libmpeg3plugin.cpp \ 168libmpeg3plugin.o: libmpeg3plugin.cpp \
167 libmpeg3plugin.h \ 169 libmpeg3plugin.h \
168 libmpeg3.h \ 170 libmpeg3.h \
169 mpeg3private.h \ 171 mpeg3private.h \
170 mpeg3atrack.h \ 172 mpeg3atrack.h \
171 mpeg3demux.h \ 173 mpeg3demux.h \
172 mpeg3title.h \ 174 mpeg3title.h \
173 mpeg3io.h \ 175 mpeg3io.h \
174 mpeg3css.h \ 176 mpeg3css.h \
175 mpeg3private.inc \ 177 mpeg3private.inc \
176 audio/mpeg3audio.h \ 178 audio/mpeg3audio.h \
177 mpeg3vtrack.h \ 179 mpeg3vtrack.h \
178 video/mpeg3video.h \ 180 video/mpeg3video.h \
179 mpeg3protos.h \ 181 mpeg3protos.h
180 ../mediaplayerplugininterface.h
181 182
182libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ 183libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
183 libmpeg3plugin.h \ 184 libmpeg3plugin.h \
184 libmpeg3.h \ 185 libmpeg3.h \
185 mpeg3private.h \ 186 mpeg3private.h \
186 mpeg3atrack.h \ 187 mpeg3atrack.h \
187 mpeg3demux.h \ 188 mpeg3demux.h \
188 mpeg3title.h \ 189 mpeg3title.h \
189 mpeg3io.h \ 190 mpeg3io.h \
190 mpeg3css.h \ 191 mpeg3css.h \
191 mpeg3private.inc \ 192 mpeg3private.inc \
192 audio/mpeg3audio.h \ 193 audio/mpeg3audio.h \
193 mpeg3vtrack.h \ 194 mpeg3vtrack.h \
194 video/mpeg3video.h \ 195 video/mpeg3video.h \
195 mpeg3protos.h \ 196 mpeg3protos.h \
196 ../mediaplayerplugininterface.h \ 197 libmpeg3pluginimpl.h
197 libmpeg3pluginimpl.h \
198 ../mediaplayerplugininterface.h
199 198
200bitstream.o: bitstream.c \ 199bitstream.o: bitstream.c \
201 mpeg3private.h \ 200 mpeg3private.h \
202 mpeg3atrack.h \ 201 mpeg3atrack.h \
203 mpeg3demux.h \ 202 mpeg3demux.h \
204 mpeg3title.h \ 203 mpeg3title.h \
205 mpeg3io.h \ 204 mpeg3io.h \
206 mpeg3css.h \ 205 mpeg3css.h \
207 mpeg3private.inc \ 206 mpeg3private.inc \
208 audio/mpeg3audio.h \ 207 audio/mpeg3audio.h \
209 mpeg3vtrack.h \ 208 mpeg3vtrack.h \
210 video/mpeg3video.h \ 209 video/mpeg3video.h \
211 mpeg3protos.h 210 mpeg3protos.h
212 211
213libmpeg3.o: libmpeg3.c \ 212libmpeg3.o: libmpeg3.c \
214 libmpeg3.h \ 213 libmpeg3.h \
215 mpeg3private.h \ 214 mpeg3private.h \
216 mpeg3atrack.h \ 215 mpeg3atrack.h \
217 mpeg3demux.h \ 216 mpeg3demux.h \
218 mpeg3title.h \ 217 mpeg3title.h \
219 mpeg3io.h \ 218 mpeg3io.h \
220 mpeg3css.h \ 219 mpeg3css.h \
221 mpeg3private.inc \ 220 mpeg3private.inc \
222 audio/mpeg3audio.h \ 221 audio/mpeg3audio.h \
223 mpeg3vtrack.h \ 222 mpeg3vtrack.h \
224 video/mpeg3video.h \ 223 video/mpeg3video.h \
225 mpeg3protos.h 224 mpeg3protos.h
226 225
227mpeg3atrack.o: mpeg3atrack.c \ 226mpeg3atrack.o: mpeg3atrack.c \
228 libmpeg3.h \ 227 libmpeg3.h \
229 mpeg3private.h \ 228 mpeg3private.h \
230 mpeg3atrack.h \ 229 mpeg3atrack.h \
231 mpeg3demux.h \ 230 mpeg3demux.h \
232 mpeg3title.h \ 231 mpeg3title.h \
233 mpeg3io.h \ 232 mpeg3io.h \
234 mpeg3css.h \ 233 mpeg3css.h \
235 mpeg3private.inc \ 234 mpeg3private.inc \
236 audio/mpeg3audio.h \ 235 audio/mpeg3audio.h \
237 mpeg3vtrack.h \ 236 mpeg3vtrack.h \
238 video/mpeg3video.h \ 237 video/mpeg3video.h \
239 mpeg3protos.h 238 mpeg3protos.h
240 239
241mpeg3css.o: mpeg3css.c \ 240mpeg3css.o: mpeg3css.c \
242 mpeg3css.h \ 241 mpeg3css.h \
243 mpeg3private.h \ 242 mpeg3private.h \
244 mpeg3atrack.h \ 243 mpeg3atrack.h \
245 mpeg3demux.h \ 244 mpeg3demux.h \
246 mpeg3title.h \ 245 mpeg3title.h \
247 mpeg3io.h \ 246 mpeg3io.h \
248 mpeg3private.inc \ 247 mpeg3private.inc \
249 audio/mpeg3audio.h \ 248 audio/mpeg3audio.h \
250 mpeg3vtrack.h \ 249 mpeg3vtrack.h \
251 video/mpeg3video.h 250 video/mpeg3video.h
252 251
253mpeg3demux.o: mpeg3demux.c \ 252mpeg3demux.o: mpeg3demux.c \
254 libmpeg3.h \ 253 libmpeg3.h \
255 mpeg3private.h \ 254 mpeg3private.h \
256 mpeg3atrack.h \ 255 mpeg3atrack.h \
257 mpeg3demux.h \ 256 mpeg3demux.h \
258 mpeg3title.h \ 257 mpeg3title.h \
259 mpeg3io.h \ 258 mpeg3io.h \
260 mpeg3css.h \ 259 mpeg3css.h \
261 mpeg3private.inc \ 260 mpeg3private.inc \
262 audio/mpeg3audio.h \ 261 audio/mpeg3audio.h \
263 mpeg3vtrack.h \ 262 mpeg3vtrack.h \
264 video/mpeg3video.h \ 263 video/mpeg3video.h \
265 mpeg3protos.h 264 mpeg3protos.h
266 265
267mpeg3io.o: mpeg3io.c \ 266mpeg3io.o: mpeg3io.c \
268 mpeg3private.h \ 267 mpeg3private.h \
269 mpeg3atrack.h \ 268 mpeg3atrack.h \
270 mpeg3demux.h \ 269 mpeg3demux.h \
271 mpeg3title.h \ 270 mpeg3title.h \
272 mpeg3io.h \ 271 mpeg3io.h \
273 mpeg3css.h \ 272 mpeg3css.h \
274 mpeg3private.inc \ 273 mpeg3private.inc \
275 audio/mpeg3audio.h \ 274 audio/mpeg3audio.h \
276 mpeg3vtrack.h \ 275 mpeg3vtrack.h \
277 video/mpeg3video.h \ 276 video/mpeg3video.h \
278 mpeg3protos.h 277 mpeg3protos.h
279 278
280mpeg3title.o: mpeg3title.c \ 279mpeg3title.o: mpeg3title.c \
281 mpeg3private.h \ 280 mpeg3private.h \
282 mpeg3atrack.h \ 281 mpeg3atrack.h \
283 mpeg3demux.h \ 282 mpeg3demux.h \
284 mpeg3title.h \ 283 mpeg3title.h \
285 mpeg3io.h \ 284 mpeg3io.h \
286 mpeg3css.h \ 285 mpeg3css.h \
287 mpeg3private.inc \ 286 mpeg3private.inc \
288 audio/mpeg3audio.h \ 287 audio/mpeg3audio.h \
289 mpeg3vtrack.h \ 288 mpeg3vtrack.h \
290 video/mpeg3video.h \ 289 video/mpeg3video.h \
291 mpeg3protos.h 290 mpeg3protos.h
292 291
293mpeg3vtrack.o: mpeg3vtrack.c \ 292mpeg3vtrack.o: mpeg3vtrack.c \
294 libmpeg3.h \ 293 libmpeg3.h \
295 mpeg3private.h \ 294 mpeg3private.h \
296 mpeg3atrack.h \ 295 mpeg3atrack.h \
297 mpeg3demux.h \ 296 mpeg3demux.h \
298 mpeg3title.h \ 297 mpeg3title.h \
299 mpeg3io.h \ 298 mpeg3io.h \
300 mpeg3css.h \ 299 mpeg3css.h \
301 mpeg3private.inc \ 300 mpeg3private.inc \
302 audio/mpeg3audio.h \ 301 audio/mpeg3audio.h \
303 mpeg3vtrack.h \ 302 mpeg3vtrack.h \
304 video/mpeg3video.h \ 303 video/mpeg3video.h \
305 mpeg3protos.h 304 mpeg3protos.h
306 305
307audio/ac3.o: audio/ac3.c \ 306audio/ac3.o: audio/ac3.c \
308 audio/mpeg3audio.h \ 307 audio/mpeg3audio.h \
309 audio/ac3.h \ 308 audio/ac3.h \
310 audio/mpeg3real.h \ 309 audio/mpeg3real.h \
311 audio/../bitstream.h \ 310 audio/../bitstream.h \
312 mpeg3demux.h \ 311 mpeg3demux.h \
313 mpeg3title.h \ 312 mpeg3title.h \
314 mpeg3io.h \ 313 mpeg3io.h \
315 mpeg3css.h \ 314 mpeg3css.h \
316 mpeg3private.inc \ 315 mpeg3private.inc \
317 audio/../libmpeg3.h \ 316 audio/../libmpeg3.h \
318 mpeg3private.h \ 317 mpeg3private.h \
319 mpeg3atrack.h \ 318 mpeg3atrack.h \
320 audio/mpeg3audio.h \ 319 audio/mpeg3audio.h \
321 mpeg3vtrack.h \ 320 mpeg3vtrack.h \
322 video/mpeg3video.h \ 321 video/mpeg3video.h \
323 audio/../mpeg3protos.h 322 audio/../mpeg3protos.h
324 323
325audio/bit_allocation.o: audio/bit_allocation.c \ 324audio/bit_allocation.o: audio/bit_allocation.c \
326 audio/mpeg3audio.h \ 325 audio/mpeg3audio.h \
327 audio/ac3.h \ 326 audio/ac3.h \
328 audio/mpeg3real.h \ 327 audio/mpeg3real.h \
329 audio/../bitstream.h \ 328 audio/../bitstream.h \
330 mpeg3demux.h \ 329 mpeg3demux.h \
331 mpeg3title.h \ 330 mpeg3title.h \
332 mpeg3io.h \ 331 mpeg3io.h \
333 mpeg3css.h \ 332 mpeg3css.h \
334 mpeg3private.inc \ 333 mpeg3private.inc \
335 audio/../libmpeg3.h \ 334 audio/../libmpeg3.h \
336 mpeg3private.h \ 335 mpeg3private.h \
337 mpeg3atrack.h \ 336 mpeg3atrack.h \
338 audio/mpeg3audio.h \ 337 audio/mpeg3audio.h \
339 mpeg3vtrack.h \ 338 mpeg3vtrack.h \
340 video/mpeg3video.h \ 339 video/mpeg3video.h \
341 audio/../mpeg3protos.h 340 audio/../mpeg3protos.h
342 341
343audio/dct.o: audio/dct.c \ 342audio/dct.o: audio/dct.c \
344 audio/mpeg3audio.h \ 343 audio/mpeg3audio.h \
345 audio/ac3.h \ 344 audio/ac3.h \
346 audio/mpeg3real.h \ 345 audio/mpeg3real.h \
347 audio/../bitstream.h \ 346 audio/../bitstream.h \
348 mpeg3demux.h \ 347 mpeg3demux.h \
349 mpeg3title.h \ 348 mpeg3title.h \
350 mpeg3io.h \ 349 mpeg3io.h \
351 mpeg3css.h \ 350 mpeg3css.h \
352 mpeg3private.inc \ 351 mpeg3private.inc \
353 audio/../libmpeg3.h \ 352 audio/../libmpeg3.h \
354 mpeg3private.h \ 353 mpeg3private.h \
355 mpeg3atrack.h \ 354 mpeg3atrack.h \
356 audio/mpeg3audio.h \ 355 audio/mpeg3audio.h \
357 mpeg3vtrack.h \ 356 mpeg3vtrack.h \
358 video/mpeg3video.h \ 357 video/mpeg3video.h \
359 audio/../mpeg3protos.h \ 358 audio/../mpeg3protos.h \
360 audio/tables.h \ 359 audio/tables.h \
361 audio/fptables.h 360 audio/fptables.h
362 361
363audio/exponents.o: audio/exponents.c \ 362audio/exponents.o: audio/exponents.c \
364 audio/mpeg3audio.h \ 363 audio/mpeg3audio.h \
365 audio/ac3.h \ 364 audio/ac3.h \
366 audio/mpeg3real.h \ 365 audio/mpeg3real.h \
367 audio/../bitstream.h \ 366 audio/../bitstream.h \
368 mpeg3demux.h \ 367 mpeg3demux.h \
369 mpeg3title.h \ 368 mpeg3title.h \
370 mpeg3io.h \ 369 mpeg3io.h \
371 mpeg3css.h \ 370 mpeg3css.h \
372 mpeg3private.inc \ 371 mpeg3private.inc \
373 audio/../libmpeg3.h \ 372 audio/../libmpeg3.h \
374 mpeg3private.h \ 373 mpeg3private.h \
375 mpeg3atrack.h \ 374 mpeg3atrack.h \
376 audio/mpeg3audio.h \ 375 audio/mpeg3audio.h \
377 mpeg3vtrack.h \ 376 mpeg3vtrack.h \
378 video/mpeg3video.h \ 377 video/mpeg3video.h \
379 audio/../mpeg3protos.h 378 audio/../mpeg3protos.h
380 379
381audio/header.o: audio/header.c \ 380audio/header.o: audio/header.c \
382 audio/mpeg3audio.h \ 381 audio/mpeg3audio.h \
383 audio/ac3.h \ 382 audio/ac3.h \
384 audio/mpeg3real.h \ 383 audio/mpeg3real.h \
385 audio/../bitstream.h \ 384 audio/../bitstream.h \
386 mpeg3demux.h \ 385 mpeg3demux.h \
387 mpeg3title.h \ 386 mpeg3title.h \
388 mpeg3io.h \ 387 mpeg3io.h \
389 mpeg3css.h \ 388 mpeg3css.h \
390 mpeg3private.inc \ 389 mpeg3private.inc \
391 audio/tables.h \ 390 audio/tables.h \
392 audio/../libmpeg3.h \ 391 audio/../libmpeg3.h \
393 mpeg3private.h \ 392 mpeg3private.h \
394 mpeg3atrack.h \ 393 mpeg3atrack.h \
395 audio/mpeg3audio.h \ 394 audio/mpeg3audio.h \
396 mpeg3vtrack.h \ 395 mpeg3vtrack.h \
397 video/mpeg3video.h \ 396 video/mpeg3video.h \
398 audio/../mpeg3protos.h 397 audio/../mpeg3protos.h
399 398
400audio/layer2.o: audio/layer2.c \ 399audio/layer2.o: audio/layer2.c \
401 audio/mpeg3audio.h \ 400 audio/mpeg3audio.h \
402 audio/ac3.h \ 401 audio/ac3.h \
403 audio/mpeg3real.h \ 402 audio/mpeg3real.h \
404 audio/../bitstream.h \ 403 audio/../bitstream.h \
405 mpeg3demux.h \ 404 mpeg3demux.h \
406 mpeg3title.h \ 405 mpeg3title.h \
407 mpeg3io.h \ 406 mpeg3io.h \
408 mpeg3css.h \ 407 mpeg3css.h \
409 mpeg3private.inc \ 408 mpeg3private.inc \
410 audio/../libmpeg3.h \ 409 audio/../libmpeg3.h \
411 mpeg3private.h \ 410 mpeg3private.h \
412 mpeg3atrack.h \ 411 mpeg3atrack.h \
413 audio/mpeg3audio.h \ 412 audio/mpeg3audio.h \
414 mpeg3vtrack.h \ 413 mpeg3vtrack.h \
415 video/mpeg3video.h \ 414 video/mpeg3video.h \
416 audio/../mpeg3protos.h \ 415 audio/../mpeg3protos.h \
417 audio/tables.h 416 audio/tables.h
418 417
419audio/layer3.o: audio/layer3.c \ 418audio/layer3.o: audio/layer3.c \
420 audio/huffman.h \ 419 audio/huffman.h \
421 audio/mpeg3audio.h \ 420 audio/mpeg3audio.h \
422 audio/ac3.h \ 421 audio/ac3.h \
423 audio/mpeg3real.h \ 422 audio/mpeg3real.h \
424 audio/../bitstream.h \ 423 audio/../bitstream.h \
425 mpeg3demux.h \ 424 mpeg3demux.h \
426 mpeg3title.h \ 425 mpeg3title.h \
427 mpeg3io.h \ 426 mpeg3io.h \
428 mpeg3css.h \ 427 mpeg3css.h \
429 mpeg3private.inc \ 428 mpeg3private.inc \
430 audio/../libmpeg3.h \ 429 audio/../libmpeg3.h \
431 mpeg3private.h \ 430 mpeg3private.h \
432 mpeg3atrack.h \ 431 mpeg3atrack.h \
433 audio/mpeg3audio.h \ 432 audio/mpeg3audio.h \
434 mpeg3vtrack.h \ 433 mpeg3vtrack.h \
435 video/mpeg3video.h \ 434 video/mpeg3video.h \
436 audio/../mpeg3protos.h \ 435 audio/../mpeg3protos.h \
437 audio/tables.h 436 audio/tables.h
438 437
439audio/mantissa.o: audio/mantissa.c \ 438audio/mantissa.o: audio/mantissa.c \
440 audio/mpeg3audio.h \ 439 audio/mpeg3audio.h \
441 audio/ac3.h \ 440 audio/ac3.h \
442 audio/mpeg3real.h \ 441 audio/mpeg3real.h \
443 audio/../bitstream.h \ 442 audio/../bitstream.h \
444 mpeg3demux.h \ 443 mpeg3demux.h \
445 mpeg3title.h \ 444 mpeg3title.h \
446 mpeg3io.h \ 445 mpeg3io.h \
447 mpeg3css.h \ 446 mpeg3css.h \
448 mpeg3private.inc \ 447 mpeg3private.inc \
449 audio/../libmpeg3.h \ 448 audio/../libmpeg3.h \
450 mpeg3private.h \ 449 mpeg3private.h \
451 mpeg3atrack.h \ 450 mpeg3atrack.h \
452 audio/mpeg3audio.h \ 451 audio/mpeg3audio.h \
453 mpeg3vtrack.h \ 452 mpeg3vtrack.h \
454 video/mpeg3video.h \ 453 video/mpeg3video.h \
455 audio/../mpeg3protos.h 454 audio/../mpeg3protos.h
456 455
457audio/mpeg3audio.o: audio/mpeg3audio.c \ 456audio/mpeg3audio.o: audio/mpeg3audio.c \
458 audio/../libmpeg3.h \ 457 audio/../libmpeg3.h \
459 mpeg3private.h \ 458 mpeg3private.h \
460 mpeg3atrack.h \ 459 mpeg3atrack.h \
461 mpeg3demux.h \ 460 mpeg3demux.h \
462 mpeg3title.h \ 461 mpeg3title.h \
463 mpeg3io.h \ 462 mpeg3io.h \
464 mpeg3css.h \ 463 mpeg3css.h \
465 mpeg3private.inc \ 464 mpeg3private.inc \
466 audio/mpeg3audio.h \ 465 audio/mpeg3audio.h \
467 audio/ac3.h \ 466 audio/ac3.h \
468 audio/mpeg3real.h \ 467 audio/mpeg3real.h \
469 audio/../bitstream.h \ 468 audio/../bitstream.h \
470 mpeg3vtrack.h \ 469 mpeg3vtrack.h \
471 video/mpeg3video.h \ 470 video/mpeg3video.h \
472 audio/../mpeg3protos.h \ 471 audio/../mpeg3protos.h \
473 audio/mpeg3audio.h \ 472 audio/mpeg3audio.h \
474 audio/tables.h 473 audio/tables.h
475 474
476audio/pcm.o: audio/pcm.c \ 475audio/pcm.o: audio/pcm.c \
477 audio/mpeg3audio.h \ 476 audio/mpeg3audio.h \
478 audio/ac3.h \ 477 audio/ac3.h \
479 audio/mpeg3real.h \ 478 audio/mpeg3real.h \
480 audio/../bitstream.h \ 479 audio/../bitstream.h \
481 mpeg3demux.h \ 480 mpeg3demux.h \
482 mpeg3title.h \ 481 mpeg3title.h \
483 mpeg3io.h \ 482 mpeg3io.h \
484 mpeg3css.h \ 483 mpeg3css.h \
485 mpeg3private.inc \ 484 mpeg3private.inc \
486 audio/../libmpeg3.h \ 485 audio/../libmpeg3.h \
487 mpeg3private.h \ 486 mpeg3private.h \
488 mpeg3atrack.h \ 487 mpeg3atrack.h \
489 audio/mpeg3audio.h \ 488 audio/mpeg3audio.h \
490 mpeg3vtrack.h \ 489 mpeg3vtrack.h \
491 video/mpeg3video.h \ 490 video/mpeg3video.h \
492 audio/../mpeg3protos.h 491 audio/../mpeg3protos.h
493 492
494audio/synthesizers.o: audio/synthesizers.c \ 493audio/synthesizers.o: audio/synthesizers.c \
495 audio/mpeg3audio.h \ 494 audio/mpeg3audio.h \
496 audio/ac3.h \ 495 audio/ac3.h \
497 audio/mpeg3real.h \ 496 audio/mpeg3real.h \
498 audio/../bitstream.h \ 497 audio/../bitstream.h \
499 mpeg3demux.h \ 498 mpeg3demux.h \
500 mpeg3title.h \ 499 mpeg3title.h \
501 mpeg3io.h \ 500 mpeg3io.h \
502 mpeg3css.h \ 501 mpeg3css.h \
503 mpeg3private.inc \ 502 mpeg3private.inc \
504 audio/../libmpeg3.h \ 503 audio/../libmpeg3.h \
505 mpeg3private.h \ 504 mpeg3private.h \
506 mpeg3atrack.h \ 505 mpeg3atrack.h \
507 audio/mpeg3audio.h \ 506 audio/mpeg3audio.h \
508 mpeg3vtrack.h \ 507 mpeg3vtrack.h \
509 video/mpeg3video.h \ 508 video/mpeg3video.h \
510 audio/../mpeg3protos.h \ 509 audio/../mpeg3protos.h \
511 audio/tables.h 510 audio/tables.h
512 511
513audio/tables.o: audio/tables.c \ 512audio/tables.o: audio/tables.c \
514 audio/mpeg3audio.h \ 513 audio/mpeg3audio.h \
515 audio/ac3.h \ 514 audio/ac3.h \
516 audio/mpeg3real.h \ 515 audio/mpeg3real.h \
517 audio/../bitstream.h \ 516 audio/../bitstream.h \
518 mpeg3demux.h \ 517 mpeg3demux.h \
519 mpeg3title.h \ 518 mpeg3title.h \
520 mpeg3io.h \ 519 mpeg3io.h \
521 mpeg3css.h \ 520 mpeg3css.h \
522 mpeg3private.inc \ 521 mpeg3private.inc \
523 audio/../libmpeg3.h \ 522 audio/../libmpeg3.h \
524 mpeg3private.h \ 523 mpeg3private.h \
525 mpeg3atrack.h \ 524 mpeg3atrack.h \
526 audio/mpeg3audio.h \ 525 audio/mpeg3audio.h \
527 mpeg3vtrack.h \ 526 mpeg3vtrack.h \
528 video/mpeg3video.h \ 527 video/mpeg3video.h \
529 audio/../mpeg3protos.h \ 528 audio/../mpeg3protos.h \
530 audio/tables.h \ 529 audio/tables.h \
531 audio/fptables.h 530 audio/fptables.h
532 531
533video/getpicture.o: video/getpicture.c \ 532video/getpicture.o: video/getpicture.c \
534 audio/../libmpeg3.h \ 533 audio/../libmpeg3.h \
535 mpeg3private.h \ 534 mpeg3private.h \
536 mpeg3atrack.h \ 535 mpeg3atrack.h \
537 mpeg3demux.h \ 536 mpeg3demux.h \
538 mpeg3title.h \ 537 mpeg3title.h \
539 mpeg3io.h \ 538 mpeg3io.h \
540 mpeg3css.h \ 539 mpeg3css.h \
541 mpeg3private.inc \ 540 mpeg3private.inc \
542 audio/mpeg3audio.h \ 541 audio/mpeg3audio.h \
543 audio/ac3.h \ 542 audio/ac3.h \
544 audio/mpeg3real.h \ 543 audio/mpeg3real.h \
545 audio/../bitstream.h \ 544 audio/../bitstream.h \
546 mpeg3vtrack.h \ 545 mpeg3vtrack.h \
547 video/mpeg3video.h \ 546 video/mpeg3video.h \
548 video/../mpeg3private.inc \ 547 video/../mpeg3private.inc \
549 video/idct.h \ 548 video/idct.h \
550 video/slice.h \ 549 video/slice.h \
551 video/../timecode.h \ 550 video/../timecode.h \
552 video/../mpeg3protos.h \ 551 video/../mpeg3protos.h \
553 video/mpeg3video.h \ 552 video/mpeg3video.h \
554 video/vlc.h 553 video/vlc.h
555 554
556video/headers.o: video/headers.c \ 555video/headers.o: video/headers.c \
557 video/../mpeg3demux.h \ 556 video/../mpeg3demux.h \
558 mpeg3title.h \ 557 mpeg3title.h \
559 mpeg3io.h \ 558 mpeg3io.h \
560 mpeg3css.h \ 559 mpeg3css.h \
561 mpeg3private.inc \ 560 mpeg3private.inc \
562 audio/../libmpeg3.h \ 561 audio/../libmpeg3.h \
563 mpeg3private.h \ 562 mpeg3private.h \
564 mpeg3atrack.h \ 563 mpeg3atrack.h \
565 mpeg3demux.h \ 564 mpeg3demux.h \
566 audio/mpeg3audio.h \ 565 audio/mpeg3audio.h \
567 audio/ac3.h \ 566 audio/ac3.h \
568 audio/mpeg3real.h \ 567 audio/mpeg3real.h \
569 audio/../bitstream.h \ 568 audio/../bitstream.h \
570 mpeg3vtrack.h \ 569 mpeg3vtrack.h \
571 video/mpeg3video.h \ 570 video/mpeg3video.h \
572 video/../mpeg3private.inc \ 571 video/../mpeg3private.inc \
573 video/idct.h \ 572 video/idct.h \
574 video/slice.h \ 573 video/slice.h \
575 video/../timecode.h \ 574 video/../timecode.h \
576 video/../mpeg3protos.h \ 575 video/../mpeg3protos.h \
577 video/mpeg3video.h 576 video/mpeg3video.h
578 577
579video/idct.o: video/idct.c \ 578video/idct.o: video/idct.c \
580 video/idct.h 579 video/idct.h
581 580
582video/macroblocks.o: video/macroblocks.c \ 581video/macroblocks.o: video/macroblocks.c \
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index e9fec6c..560534e 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -1,112 +1,111 @@
1############################################################################# 1#############################################################################
2 2
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(OPIEDIR)/include -I.. 9 INCPATH =-I$(OPIEDIR)/include -I..
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
13 UIC =$(SYSCONF_UIC) 13 UIC =$(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = ../../plugins/codecs/ 17DESTDIR = ../../plugins/codecs/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= wavplugin 21 TARGET= wavplugin
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =wavplugin.h \ 26 HEADERS =wavplugin.h \
27 wavpluginimpl.h 27 wavpluginimpl.h
28 SOURCES =wavplugin.cpp \ 28 SOURCES =wavplugin.cpp \
29 wavpluginimpl.cpp 29 wavpluginimpl.cpp
30 OBJECTS =wavplugin.o \ 30 OBJECTS =wavplugin.o \
31 wavpluginimpl.o 31 wavpluginimpl.o
32INTERFACES = 32INTERFACES =
33UICDECLS = 33UICDECLS =
34UICIMPLS = 34UICIMPLS =
35 SRCMOC = 35 SRCMOC =
36 OBJMOC = 36 OBJMOC =
37 37
38 38
39####### Implicit rules 39####### Implicit rules
40 40
41.SUFFIXES: .cpp .cxx .cc .C .c 41.SUFFIXES: .cpp .cxx .cc .C .c
42 42
43.cpp.o: 43.cpp.o:
44 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 44 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
45 45
46.cxx.o: 46.cxx.o:
47 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 47 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
48 48
49.cc.o: 49.cc.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51 51
52.C.o: 52.C.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54 54
55.c.o: 55.c.o:
56 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 56 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
57 57
58####### Build rules 58####### Build rules
59 59
60 60
61all: $(DESTDIR)$(SYSCONF_LINK_TARGET) 61all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
62 62
63$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 63$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
64 $(SYSCONF_LINK_LIB) 64 $(SYSCONF_LINK_LIB)
65 65
66moc: $(SRCMOC) 66moc: $(SRCMOC)
67 67
68tmake: 68tmake: Makefile.in
69 tmake wavplugin.pro 69
70Makefile.in: wavplugin.pro
71 tmake wavplugin.pro -o Makefile.in
70 72
71clean: 73clean:
72 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
73 -rm -f *~ core 75 -rm -f *~ core
74 -rm -f allmoc.cpp 76 -rm -f allmoc.cpp
75 77
76####### Extension Modules 78####### Extension Modules
77 79
78listpromodules: 80listpromodules:
79 @echo 81 @echo
80 82
81listallmodules: 83listallmodules:
82 @echo 84 @echo
83 85
84listaddonpromodules: 86listaddonpromodules:
85 @echo 87 @echo
86 88
87listaddonentmodules: 89listaddonentmodules:
88 @echo 90 @echo
89 91
90 92
91REQUIRES= 93REQUIRES=
92 94
93####### Sub-libraries 95####### Sub-libraries
94 96
95 97
96###### Combined headers 98###### Combined headers
97 99
98 100
99 101
100####### Compile 102####### Compile
101 103
102wavplugin.o: wavplugin.cpp \ 104wavplugin.o: wavplugin.cpp \
103 wavplugin.h \ 105 wavplugin.h
104 ../mediaplayerplugininterface.h
105 106
106wavpluginimpl.o: wavpluginimpl.cpp \ 107wavpluginimpl.o: wavpluginimpl.cpp \
107 wavplugin.h \ 108 wavplugin.h \
108 ../mediaplayerplugininterface.h \ 109 wavpluginimpl.h
109 wavpluginimpl.h \
110 ../mediaplayerplugininterface.h
111 110
112 111
diff --git a/core/pim/datebook/Makefile.in b/core/pim/datebook/Makefile.in
index 0c3282e..cc31efe 100644
--- a/core/pim/datebook/Makefile.in
+++ b/core/pim/datebook/Makefile.in
@@ -1,408 +1,323 @@
1############################################################################# 1#############################################################################
2 2
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(OPIEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
13 UIC =$(SYSCONF_UIC) 13 UIC =$(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(OPIEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= datebook 21 TARGET= datebook
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =datebookday.h \ 26 HEADERS =datebookday.h \
27 datebook.h \ 27 datebook.h \
28 dateentryimpl.h \ 28 dateentryimpl.h \
29 datebookdayheaderimpl.h \ 29 datebookdayheaderimpl.h \
30 datebooksettings.h \ 30 datebooksettings.h \
31 datebookweek.h \ 31 datebookweek.h \
32 datebookweekheaderimpl.h \ 32 datebookweekheaderimpl.h \
33 repeatentry.h 33 repeatentry.h
34 SOURCES =main.cpp \ 34 SOURCES =main.cpp \
35 datebookday.cpp \ 35 datebookday.cpp \
36 datebook.cpp \ 36 datebook.cpp \
37 dateentryimpl.cpp \ 37 dateentryimpl.cpp \
38 datebookdayheaderimpl.cpp \ 38 datebookdayheaderimpl.cpp \
39 datebooksettings.cpp \ 39 datebooksettings.cpp \
40 datebookweek.cpp \ 40 datebookweek.cpp \
41 datebookweekheaderimpl.cpp \ 41 datebookweekheaderimpl.cpp \
42 repeatentry.cpp 42 repeatentry.cpp
43 OBJECTS =main.o \ 43 OBJECTS =main.o \
44 datebookday.o \ 44 datebookday.o \
45 datebook.o \ 45 datebook.o \
46 dateentryimpl.o \ 46 dateentryimpl.o \
47 datebookdayheaderimpl.o \ 47 datebookdayheaderimpl.o \
48 datebooksettings.o \ 48 datebooksettings.o \
49 datebookweek.o \ 49 datebookweek.o \
50 datebookweekheaderimpl.o \ 50 datebookweekheaderimpl.o \
51 repeatentry.o \ 51 repeatentry.o \
52 dateentry.o \ 52 dateentry.o \
53 datebookdayheader.o \ 53 datebookdayheader.o \
54 datebooksettingsbase.o \ 54 datebooksettingsbase.o \
55 datebookweekheader.o \ 55 datebookweekheader.o \
56 repeatentrybase.o 56 repeatentrybase.o
57INTERFACES = dateentry.ui \ 57INTERFACES = dateentry.ui \
58 datebookdayheader.ui \ 58 datebookdayheader.ui \
59 datebooksettingsbase.ui \ 59 datebooksettingsbase.ui \
60 datebookweekheader.ui \ 60 datebookweekheader.ui \
61 repeatentrybase.ui 61 repeatentrybase.ui
62UICDECLS = dateentry.h \ 62UICDECLS = dateentry.h \
63 datebookdayheader.h \ 63 datebookdayheader.h \
64 datebooksettingsbase.h \ 64 datebooksettingsbase.h \
65 datebookweekheader.h \ 65 datebookweekheader.h \
66 repeatentrybase.h 66 repeatentrybase.h
67UICIMPLS = dateentry.cpp \ 67UICIMPLS = dateentry.cpp \
68 datebookdayheader.cpp \ 68 datebookdayheader.cpp \
69 datebooksettingsbase.cpp \ 69 datebooksettingsbase.cpp \
70 datebookweekheader.cpp \ 70 datebookweekheader.cpp \
71 repeatentrybase.cpp 71 repeatentrybase.cpp
72 SRCMOC =moc_datebookday.cpp \ 72 SRCMOC =moc_datebookday.cpp \
73 moc_datebook.cpp \ 73 moc_datebook.cpp \
74 moc_dateentryimpl.cpp \ 74 moc_dateentryimpl.cpp \
75 moc_datebookdayheaderimpl.cpp \ 75 moc_datebookdayheaderimpl.cpp \
76 moc_datebookweek.cpp \ 76 moc_datebookweek.cpp \
77 moc_datebookweekheaderimpl.cpp \ 77 moc_datebookweekheaderimpl.cpp \
78 moc_repeatentry.cpp \ 78 moc_repeatentry.cpp \
79 moc_dateentry.cpp \ 79 moc_dateentry.cpp \
80 moc_datebookdayheader.cpp \ 80 moc_datebookdayheader.cpp \
81 moc_datebooksettingsbase.cpp \ 81 moc_datebooksettingsbase.cpp \
82 moc_datebookweekheader.cpp \ 82 moc_datebookweekheader.cpp \
83 moc_repeatentrybase.cpp 83 moc_repeatentrybase.cpp
84 OBJMOC =moc_datebookday.o \ 84 OBJMOC =moc_datebookday.o \
85 moc_datebook.o \ 85 moc_datebook.o \
86 moc_dateentryimpl.o \ 86 moc_dateentryimpl.o \
87 moc_datebookdayheaderimpl.o \ 87 moc_datebookdayheaderimpl.o \
88 moc_datebookweek.o \ 88 moc_datebookweek.o \
89 moc_datebookweekheaderimpl.o \ 89 moc_datebookweekheaderimpl.o \
90 moc_repeatentry.o \ 90 moc_repeatentry.o \
91 moc_dateentry.o \ 91 moc_dateentry.o \
92 moc_datebookdayheader.o \ 92 moc_datebookdayheader.o \
93 moc_datebooksettingsbase.o \ 93 moc_datebooksettingsbase.o \
94 moc_datebookweekheader.o \ 94 moc_datebookweekheader.o \
95 moc_repeatentrybase.o 95 moc_repeatentrybase.o
96 96
97 97
98####### Implicit rules 98####### Implicit rules
99 99
100.SUFFIXES: .cpp .cxx .cc .C .c 100.SUFFIXES: .cpp .cxx .cc .C .c
101 101
102.cpp.o: 102.cpp.o:
103 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 103 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
104 104
105.cxx.o: 105.cxx.o:
106 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 106 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
107 107
108.cc.o: 108.cc.o:
109 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 109 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
110 110
111.C.o: 111.C.o:
112 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 112 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
113 113
114.c.o: 114.c.o:
115 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 115 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
116 116
117####### Build rules 117####### Build rules
118 118
119 119
120all: $(DESTDIR)$(TARGET) 120all: $(DESTDIR)$(TARGET)
121 121
122$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 122$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
123 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 123 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
124 124
125moc: $(SRCMOC) 125moc: $(SRCMOC)
126 126
127tmake: 127tmake: Makefile.in
128 tmake datebook.pro 128
129Makefile.in: datebook.pro
130 tmake datebook.pro -o Makefile.in
129 131
130clean: 132clean:
131 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 133 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
132 -rm -f *~ core 134 -rm -f *~ core
133 -rm -f allmoc.cpp 135 -rm -f allmoc.cpp
134 136
135####### Extension Modules 137####### Extension Modules
136 138
137listpromodules: 139listpromodules:
138 @echo 140 @echo
139 141
140listallmodules: 142listallmodules:
141 @echo 143 @echo
142 144
143listaddonpromodules: 145listaddonpromodules:
144 @echo 146 @echo
145 147
146listaddonentmodules: 148listaddonentmodules:
147 @echo 149 @echo
148 150
149 151
150REQUIRES= 152REQUIRES=
151 153
152####### Sub-libraries 154####### Sub-libraries
153 155
154 156
155###### Combined headers 157###### Combined headers
156 158
157 159
158 160
159####### Compile 161####### Compile
160 162
161main.o: main.cpp \ 163main.o: main.cpp \
162 datebook.h \ 164 datebook.h
163 $(OPIEDIR)/include/qpe/datebookdb.h \
164 $(OPIEDIR)/include/qpe/event.h \
165 $(OPIEDIR)/include/qpe/palmtoprecord.h \
166 $(OPIEDIR)/include/qpe/timeconversion.h \
167 $(OPIEDIR)/include/qpe/qpcglobal.h \
168 $(OPIEDIR)/include/qpe/qpeapplication.h
169 165
170datebookday.o: datebookday.cpp \ 166datebookday.o: datebookday.cpp \
171 datebookday.h \ 167 datebookday.h \
172 $(OPIEDIR)/include/qpe/event.h \
173 $(OPIEDIR)/include/qpe/palmtoprecord.h \
174 $(OPIEDIR)/include/qpe/timeconversion.h \
175 $(OPIEDIR)/include/qpe/qpcglobal.h \
176 datebookdayheaderimpl.h \ 168 datebookdayheaderimpl.h \
177 datebookdayheader.h \ 169 datebookdayheader.h
178 $(OPIEDIR)/include/qpe/datebookdb.h \
179 $(OPIEDIR)/include/qpe/resource.h \
180 $(OPIEDIR)/include/qpe/qpeapplication.h \
181 $(OPIEDIR)/include/qpe/timestring.h \
182 $(OPIEDIR)/include/qpe/qpedebug.h
183 170
184datebook.o: datebook.cpp \ 171datebook.o: datebook.cpp \
185 datebook.h \ 172 datebook.h \
186 $(OPIEDIR)/include/qpe/datebookdb.h \
187 $(OPIEDIR)/include/qpe/event.h \
188 $(OPIEDIR)/include/qpe/palmtoprecord.h \
189 $(OPIEDIR)/include/qpe/timeconversion.h \
190 $(OPIEDIR)/include/qpe/qpcglobal.h \
191 datebookday.h \ 173 datebookday.h \
192 datebooksettings.h \ 174 datebooksettings.h \
193 datebooksettingsbase.h \ 175 datebooksettingsbase.h \
194 datebookweek.h \ 176 datebookweek.h \
195 dateentryimpl.h \ 177 dateentryimpl.h \
196 dateentry.h \ 178 dateentry.h
197 $(OPIEDIR)/include/qpe/datebookmonth.h \
198 $(OPIEDIR)/include/qpe/qpeapplication.h \
199 $(OPIEDIR)/include/qpe/config.h \
200 $(OPIEDIR)/include/qpe/qpedebug.h \
201 $(OPIEDIR)/include/qpe/finddialog.h \
202 $(OPIEDIR)/include/qpe/ir.h \
203 $(OPIEDIR)/include/qpe/qpemenubar.h \
204 $(OPIEDIR)/include/qpe/qpemessagebox.h \
205 $(OPIEDIR)/include/qpe/resource.h \
206 $(OPIEDIR)/include/qpe/sound.h \
207 $(OPIEDIR)/include/qpe/timestring.h \
208 $(OPIEDIR)/include/qpe/qpetoolbar.h \
209 $(OPIEDIR)/include/qpe/tzselect.h \
210 $(OPIEDIR)/include/qpe/xmlreader.h
211 179
212dateentryimpl.o: dateentryimpl.cpp \ 180dateentryimpl.o: dateentryimpl.cpp \
213 dateentryimpl.h \ 181 dateentryimpl.h \
214 dateentry.h \ 182 dateentry.h \
215 $(OPIEDIR)/include/qpe/event.h \
216 $(OPIEDIR)/include/qpe/palmtoprecord.h \
217 $(OPIEDIR)/include/qpe/timeconversion.h \
218 $(OPIEDIR)/include/qpe/qpcglobal.h \
219 repeatentry.h \ 183 repeatentry.h \
220 repeatentrybase.h \ 184 repeatentrybase.h
221 $(OPIEDIR)/include/qpe/qpeapplication.h \
222 $(OPIEDIR)/include/qpe/categoryselect.h \
223 $(OPIEDIR)/include/qpe/datebookmonth.h \
224 $(OPIEDIR)/include/qpe/global.h \
225 $(OPIEDIR)/include/qpe/timestring.h \
226 $(OPIEDIR)/include/qpe/tzselect.h
227 185
228datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \ 186datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \
229 datebookdayheaderimpl.h \ 187 datebookdayheaderimpl.h \
230 datebookdayheader.h \ 188 datebookdayheader.h
231 $(OPIEDIR)/include/qpe/datebookmonth.h \
232 $(OPIEDIR)/include/qpe/event.h \
233 $(OPIEDIR)/include/qpe/palmtoprecord.h \
234 $(OPIEDIR)/include/qpe/timeconversion.h \
235 $(OPIEDIR)/include/qpe/qpcglobal.h \
236 $(OPIEDIR)/include/qpe/timestring.h
237 189
238datebooksettings.o: datebooksettings.cpp \ 190datebooksettings.o: datebooksettings.cpp \
239 datebooksettings.h \ 191 datebooksettings.h \
240 datebooksettingsbase.h \ 192 datebooksettingsbase.h
241 $(OPIEDIR)/include/qpe/qpeapplication.h
242 193
243datebookweek.o: datebookweek.cpp \ 194datebookweek.o: datebookweek.cpp \
244 datebookweek.h \ 195 datebookweek.h \
245 $(OPIEDIR)/include/qpe/event.h \
246 $(OPIEDIR)/include/qpe/palmtoprecord.h \
247 $(OPIEDIR)/include/qpe/timeconversion.h \
248 $(OPIEDIR)/include/qpe/qpcglobal.h \
249 datebookweekheaderimpl.h \ 196 datebookweekheaderimpl.h \
250 datebookweekheader.h \ 197 datebookweekheader.h
251 $(OPIEDIR)/include/qpe/calendar.h \
252 $(OPIEDIR)/include/qpe/datebookdb.h \
253 $(OPIEDIR)/include/qpe/qpeapplication.h \
254 $(OPIEDIR)/include/qpe/timestring.h
255 198
256datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \ 199datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \
257 datebookweekheaderimpl.h \ 200 datebookweekheaderimpl.h \
258 datebookweekheader.h 201 datebookweekheader.h
259 202
260repeatentry.o: repeatentry.cpp \ 203repeatentry.o: repeatentry.cpp \
261 repeatentry.h \ 204 repeatentry.h \
262 repeatentrybase.h \ 205 repeatentrybase.h
263 $(OPIEDIR)/include/qpe/event.h \
264 $(OPIEDIR)/include/qpe/palmtoprecord.h \
265 $(OPIEDIR)/include/qpe/timeconversion.h \
266 $(OPIEDIR)/include/qpe/qpcglobal.h \
267 $(OPIEDIR)/include/qpe/datebookmonth.h \
268 $(OPIEDIR)/include/qpe/qpeapplication.h \
269 $(OPIEDIR)/include/qpe/timestring.h
270 206
271dateentry.h: dateentry.ui 207dateentry.h: dateentry.ui
272 $(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h 208 $(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h
273 209
274dateentry.cpp: dateentry.ui 210dateentry.cpp: dateentry.ui
275 $(UIC) dateentry.ui -i dateentry.h -o dateentry.cpp 211 $(UIC) dateentry.ui -i dateentry.h -o dateentry.cpp
276 212
277datebookdayheader.h: datebookdayheader.ui 213datebookdayheader.h: datebookdayheader.ui
278 $(UIC) datebookdayheader.ui -o $(INTERFACE_DECL_PATH)/datebookdayheader.h 214 $(UIC) datebookdayheader.ui -o $(INTERFACE_DECL_PATH)/datebookdayheader.h
279 215
280datebookdayheader.cpp: datebookdayheader.ui 216datebookdayheader.cpp: datebookdayheader.ui
281 $(UIC) datebookdayheader.ui -i datebookdayheader.h -o datebookdayheader.cpp 217 $(UIC) datebookdayheader.ui -i datebookdayheader.h -o datebookdayheader.cpp
282 218
283datebooksettingsbase.h: datebooksettingsbase.ui 219datebooksettingsbase.h: datebooksettingsbase.ui
284 $(UIC) datebooksettingsbase.ui -o $(INTERFACE_DECL_PATH)/datebooksettingsbase.h 220 $(UIC) datebooksettingsbase.ui -o $(INTERFACE_DECL_PATH)/datebooksettingsbase.h
285 221
286datebooksettingsbase.cpp: datebooksettingsbase.ui 222datebooksettingsbase.cpp: datebooksettingsbase.ui
287 $(UIC) datebooksettingsbase.ui -i datebooksettingsbase.h -o datebooksettingsbase.cpp 223 $(UIC) datebooksettingsbase.ui -i datebooksettingsbase.h -o datebooksettingsbase.cpp
288 224
289datebookweekheader.h: datebookweekheader.ui 225datebookweekheader.h: datebookweekheader.ui
290 $(UIC) datebookweekheader.ui -o $(INTERFACE_DECL_PATH)/datebookweekheader.h 226 $(UIC) datebookweekheader.ui -o $(INTERFACE_DECL_PATH)/datebookweekheader.h
291 227
292datebookweekheader.cpp: datebookweekheader.ui 228datebookweekheader.cpp: datebookweekheader.ui
293 $(UIC) datebookweekheader.ui -i datebookweekheader.h -o datebookweekheader.cpp 229 $(UIC) datebookweekheader.ui -i datebookweekheader.h -o datebookweekheader.cpp
294 230
295repeatentrybase.h: repeatentrybase.ui 231repeatentrybase.h: repeatentrybase.ui
296 $(UIC) repeatentrybase.ui -o $(INTERFACE_DECL_PATH)/repeatentrybase.h 232 $(UIC) repeatentrybase.ui -o $(INTERFACE_DECL_PATH)/repeatentrybase.h
297 233
298repeatentrybase.cpp: repeatentrybase.ui 234repeatentrybase.cpp: repeatentrybase.ui
299 $(UIC) repeatentrybase.ui -i repeatentrybase.h -o repeatentrybase.cpp 235 $(UIC) repeatentrybase.ui -i repeatentrybase.h -o repeatentrybase.cpp
300 236
301dateentry.o: dateentry.cpp 237dateentry.o: dateentry.cpp
302 238
303datebookdayheader.o: datebookdayheader.cpp 239datebookdayheader.o: datebookdayheader.cpp
304 240
305datebooksettingsbase.o: datebooksettingsbase.cpp 241datebooksettingsbase.o: datebooksettingsbase.cpp
306 242
307datebookweekheader.o: datebookweekheader.cpp 243datebookweekheader.o: datebookweekheader.cpp
308 244
309repeatentrybase.o: repeatentrybase.cpp 245repeatentrybase.o: repeatentrybase.cpp
310 246
311moc_datebookday.o: moc_datebookday.cpp \ 247moc_datebookday.o: moc_datebookday.cpp \
312 datebookday.h \ 248 datebookday.h
313 $(OPIEDIR)/include/qpe/event.h \
314 $(OPIEDIR)/include/qpe/palmtoprecord.h \
315 $(OPIEDIR)/include/qpe/timeconversion.h \
316 $(OPIEDIR)/include/qpe/qpcglobal.h
317 249
318moc_datebook.o: moc_datebook.cpp \ 250moc_datebook.o: moc_datebook.cpp \
319 datebook.h \ 251 datebook.h
320 $(OPIEDIR)/include/qpe/datebookdb.h \
321 $(OPIEDIR)/include/qpe/event.h \
322 $(OPIEDIR)/include/qpe/palmtoprecord.h \
323 $(OPIEDIR)/include/qpe/timeconversion.h \
324 $(OPIEDIR)/include/qpe/qpcglobal.h
325 252
326moc_dateentryimpl.o: moc_dateentryimpl.cpp \ 253moc_dateentryimpl.o: moc_dateentryimpl.cpp \
327 dateentryimpl.h \ 254 dateentryimpl.h \
328 dateentry.h \ 255 dateentry.h
329 $(OPIEDIR)/include/qpe/event.h \
330 $(OPIEDIR)/include/qpe/palmtoprecord.h \
331 $(OPIEDIR)/include/qpe/timeconversion.h \
332 $(OPIEDIR)/include/qpe/qpcglobal.h
333 256
334moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \ 257moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \
335 datebookdayheaderimpl.h \ 258 datebookdayheaderimpl.h \
336 datebookdayheader.h 259 datebookdayheader.h
337 260
338moc_datebookweek.o: moc_datebookweek.cpp \ 261moc_datebookweek.o: moc_datebookweek.cpp \
339 datebookweek.h \ 262 datebookweek.h
340 $(OPIEDIR)/include/qpe/event.h \
341 $(OPIEDIR)/include/qpe/palmtoprecord.h \
342 $(OPIEDIR)/include/qpe/timeconversion.h \
343 $(OPIEDIR)/include/qpe/qpcglobal.h
344 263
345moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \ 264moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \
346 datebookweekheaderimpl.h \ 265 datebookweekheaderimpl.h \
347 datebookweekheader.h 266 datebookweekheader.h
348 267
349moc_repeatentry.o: moc_repeatentry.cpp \ 268moc_repeatentry.o: moc_repeatentry.cpp \
350 repeatentry.h \ 269 repeatentry.h \
351 repeatentrybase.h \ 270 repeatentrybase.h
352 $(OPIEDIR)/include/qpe/event.h \
353 $(OPIEDIR)/include/qpe/palmtoprecord.h \
354 $(OPIEDIR)/include/qpe/timeconversion.h \
355 $(OPIEDIR)/include/qpe/qpcglobal.h
356 271
357moc_dateentry.o: moc_dateentry.cpp \ 272moc_dateentry.o: moc_dateentry.cpp \
358 dateentry.h 273 dateentry.h
359 274
360moc_datebookdayheader.o: moc_datebookdayheader.cpp \ 275moc_datebookdayheader.o: moc_datebookdayheader.cpp \
361 datebookdayheader.h 276 datebookdayheader.h
362 277
363moc_datebooksettingsbase.o: moc_datebooksettingsbase.cpp \ 278moc_datebooksettingsbase.o: moc_datebooksettingsbase.cpp \
364 datebooksettingsbase.h 279 datebooksettingsbase.h
365 280
366moc_datebookweekheader.o: moc_datebookweekheader.cpp \ 281moc_datebookweekheader.o: moc_datebookweekheader.cpp \
367 datebookweekheader.h 282 datebookweekheader.h
368 283
369moc_repeatentrybase.o: moc_repeatentrybase.cpp \ 284moc_repeatentrybase.o: moc_repeatentrybase.cpp \
370 repeatentrybase.h 285 repeatentrybase.h
371 286
372moc_datebookday.cpp: datebookday.h 287moc_datebookday.cpp: datebookday.h
373 $(MOC) datebookday.h -o moc_datebookday.cpp 288 $(MOC) datebookday.h -o moc_datebookday.cpp
374 289
375moc_datebook.cpp: datebook.h 290moc_datebook.cpp: datebook.h
376 $(MOC) datebook.h -o moc_datebook.cpp 291 $(MOC) datebook.h -o moc_datebook.cpp
377 292
378moc_dateentryimpl.cpp: dateentryimpl.h 293moc_dateentryimpl.cpp: dateentryimpl.h
379 $(MOC) dateentryimpl.h -o moc_dateentryimpl.cpp 294 $(MOC) dateentryimpl.h -o moc_dateentryimpl.cpp
380 295
381moc_datebookdayheaderimpl.cpp: datebookdayheaderimpl.h 296moc_datebookdayheaderimpl.cpp: datebookdayheaderimpl.h
382 $(MOC) datebookdayheaderimpl.h -o moc_datebookdayheaderimpl.cpp 297 $(MOC) datebookdayheaderimpl.h -o moc_datebookdayheaderimpl.cpp
383 298
384moc_datebookweek.cpp: datebookweek.h 299moc_datebookweek.cpp: datebookweek.h
385 $(MOC) datebookweek.h -o moc_datebookweek.cpp 300 $(MOC) datebookweek.h -o moc_datebookweek.cpp
386 301
387moc_datebookweekheaderimpl.cpp: datebookweekheaderimpl.h 302moc_datebookweekheaderimpl.cpp: datebookweekheaderimpl.h
388 $(MOC) datebookweekheaderimpl.h -o moc_datebookweekheaderimpl.cpp 303 $(MOC) datebookweekheaderimpl.h -o moc_datebookweekheaderimpl.cpp
389 304
390moc_repeatentry.cpp: repeatentry.h 305moc_repeatentry.cpp: repeatentry.h
391 $(MOC) repeatentry.h -o moc_repeatentry.cpp 306 $(MOC) repeatentry.h -o moc_repeatentry.cpp
392 307
393moc_dateentry.cpp: dateentry.h 308moc_dateentry.cpp: dateentry.h
394 $(MOC) dateentry.h -o moc_dateentry.cpp 309 $(MOC) dateentry.h -o moc_dateentry.cpp
395 310
396moc_datebookdayheader.cpp: datebookdayheader.h 311moc_datebookdayheader.cpp: datebookdayheader.h
397 $(MOC) datebookdayheader.h -o moc_datebookdayheader.cpp 312 $(MOC) datebookdayheader.h -o moc_datebookdayheader.cpp
398 313
399moc_datebooksettingsbase.cpp: datebooksettingsbase.h 314moc_datebooksettingsbase.cpp: datebooksettingsbase.h
400 $(MOC) datebooksettingsbase.h -o moc_datebooksettingsbase.cpp 315 $(MOC) datebooksettingsbase.h -o moc_datebooksettingsbase.cpp
401 316
402moc_datebookweekheader.cpp: datebookweekheader.h 317moc_datebookweekheader.cpp: datebookweekheader.h
403 $(MOC) datebookweekheader.h -o moc_datebookweekheader.cpp 318 $(MOC) datebookweekheader.h -o moc_datebookweekheader.cpp
404 319
405moc_repeatentrybase.cpp: repeatentrybase.h 320moc_repeatentrybase.cpp: repeatentrybase.h
406 $(MOC) repeatentrybase.h -o moc_repeatentrybase.cpp 321 $(MOC) repeatentrybase.h -o moc_repeatentrybase.cpp
407 322
408 323
diff --git a/docs/start.doc b/docs/start.doc
index 01b6ab1..53a4e36 100644
--- a/docs/start.doc
+++ b/docs/start.doc
@@ -1,191 +1,206 @@
1/*! 1/*!
2 2
3\page start.html 3\page start.html
4 4
5\title Getting Started 5\title Getting Started
6 6
7<html> 7<html>
8<title>Qtopia - The Qt palmtop environment</title> 8<title>Qtopia - The Qt palmtop environment</title>
9 9
10<body> 10<body>
11<h1><i>Qtopia</i> - The Qt palmtop environment</h1> 11<h1><i>Qtopia</i> - The Qt palmtop environment</h1>
12 12
13<p> 13<p>
14<i>Qtopia</i> is a windowing system for handheld devices. It offers 14<i>Qtopia</i> is a windowing system for handheld devices. It offers
15developers the powerful Qt API, and provides users with fast and 15developers the powerful Qt API, and provides users with fast and
16intuitive interaction. 16intuitive interaction.
17 17
18<h2>Developing for <i>Qtopia</i></h2> 18<h2>Developing for <i>Qtopia</i></h2>
19 19
20<p> 20<p>
21The Qt API includes rich GUI functionality, and is suitable for 21The Qt API includes rich GUI functionality, and is suitable for
22both large and small applications. 22both large and small applications.
23 23
24<p> 24<p>
25Since <i>Qtopia</i> offers the complete Qt API, you can do much of 25Since <i>Qtopia</i> offers the complete Qt API, you can do much of
26your development on any of the other platforms for which Qt is 26your development on any of the other platforms for which Qt is
27available - Windows, Unix/X11, or Mac OS X. However, for optimal 27available - Windows, Unix/X11, or Mac OS X. However, for optimal
28tailoring of your application to the smaller screen and other 28tailoring of your application to the smaller screen and other
29demands of a handheld environment, you should use the <i>Qtopia 29demands of a handheld environment, you should use the <i>Qtopia
30SDK</i>. 30SDK</i>.
31 31
32<p> 32<p>
33The <i>Qtopia SDK</i> allows you to develop <i>Qtopia</i> 33The <i>Qtopia SDK</i> allows you to develop <i>Qtopia</i>
34applications under the Linux desktop environment using the Qt Virtual 34applications under the Linux desktop environment using the Qt Virtual
35Framebuffer, which completely emulates the handheld <i>Qtopia</i> 35Framebuffer, which completely emulates the handheld <i>Qtopia</i>
36environment. It also includes cross-compiler software so that you can 36environment. It also includes cross-compiler software so that you can
37compile your application to run on the target handheld device. 37compile your application to run on the target handheld device.
38If you do not already have the Qtopia SDK (this document is normally 38If you do not already have the Qtopia SDK (this document is normally
39part of the SDK), contact info@trolltech.com, or see the 39part of the SDK), contact info@trolltech.com, or see the
40<a href=http://www.trolltech.com>Trolltech</a> web site. 40<a href=http://www.trolltech.com>Trolltech</a> web site.
41 41
42<p>To build applications for the SHARP SL5000 or similar StrongARM-based devices, 42<p>To build applications for the SHARP SL5000 or similar StrongARM-based devices,
43you will also need a StrongARM cross compiler. Entrants in the programming 43you will also need a StrongARM cross compiler. Entrants in the programming
44contest for this device will have received both the SDK and a cross-compiler. 44contest for this device will have received both the SDK and a cross-compiler.
45 45
46<p> 46<p>
47The SDK includes an example program. We recommend that you compile and 47The SDK includes an example program. We recommend that you compile and
48run this example to learn how things work, before tackling your own 48run this example to learn how things work, before tackling your own
49projects. 49projects.
50 50
51<p> 51<p>
52To compile the example program for running on the Linux desktop: 52To compile the example program for running on the Linux desktop:
53 53
54<ol> 54<ol>
55 <li> 55 <li>
56 <p> 56 <p>
57 Check the environment is correct: 57 Check the environment is correct:
58 58
59 <p> 59 <p>
60<pre> 60<pre>
61 export OPIEDIR=/opt/Qtopia 61 export QPEDIR=/opt/Qtopia
62 export QTDIR=/opt/Qtopia 62 export QTDIR=/opt/Qtopia
63 export PATH=$QTDIR/bin:$PATH 63 export PATH=$QTDIR/bin:$PATH
64 export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++ 64 export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++
65 export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH 65 export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
66</pre> 66</pre>
67 67
68 <li> Take a copy of the example: 68 <li> Take a copy of the example:
69 69
70<pre> 70<pre>
71 cd somewhere 71 cd somewhere
72 cp -r $OPIEDIR/example . 72 cp -r $QPEDIR/example .
73 cd example 73 cd example
74</pre> 74</pre>
75 75
76 <li> Generate a Makefile: 76 <li> Generate a Makefile:
77 77
78<pre> 78<pre>
79 tmake -o Makefile example.pro 79 tmake -o Makefile example.pro
80</pre> 80</pre>
81 81
82 <li> Build the example: 82 <li> Build the example:
83 83
84<pre> 84<pre>
85 make 85 make
86</pre> 86</pre>
87 87
88 <li> Install it: 88 <li> Install it:
89 89
90<pre> 90<pre>
91 su # root privileges required to install 91 su # root privileges required to install
92 cp example.desktop $OPIEDIR/apps/Applications 92 cp example.desktop $QPEDIR/apps/Applications
93 cp Example.png $OPIEDIR/pics 93 cp Example.png $QPEDIR/pics
94 cp example $OPIEDIR/bin 94 cp example $QPEDIR/bin
95 exit # no need to be root anymore 95 exit # no need to be root anymore
96</pre> 96</pre>
97 97
98 <li> To run it, first run the Qt Virtual Framebuffer: 98 <li> To run it, first run the Qt Virtual Framebuffer:
99 99
100<pre> 100<pre>
101 qvfb &amp; 101 qvfb &amp;
102</pre> 102</pre>
103 103
104 <li> Then run the <i>Qtopia</i> environment: 104 <li> Then run the <i>Qtopia</i> environment:
105 105
106<pre> 106<pre>
107 qpe 107 qpe
108</pre> 108</pre>
109 109
110<p> 110<p>
111 Your application should be available in the Applications tab visible 111 Your application should be available in the Applications tab visible
112inside the Qt Virtual Framebuffer window. 112inside the Qt Virtual Framebuffer window.
113</p> 113</p>
114 114
115 <li> If you want to distribute your applications to others, build an RPM package, e.g.: 115 <li> If you want to distribute your applications to others, build an RPM package, e.g.:
116<pre> 116<pre>
117 mkipks -rpm -arch i386 example.control 117 mkipks -rpm -arch i386 example.control
118</pre> 118</pre>
119</ol> 119</ol>
120 120
121<p> 121<p>
122To make your own application, use the example program as a model. Make sure that 122To make your own application, use the example program as a model. Make sure that
123when you add files to your project, you also add them 123when you add files to your project, you also add them
124to your project file (e.g. <tt>example.pro</tt>) and rerun the 124to your project file (e.g. <tt>example.pro</tt>) and rerun the
125<tt>tmake</tt> command to update the <tt>Makefile</tt>. 125<tt>tmake</tt> command to update the <tt>Makefile</tt>.
126 126
127<p> 127<p>
128To build you application for the SHARP SL5000 rather than just running 128To build you application for the SHARP SL5000 rather than just running
129on the desktop, the process is similar: 129on the desktop, the process is similar:
130 130
131<ol> 131<ol>
132 <li> 132 <li>
133 <p> 133 <p>
134 Check the environment is correctly set for the SHARP SL5000: 134 Check the environment is correctly set for the SHARP SL5000:
135 135
136 <p> 136 <p>
137<pre> 137<pre>
138 export OPIEDIR=/opt/Qtopia/sharp 138 export QPEDIR=/opt/Qtopia/sharp
139 export QTDIR=/opt/Qtopia/sharp 139 export QTDIR=/opt/Qtopia/sharp
140 export PATH=$QTDIR/bin:/usr/local/arm/bin:$PATH 140 export PATH=$QTDIR/bin:/usr/local/arm/bin:$PATH
141 export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++ 141 export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
142</pre> 142</pre>
143 143
144 <li> Build and install exactly the same as you did for the desktop 144 <li> Rebuild the makefile ($TMAKEPATH has changed) above:
145 (note that the generated Makefile is different):
146<pre> 145<pre>
147 make clean 146 make clean
148 tmake -o Makefile example.pro 147 tmake -o Makefile example.pro
149 ... <i>etc.</i>
150</pre> 148</pre>
151 149
152 <li> To install it on a device, build an ipk package file (you should be root 150 <li> Build it:
153 to do this, since then it will strip the executable for you):
154<pre> 151<pre>
152 make
153</pre>
154
155 <li> Install it (note that this is now going into the /opt/Qtopia/sharp/ directory):
156<pre>
157 su # root privileges required to install
158 cp example.desktop $QPEDIR/apps/Applications
159 cp Example.png $QPEDIR/pics
160 cp example $QPEDIR/bin
161 exit # no need to be root anymore
162</pre>
163
164</pre>
165
166 <li> To install it on a device, build an ipk package file:
167<pre>
168 su # root privileges required to strip the executable
155 mkipks example.control 169 mkipks example.control
170 exit # no need to be root anymore
156</pre> 171</pre>
157 172
158<p> 173<p>
159 The resulting <tt>example-1.0.0.ipk</tt> can be installed on the 174 The resulting <tt>example-1.0.0.ipk</tt> can be installed on the
160SL5000 by using <i>Qtopia Desktop</i>. 175SL5000 by using <i>Qtopia Desktop</i>.
161</p> 176</p>
162 177
163</ol> 178</ol>
164 179
165<h3>Building Your Own Applications</h3> 180<h3>Building Your Own Applications</h3>
166 181
167Once you have built the example, you can proceed with writing 182Once you have built the example, you can proceed with writing
168your own applicatons. If you are not familiar with Qt, you should 183your own applicatons. If you are not familiar with Qt, you should
169consult the Qt documentation by pointing your web browser at 184consult the Qt documentation by pointing your web browser at
170<a href=file:/opt/Qtopia/doc/html/index.html><tt>/opt/Qtopia/doc/html/index.html</tt></a> 185<a href=file:/opt/Qtopia/doc/html/index.html><tt>/opt/Qtopia/doc/html/index.html</tt></a>
171when you have installed the SDK, or use the online 186when you have installed the SDK, or use the online
172<a href=http://doc.trolltech.com/>Trolltech Documentation Site</a>. 187<a href=http://doc.trolltech.com/>Trolltech Documentation Site</a>.
173The <a href="http://www.trolltech.com/products/qt/whitepaper.html">Qt 188The <a href="http://www.trolltech.com/products/qt/whitepaper.html">Qt
174Whitepaper</a> provides a good overview of, and introduction to, the 189Whitepaper</a> provides a good overview of, and introduction to, the
175Qt API. 190Qt API.
176 191
177<p> 192<p>
178When you add more files to your application, just edit the project 193When you add more files to your application, just edit the project
179file (e.g. <tt>example.pro</tt>) and rerun the <tt>tmake</tt> 194file (e.g. <tt>example.pro</tt>) and rerun the <tt>tmake</tt>
180command. 195command.
181 196
182<p> 197<p>
183The <tt>.ui</tt> files are <i>Qt Designer</i> user interface files. 198The <tt>.ui</tt> files are <i>Qt Designer</i> user interface files.
184You can create and edit these using <i>Qt Designer</i>: 199You can create and edit these using <i>Qt Designer</i>:
185<pre> 200<pre>
186 designer example.ui 201 designer example.ui
187</pre> 202</pre>
188<i>Qt Designer</i>'s online documentation includes a complete 203<i>Qt Designer</i>'s online documentation includes a complete
189tutorial. 204tutorial.
190 205
191*/ 206*/
diff --git a/library/Makefile.in b/library/Makefile.in
index b74b818..b8fc1f6 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -1,903 +1,818 @@
1############################################################################# 1#############################################################################
2 2
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(OPIEDIR)/include -Ibackend 9 INCPATH =-I$(OPIEDIR)/include -Ibackend
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -ldl -lcrypt -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -ldl -lcrypt -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
13 UIC =$(SYSCONF_UIC) 13 UIC =$(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QTDIR)/lib$(PROJMAK)/ 17DESTDIR = $(QTDIR)/lib$(PROJMAK)/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 5 19VER_MIN = 5
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= qpe 21 TARGET= qpe
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =calendar.h \ 26 HEADERS =calendar.h \
27 global.h \ 27 global.h \
28 resource.h \ 28 resource.h \
29 xmlreader.h \ 29 xmlreader.h \
30 mimetype.h \ 30 mimetype.h \
31 menubutton.h \ 31 menubutton.h \
32 network.h \ 32 network.h \
33 networkinterface.h \ 33 networkinterface.h \
34 proxies.h \
35 filemanager.h \ 34 filemanager.h \
36 fontmanager.h \ 35 fontmanager.h \
37 qdawg.h \ 36 qdawg.h \
38 datebookmonth.h \ 37 datebookmonth.h \
39 fileselector.h \ 38 fileselector.h \
39 fileselector_p.h \
40 imageedit.h \ 40 imageedit.h \
41 qcopenvelope_qws.h \ 41 qcopenvelope_qws.h \
42 qpedecoration_qws.h \ 42 qpedecoration_qws.h \
43 qpeapplication.h \ 43 qpeapplication.h \
44 qpestyle.h \ 44 qpestyle.h \
45 qpedialog.h \ 45 qpedialog.h \
46 lightstyle.h \ 46 lightstyle.h \
47 config.h \ 47 config.h \
48 applnk.h \ 48 applnk.h \
49 sound.h \ 49 sound.h \
50 tzselect.h \ 50 tzselect.h \
51 qmath.h \ 51 qmath.h \
52 datebookdb.h \ 52 datebookdb.h \
53 alarmserver.h \ 53 alarmserver.h \
54 process.h \ 54 process.h \
55 password.h \ 55 password.h \
56 timestring.h \ 56 timestring.h \
57 fontfactoryinterface.h \ 57 fontfactoryinterface.h \
58 fontdatabase.h \ 58 fontdatabase.h \
59 power.h \ 59 power.h \
60 storage.h \ 60 storage.h \
61 qpemessagebox.h \ 61 qpemessagebox.h \
62 backend/timeconversion.h \ 62 backend/timeconversion.h \
63 qpedebug.h \ 63 qpedebug.h \
64 qpemenubar.h \ 64 qpemenubar.h \
65 qpetoolbar.h \ 65 qpetoolbar.h \
66 backend/categories.h \ 66 backend/categories.h \
67 backend/stringutil.h \ 67 backend/stringutil.h \
68 backend/palmtopuid.h \ 68 backend/palmtopuid.h \
69 backend/palmtoprecord.h \ 69 backend/palmtoprecord.h \
70 backend/task.h \ 70 backend/task.h \
71 backend/event.h \ 71 backend/event.h \
72 backend/contact.h \ 72 backend/contact.h \
73 categorymenu.h \ 73 categorymenu.h \
74 categoryedit_p.h \ 74 categoryedit_p.h \
75 categoryselect.h \ 75 categoryselect.h \
76 categorywidget.h \ 76 categorywidget.h \
77 ir.h \ 77 ir.h \
78 backend/vobject_p.h \ 78 backend/vobject_p.h \
79 findwidget_p.h \ 79 findwidget_p.h \
80 finddialog.h \ 80 finddialog.h \
81 lnkproperties.h \ 81 lnkproperties.h
82 quuid.h \
83 qcom.h \
84 qlibrary.h \
85 qlibrary_p.h \
86 qprocess.h
87 SOURCES =calendar.cpp \ 82 SOURCES =calendar.cpp \
88 global.cpp \ 83 global.cpp \
89 xmlreader.cpp \ 84 xmlreader.cpp \
90 mimetype.cpp \ 85 mimetype.cpp \
91 menubutton.cpp \ 86 menubutton.cpp \
92 network.cpp \ 87 network.cpp \
93 networkinterface.cpp \ 88 networkinterface.cpp \
94 proxies.cpp \
95 filemanager.cpp \ 89 filemanager.cpp \
96 fontmanager.cpp \ 90 fontmanager.cpp \
97 qdawg.cpp \ 91 qdawg.cpp \
98 datebookmonth.cpp \ 92 datebookmonth.cpp \
99 fileselector.cpp \ 93 fileselector.cpp \
100 imageedit.cpp \ 94 imageedit.cpp \
101 resource.cpp \ 95 resource.cpp \
102 qpedecoration_qws.cpp \ 96 qpedecoration_qws.cpp \
103 qcopenvelope_qws.cpp \ 97 qcopenvelope_qws.cpp \
104 qpeapplication.cpp \ 98 qpeapplication.cpp \
105 qpestyle.cpp \ 99 qpestyle.cpp \
106 qpedialog.cpp \ 100 qpedialog.cpp \
107 lightstyle.cpp \ 101 lightstyle.cpp \
108 config.cpp \ 102 config.cpp \
109 applnk.cpp \ 103 applnk.cpp \
110 sound.cpp \ 104 sound.cpp \
111 tzselect.cpp \ 105 tzselect.cpp \
112 qmath.c \ 106 qmath.c \
113 datebookdb.cpp \ 107 datebookdb.cpp \
114 alarmserver.cpp \ 108 alarmserver.cpp \
115 password.cpp \ 109 password.cpp \
116 process.cpp \ 110 process.cpp \
117 process_unix.cpp \ 111 process_unix.cpp \
118 timestring.cpp \ 112 timestring.cpp \
119 fontdatabase.cpp \ 113 fontdatabase.cpp \
120 power.cpp \ 114 power.cpp \
121 storage.cpp \ 115 storage.cpp \
122 qpemessagebox.cpp \ 116 qpemessagebox.cpp \
123 backend/timeconversion.cpp \ 117 backend/timeconversion.cpp \
124 qpedebug.cpp \ 118 qpedebug.cpp \
125 qpemenubar.cpp \ 119 qpemenubar.cpp \
126 qpetoolbar.cpp \ 120 qpetoolbar.cpp \
127 backend/categories.cpp \ 121 backend/categories.cpp \
128 backend/stringutil.cpp \ 122 backend/stringutil.cpp \
129 backend/palmtoprecord.cpp \ 123 backend/palmtoprecord.cpp \
130 backend/task.cpp \ 124 backend/task.cpp \
131 backend/event.cpp \ 125 backend/event.cpp \
132 backend/contact.cpp \ 126 backend/contact.cpp \
133 categorymenu.cpp \ 127 categorymenu.cpp \
134 categoryedit_p.cpp \ 128 categoryedit_p.cpp \
135 categoryselect.cpp \ 129 categoryselect.cpp \
136 categorywidget.cpp \ 130 categorywidget.cpp \
137 ir.cpp \ 131 ir.cpp \
138 backend/vcc_yacc.cpp \ 132 backend/vcc_yacc.cpp \
139 backend/vobject.cpp \ 133 backend/vobject.cpp \
140 findwidget_p.cpp \ 134 findwidget_p.cpp \
141 finddialog.cpp \ 135 finddialog.cpp \
142 lnkproperties.cpp \ 136 lnkproperties.cpp
143 quuid.cpp \
144 qlibrary.cpp \
145 qlibrary_unix.cpp \
146 qprocess.cpp \
147 qprocess_unix.cpp
148 OBJECTS =calendar.o \ 137 OBJECTS =calendar.o \
149 global.o \ 138 global.o \
150 xmlreader.o \ 139 xmlreader.o \
151 mimetype.o \ 140 mimetype.o \
152 menubutton.o \ 141 menubutton.o \
153 network.o \ 142 network.o \
154 networkinterface.o \ 143 networkinterface.o \
155 proxies.o \
156 filemanager.o \ 144 filemanager.o \
157 fontmanager.o \ 145 fontmanager.o \
158 qdawg.o \ 146 qdawg.o \
159 datebookmonth.o \ 147 datebookmonth.o \
160 fileselector.o \ 148 fileselector.o \
161 imageedit.o \ 149 imageedit.o \
162 resource.o \ 150 resource.o \
163 qpedecoration_qws.o \ 151 qpedecoration_qws.o \
164 qcopenvelope_qws.o \ 152 qcopenvelope_qws.o \
165 qpeapplication.o \ 153 qpeapplication.o \
166 qpestyle.o \ 154 qpestyle.o \
167 qpedialog.o \ 155 qpedialog.o \
168 lightstyle.o \ 156 lightstyle.o \
169 config.o \ 157 config.o \
170 applnk.o \ 158 applnk.o \
171 sound.o \ 159 sound.o \
172 tzselect.o \ 160 tzselect.o \
173 qmath.o \ 161 qmath.o \
174 datebookdb.o \ 162 datebookdb.o \
175 alarmserver.o \ 163 alarmserver.o \
176 password.o \ 164 password.o \
177 process.o \ 165 process.o \
178 process_unix.o \ 166 process_unix.o \
179 timestring.o \ 167 timestring.o \
180 fontdatabase.o \ 168 fontdatabase.o \
181 power.o \ 169 power.o \
182 storage.o \ 170 storage.o \
183 qpemessagebox.o \ 171 qpemessagebox.o \
184 backend/timeconversion.o \ 172 backend/timeconversion.o \
185 qpedebug.o \ 173 qpedebug.o \
186 qpemenubar.o \ 174 qpemenubar.o \
187 qpetoolbar.o \ 175 qpetoolbar.o \
188 backend/categories.o \ 176 backend/categories.o \
189 backend/stringutil.o \ 177 backend/stringutil.o \
190 backend/palmtoprecord.o \ 178 backend/palmtoprecord.o \
191 backend/task.o \ 179 backend/task.o \
192 backend/event.o \ 180 backend/event.o \
193 backend/contact.o \ 181 backend/contact.o \
194 categorymenu.o \ 182 categorymenu.o \
195 categoryedit_p.o \ 183 categoryedit_p.o \
196 categoryselect.o \ 184 categoryselect.o \
197 categorywidget.o \ 185 categorywidget.o \
198 ir.o \ 186 ir.o \
199 backend/vcc_yacc.o \ 187 backend/vcc_yacc.o \
200 backend/vobject.o \ 188 backend/vobject.o \
201 findwidget_p.o \ 189 findwidget_p.o \
202 finddialog.o \ 190 finddialog.o \
203 lnkproperties.o \ 191 lnkproperties.o \
204 quuid.o \
205 qlibrary.o \
206 qlibrary_unix.o \
207 qprocess.o \
208 qprocess_unix.o \
209 passwordbase_p.o \ 192 passwordbase_p.o \
210 proxiesbase_p.o \
211 categoryeditbase_p.o \ 193 categoryeditbase_p.o \
212 findwidgetbase_p.o \ 194 findwidgetbase_p.o \
213 lnkpropertiesbase_p.o 195 lnkpropertiesbase_p.o
214INTERFACES = passwordbase_p.ui \ 196INTERFACES = passwordbase_p.ui \
215 proxiesbase_p.ui \
216 categoryeditbase_p.ui \ 197 categoryeditbase_p.ui \
217 findwidgetbase_p.ui \ 198 findwidgetbase_p.ui \
218 lnkpropertiesbase_p.ui 199 lnkpropertiesbase_p.ui
219UICDECLS = passwordbase_p.h \ 200UICDECLS = passwordbase_p.h \
220 proxiesbase_p.h \
221 categoryeditbase_p.h \ 201 categoryeditbase_p.h \
222 findwidgetbase_p.h \ 202 findwidgetbase_p.h \
223 lnkpropertiesbase_p.h 203 lnkpropertiesbase_p.h
224UICIMPLS = passwordbase_p.cpp \ 204UICIMPLS = passwordbase_p.cpp \
225 proxiesbase_p.cpp \
226 categoryeditbase_p.cpp \ 205 categoryeditbase_p.cpp \
227 findwidgetbase_p.cpp \ 206 findwidgetbase_p.cpp \
228 lnkpropertiesbase_p.cpp 207 lnkpropertiesbase_p.cpp
229 SRCMOC =moc_menubutton.cpp \ 208 SRCMOC =moc_menubutton.cpp \
230 moc_proxies.cpp \
231 moc_datebookmonth.cpp \ 209 moc_datebookmonth.cpp \
232 moc_fileselector.cpp \ 210 moc_fileselector.cpp \
211 moc_fileselector_p.cpp \
233 moc_imageedit.cpp \ 212 moc_imageedit.cpp \
234 moc_qpedecoration_qws.cpp \ 213 moc_qpedecoration_qws.cpp \
235 moc_qpeapplication.cpp \ 214 moc_qpeapplication.cpp \
236 moc_qpedialog.cpp \ 215 moc_qpedialog.cpp \
237 moc_tzselect.cpp \ 216 moc_tzselect.cpp \
238 moc_process.cpp \ 217 moc_process.cpp \
239 moc_storage.cpp \ 218 moc_storage.cpp \
240 moc_qpemenubar.cpp \ 219 moc_qpemenubar.cpp \
241 moc_qpetoolbar.cpp \ 220 moc_qpetoolbar.cpp \
242 backend/moc_categories.cpp \ 221 backend/moc_categories.cpp \
243 moc_categorymenu.cpp \ 222 moc_categorymenu.cpp \
244 moc_categoryedit_p.cpp \ 223 moc_categoryedit_p.cpp \
245 moc_categoryselect.cpp \ 224 moc_categoryselect.cpp \
246 moc_ir.cpp \ 225 moc_ir.cpp \
247 moc_findwidget_p.cpp \ 226 moc_findwidget_p.cpp \
248 moc_finddialog.cpp \ 227 moc_finddialog.cpp \
249 moc_lnkproperties.cpp \ 228 moc_lnkproperties.cpp \
250 moc_qlibrary_p.cpp \
251 moc_qprocess.cpp \
252 global.moc \ 229 global.moc \
253 network.moc \ 230 network.moc \
254 password.moc \ 231 password.moc \
255 process_unix.moc \ 232 process_unix.moc \
256 timestring.moc \ 233 timestring.moc \
257 qprocess_unix.moc \
258 moc_passwordbase_p.cpp \ 234 moc_passwordbase_p.cpp \
259 moc_proxiesbase_p.cpp \
260 moc_categoryeditbase_p.cpp \ 235 moc_categoryeditbase_p.cpp \
261 moc_findwidgetbase_p.cpp \ 236 moc_findwidgetbase_p.cpp \
262 moc_lnkpropertiesbase_p.cpp 237 moc_lnkpropertiesbase_p.cpp
263 OBJMOC =moc_menubutton.o \ 238 OBJMOC =moc_menubutton.o \
264 moc_proxies.o \
265 moc_datebookmonth.o \ 239 moc_datebookmonth.o \
266 moc_fileselector.o \ 240 moc_fileselector.o \
241 moc_fileselector_p.o \
267 moc_imageedit.o \ 242 moc_imageedit.o \
268 moc_qpedecoration_qws.o \ 243 moc_qpedecoration_qws.o \
269 moc_qpeapplication.o \ 244 moc_qpeapplication.o \
270 moc_qpedialog.o \ 245 moc_qpedialog.o \
271 moc_tzselect.o \ 246 moc_tzselect.o \
272 moc_process.o \ 247 moc_process.o \
273 moc_storage.o \ 248 moc_storage.o \
274 moc_qpemenubar.o \ 249 moc_qpemenubar.o \
275 moc_qpetoolbar.o \ 250 moc_qpetoolbar.o \
276 backend/moc_categories.o \ 251 backend/moc_categories.o \
277 moc_categorymenu.o \ 252 moc_categorymenu.o \
278 moc_categoryedit_p.o \ 253 moc_categoryedit_p.o \
279 moc_categoryselect.o \ 254 moc_categoryselect.o \
280 moc_ir.o \ 255 moc_ir.o \
281 moc_findwidget_p.o \ 256 moc_findwidget_p.o \
282 moc_finddialog.o \ 257 moc_finddialog.o \
283 moc_lnkproperties.o \ 258 moc_lnkproperties.o \
284 moc_qlibrary_p.o \
285 moc_qprocess.o \
286 moc_passwordbase_p.o \ 259 moc_passwordbase_p.o \
287 moc_proxiesbase_p.o \
288 moc_categoryeditbase_p.o \ 260 moc_categoryeditbase_p.o \
289 moc_findwidgetbase_p.o \ 261 moc_findwidgetbase_p.o \
290 moc_lnkpropertiesbase_p.o 262 moc_lnkpropertiesbase_p.o
291 263
292 264
293####### Implicit rules 265####### Implicit rules
294 266
295.SUFFIXES: .cpp .cxx .cc .C .c 267.SUFFIXES: .cpp .cxx .cc .C .c
296 268
297.cpp.o: 269.cpp.o:
298 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 270 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
299 271
300.cxx.o: 272.cxx.o:
301 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 273 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
302 274
303.cc.o: 275.cc.o:
304 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 276 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
305 277
306.C.o: 278.C.o:
307 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 279 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
308 280
309.c.o: 281.c.o:
310 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 282 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
311 283
312####### Build rules 284####### Build rules
313 285
314 286
315all: $(DESTDIR)$(SYSCONF_LINK_TARGET) 287all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
316 288
317$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 289$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
318 $(SYSCONF_LINK_LIB) 290 $(SYSCONF_LINK_LIB)
319 291
320moc: $(SRCMOC) 292moc: $(SRCMOC)
321 293
322tmake: 294tmake: Makefile.in
323 tmake library.pro 295
296Makefile.in: library.pro
297 tmake library.pro -o Makefile.in
324 298
325clean: 299clean:
326 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 300 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
327 -rm -f *~ core 301 -rm -f *~ core
328 -rm -f allmoc.cpp 302 -rm -f allmoc.cpp
329 303
330####### Extension Modules 304####### Extension Modules
331 305
332listpromodules: 306listpromodules:
333 @echo 307 @echo
334 308
335listallmodules: 309listallmodules:
336 @echo 310 @echo
337 311
338listaddonpromodules: 312listaddonpromodules:
339 @echo 313 @echo
340 314
341listaddonentmodules: 315listaddonentmodules:
342 @echo 316 @echo
343 317
344 318
345REQUIRES= 319REQUIRES=
346 320
347####### Sub-libraries 321####### Sub-libraries
348 322
349 323
350###### Combined headers 324###### Combined headers
351 325
352 326
353 327
354####### Compile 328####### Compile
355 329
356calendar.o: calendar.cpp \ 330calendar.o: calendar.cpp \
357 calendar.h 331 calendar.h
358 332
359global.o: global.cpp \ 333global.o: global.cpp \
360 global.moc 334 global.moc
361 335
362xmlreader.o: xmlreader.cpp \ 336xmlreader.o: xmlreader.cpp \
363 xmlreader.h 337 xmlreader.h
364 338
365mimetype.o: mimetype.cpp \ 339mimetype.o: mimetype.cpp \
366 mimetype.h \ 340 mimetype.h \
367 applnk.h \ 341 applnk.h \
368 resource.h \ 342 resource.h \
369 qpeapplication.h \ 343 qpeapplication.h \
370 qpedecoration_qws.h \ 344 qpedecoration_qws.h \
371 timestring.h 345 timestring.h
372 346
373menubutton.o: menubutton.cpp \ 347menubutton.o: menubutton.cpp \
374 menubutton.h 348 menubutton.h
375 349
376network.o: network.cpp \ 350network.o: network.cpp \
377 network.moc 351 network.moc
378 352
379networkinterface.o: networkinterface.cpp \ 353networkinterface.o: networkinterface.cpp \
380 networkinterface.h \ 354 networkinterface.h \
381 network.h \ 355 network.h \
382 config.h 356 config.h
383 357
384proxies.o: proxies.cpp \
385 proxies.h \
386 config.h \
387 proxiesbase_p.h
388
389filemanager.o: filemanager.cpp \ 358filemanager.o: filemanager.cpp \
390 filemanager.h \ 359 filemanager.h \
391 applnk.h 360 applnk.h
392 361
393fontmanager.o: fontmanager.cpp \ 362fontmanager.o: fontmanager.cpp \
394 fontmanager.h 363 fontmanager.h
395 364
396qdawg.o: qdawg.cpp \ 365qdawg.o: qdawg.cpp \
397 qdawg.h 366 qdawg.h
398 367
399datebookmonth.o: datebookmonth.cpp \ 368datebookmonth.o: datebookmonth.cpp \
400 config.h \ 369 config.h \
401 datebookmonth.h \ 370 datebookmonth.h \
402 calendar.h \ 371 calendar.h \
403 timestring.h \ 372 timestring.h \
404 datebookdb.h \ 373 datebookdb.h \
405 resource.h \ 374 resource.h \
406 qpeapplication.h \ 375 qpeapplication.h \
407 qpedecoration_qws.h 376 qpedecoration_qws.h
408 377
409fileselector.o: fileselector.cpp \ 378fileselector.o: fileselector.cpp \
410 fileselector.h \ 379 fileselector.h \
411 filemanager.h \ 380 filemanager.h \
412 applnk.h \ 381 applnk.h \
382 fileselector_p.h \
413 global.h \ 383 global.h \
414 resource.h \ 384 resource.h \
415 config.h \ 385 config.h \
416 storage.h \ 386 storage.h \
417 qpemenubar.h \ 387 qpemenubar.h \
418 lnkproperties.h \ 388 lnkproperties.h \
419 qpeapplication.h \ 389 qpeapplication.h \
420 qpedecoration_qws.h \ 390 qpedecoration_qws.h \
421 timestring.h \ 391 timestring.h \
422 categorymenu.h 392 categorymenu.h
423 393
424imageedit.o: imageedit.cpp \ 394imageedit.o: imageedit.cpp \
425 imageedit.h 395 imageedit.h
426 396
427resource.o: resource.cpp \ 397resource.o: resource.cpp \
428 qpeapplication.h \ 398 qpeapplication.h \
429 qpedecoration_qws.h \ 399 qpedecoration_qws.h \
430 timestring.h \ 400 timestring.h \
431 resource.h \ 401 resource.h \
432 inlinepics_p.h 402 inlinepics_p.h
433 403
434qpedecoration_qws.o: qpedecoration_qws.cpp \ 404qpedecoration_qws.o: qpedecoration_qws.cpp \
435 qcopenvelope_qws.h \ 405 qcopenvelope_qws.h \
436 qpedecoration_qws.h \ 406 qpedecoration_qws.h \
437 qpeapplication.h \ 407 qpeapplication.h \
438 timestring.h \ 408 timestring.h \
439 resource.h \ 409 resource.h \
440 global.h 410 global.h
441 411
442qcopenvelope_qws.o: qcopenvelope_qws.cpp \ 412qcopenvelope_qws.o: qcopenvelope_qws.cpp \
443 qcopenvelope_qws.h \ 413 qcopenvelope_qws.h \
444 global.h 414 global.h
445 415
446qpeapplication.o: qpeapplication.cpp \ 416qpeapplication.o: qpeapplication.cpp \
447 qcopenvelope_qws.h \ 417 qcopenvelope_qws.h \
448 qpeapplication.h \ 418 qpeapplication.h \
449 qpedecoration_qws.h \ 419 qpedecoration_qws.h \
450 timestring.h \ 420 timestring.h \
451 qpestyle.h \ 421 qpestyle.h \
452 lightstyle.h \ 422 lightstyle.h \
453 global.h \ 423 global.h \
454 resource.h \ 424 resource.h \
455 config.h \ 425 config.h \
456 network.h \ 426 network.h \
457 fontmanager.h \ 427 fontmanager.h \
458 power.h \ 428 power.h \
459 alarmserver.h \ 429 alarmserver.h \
460 applnk.h \ 430 applnk.h \
461 qpemenubar.h 431 qpemenubar.h
462 432
463qpestyle.o: qpestyle.cpp \ 433qpestyle.o: qpestyle.cpp \
464 qpestyle.h \ 434 qpestyle.h \
465 qpeapplication.h \ 435 qpeapplication.h \
466 qpedecoration_qws.h \ 436 qpedecoration_qws.h \
467 timestring.h 437 timestring.h
468 438
469qpedialog.o: qpedialog.cpp \ 439qpedialog.o: qpedialog.cpp \
470 qpedialog.h \ 440 qpedialog.h \
471 qpeapplication.h \ 441 qpeapplication.h \
472 qpedecoration_qws.h \ 442 qpedecoration_qws.h \
473 timestring.h 443 timestring.h
474 444
475lightstyle.o: lightstyle.cpp \ 445lightstyle.o: lightstyle.cpp \
476 lightstyle.h 446 lightstyle.h
477 447
478config.o: config.cpp \ 448config.o: config.cpp \
479 config.h 449 config.h
480 450
481applnk.o: applnk.cpp \ 451applnk.o: applnk.cpp \
482 applnk.h 452 applnk.h
483 453
484sound.o: sound.cpp 454sound.o: sound.cpp
485 455
486tzselect.o: tzselect.cpp \ 456tzselect.o: tzselect.cpp \
487 tzselect.h \ 457 tzselect.h \
488 resource.h \ 458 resource.h \
489 global.h \ 459 global.h \
490 config.h 460 config.h
491 461
492qmath.o: qmath.c \ 462qmath.o: qmath.c \
493 qmath.h 463 qmath.h
494 464
495datebookdb.o: datebookdb.cpp \ 465datebookdb.o: datebookdb.cpp \
496 datebookdb.h 466 datebookdb.h
497 467
498alarmserver.o: alarmserver.cpp \ 468alarmserver.o: alarmserver.cpp \
499 qpeapplication.h \ 469 qpeapplication.h \
500 qpedecoration_qws.h \ 470 qpedecoration_qws.h \
501 timestring.h \ 471 timestring.h \
502 global.h \ 472 global.h \
503 resource.h \ 473 resource.h \
504 qcopenvelope_qws.h \ 474 qcopenvelope_qws.h \
505 alarmserver.h 475 alarmserver.h
506 476
507password.o: password.cpp \ 477password.o: password.cpp \
508 password.moc \ 478 password.moc \
509 password.h \ 479 password.h \
510 config.h \ 480 config.h \
511 global.h \ 481 global.h \
512 backend/contact.h \ 482 backend/contact.h \
513 passwordbase_p.h 483 passwordbase_p.h
514 484
515process.o: process.cpp \ 485process.o: process.cpp \
516 process.h 486 process.h
517 487
518process_unix.o: process_unix.cpp \ 488process_unix.o: process_unix.cpp \
519 process_unix.moc \ 489 process_unix.moc \
520 process.h 490 process.h
521 491
522timestring.o: timestring.cpp \ 492timestring.o: timestring.cpp \
523 timestring.moc \ 493 timestring.moc \
524 timestring.h \ 494 timestring.h \
525 qpeapplication.h \ 495 qpeapplication.h \
526 qpedecoration_qws.h \ 496 qpedecoration_qws.h \
527 config.h 497 config.h
528 498
529fontdatabase.o: fontdatabase.cpp \ 499fontdatabase.o: fontdatabase.cpp \
530 qpeapplication.h \ 500 qpeapplication.h \
531 qpedecoration_qws.h \ 501 qpedecoration_qws.h \
532 timestring.h \ 502 timestring.h \
533 fontfactoryinterface.h \ 503 fontfactoryinterface.h \
534 fontdatabase.h 504 fontdatabase.h
535 505
536power.o: power.cpp \ 506power.o: power.cpp \
537 power.h \ 507 power.h
538 custom.h
539 508
540storage.o: storage.cpp 509storage.o: storage.cpp
541 510
542qpemessagebox.o: qpemessagebox.cpp \ 511qpemessagebox.o: qpemessagebox.cpp \
543 qpemessagebox.h 512 qpemessagebox.h
544 513
545backend/timeconversion.o: backend/timeconversion.cpp \ 514backend/timeconversion.o: backend/timeconversion.cpp \
546 backend/timeconversion.h 515 backend/timeconversion.h
547 516
548qpedebug.o: qpedebug.cpp \ 517qpedebug.o: qpedebug.cpp \
549 qpedebug.h 518 qpedebug.h
550 519
551qpemenubar.o: qpemenubar.cpp \ 520qpemenubar.o: qpemenubar.cpp \
552 qpemenubar.h 521 qpemenubar.h
553 522
554qpetoolbar.o: qpetoolbar.cpp \ 523qpetoolbar.o: qpetoolbar.cpp \
555 qpetoolbar.h \ 524 qpetoolbar.h \
556 qpemenubar.h 525 qpemenubar.h
557 526
558backend/categories.o: backend/categories.cpp \ 527backend/categories.o: backend/categories.cpp \
559 backend/categories.h \ 528 backend/categories.h \
560 backend/qpcglobal.h \ 529 backend/qpcglobal.h \
561 backend/palmtopuidgen.h \ 530 backend/palmtopuidgen.h \
562 backend/stringutil.h 531 backend/stringutil.h
563 532
564backend/stringutil.o: backend/stringutil.cpp \ 533backend/stringutil.o: backend/stringutil.cpp \
565 backend/stringutil.h \ 534 backend/stringutil.h \
566 backend/qpcglobal.h 535 backend/qpcglobal.h
567 536
568backend/palmtoprecord.o: backend/palmtoprecord.cpp \ 537backend/palmtoprecord.o: backend/palmtoprecord.cpp \
569 backend/palmtoprecord.h \ 538 backend/palmtoprecord.h \
570 backend/qpcglobal.h \ 539 backend/qpcglobal.h \
571 backend/palmtopuidgen.h \ 540 backend/palmtopuidgen.h \
572 backend/stringutil.h 541 backend/stringutil.h
573 542
574backend/task.o: backend/task.cpp \ 543backend/task.o: backend/task.cpp \
575 backend/vobject_p.h \ 544 backend/vobject_p.h \
576 backend/timeconversion.h \ 545 backend/timeconversion.h \
577 backend/qfiledirect_p.h 546 backend/qfiledirect_p.h
578 547
579backend/event.o: backend/event.cpp \ 548backend/event.o: backend/event.cpp \
580 backend/event.h \ 549 backend/event.h \
581 backend/qfiledirect_p.h \ 550 backend/qfiledirect_p.h \
582 backend/vobject_p.h 551 backend/vobject_p.h
583 552
584backend/contact.o: backend/contact.cpp \ 553backend/contact.o: backend/contact.cpp \
585 backend/contact.h \ 554 backend/contact.h \
586 backend/vobject_p.h \ 555 backend/vobject_p.h \
587 backend/qfiledirect_p.h 556 backend/qfiledirect_p.h
588 557
589categorymenu.o: categorymenu.cpp \ 558categorymenu.o: categorymenu.cpp \
590 categorymenu.h \ 559 categorymenu.h \
591 backend/categories.h \ 560 backend/categories.h \
592 backend/qpcglobal.h \ 561 backend/qpcglobal.h \
593 backend/palmtopuidgen.h \ 562 backend/palmtopuidgen.h \
594 categoryselect.h 563 categoryselect.h
595 564
596categoryedit_p.o: categoryedit_p.cpp \ 565categoryedit_p.o: categoryedit_p.cpp \
597 categoryedit_p.h \ 566 categoryedit_p.h \
598 categoryeditbase_p.h 567 categoryeditbase_p.h
599 568
600categoryselect.o: categoryselect.cpp \ 569categoryselect.o: categoryselect.cpp \
601 categorywidget.h \ 570 categorywidget.h \
602 categoryselect.h 571 categoryselect.h
603 572
604categorywidget.o: categorywidget.cpp \ 573categorywidget.o: categorywidget.cpp \
605 categoryedit_p.h \ 574 categoryedit_p.h \
606 categoryeditbase_p.h \ 575 categoryeditbase_p.h \
607 categorywidget.h 576 categorywidget.h
608 577
609ir.o: ir.cpp \ 578ir.o: ir.cpp \
610 ir.h \ 579 ir.h \
611 qcopenvelope_qws.h \ 580 qcopenvelope_qws.h \
612 applnk.h 581 applnk.h
613 582
614backend/vcc_yacc.o: backend/vcc_yacc.cpp \ 583backend/vcc_yacc.o: backend/vcc_yacc.cpp \
615 backend/vobject_p.h \ 584 backend/vobject_p.h \
616 backend/qfiledirect_p.h 585 backend/qfiledirect_p.h
617 586
618backend/vobject.o: backend/vobject.cpp \ 587backend/vobject.o: backend/vobject.cpp \
619 backend/vobject_p.h \ 588 backend/vobject_p.h \
620 backend/qfiledirect_p.h 589 backend/qfiledirect_p.h
621 590
622findwidget_p.o: findwidget_p.cpp \ 591findwidget_p.o: findwidget_p.cpp \
623 findwidget_p.h \ 592 findwidget_p.h \
624 findwidgetbase_p.h 593 findwidgetbase_p.h
625 594
626finddialog.o: finddialog.cpp \ 595finddialog.o: finddialog.cpp \
627 finddialog.h \ 596 finddialog.h \
628 findwidget_p.h \ 597 findwidget_p.h \
629 findwidgetbase_p.h 598 findwidgetbase_p.h
630 599
631lnkproperties.o: lnkproperties.cpp \ 600lnkproperties.o: lnkproperties.cpp \
632 lnkproperties.h \ 601 lnkproperties.h \
633 lnkpropertiesbase_p.h \ 602 lnkpropertiesbase_p.h \
634 ir.h 603 ir.h
635 604
636quuid.o: quuid.cpp \
637 quuid.h
638
639qlibrary.o: qlibrary.cpp \
640 qlibrary_p.h \
641 qlibrary.h
642
643qlibrary_unix.o: qlibrary_unix.cpp \
644 qlibrary_p.h \
645 qlibrary.h
646
647qprocess.o: qprocess.cpp \
648 qprocess.h
649
650qprocess_unix.o: qprocess_unix.cpp \
651 qprocess_unix.moc \
652 qprocess.h \
653 qcleanuphandler_p.h
654
655passwordbase_p.h: passwordbase_p.ui 605passwordbase_p.h: passwordbase_p.ui
656 $(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h 606 $(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h
657 607
658passwordbase_p.cpp: passwordbase_p.ui 608passwordbase_p.cpp: passwordbase_p.ui
659 $(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp 609 $(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp
660 610
661proxiesbase_p.h: proxiesbase_p.ui
662 $(UIC) proxiesbase_p.ui -o $(INTERFACE_DECL_PATH)/proxiesbase_p.h
663
664proxiesbase_p.cpp: proxiesbase_p.ui
665 $(UIC) proxiesbase_p.ui -i proxiesbase_p.h -o proxiesbase_p.cpp
666
667categoryeditbase_p.h: categoryeditbase_p.ui 611categoryeditbase_p.h: categoryeditbase_p.ui
668 $(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h 612 $(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h
669 613
670categoryeditbase_p.cpp: categoryeditbase_p.ui 614categoryeditbase_p.cpp: categoryeditbase_p.ui
671 $(UIC) categoryeditbase_p.ui -i categoryeditbase_p.h -o categoryeditbase_p.cpp 615 $(UIC) categoryeditbase_p.ui -i categoryeditbase_p.h -o categoryeditbase_p.cpp
672 616
673findwidgetbase_p.h: findwidgetbase_p.ui 617findwidgetbase_p.h: findwidgetbase_p.ui
674 $(UIC) findwidgetbase_p.ui -o $(INTERFACE_DECL_PATH)/findwidgetbase_p.h 618 $(UIC) findwidgetbase_p.ui -o $(INTERFACE_DECL_PATH)/findwidgetbase_p.h
675 619
676findwidgetbase_p.cpp: findwidgetbase_p.ui 620findwidgetbase_p.cpp: findwidgetbase_p.ui
677 $(UIC) findwidgetbase_p.ui -i findwidgetbase_p.h -o findwidgetbase_p.cpp 621 $(UIC) findwidgetbase_p.ui -i findwidgetbase_p.h -o findwidgetbase_p.cpp
678 622
679lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui 623lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui
680 $(UIC) lnkpropertiesbase_p.ui -o $(INTERFACE_DECL_PATH)/lnkpropertiesbase_p.h 624 $(UIC) lnkpropertiesbase_p.ui -o $(INTERFACE_DECL_PATH)/lnkpropertiesbase_p.h
681 625
682lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui 626lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui
683 $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp 627 $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp
684 628
685passwordbase_p.o: passwordbase_p.cpp 629passwordbase_p.o: passwordbase_p.cpp
686 630
687proxiesbase_p.o: proxiesbase_p.cpp
688
689categoryeditbase_p.o: categoryeditbase_p.cpp 631categoryeditbase_p.o: categoryeditbase_p.cpp
690 632
691findwidgetbase_p.o: findwidgetbase_p.cpp 633findwidgetbase_p.o: findwidgetbase_p.cpp
692 634
693lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp 635lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp
694 636
695moc_menubutton.o: moc_menubutton.cpp \ 637moc_menubutton.o: moc_menubutton.cpp \
696 menubutton.h 638 menubutton.h
697 639
698moc_proxies.o: moc_proxies.cpp \
699 proxies.h \
700 config.h
701
702moc_datebookmonth.o: moc_datebookmonth.cpp \ 640moc_datebookmonth.o: moc_datebookmonth.cpp \
703 datebookmonth.h \ 641 datebookmonth.h \
704 calendar.h \ 642 calendar.h \
705 timestring.h 643 timestring.h
706 644
707moc_fileselector.o: moc_fileselector.cpp \ 645moc_fileselector.o: moc_fileselector.cpp \
708 fileselector.h \ 646 fileselector.h \
709 filemanager.h \ 647 filemanager.h \
710 applnk.h 648 applnk.h
711 649
650moc_fileselector_p.o: moc_fileselector_p.cpp \
651 fileselector_p.h
652
712moc_imageedit.o: moc_imageedit.cpp \ 653moc_imageedit.o: moc_imageedit.cpp \
713 imageedit.h 654 imageedit.h
714 655
715moc_qpedecoration_qws.o: moc_qpedecoration_qws.cpp \ 656moc_qpedecoration_qws.o: moc_qpedecoration_qws.cpp \
716 qpedecoration_qws.h 657 qpedecoration_qws.h
717 658
718moc_qpeapplication.o: moc_qpeapplication.cpp \ 659moc_qpeapplication.o: moc_qpeapplication.cpp \
719 qpeapplication.h \ 660 qpeapplication.h \
720 qpedecoration_qws.h \ 661 qpedecoration_qws.h \
721 timestring.h 662 timestring.h
722 663
723moc_qpedialog.o: moc_qpedialog.cpp \ 664moc_qpedialog.o: moc_qpedialog.cpp \
724 qpedialog.h 665 qpedialog.h
725 666
726moc_tzselect.o: moc_tzselect.cpp \ 667moc_tzselect.o: moc_tzselect.cpp \
727 tzselect.h 668 tzselect.h
728 669
729moc_process.o: moc_process.cpp \ 670moc_process.o: moc_process.cpp \
730 process.h 671 process.h
731 672
732moc_storage.o: moc_storage.cpp \ 673moc_storage.o: moc_storage.cpp \
733 storage.h 674 storage.h
734 675
735moc_qpemenubar.o: moc_qpemenubar.cpp \ 676moc_qpemenubar.o: moc_qpemenubar.cpp \
736 qpemenubar.h 677 qpemenubar.h
737 678
738moc_qpetoolbar.o: moc_qpetoolbar.cpp \ 679moc_qpetoolbar.o: moc_qpetoolbar.cpp \
739 qpetoolbar.h 680 qpetoolbar.h
740 681
741backend/moc_categories.o: backend/moc_categories.cpp \ 682backend/moc_categories.o: backend/moc_categories.cpp \
742 backend/categories.h \ 683 backend/categories.h \
743 backend/qpcglobal.h \ 684 backend/qpcglobal.h \
744 backend/palmtopuidgen.h 685 backend/palmtopuidgen.h
745 686
746moc_categorymenu.o: moc_categorymenu.cpp \ 687moc_categorymenu.o: moc_categorymenu.cpp \
747 categorymenu.h 688 categorymenu.h
748 689
749moc_categoryedit_p.o: moc_categoryedit_p.cpp \ 690moc_categoryedit_p.o: moc_categoryedit_p.cpp \
750 categoryedit_p.h \ 691 categoryedit_p.h \
751 categoryeditbase_p.h 692 categoryeditbase_p.h
752 693
753moc_categoryselect.o: moc_categoryselect.cpp \ 694moc_categoryselect.o: moc_categoryselect.cpp \
754 categoryselect.h 695 categoryselect.h
755 696
756moc_ir.o: moc_ir.cpp \ 697moc_ir.o: moc_ir.cpp \
757 ir.h 698 ir.h
758 699
759moc_findwidget_p.o: moc_findwidget_p.cpp \ 700moc_findwidget_p.o: moc_findwidget_p.cpp \
760 findwidget_p.h \ 701 findwidget_p.h \
761 findwidgetbase_p.h 702 findwidgetbase_p.h
762 703
763moc_finddialog.o: moc_finddialog.cpp \ 704moc_finddialog.o: moc_finddialog.cpp \
764 finddialog.h 705 finddialog.h
765 706
766moc_lnkproperties.o: moc_lnkproperties.cpp \ 707moc_lnkproperties.o: moc_lnkproperties.cpp \
767 lnkproperties.h 708 lnkproperties.h
768 709
769moc_qlibrary_p.o: moc_qlibrary_p.cpp \
770 qlibrary_p.h \
771 qlibrary.h
772
773moc_qprocess.o: moc_qprocess.cpp \
774 qprocess.h
775
776moc_passwordbase_p.o: global.moc \ 710moc_passwordbase_p.o: global.moc \
777 global.cpp 711 global.cpp
778 712
779moc_proxiesbase_p.o: network.moc \ 713moc_categoryeditbase_p.o: network.moc \
780 network.cpp 714 network.cpp
781 715
782moc_categoryeditbase_p.o: password.moc \ 716moc_findwidgetbase_p.o: password.moc \
783 password.cpp \ 717 password.cpp \
784 password.h \ 718 password.h \
785 config.h \ 719 config.h \
786 global.h \ 720 global.h \
787 backend/contact.h \ 721 backend/contact.h \
788 passwordbase_p.h 722 passwordbase_p.h
789 723
790moc_findwidgetbase_p.o: process_unix.moc \ 724moc_lnkpropertiesbase_p.o: process_unix.moc \
791 process_unix.cpp \ 725 process_unix.cpp \
792 process.h 726 process.h
793 727
794moc_lnkpropertiesbase_p.o: timestring.moc \
795 timestring.cpp \
796 timestring.h \
797 qpeapplication.h \
798 qpedecoration_qws.h \
799 config.h
800
801moc_menubutton.cpp: menubutton.h 728moc_menubutton.cpp: menubutton.h
802 $(MOC) menubutton.h -o moc_menubutton.cpp 729 $(MOC) menubutton.h -o moc_menubutton.cpp
803 730
804moc_proxies.cpp: proxies.h
805 $(MOC) proxies.h -o moc_proxies.cpp
806
807moc_datebookmonth.cpp: datebookmonth.h 731moc_datebookmonth.cpp: datebookmonth.h
808 $(MOC) datebookmonth.h -o moc_datebookmonth.cpp 732 $(MOC) datebookmonth.h -o moc_datebookmonth.cpp
809 733
810moc_fileselector.cpp: fileselector.h 734moc_fileselector.cpp: fileselector.h
811 $(MOC) fileselector.h -o moc_fileselector.cpp 735 $(MOC) fileselector.h -o moc_fileselector.cpp
812 736
737moc_fileselector_p.cpp: fileselector_p.h
738 $(MOC) fileselector_p.h -o moc_fileselector_p.cpp
739
813moc_imageedit.cpp: imageedit.h 740moc_imageedit.cpp: imageedit.h
814 $(MOC) imageedit.h -o moc_imageedit.cpp 741 $(MOC) imageedit.h -o moc_imageedit.cpp
815 742
816moc_qpedecoration_qws.cpp: qpedecoration_qws.h 743moc_qpedecoration_qws.cpp: qpedecoration_qws.h
817 $(MOC) qpedecoration_qws.h -o moc_qpedecoration_qws.cpp 744 $(MOC) qpedecoration_qws.h -o moc_qpedecoration_qws.cpp
818 745
819moc_qpeapplication.cpp: qpeapplication.h 746moc_qpeapplication.cpp: qpeapplication.h
820 $(MOC) qpeapplication.h -o moc_qpeapplication.cpp 747 $(MOC) qpeapplication.h -o moc_qpeapplication.cpp
821 748
822moc_qpedialog.cpp: qpedialog.h 749moc_qpedialog.cpp: qpedialog.h
823 $(MOC) qpedialog.h -o moc_qpedialog.cpp 750 $(MOC) qpedialog.h -o moc_qpedialog.cpp
824 751
825moc_tzselect.cpp: tzselect.h 752moc_tzselect.cpp: tzselect.h
826 $(MOC) tzselect.h -o moc_tzselect.cpp 753 $(MOC) tzselect.h -o moc_tzselect.cpp
827 754
828moc_process.cpp: process.h 755moc_process.cpp: process.h
829 $(MOC) process.h -o moc_process.cpp 756 $(MOC) process.h -o moc_process.cpp
830 757
831moc_storage.cpp: storage.h 758moc_storage.cpp: storage.h
832 $(MOC) storage.h -o moc_storage.cpp 759 $(MOC) storage.h -o moc_storage.cpp
833 760
834moc_qpemenubar.cpp: qpemenubar.h 761moc_qpemenubar.cpp: qpemenubar.h
835 $(MOC) qpemenubar.h -o moc_qpemenubar.cpp 762 $(MOC) qpemenubar.h -o moc_qpemenubar.cpp
836 763
837moc_qpetoolbar.cpp: qpetoolbar.h 764moc_qpetoolbar.cpp: qpetoolbar.h
838 $(MOC) qpetoolbar.h -o moc_qpetoolbar.cpp 765 $(MOC) qpetoolbar.h -o moc_qpetoolbar.cpp
839 766
840backend/moc_categories.cpp: backend/categories.h 767backend/moc_categories.cpp: backend/categories.h
841 $(MOC) backend/categories.h -o backend/moc_categories.cpp 768 $(MOC) backend/categories.h -o backend/moc_categories.cpp
842 769
843moc_categorymenu.cpp: categorymenu.h 770moc_categorymenu.cpp: categorymenu.h
844 $(MOC) categorymenu.h -o moc_categorymenu.cpp 771 $(MOC) categorymenu.h -o moc_categorymenu.cpp
845 772
846moc_categoryedit_p.cpp: categoryedit_p.h 773moc_categoryedit_p.cpp: categoryedit_p.h
847 $(MOC) categoryedit_p.h -o moc_categoryedit_p.cpp 774 $(MOC) categoryedit_p.h -o moc_categoryedit_p.cpp
848 775
849moc_categoryselect.cpp: categoryselect.h 776moc_categoryselect.cpp: categoryselect.h
850 $(MOC) categoryselect.h -o moc_categoryselect.cpp 777 $(MOC) categoryselect.h -o moc_categoryselect.cpp
851 778
852moc_ir.cpp: ir.h 779moc_ir.cpp: ir.h
853 $(MOC) ir.h -o moc_ir.cpp 780 $(MOC) ir.h -o moc_ir.cpp
854 781
855moc_findwidget_p.cpp: findwidget_p.h 782moc_findwidget_p.cpp: findwidget_p.h
856 $(MOC) findwidget_p.h -o moc_findwidget_p.cpp 783 $(MOC) findwidget_p.h -o moc_findwidget_p.cpp
857 784
858moc_finddialog.cpp: finddialog.h 785moc_finddialog.cpp: finddialog.h
859 $(MOC) finddialog.h -o moc_finddialog.cpp 786 $(MOC) finddialog.h -o moc_finddialog.cpp
860 787
861moc_lnkproperties.cpp: lnkproperties.h 788moc_lnkproperties.cpp: lnkproperties.h
862 $(MOC) lnkproperties.h -o moc_lnkproperties.cpp 789 $(MOC) lnkproperties.h -o moc_lnkproperties.cpp
863 790
864moc_qlibrary_p.cpp: qlibrary_p.h
865 $(MOC) qlibrary_p.h -o moc_qlibrary_p.cpp
866
867moc_qprocess.cpp: qprocess.h
868 $(MOC) qprocess.h -o moc_qprocess.cpp
869
870global.moc: global.cpp 791global.moc: global.cpp
871 $(MOC) global.cpp -o global.moc 792 $(MOC) global.cpp -o global.moc
872 793
873network.moc: network.cpp 794network.moc: network.cpp
874 $(MOC) network.cpp -o network.moc 795 $(MOC) network.cpp -o network.moc
875 796
876password.moc: password.cpp 797password.moc: password.cpp
877 $(MOC) password.cpp -o password.moc 798 $(MOC) password.cpp -o password.moc
878 799
879process_unix.moc: process_unix.cpp 800process_unix.moc: process_unix.cpp
880 $(MOC) process_unix.cpp -o process_unix.moc 801 $(MOC) process_unix.cpp -o process_unix.moc
881 802
882timestring.moc: timestring.cpp 803timestring.moc: timestring.cpp
883 $(MOC) timestring.cpp -o timestring.moc 804 $(MOC) timestring.cpp -o timestring.moc
884 805
885qprocess_unix.moc: qprocess_unix.cpp
886 $(MOC) qprocess_unix.cpp -o qprocess_unix.moc
887
888moc_passwordbase_p.cpp: passwordbase_p.h 806moc_passwordbase_p.cpp: passwordbase_p.h
889 $(MOC) passwordbase_p.h -o moc_passwordbase_p.cpp 807 $(MOC) passwordbase_p.h -o moc_passwordbase_p.cpp
890 808
891moc_proxiesbase_p.cpp: proxiesbase_p.h
892 $(MOC) proxiesbase_p.h -o moc_proxiesbase_p.cpp
893
894moc_categoryeditbase_p.cpp: categoryeditbase_p.h 809moc_categoryeditbase_p.cpp: categoryeditbase_p.h
895 $(MOC) categoryeditbase_p.h -o moc_categoryeditbase_p.cpp 810 $(MOC) categoryeditbase_p.h -o moc_categoryeditbase_p.cpp
896 811
897moc_findwidgetbase_p.cpp: findwidgetbase_p.h 812moc_findwidgetbase_p.cpp: findwidgetbase_p.h
898 $(MOC) findwidgetbase_p.h -o moc_findwidgetbase_p.cpp 813 $(MOC) findwidgetbase_p.h -o moc_findwidgetbase_p.cpp
899 814
900moc_lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.h 815moc_lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.h
901 $(MOC) lnkpropertiesbase_p.h -o moc_lnkpropertiesbase_p.cpp 816 $(MOC) lnkpropertiesbase_p.h -o moc_lnkpropertiesbase_p.cpp
902 817
903 818
diff --git a/library/global.cpp b/library/global.cpp
index e5fc2b3..fd7579a 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -124,521 +124,521 @@ bool StartingAppList::isStarting( const QString name )
124void StartingAppList::handleNewChannel( const QString & name ) 124void StartingAppList::handleNewChannel( const QString & name )
125{ 125{
126#if QT_VERSION >= 232 && !defined(QT_NO_COP) 126#if QT_VERSION >= 232 && !defined(QT_NO_COP)
127 dict.remove( name ); 127 dict.remove( name );
128#endif 128#endif
129} 129}
130 130
131static bool docDirCreated = FALSE; 131static bool docDirCreated = FALSE;
132static QDawg* fixed_dawg = 0; 132static QDawg* fixed_dawg = 0;
133static QDict<QDawg> *named_dawg = 0; 133static QDict<QDawg> *named_dawg = 0;
134 134
135static QString qpeDir() 135static QString qpeDir()
136{ 136{
137 QString dir = getenv("OPIEDIR"); 137 QString dir = getenv("OPIEDIR");
138 if ( dir.isEmpty() ) dir = ".."; 138 if ( dir.isEmpty() ) dir = "..";
139 return dir; 139 return dir;
140} 140}
141 141
142static QString dictDir() 142static QString dictDir()
143{ 143{
144 return qpeDir() + "/etc/dict"; 144 return qpeDir() + "/etc/dict";
145} 145}
146 146
147/*! 147/*!
148 \class Global global.h 148 \class Global global.h
149 \brief The Global class collects application-wide global functions. 149 \brief The Global class collects application-wide global functions.
150*/ 150*/
151 151
152/*! 152/*!
153 \internal 153 \internal
154*/ 154*/
155Global::Global() 155Global::Global()
156{ 156{
157} 157}
158 158
159/*! 159/*!
160 Returns the unchangeable QDawg that contains general 160 Returns the unchangeable QDawg that contains general
161 words for the current locale. 161 words for the current locale.
162 162
163 \sa addedDawg() 163 \sa addedDawg()
164*/ 164*/
165const QDawg& Global::fixedDawg() 165const QDawg& Global::fixedDawg()
166{ 166{
167 if ( !fixed_dawg ) { 167 if ( !fixed_dawg ) {
168 if ( !docDirCreated ) 168 if ( !docDirCreated )
169 createDocDir(); 169 createDocDir();
170 170
171 fixed_dawg = new QDawg; 171 fixed_dawg = new QDawg;
172 QString dawgfilename = dictDir() + "/dawg"; 172 QString dawgfilename = dictDir() + "/dawg";
173 QString lang = getenv( "LANG" ); 173 QString lang = getenv( "LANG" );
174 QString dawgfilename_lang = dawgfilename + "." + lang; 174 QString dawgfilename_lang = dawgfilename + "." + lang;
175 QString words_lang = dictDir() + "/words." + lang; 175 QString words_lang = dictDir() + "/words." + lang;
176 if ( QFile::exists(dawgfilename_lang) || 176 if ( QFile::exists(dawgfilename_lang) ||
177 QFile::exists(words_lang) ) 177 QFile::exists(words_lang) )
178 dawgfilename = dawgfilename_lang; 178 dawgfilename = dawgfilename_lang;
179 QFile dawgfile(dawgfilename); 179 QFile dawgfile(dawgfilename);
180 180
181 if ( !dawgfile.exists() ) { 181 if ( !dawgfile.exists() ) {
182 QString fn = dictDir() + "/words"; 182 QString fn = dictDir() + "/words";
183 if ( QFile::exists(words_lang) ) 183 if ( QFile::exists(words_lang) )
184 fn = words_lang; 184 fn = words_lang;
185 QFile in(fn); 185 QFile in(fn);
186 if ( in.open(IO_ReadOnly) ) { 186 if ( in.open(IO_ReadOnly) ) {
187 fixed_dawg->createFromWords(&in); 187 fixed_dawg->createFromWords(&in);
188 dawgfile.open(IO_WriteOnly); 188 dawgfile.open(IO_WriteOnly);
189 fixed_dawg->write(&dawgfile); 189 fixed_dawg->write(&dawgfile);
190 dawgfile.close(); 190 dawgfile.close();
191 } 191 }
192 } else { 192 } else {
193 fixed_dawg->readFile(dawgfilename); 193 fixed_dawg->readFile(dawgfilename);
194 } 194 }
195 } 195 }
196 196
197 return *fixed_dawg; 197 return *fixed_dawg;
198} 198}
199 199
200/*! 200/*!
201 Returns the changeable QDawg that contains general 201 Returns the changeable QDawg that contains general
202 words for the current locale. 202 words for the current locale.
203 203
204 \sa fixedDawg() 204 \sa fixedDawg()
205*/ 205*/
206const QDawg& Global::addedDawg() 206const QDawg& Global::addedDawg()
207{ 207{
208 return dawg("local"); 208 return dawg("local");
209} 209}
210 210
211/*! 211/*!
212 Returns the QDawg with the given \a name. 212 Returns the QDawg with the given \a name.
213 This is an application-specific word list. 213 This is an application-specific word list.
214 214
215 \a name should not contain "/". 215 \a name should not contain "/".
216*/ 216*/
217const QDawg& Global::dawg(const QString& name) 217const QDawg& Global::dawg(const QString& name)
218{ 218{
219 createDocDir(); 219 createDocDir();
220 if ( !named_dawg ) 220 if ( !named_dawg )
221 named_dawg = new QDict<QDawg>; 221 named_dawg = new QDict<QDawg>;
222 QDawg* r = named_dawg->find(name); 222 QDawg* r = named_dawg->find(name);
223 if ( !r ) { 223 if ( !r ) {
224 r = new QDawg; 224 r = new QDawg;
225 named_dawg->insert(name,r); 225 named_dawg->insert(name,r);
226 QString dawgfilename = dictDir() + "/" + name + ".dawg"; 226 QString dawgfilename = dictDir() + "/" + name + ".dawg";
227 QFile dawgfile(dawgfilename); 227 QFile dawgfile(dawgfilename);
228 if ( dawgfile.open(IO_ReadOnly) ) 228 if ( dawgfile.open(IO_ReadOnly) )
229 r->readFile(dawgfilename); 229 r->readFile(dawgfilename);
230 } 230 }
231 return *r; 231 return *r;
232} 232}
233 233
234/*! 234/*!
235 Adds \a wordlist to the addedDawg(). 235 Adds \a wordlist to the addedDawg().
236*/ 236*/
237void Global::addWords(const QStringList& wordlist) 237void Global::addWords(const QStringList& wordlist)
238{ 238{
239 addWords("local",wordlist); 239 addWords("local",wordlist);
240} 240}
241 241
242/*! 242/*!
243 Adds \a wordlist to the dawg() named \a dictname. 243 Adds \a wordlist to the dawg() named \a dictname.
244*/ 244*/
245void Global::addWords(const QString& dictname, const QStringList& wordlist) 245void Global::addWords(const QString& dictname, const QStringList& wordlist)
246{ 246{
247 QDawg& d = (QDawg&)dawg(dictname); 247 QDawg& d = (QDawg&)dawg(dictname);
248 QStringList all = d.allWords() + wordlist; 248 QStringList all = d.allWords() + wordlist;
249 d.createFromWords(all); 249 d.createFromWords(all);
250 250
251 QString dawgfilename = dictDir() + "/" + dictname + ".dawg"; 251 QString dawgfilename = dictDir() + "/" + dictname + ".dawg";
252 QFile dawgfile(dawgfilename); 252 QFile dawgfile(dawgfilename);
253 if ( dawgfile.open(IO_WriteOnly) ) { 253 if ( dawgfile.open(IO_WriteOnly) ) {
254 d.write(&dawgfile); 254 d.write(&dawgfile);
255 dawgfile.close(); 255 dawgfile.close();
256 } 256 }
257 257
258 // #### Re-read the dawg here if we use mmap(). 258 // #### Re-read the dawg here if we use mmap().
259 259
260 // #### Signal other processes to re-read. 260 // #### Signal other processes to re-read.
261} 261}
262 262
263 263
264/*! 264/*!
265 Returns a full path for the application named \a appname, with the 265 Returns a full path for the application named \a appname, with the
266 given \a filename or QString::null if there was a problem creating 266 given \a filename or QString::null if there was a problem creating
267 the directory tree for \a appname. 267 the directory tree for \a appname.
268 If \a filename contains "/", it is the caller's responsibility to 268 If \a filename contains "/", it is the caller's responsibility to
269 ensure those directories exist. 269 ensure those directories exist.
270*/ 270*/
271QString Global::applicationFileName(const QString& appname, const QString& filename) 271QString Global::applicationFileName(const QString& appname, const QString& filename)
272{ 272{
273 QDir d; 273 QDir d;
274 QString r = getenv("HOME"); 274 QString r = getenv("HOME");
275 r += "/Applications/"; 275 r += "/Applications/";
276 if ( !QFile::exists( r ) ) 276 if ( !QFile::exists( r ) )
277 if ( d.mkdir(r) == false ) 277 if ( d.mkdir(r) == false )
278 return QString::null; 278 return QString::null;
279 r += appname; 279 r += appname;
280 if ( !QFile::exists( r ) ) 280 if ( !QFile::exists( r ) )
281 if ( d.mkdir(r) == false ) 281 if ( d.mkdir(r) == false )
282 return QString::null; 282 return QString::null;
283 r += "/"; r += filename; 283 r += "/"; r += filename;
284 return r; 284 return r;
285} 285}
286 286
287/*! 287/*!
288 \internal 288 \internal
289*/ 289*/
290void Global::createDocDir() 290void Global::createDocDir()
291{ 291{
292 if ( !docDirCreated ) { 292 if ( !docDirCreated ) {
293 docDirCreated = TRUE; 293 docDirCreated = TRUE;
294 mkdir( QPEApplication::documentDir().latin1(), 0755 ); 294 mkdir( QPEApplication::documentDir().latin1(), 0755 );
295 } 295 }
296} 296}
297 297
298 298
299/*! 299/*!
300 Displays a status \a message to the user. This generally appears 300 Displays a status \a message to the user. This generally appears
301 in the taskbar for some amount of time, then disappears. 301 in the taskbar for some amount of time, then disappears.
302*/ 302*/
303void Global::statusMessage(const QString& message) 303void Global::statusMessage(const QString& message)
304{ 304{
305#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 305#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
306 QCopEnvelope e( "QPE/TaskBar", "message(QString)" ); 306 QCopEnvelope e( "QPE/TaskBar", "message(QString)" );
307 e << message; 307 e << message;
308#endif 308#endif
309} 309}
310 310
311/*! 311/*!
312 \internal 312 \internal
313*/ 313*/
314void Global::applyStyle() 314void Global::applyStyle()
315{ 315{
316#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 316#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
317 QCopChannel::send( "QPE/System", "applyStyle()" ); 317 QCopChannel::send( "QPE/System", "applyStyle()" );
318#else 318#else
319 ((QPEApplication *)qApp)->applyStyle(); // apply without needing QCop for floppy version 319 ((QPEApplication *)qApp)->applyStyle(); // apply without needing QCop for floppy version
320#endif 320#endif
321} 321}
322 322
323/*! 323/*!
324 \internal 324 \internal
325*/ 325*/
326QWidget *Global::shutdown( bool ) 326QWidget *Global::shutdown( bool )
327{ 327{
328#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 328#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
329 QCopChannel::send( "QPE/System", "shutdown()" ); 329 QCopChannel::send( "QPE/System", "shutdown()" );
330#endif 330#endif
331 return 0; 331 return 0;
332} 332}
333 333
334/*! 334/*!
335 \internal 335 \internal
336*/ 336*/
337QWidget *Global::restart( bool ) 337QWidget *Global::restart( bool )
338{ 338{
339#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 339#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
340 QCopChannel::send( "QPE/System", "restart()" ); 340 QCopChannel::send( "QPE/System", "restart()" );
341#endif 341#endif
342 return 0; 342 return 0;
343} 343}
344 344
345/*! 345/*!
346 Explicitly show the current input method. 346 Explicitly show the current input method.
347*/ 347*/
348void Global::showInputMethod() 348void Global::showInputMethod()
349{ 349{
350#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 350#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
351 QCopChannel::send( "QPE/TaskBar", "showInputMethod()" ); 351 QCopChannel::send( "QPE/TaskBar", "showInputMethod()" );
352#endif 352#endif
353} 353}
354 354
355/*! 355/*!
356 Explicitly hide the current input method. 356 Explicitly hide the current input method.
357*/ 357*/
358void Global::hideInputMethod() 358void Global::hideInputMethod()
359{ 359{
360#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 360#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
361 QCopChannel::send( "QPE/TaskBar", "hideInputMethod()" ); 361 QCopChannel::send( "QPE/TaskBar", "hideInputMethod()" );
362#endif 362#endif
363} 363}
364 364
365 365
366/*! 366/*!
367 \internal 367 \internal
368*/ 368*/
369bool Global::isBuiltinCommand( const QString &name ) 369bool Global::isBuiltinCommand( const QString &name )
370{ 370{
371 if(!builtin) 371 if(!builtin)
372 return FALSE; // yes, it can happen 372 return FALSE; // yes, it can happen
373 for (int i = 0; builtin[i].file; i++) { 373 for (int i = 0; builtin[i].file; i++) {
374 if ( builtin[i].file == name ) { 374 if ( builtin[i].file == name ) {
375 return TRUE; 375 return TRUE;
376 } 376 }
377 } 377 }
378 return FALSE; 378 return FALSE;
379} 379}
380 380
381Global::Command* Global::builtin=0; 381Global::Command* Global::builtin=0;
382QGuardedPtr<QWidget> *Global::running=0; 382QGuardedPtr<QWidget> *Global::running=0;
383 383
384/*! 384/*!
385 \class Global::Command 385 \class Global::Command
386 \brief The Global::Command class is internal. 386 \brief The Global::Command class is internal.
387 \internal 387 \internal
388*/ 388*/
389 389
390/*! 390/*!
391 \internal 391 \internal
392*/ 392*/
393void Global::setBuiltinCommands( Command* list ) 393void Global::setBuiltinCommands( Command* list )
394{ 394{
395 if ( running ) 395 if ( running )
396 delete [] running; 396 delete [] running;
397 397
398 builtin = list; 398 builtin = list;
399 int count = 0; 399 int count = 0;
400 if (!builtin) 400 if (!builtin)
401 return; 401 return;
402 while ( builtin[count].file ) 402 while ( builtin[count].file )
403 count++; 403 count++;
404 404
405 running = new QGuardedPtr<QWidget> [ count ]; 405 running = new QGuardedPtr<QWidget> [ count ];
406} 406}
407 407
408/*! 408/*!
409 \internal 409 \internal
410*/ 410*/
411void Global::setDocument( QWidget* receiver, const QString& document ) 411void Global::setDocument( QWidget* receiver, const QString& document )
412{ 412{
413 Emitter emitter(receiver,document); 413 Emitter emitter(receiver,document);
414} 414}
415 415
416/*! 416/*!
417 \internal 417 \internal
418*/ 418*/
419bool Global::terminateBuiltin( const QString& n ) 419bool Global::terminateBuiltin( const QString& n )
420{ 420{
421 if (!builtin) 421 if (!builtin)
422 return FALSE; 422 return FALSE;
423 for (int i = 0; builtin[i].file; i++) { 423 for (int i = 0; builtin[i].file; i++) {
424 if ( builtin[i].file == n ) { 424 if ( builtin[i].file == n ) {
425 delete running[i]; 425 delete running[i];
426 return TRUE; 426 return TRUE;
427 } 427 }
428 } 428 }
429 return FALSE; 429 return FALSE;
430} 430}
431 431
432/*! 432/*!
433 \internal 433 \internal
434*/ 434*/
435void Global::terminate( const AppLnk* app ) 435void Global::terminate( const AppLnk* app )
436{ 436{
437 //if ( terminateBuiltin(app->exec()) ) return; // maybe? haven't tried this 437 //if ( terminateBuiltin(app->exec()) ) return; // maybe? haven't tried this
438 438
439 QCString channel = "QPE/Application/" + app->exec().utf8(); 439 QCString channel = "QPE/Application/" + app->exec().utf8();
440 if ( QCopChannel::isRegistered(channel) ) { 440 if ( QCopChannel::isRegistered(channel) ) {
441 QCopEnvelope e(channel, "quit()"); 441 QCopEnvelope e(channel, "quit()");
442 } 442 }
443} 443}
444 444
445/*! 445/*!
446 Low-level function to run command \a c. Not recommended. 446 Low-level function to run command \a c. Not recommended.
447*/ 447*/
448void Global::invoke(const QString &c) 448void Global::invoke(const QString &c)
449{ 449{
450 // Convert the command line in to a list of arguments 450 // Convert the command line in to a list of arguments
451 QStringList list = QStringList::split(QRegExp(" *"),c); 451 QStringList list = QStringList::split(QRegExp(" *"),c);
452 452
453#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 453#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
454 QString ap=list[0]; 454 QString ap=list[0];
455 // see if the application is already running 455 // see if the application is already running
456 // XXX should lock file /tmp/qcop-msg-ap 456 // XXX should lock file /tmp/qcop-msg-ap
457 if ( QCopChannel::isRegistered( ("QPE/Application/" + ap).latin1() ) ) { 457 if ( QCopChannel::isRegistered( ("QPE/Application/" + ap).latin1() ) ) {
458 QCopEnvelope e("QPE/System", "notBusy(QString)" ); 458 QCopEnvelope e("QPE/System", "notBusy(QString)" );
459 e << ap; 459 e << ap;
460 return; 460 return;
461 } 461 }
462 // XXX should unlock file /tmp/qcop-msg-ap 462 // XXX should unlock file /tmp/qcop-msg-ap
463 //see if it is being started 463 //see if it is being started
464 if ( StartingAppList::isStarting( ap ) ) { 464 if ( StartingAppList::isStarting( ap ) ) {
465 QCopEnvelope e("QPE/System", "notBusy(QString)" ); 465 QCopEnvelope e("QPE/System", "notBusy(QString)" );
466 e << ap; 466 e << ap;
467 return; 467 return;
468 } 468 }
469 469
470#endif 470#endif
471 471
472#ifdef QT_NO_QWS_MULTIPROCESS 472#ifdef QT_NO_QWS_MULTIPROCESS
473 QMessageBox::warning( 0, "Error", "Could not find the application " + c, "Ok", 0, 0, 0, 1 ); 473 QMessageBox::warning( 0, "Error", "Could not find the application " + c, "Ok", 0, 0, 0, 1 );
474#else 474#else
475 475
476 QStrList slist; 476 QStrList slist;
477 unsigned int j; 477 unsigned int j;
478 for ( j = 0; j < list.count(); j++ ) 478 for ( j = 0; j < list.count(); j++ )
479 slist.append( list[j].utf8() ); 479 slist.append( list[j].utf8() );
480 480
481 const char **args = new (const char *)[slist.count() + 1]; 481 const char **args = new (const char *)[slist.count() + 1];
482 for ( j = 0; j < slist.count(); j++ ) 482 for ( j = 0; j < slist.count(); j++ )
483 args[j] = slist.at(j); 483 args[j] = slist.at(j);
484 args[j] = NULL; 484 args[j] = NULL;
485 485
486#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 486#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
487 // an attempt to show a wait... 487 // an attempt to show a wait...
488 // more logic should be used, but this will be fine for the moment... 488 // more logic should be used, but this will be fine for the moment...
489 QCopEnvelope ( "QPE/System", "busy()" ); 489 QCopEnvelope ( "QPE/System", "busy()" );
490#endif 490#endif
491 491
492#ifdef HAVE_QUICKEXEC 492#ifdef HAVE_QUICKEXEC
493 QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".so"; 493 QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".so";
494 qDebug("libfile = %s", libexe.latin1() ); 494 qDebug("libfile = %s", libexe.latin1() );
495 if ( QFile::exists( libexe ) ) { 495 if ( QFile::exists( libexe ) ) {
496 qDebug("calling quickexec %s", libexe.latin1() ); 496 qDebug("calling quickexec %s", libexe.latin1() );
497 quickexecv( libexe.utf8().data(), (const char **)args ); 497 quickexecv( libexe.utf8().data(), (const char **)args );
498 } else 498 } else
499#endif 499#endif
500 { 500 {
501 if ( !::vfork() ) { 501 if ( !::vfork() ) {
502 for ( int fd = 3; fd < 100; fd++ ) 502 for ( int fd = 3; fd < 100; fd++ )
503 ::close( fd ); 503 ::close( fd );
504 ::setpgid( ::getpid(), ::getppid() ); 504 ::setpgid( ::getpid(), ::getppid() );
505 // Try bindir first, so that foo/bar works too 505 // Try bindir first, so that foo/bar works too
506 ::execv( qpeDir()+"/bin/"+args[0], (char * const *)args ); 506 ::execv( qpeDir()+"/bin/"+args[0], (char * const *)args );
507 ::execvp( args[0], (char * const *)args ); 507 ::execvp( args[0], (char * const *)args );
508 exit( -1 ); 508 _exit( -1 );
509 } 509 }
510 } 510 }
511 StartingAppList::add( list[0] ); 511 StartingAppList::add( list[0] );
512#endif //QT_NO_QWS_MULTIPROCESS 512#endif //QT_NO_QWS_MULTIPROCESS
513} 513}
514 514
515/*! 515/*!
516 Executes application identfied by \a c, passing \a document. 516 Executes application identfied by \a c, passing \a document.
517 517
518 Note that you might be better off sending a QCop message to 518 Note that you might be better off sending a QCop message to
519 the application's QPE/Application/<i>appname</i> channel. 519 the application's QPE/Application/<i>appname</i> channel.
520*/ 520*/
521void Global::execute( const QString &c, const QString& document ) 521void Global::execute( const QString &c, const QString& document )
522{ 522{
523 if ( qApp->type() != QApplication::GuiServer ) { 523 if ( qApp->type() != QApplication::GuiServer ) {
524 // ask the server to do the work 524 // ask the server to do the work
525#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 525#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
526 if ( document.isNull() ) { 526 if ( document.isNull() ) {
527 QCopEnvelope e( "QPE/System", "execute(QString)" ); 527 QCopEnvelope e( "QPE/System", "execute(QString)" );
528 e << c; 528 e << c;
529 } else { 529 } else {
530 QCopEnvelope e( "QPE/System", "execute(QString,QString)" ); 530 QCopEnvelope e( "QPE/System", "execute(QString,QString)" );
531 e << c << document; 531 e << c << document;
532 } 532 }
533#endif 533#endif
534 return; 534 return;
535 } 535 }
536 536
537 // Attempt to execute the app using a builtin class for the app first 537 // Attempt to execute the app using a builtin class for the app first
538 // else try and find it in the bin directory 538 // else try and find it in the bin directory
539 if (builtin) { 539 if (builtin) {
540 for (int i = 0; builtin[i].file; i++) { 540 for (int i = 0; builtin[i].file; i++) {
541 if ( builtin[i].file == c ) { 541 if ( builtin[i].file == c ) {
542 if ( running[i] ) { 542 if ( running[i] ) {
543 if ( !document.isNull() && builtin[i].documentary ) 543 if ( !document.isNull() && builtin[i].documentary )
544 setDocument(running[i], document); 544 setDocument(running[i], document);
545 running[i]->raise(); 545 running[i]->raise();
546 running[i]->show(); 546 running[i]->show();
547 running[i]->setActiveWindow(); 547 running[i]->setActiveWindow();
548 } else { 548 } else {
549 running[i] = builtin[i].func( builtin[i].maximized ); 549 running[i] = builtin[i].func( builtin[i].maximized );
550 } 550 }
551 QCopEnvelope e("QPE/System", "notBusy(QString)" ); 551 QCopEnvelope e("QPE/System", "notBusy(QString)" );
552 e << c; // that was quick ;-) 552 e << c; // that was quick ;-)
553 return; 553 return;
554 } 554 }
555 } 555 }
556 } 556 }
557 557
558 //Global::invoke(c, document); 558 //Global::invoke(c, document);
559 559
560 // Convert the command line in to a list of arguments 560 // Convert the command line in to a list of arguments
561 QStringList list = QStringList::split(QRegExp(" *"),c); 561 QStringList list = QStringList::split(QRegExp(" *"),c);
562 562
563#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 563#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
564 QString ap=list[0]; 564 QString ap=list[0];
565 565
566 qDebug("executing %s", ap.latin1() ); 566 qDebug("executing %s", ap.latin1() );
567 if ( ap == "suspend" ) { 567 if ( ap == "suspend" ) {
568 QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE ); 568 QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );
569 return; 569 return;
570 } 570 }
571 571
572 /* if need be, sending a qcop message will result in an invoke, see 572 /* if need be, sending a qcop message will result in an invoke, see
573 preceeding function */ 573 preceeding function */
574 { QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "raise()" ); } 574 { QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "raise()" ); }
575 if ( !document.isEmpty() ) { 575 if ( !document.isEmpty() ) {
576 QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "setDocument(QString)" ); 576 QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "setDocument(QString)" );
577 env << document; 577 env << document;
578 } 578 }
579#endif 579#endif
580} 580}
581 581
582/*! 582/*!
583 Returns the string \a s with the characters backslash, ", and $ 583 Returns the string \a s with the characters backslash, ", and $
584 quoted by a preceeding backslash. 584 quoted by a preceeding backslash.
585*/ 585*/
586QString Global::shellQuote(const QString& s) 586QString Global::shellQuote(const QString& s)
587{ 587{
588 QString r="\""; 588 QString r="\"";
589 for (int i=0; i<(int)s.length(); i++) { 589 for (int i=0; i<(int)s.length(); i++) {
590 char c = s[i].latin1(); 590 char c = s[i].latin1();
591 switch (c) { 591 switch (c) {
592 case '\\': case '"': case '$': 592 case '\\': case '"': case '$':
593 r+="\\"; 593 r+="\\";
594 } 594 }
595 r += s[i]; 595 r += s[i];
596 } 596 }
597 r += "\""; 597 r += "\"";
598 return r; 598 return r;
599} 599}
600 600
601/*! 601/*!
602 Returns the string \a s with the characters backslash and " 602 Returns the string \a s with the characters backslash and "
603 quoted by a preceeding backslash. 603 quoted by a preceeding backslash.
604*/ 604*/
605QString Global::stringQuote(const QString& s) 605QString Global::stringQuote(const QString& s)
606{ 606{
607 QString r="\""; 607 QString r="\"";
608 for (int i=0; i<(int)s.length(); i++) { 608 for (int i=0; i<(int)s.length(); i++) {
609 char c = s[i].latin1(); 609 char c = s[i].latin1();
610 switch (c) { 610 switch (c) {
611 case '\\': case '"': 611 case '\\': case '"':
612 r+="\\"; 612 r+="\\";
613 } 613 }
614 r += s[i]; 614 r += s[i];
615 } 615 }
616 r += "\""; 616 r += "\"";
617 return r; 617 return r;
618} 618}
619 619
620/*! 620/*!
621 Finds all documents on the system's document directories which 621 Finds all documents on the system's document directories which
622 match the filter \a mimefilter, and appends the resulting DocLnk 622 match the filter \a mimefilter, and appends the resulting DocLnk
623 objects to \a folder. 623 objects to \a folder.
624*/ 624*/
625void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter) 625void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter)
626{ 626{
627 QString homedocs = QString(getenv("HOME")) + "/Documents"; 627 QString homedocs = QString(getenv("HOME")) + "/Documents";
628 DocLnkSet d(homedocs,mimefilter); 628 DocLnkSet d(homedocs,mimefilter);
629 folder->appendFrom(d); 629 folder->appendFrom(d);
630 StorageInfo storage; 630 StorageInfo storage;
631 const QList<FileSystem> &fs = storage.fileSystems(); 631 const QList<FileSystem> &fs = storage.fileSystems();
632 QListIterator<FileSystem> it ( fs ); 632 QListIterator<FileSystem> it ( fs );
633 for ( ; it.current(); ++it ) { 633 for ( ; it.current(); ++it ) {
634 if ( (*it)->isRemovable() ) { 634 if ( (*it)->isRemovable() ) {
635 QString path = (*it)->path(); 635 QString path = (*it)->path();
636 DocLnkSet ide( path, mimefilter ); 636 DocLnkSet ide( path, mimefilter );
637 folder->appendFrom(ide); 637 folder->appendFrom(ide);
638 } 638 }
639 } 639 }
640} 640}
641 641
642 642
643 643
644#include "global.moc" 644#include "global.moc"
diff --git a/library/library.pro b/library/library.pro
index 058d216..e71e5a0 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -1,132 +1,130 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= calendar.h \ 3 HEADERS= calendar.h \
4 global.h \ 4 global.h \
5 resource.h \ 5 resource.h \
6 xmlreader.h \ 6 xmlreader.h \
7 mimetype.h \ 7 mimetype.h \
8 menubutton.h \ 8 menubutton.h \
9 network.h \ 9 network.h \
10 networkinterface.h \ 10 networkinterface.h \
11 proxies.h \
12 filemanager.h \ 11 filemanager.h \
13 fontmanager.h \ 12 fontmanager.h \
14 qdawg.h \ 13 qdawg.h \
15 datebookmonth.h \ 14 datebookmonth.h \
16 fileselector.h \ 15 fileselector.h \
16 fileselector_p.h \
17 imageedit.h \ 17 imageedit.h \
18 qcopenvelope_qws.h \ 18 qcopenvelope_qws.h \
19 qpedecoration_qws.h \ 19 qpedecoration_qws.h \
20 qpeapplication.h \ 20 qpeapplication.h \
21 qpestyle.h \ 21 qpestyle.h \
22 qpedialog.h \ 22 qpedialog.h \
23 lightstyle.h \ 23 lightstyle.h \
24 config.h \ 24 config.h \
25 applnk.h \ 25 applnk.h \
26 sound.h \ 26 sound.h \
27 tzselect.h \ 27 tzselect.h \
28 qmath.h \ 28 qmath.h \
29 datebookdb.h \ 29 datebookdb.h \
30 alarmserver.h \ 30 alarmserver.h \
31 process.h \ 31 process.h \
32 password.h \ 32 password.h \
33 timestring.h \ 33 timestring.h \
34 fontfactoryinterface.h \ 34 fontfactoryinterface.h \
35 fontdatabase.h \ 35 fontdatabase.h \
36 power.h \ 36 power.h \
37 storage.h \ 37 storage.h \
38 qpemessagebox.h \ 38 qpemessagebox.h \
39 backend/timeconversion.h \ 39 backend/timeconversion.h \
40 qpedebug.h \ 40 qpedebug.h \
41 qpemenubar.h \ 41 qpemenubar.h \
42 qpetoolbar.h \ 42 qpetoolbar.h \
43 backend/categories.h \ 43 backend/categories.h \
44 backend/stringutil.h \ 44 backend/stringutil.h \
45 backend/palmtopuid.h \ 45 backend/palmtopuid.h \
46 backend/palmtoprecord.h \ 46 backend/palmtoprecord.h \
47 backend/task.h \ 47 backend/task.h \
48 backend/event.h \ 48 backend/event.h \
49 backend/contact.h\ 49 backend/contact.h\
50 categorymenu.h \ 50 categorymenu.h \
51 categoryedit_p.h \ 51 categoryedit_p.h \
52 categoryselect.h \ 52 categoryselect.h \
53 categorywidget.h \ 53 categorywidget.h \
54 ir.h \ 54 ir.h \
55 backend/vobject_p.h \ 55 backend/vobject_p.h \
56 findwidget_p.h \ 56 findwidget_p.h \
57 finddialog.h \ 57 finddialog.h \
58 lnkproperties.h 58 lnkproperties.h
59 59
60 SOURCES= calendar.cpp \ 60 SOURCES= calendar.cpp \
61 global.cpp \ 61 global.cpp \
62 xmlreader.cpp \ 62 xmlreader.cpp \
63 mimetype.cpp \ 63 mimetype.cpp \
64 menubutton.cpp \ 64 menubutton.cpp \
65 network.cpp \ 65 network.cpp \
66 networkinterface.cpp \ 66 networkinterface.cpp \
67 proxies.cpp \
68 filemanager.cpp \ 67 filemanager.cpp \
69 fontmanager.cpp \ 68 fontmanager.cpp \
70 qdawg.cpp \ 69 qdawg.cpp \
71 datebookmonth.cpp \ 70 datebookmonth.cpp \
72 fileselector.cpp \ 71 fileselector.cpp \
73 imageedit.cpp \ 72 imageedit.cpp \
74 resource.cpp \ 73 resource.cpp \
75 qpedecoration_qws.cpp \ 74 qpedecoration_qws.cpp \
76 qcopenvelope_qws.cpp \ 75 qcopenvelope_qws.cpp \
77 qpeapplication.cpp \ 76 qpeapplication.cpp \
78 qpestyle.cpp \ 77 qpestyle.cpp \
79 qpedialog.cpp \ 78 qpedialog.cpp \
80 lightstyle.cpp \ 79 lightstyle.cpp \
81 config.cpp \ 80 config.cpp \
82 applnk.cpp \ 81 applnk.cpp \
83 sound.cpp \ 82 sound.cpp \
84 tzselect.cpp \ 83 tzselect.cpp \
85 qmath.c \ 84 qmath.c \
86 datebookdb.cpp \ 85 datebookdb.cpp \
87 alarmserver.cpp \ 86 alarmserver.cpp \
88 password.cpp \ 87 password.cpp \
89 process.cpp \ 88 process.cpp \
90 process_unix.cpp \ 89 process_unix.cpp \
91 timestring.cpp \ 90 timestring.cpp \
92 fontdatabase.cpp \ 91 fontdatabase.cpp \
93 power.cpp \ 92 power.cpp \
94 storage.cpp \ 93 storage.cpp \
95 qpemessagebox.cpp \ 94 qpemessagebox.cpp \
96 backend/timeconversion.cpp \ 95 backend/timeconversion.cpp \
97 qpedebug.cpp \ 96 qpedebug.cpp \
98 qpemenubar.cpp \ 97 qpemenubar.cpp \
99 qpetoolbar.cpp \ 98 qpetoolbar.cpp \
100 backend/categories.cpp \ 99 backend/categories.cpp \
101 backend/stringutil.cpp \ 100 backend/stringutil.cpp \
102 backend/palmtoprecord.cpp \ 101 backend/palmtoprecord.cpp \
103 backend/task.cpp \ 102 backend/task.cpp \
104 backend/event.cpp \ 103 backend/event.cpp \
105 backend/contact.cpp \ 104 backend/contact.cpp \
106 categorymenu.cpp \ 105 categorymenu.cpp \
107 categoryedit_p.cpp \ 106 categoryedit_p.cpp \
108 categoryselect.cpp \ 107 categoryselect.cpp \
109 categorywidget.cpp \ 108 categorywidget.cpp \
110 ir.cpp \ 109 ir.cpp \
111 backend/vcc_yacc.cpp \ 110 backend/vcc_yacc.cpp \
112 backend/vobject.cpp \ 111 backend/vobject.cpp \
113 findwidget_p.cpp \ 112 findwidget_p.cpp \
114 finddialog.cpp \ 113 finddialog.cpp \
115 lnkproperties.cpp 114 lnkproperties.cpp
116 115
117# Qt 3 compatibility 116# Qt 3 compatibility
118qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h 117qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
119qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \ 118qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
120 qprocess_unix.cpp
121 119
122INCLUDEPATH += $(OPIEDIR)/include backend 120INCLUDEPATH += $(OPIEDIR)/include backend
123 LIBS += -ldl -lcrypt -lm 121 LIBS += -ldl -lcrypt -lm
124 122
125INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui 123INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
126 124
127 TARGET = qpe 125 TARGET = qpe
128 DESTDIR = $(QTDIR)/lib$(PROJMAK) 126 DESTDIR = $(QTDIR)/lib$(PROJMAK)
129# This is set by configure$(OPIEDIR). 127# This is set by configure$(OPIEDIR).
130 VERSION = 1.5.0 128 VERSION = 1.5.0
131 129
132TRANSLATIONS = ../i18n/de/libqpe.ts 130TRANSLATIONS = ../i18n/de/libqpe.ts
diff --git a/noncore/games/chess/Makefile.in b/noncore/games/chess/Makefile.in
index 7354d76..a1f2cd7 100644
--- a/noncore/games/chess/Makefile.in
+++ b/noncore/games/chess/Makefile.in
@@ -1,134 +1,134 @@
1############################################################################# 1#############################################################################
2 2
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DQCONFIG=\"qpe\" 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) -DQCONFIG=\"qpe\" 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
13 UIC =$(SYSCONF_UIC) 13 UIC =$(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = ../bin/ 17DESTDIR = ../bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= chess 21 TARGET= chess
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =chess.h 26 HEADERS =chess.h
27 SOURCES =chess.cpp \ 27 SOURCES =chess.cpp \
28 main.cpp 28 main.cpp
29 OBJECTS =chess.o \ 29 OBJECTS =chess.o \
30 main.o \ 30 main.o \
31 mainwindow.o 31 mainwindow.o
32INTERFACES = mainwindow.ui 32INTERFACES = mainwindow.ui
33UICDECLS = mainwindow.h 33UICDECLS = mainwindow.h
34UICIMPLS = mainwindow.cpp 34UICIMPLS = mainwindow.cpp
35 SRCMOC =moc_chess.cpp \ 35 SRCMOC =moc_chess.cpp \
36 moc_mainwindow.cpp 36 moc_mainwindow.cpp
37 OBJMOC =moc_chess.o \ 37 OBJMOC =moc_chess.o \
38 moc_mainwindow.o 38 moc_mainwindow.o
39 39
40 40
41####### Implicit rules 41####### Implicit rules
42 42
43.SUFFIXES: .cpp .cxx .cc .C .c 43.SUFFIXES: .cpp .cxx .cc .C .c
44 44
45.cpp.o: 45.cpp.o:
46 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 46 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
47 47
48.cxx.o: 48.cxx.o:
49 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 49 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
50 50
51.cc.o: 51.cc.o:
52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
53 53
54.C.o: 54.C.o:
55 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 55 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
56 56
57.c.o: 57.c.o:
58 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 58 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
59 59
60####### Build rules 60####### Build rules
61 61
62 62
63all: $(DESTDIR)$(TARGET) 63all: $(DESTDIR)$(TARGET)
64 64
65$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 65$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
66 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 66 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
67 67
68moc: $(SRCMOC) 68moc: $(SRCMOC)
69 69
70tmake: 70tmake: Makefile.in
71 tmake chess.pro 71
72Makefile.in: chess.pro
73 tmake chess.pro -o Makefile.in
72 74
73clean: 75clean:
74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 76 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
75 -rm -f *~ core 77 -rm -f *~ core
76 -rm -f allmoc.cpp 78 -rm -f allmoc.cpp
77 79
78####### Extension Modules 80####### Extension Modules
79 81
80listpromodules: 82listpromodules:
81 @echo 83 @echo
82 84
83listallmodules: 85listallmodules:
84 @echo 86 @echo
85 87
86listaddonpromodules: 88listaddonpromodules:
87 @echo 89 @echo
88 90
89listaddonentmodules: 91listaddonentmodules:
90 @echo 92 @echo
91 93
92 94
93REQUIRES= 95REQUIRES=
94 96
95####### Sub-libraries 97####### Sub-libraries
96 98
97 99
98###### Combined headers 100###### Combined headers
99 101
100 102
101 103
102####### Compile 104####### Compile
103 105
104chess.o: chess.cpp \ 106chess.o: chess.cpp \
105 $(QPEDIR)/include/qpe/config.h \
106 $(QPEDIR)/include/qpe/resource.h \
107 chess.h 107 chess.h
108 108
109main.o: main.cpp \ 109main.o: main.cpp \
110 mainwindow.h 110 chess.h
111 111
112mainwindow.h: mainwindow.ui 112mainwindow.h: mainwindow.ui
113 $(UIC) mainwindow.ui -o $(INTERFACE_DECL_PATH)/mainwindow.h 113 $(UIC) mainwindow.ui -o $(INTERFACE_DECL_PATH)/mainwindow.h
114 114
115mainwindow.cpp: mainwindow.ui 115mainwindow.cpp: mainwindow.ui
116 $(UIC) mainwindow.ui -i mainwindow.h -o mainwindow.cpp 116 $(UIC) mainwindow.ui -i mainwindow.h -o mainwindow.cpp
117 117
118mainwindow.o: mainwindow.cpp \ 118mainwindow.o: mainwindow.cpp \
119 mainwindow.h \ 119 mainwindow.h \
120 mainwindow.ui 120 mainwindow.ui
121 121
122moc_chess.o: moc_chess.cpp \ 122moc_chess.o: moc_chess.cpp \
123 chess.h 123 chess.h
124 124
125moc_mainwindow.o: moc_mainwindow.cpp \ 125moc_mainwindow.o: moc_mainwindow.cpp \
126 mainwindow.h 126 mainwindow.h
127 127
128moc_chess.cpp: chess.h 128moc_chess.cpp: chess.h
129 $(MOC) chess.h -o moc_chess.cpp 129 $(MOC) chess.h -o moc_chess.cpp
130 130
131moc_mainwindow.cpp: mainwindow.h 131moc_mainwindow.cpp: mainwindow.h
132 $(MOC) mainwindow.h -o moc_mainwindow.cpp 132 $(MOC) mainwindow.h -o moc_mainwindow.cpp
133 133
134 134
diff --git a/noncore/games/go/Makefile.in b/noncore/games/go/Makefile.in
index 985eff0..0395dff 100644
--- a/noncore/games/go/Makefile.in
+++ b/noncore/games/go/Makefile.in
@@ -1,158 +1,155 @@
1############################################################################# 1#############################################################################
2 2
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(OPIEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
13 UIC =$(SYSCONF_UIC) 13 UIC =$(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = ../bin/ 17DESTDIR = ../bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= go 21 TARGET= go
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =amigo.h \ 26 HEADERS =amigo.h \
27 go.h \ 27 go.h \
28 goplayutils.h \ 28 goplayutils.h \
29 gowidget.h 29 gowidget.h
30 SOURCES =amigo.c \ 30 SOURCES =amigo.c \
31 goplayer.c \ 31 goplayer.c \
32 goplayutils.c \ 32 goplayutils.c \
33 killable.c \ 33 killable.c \
34 gowidget.cpp \ 34 gowidget.cpp \
35 main.cpp 35 main.cpp
36 OBJECTS =amigo.o \ 36 OBJECTS =amigo.o \
37 goplayer.o \ 37 goplayer.o \
38 goplayutils.o \ 38 goplayutils.o \
39 killable.o \ 39 killable.o \
40 gowidget.o \ 40 gowidget.o \
41 main.o 41 main.o
42INTERFACES = 42INTERFACES =
43UICDECLS = 43UICDECLS =
44UICIMPLS = 44UICIMPLS =
45 SRCMOC =moc_gowidget.cpp 45 SRCMOC =moc_gowidget.cpp
46 OBJMOC =moc_gowidget.o 46 OBJMOC =moc_gowidget.o
47 47
48 48
49####### Implicit rules 49####### Implicit rules
50 50
51.SUFFIXES: .cpp .cxx .cc .C .c 51.SUFFIXES: .cpp .cxx .cc .C .c
52 52
53.cpp.o: 53.cpp.o:
54 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 54 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
55 55
56.cxx.o: 56.cxx.o:
57 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 57 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
58 58
59.cc.o: 59.cc.o:
60 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 60 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
61 61
62.C.o: 62.C.o:
63 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 63 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
64 64
65.c.o: 65.c.o:
66 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 66 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
67 67
68####### Build rules 68####### Build rules
69 69
70 70
71all: $(DESTDIR)$(TARGET) 71all: $(DESTDIR)$(TARGET)
72 72
73$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 73$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
74 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 74 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
75 75
76moc: $(SRCMOC) 76moc: $(SRCMOC)
77 77
78tmake: 78tmake: Makefile.in
79 tmake go.pro 79
80Makefile.in: go.pro
81 tmake go.pro -o Makefile.in
80 82
81clean: 83clean:
82 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 84 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
83 -rm -f *~ core 85 -rm -f *~ core
84 -rm -f allmoc.cpp 86 -rm -f allmoc.cpp
85 87
86####### Extension Modules 88####### Extension Modules
87 89
88listpromodules: 90listpromodules:
89 @echo 91 @echo
90 92
91listallmodules: 93listallmodules:
92 @echo 94 @echo
93 95
94listaddonpromodules: 96listaddonpromodules:
95 @echo 97 @echo
96 98
97listaddonentmodules: 99listaddonentmodules:
98 @echo 100 @echo
99 101
100 102
101REQUIRES= 103REQUIRES=
102 104
103####### Sub-libraries 105####### Sub-libraries
104 106
105 107
106###### Combined headers 108###### Combined headers
107 109
108 110
109 111
110####### Compile 112####### Compile
111 113
112amigo.o: amigo.c \ 114amigo.o: amigo.c \
113 go.h \ 115 go.h \
114 goplayutils.h \ 116 goplayutils.h \
115 amigo.h 117 amigo.h
116 118
117goplayer.o: goplayer.c \ 119goplayer.o: goplayer.c \
118 go.h \ 120 go.h \
119 goplayutils.h \ 121 goplayutils.h \
120 amigo.h 122 amigo.h
121 123
122goplayutils.o: goplayutils.c \ 124goplayutils.o: goplayutils.c \
123 goplayutils.h \ 125 goplayutils.h \
124 amigo.h \ 126 amigo.h \
125 go.h 127 go.h
126 128
127killable.o: killable.c \ 129killable.o: killable.c \
128 go.h \ 130 go.h \
129 goplayutils.h \ 131 goplayutils.h \
130 amigo.h 132 amigo.h
131 133
132gowidget.o: gowidget.cpp \ 134gowidget.o: gowidget.cpp \
133 gowidget.h \ 135 gowidget.h \
134 amigo.h \ 136 amigo.h \
135 go.h \ 137 go.h \
136 goplayutils.h \ 138 goplayutils.h
137 $(OPIEDIR)/include/qpe/config.h \
138 $(OPIEDIR)/include/qpe/resource.h \
139 $(OPIEDIR)/include/qpe/qpetoolbar.h \
140 $(OPIEDIR)/include/qpe/qpemenubar.h
141 139
142main.o: main.cpp \ 140main.o: main.cpp \
143 gowidget.h \ 141 gowidget.h \
144 amigo.h \ 142 amigo.h \
145 go.h \ 143 go.h \
146 goplayutils.h \ 144 goplayutils.h
147 $(OPIEDIR)/include/qpe/qpeapplication.h
148 145
149moc_gowidget.o: moc_gowidget.cpp \ 146moc_gowidget.o: moc_gowidget.cpp \
150 gowidget.h \ 147 gowidget.h \
151 amigo.h \ 148 amigo.h \
152 go.h \ 149 go.h \
153 goplayutils.h 150 goplayutils.h
154 151
155moc_gowidget.cpp: gowidget.h 152moc_gowidget.cpp: gowidget.h
156 $(MOC) gowidget.h -o moc_gowidget.cpp 153 $(MOC) gowidget.h -o moc_gowidget.cpp
157 154
158 155