summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xconfigure12
-rw-r--r--core/applets/batteryapplet/Makefile.in2
-rw-r--r--core/applets/batteryapplet/batteryapplet.pro4
-rw-r--r--core/applets/clipboardapplet/clipboardapplet.pro4
-rw-r--r--core/applets/clockapplet/Makefile.in2
-rw-r--r--core/applets/clockapplet/clockapplet.pro4
-rw-r--r--core/applets/volumeapplet/Makefile.in2
-rw-r--r--core/applets/volumeapplet/volumeapplet.pro4
-rw-r--r--core/apps/embeddedkonsole/Makefile.in15
-rwxr-xr-xcore/apps/embeddedkonsole/embeddedkonsole.pro6
-rw-r--r--core/apps/helpbrowser/Makefile.in16
-rw-r--r--core/apps/helpbrowser/helpbrowser.pro6
-rw-r--r--core/apps/qcop/Makefile.in4
-rw-r--r--core/apps/qcop/qcop.pro4
-rw-r--r--core/apps/textedit/Makefile.in28
-rw-r--r--core/apps/textedit/textedit.pro6
-rw-r--r--core/launcher/Makefile.in821
-rw-r--r--core/launcher/launcher.pro104
-rw-r--r--core/launcher/main.cpp2
-rw-r--r--core/multimedia/opieplayer/Makefile.in92
-rw-r--r--core/multimedia/opieplayer/libflash/libflash.pro4
-rw-r--r--core/multimedia/opieplayer/libmad/Makefile.in6
-rw-r--r--core/multimedia/opieplayer/libmad/libmad.pro4
-rw-r--r--core/multimedia/opieplayer/libmpeg3/Makefile.in6
-rw-r--r--core/multimedia/opieplayer/libmpeg3/libmpeg3.pro4
-rw-r--r--core/multimedia/opieplayer/mpegplayer.pro10
-rw-r--r--core/multimedia/opieplayer/wavplugin/Makefile.in6
-rw-r--r--core/multimedia/opieplayer/wavplugin/wavplugin.pro4
-rw-r--r--core/pim/addressbook/Makefile.in102
-rw-r--r--core/pim/addressbook/addressbook.pro6
-rw-r--r--core/pim/datebook/Makefile.in155
-rw-r--r--core/pim/datebook/datebook.pro6
-rw-r--r--core/pim/todo/Makefile.in78
-rw-r--r--core/pim/todo/todo.pro6
-rw-r--r--core/settings/citytime/Makefile.in24
-rw-r--r--core/settings/citytime/citytime.pro6
-rw-r--r--core/settings/light-and-power/Makefile.in2
-rw-r--r--core/settings/light-and-power/light-and-power.pro4
-rw-r--r--core/settings/security/Makefile.in2
-rw-r--r--core/settings/security/security.pro4
-rw-r--r--docs/qcop.doc2
-rw-r--r--docs/start.doc12
-rwxr-xr-xetc/init.d/qpe8
-rw-r--r--example/example.pro4
-rw-r--r--freetype/freetype.pro6
-rw-r--r--inputmethods/handwriting/Makefile.in2
-rw-r--r--inputmethods/handwriting/handwriting.pro4
-rw-r--r--inputmethods/keyboard/Makefile.in2
-rw-r--r--inputmethods/keyboard/keyboard.pro4
-rw-r--r--inputmethods/pickboard/Makefile.in2
-rw-r--r--inputmethods/pickboard/pickboard.pro4
-rw-r--r--inputmethods/unikeyboard/Makefile.in2
-rw-r--r--inputmethods/unikeyboard/unikeyboard.pro4
-rw-r--r--library/Makefile.in26
-rw-r--r--library/global.cpp2
-rw-r--r--library/library.pro4
-rw-r--r--library/qpeapplication.cpp4
-rwxr-xr-xmkipks18
-rw-r--r--noncore/apps/dictionary/dictionary.pro4
-rw-r--r--noncore/apps/tableviewer/tableviewer.pro4
-rw-r--r--noncore/comm/keypebble/Makefile.in20
-rw-r--r--noncore/comm/keypebble/keypebble.pro4
-rw-r--r--noncore/games/chess/chess.pro4
-rw-r--r--noncore/games/fifteen/Makefile.in12
-rw-r--r--noncore/games/fifteen/fifteen.pro4
-rw-r--r--noncore/games/go/Makefile.in12
-rw-r--r--noncore/games/go/go.pro4
-rw-r--r--noncore/games/mindbreaker/Makefile.in12
-rw-r--r--noncore/games/mindbreaker/mindbreaker.pro6
-rw-r--r--noncore/games/minesweep/Makefile.in16
-rw-r--r--noncore/games/minesweep/minesweep.pro6
-rw-r--r--noncore/games/parashoot/Makefile.in42
-rw-r--r--noncore/games/parashoot/parashoot.pro6
-rw-r--r--noncore/games/qasteroids/Makefile.in12
-rw-r--r--noncore/games/qasteroids/qasteroids.pro6
-rw-r--r--noncore/games/snake/Makefile.in16
-rw-r--r--noncore/games/snake/snake.pro6
-rw-r--r--noncore/games/solitaire/Makefile.in36
-rwxr-xr-xnoncore/games/solitaire/solitaire.pro6
-rw-r--r--noncore/games/tetrix/Makefile.in6
-rw-r--r--noncore/games/tetrix/tetrix.pro4
-rw-r--r--noncore/games/wordgame/Makefile.in28
-rw-r--r--noncore/games/wordgame/wordgame.pro6
-rw-r--r--noncore/multimedia/showimg/Makefile.in16
-rw-r--r--noncore/multimedia/showimg/showimg.pro6
-rw-r--r--noncore/settings/language/Makefile.in2
-rw-r--r--noncore/settings/language/language.pro4
-rw-r--r--noncore/settings/sound/Makefile.in2
-rw-r--r--noncore/settings/sound/sound.pro4
-rw-r--r--noncore/settings/sysinfo/Makefile.in12
-rw-r--r--noncore/settings/sysinfo/sysinfo.pro6
-rw-r--r--noncore/tools/calc2/binary/binary.pro8
-rw-r--r--noncore/tools/calc2/calc.pro4
-rw-r--r--noncore/tools/calc2/simple/simple.pro8
-rw-r--r--noncore/tools/calculator/Makefile.in14
-rw-r--r--noncore/tools/calculator/calculator.pro6
-rw-r--r--noncore/tools/clock/Makefile.in14
-rw-r--r--noncore/tools/clock/clock.pro6
-rw-r--r--noncore/unsupported/filebrowser/Makefile.in20
-rw-r--r--noncore/unsupported/filebrowser/filebrowser.pro6
-rw-r--r--noncore/unsupported/oipkg/Makefile.in18
-rw-r--r--noncore/unsupported/oipkg/qipkg.pro6
-rwxr-xr-xscripts/q_functions12
103 files changed, 1088 insertions, 1055 deletions
diff --git a/configure b/configure
index d36fd44..7824e36 100755
--- a/configure
+++ b/configure
@@ -1,270 +1,270 @@
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=linux-generic-g++
9SHARING=shared 9SHARING=shared
10DEBUG= 10DEBUG=
11QCONFIGARG= 11QCONFIGARG=
12 12
13touch .test.qpe. 13touch .test.qpe.
14if [ '!' -f ${QPEDIR}/.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 $QPEDIR is not set correctly. It is currently' 19 echo ' The environment variable $OPIEDIR is not set correctly. It is currently'
20 echo ' set to "'$QPEDIR'", 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 $QPEDIR' 23 echo ' Please read the INSTALL file for instructions on how to set $OPIEDIR'
24 echo ' correctly. If you have set $QPEDIR 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 32mkdir -p include/qpe
33( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) 33( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; )
34 34
35VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <include/qpe/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) 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) 37VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <include/qpe/version.h)
38 38
39TOMAKE= 39TOMAKE=
40 40
41if grep -q 'VERSION_STR.*"3' $QTDIR/include/qglobal.h 41if grep -q 'VERSION_STR.*"3' $QTDIR/include/qglobal.h
42then 42then
43 QT3=yes 43 QT3=yes
44else 44else
45 QT3=no 45 QT3=no
46fi 46fi
47 47
48# Parse the arguments, setting things to "yes" or "no". 48# Parse the arguments, setting things to "yes" or "no".
49 49
50while [ -n "$1" ]; do 50while [ -n "$1" ]; do
51 case $1 in 51 case $1 in
52 -platform|-xplatform) # No difference since we don't need to build moc, etc. 52 -platform|-xplatform) # No difference since we don't need to build moc, etc.
53 shift; PLATFORM=$1 53 shift; PLATFORM=$1
54 ;; 54 ;;
55 -release) 55 -release)
56 DEBUG= 56 DEBUG=
57 ;; 57 ;;
58 -debug) 58 -debug)
59 DEBUG=-debug 59 DEBUG=-debug
60 ;; 60 ;;
61 -shared) 61 -shared)
62 SHARING=shared 62 SHARING=shared
63 ;; 63 ;;
64 -static) 64 -static)
65 SHARING=static 65 SHARING=static
66 ;; 66 ;;
67 -qconfig) 67 -qconfig)
68 # optional way to specify the qconfig-qpe.h is to pass -qconfig qpe 68 # 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. 69 shift; QCONFIGARG=DEFINES+=QCONFIG='\"'$1'\"' # Don't quote me on that.
70 ;; 70 ;;
71 -make) 71 -make)
72 shift; TOMAKE="$TOMAKE $1" 72 shift; TOMAKE="$TOMAKE $1"
73 ;; 73 ;;
74 -qt3) 74 -qt3)
75 QT3=yes 75 QT3=yes
76 ;; 76 ;;
77 *) 77 *)
78 HELP=yes;; 78 HELP=yes;;
79 esac 79 esac
80 shift 80 shift
81done 81done
82 82
83TARGET=configs/$PLATFORM-$SHARING$DEBUG 83TARGET=configs/$PLATFORM-$SHARING$DEBUG
84 84
85if [ '!' -f $TARGET ] 85if [ '!' -f $TARGET ]
86then 86then
87 if [ -f configs/linux-$PLATFORM-g++-$SHARING$DEBUG ] 87 if [ -f configs/linux-$PLATFORM-g++-$SHARING$DEBUG ]
88 then 88 then
89 TARGET=configs/linux-$PLATFORM-g++-$SHARING$DEBUG 89 TARGET=configs/linux-$PLATFORM-g++-$SHARING$DEBUG
90 else 90 else
91 echo 91 echo
92 echo ' The specified platform/compiler not supported: ' $TARGET 92 echo ' The specified platform/compiler not supported: ' $TARGET
93 echo 93 echo
94 exit 2 94 exit 2
95 fi 95 fi
96fi 96fi
97 97
98# Next, emit a usage message if something failed. 98# Next, emit a usage message if something failed.
99 99
100if [ "$HELP" = "yes" ]; then 100if [ "$HELP" = "yes" ]; then
101 cat <<EOF 101 cat <<EOF
102Usage: $0 [-debug] [-release] [-shared] [-static] [-qt3] [-platform ...] 102Usage: $0 [-debug] [-release] [-shared] [-static] [-qt3] [-platform ...]
103 103
104The defaults (*) are usually acceptable. Here is a short explanation of 104The defaults (*) are usually acceptable. Here is a short explanation of
105each option: 105each option:
106 106
107 * -release ........... Compile and link Qt with debugging turned off. 107 * -release ........... Compile and link Qt with debugging turned off.
108 -debug ............. Compile and link Qt with debugging turned on. 108 -debug ............. Compile and link Qt with debugging turned on.
109 109
110 * -shared ............ Create and use a shared Qt library (libqt.so) 110 * -shared ............ Create and use a shared Qt library (libqt.so)
111 -static ............ Create and use a static Qt library (libqt.a) 111 -static ............ Create and use a static Qt library (libqt.a)
112 112
113 -qt3 ............... Configure for use with Qt 3.x 113 -qt3 ............... Configure for use with Qt 3.x
114 114
115 -platform target ... The platform you are building on ($PLATFORM) 115 -platform target ... The platform you are building on ($PLATFORM)
116EOF 116EOF
117 exit 0; 117 exit 0;
118fi 118fi
119 119
120 120
121echo Creating makefiles... 121echo Creating makefiles...
122 122
123sed -e 's/^\(VERSION.*= \).*/\1'$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT/ <library/library.pro >library/library.pro-v 123sed -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 124mv library/library.pro-v library/library.pro
125 125
126if [ "$QT3" = yes ] 126if [ "$QT3" = yes ]
127then 127then
128 VCONFIG="CONFIG+=qt3" 128 VCONFIG="CONFIG+=qt3"
129else 129else
130 VCONFIG="CONFIG+=qt2" 130 VCONFIG="CONFIG+=qt2"
131fi 131fi
132 132
133if [ -f $TMAKEPATH/tmake.conf ] 133if [ -f $TMAKEPATH/tmake.conf ]
134then 134then
135 # You have tmake. We'll regenerate the file for you... 135 # You have tmake. We'll regenerate the file for you...
136 echo "Makefiles will be regenerated." 136 echo "Makefiles will be regenerated."
137fi 137fi
138 138
139H=`pwd` 139H=`pwd`
140if [ -z "$TOMAKE" ] 140if [ -z "$TOMAKE" ]
141then 141then
142 TOMAKE=`make showcomponents` 142 TOMAKE=`make showcomponents`
143fi 143fi
144 144
145for a in $TOMAKE ; do 145for a in $TOMAKE ; do
146 N=$a/Makefile 146 N=$a/Makefile
147 M=$a/Makefile.in 147 M=$a/Makefile.in
148 O=$a/Makefile.add 148 O=$a/Makefile.add
149 f=`basename $a` 149 f=`basename $a`
150 150
151 if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ] 151 if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ]
152 then 152 then
153 ( cd $a; 153 ( cd $a;
154 TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ 154 TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \
155 tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ 155 tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \
156 -t $H/qt/tmake/propagate.t $f.pro | 156 -t $H/qt/tmake/propagate.t $f.pro |
157 sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$QPEDIR|\$(QPEDIR)|g" >Makefile.in; 157 sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in;
158 ) 158 )
159 echo -n "." 159 echo -n "."
160 appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` 160 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,,' ` 161 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" ] 162 if [ -n "$translation" -a -n "$appname" ]
163 then 163 then
164 if [ $appname != $translation ] 164 if [ $appname != $translation ]
165 then 165 then
166 echo 166 echo
167 echo "Warning: translation and appname disagree in $a/$f.pro" 167 echo "Warning: translation and appname disagree in $a/$f.pro"
168 fi 168 fi
169 fi 169 fi
170 170
171 fi 171 fi
172 172
173 cat > $N <<EOF 173 cat > $N <<EOF
174############################################################################# 174#############################################################################
175# Automatically generated from $M 175# Automatically generated from $M
176# Build options from $1 176# Build options from $1
177############################################################################# 177#############################################################################
178 178
179EOF 179EOF
180 180
181 SED= 181 SED=
182 PLATFORM_CFLAGS= 182 PLATFORM_CFLAGS=
183 183
184 if [ "$f" = "embeddedkonsole" ] 184 if [ "$f" = "embeddedkonsole" ]
185 then 185 then
186 case $PLATFORM in 186 case $PLATFORM in
187 *x86*|*generic*|*ipaq*) 187 *x86*|*generic*|*ipaq*)
188 SED="$SED /^LIBS.*=/s/\$/ -lutil/;" 188 SED="$SED /^LIBS.*=/s/\$/ -lutil/;"
189 PLATFORM_CFLAGS="-DHAVE_OPENPTY" 189 PLATFORM_CFLAGS="-DHAVE_OPENPTY"
190 ;; *) 190 ;; *)
191 SED= 191 SED=
192 esac 192 esac
193 elif [ "$f" = "libmpeg3" ] 193 elif [ "$f" = "libmpeg3" ]
194 then 194 then
195 # Patch our Makefile.in file with the platform specifics for the libmpeg3 library 195 # 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) 196 # Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code)
197 SED='s/\$(CC)/\$(CXX)/;' 197 SED='s/\$(CC)/\$(CXX)/;'
198 case $PLATFORM 198 case $PLATFORM
199 in 199 in
200 # For x86 turn on using floating point, compile mmx and css code 200 # For x86 turn on using floating point, compile mmx and css code
201 *x86*) 201 *x86*)
202 # "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486" 202 # "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486"
203 PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS" 203 PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS"
204 SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;" 204 SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;"
205 # For generic turn on using floating point 205 # For generic turn on using floating point
206 ;; *generic*) 206 ;; *generic*)
207 PLATFORM_CFLAGS="" 207 PLATFORM_CFLAGS=""
208 # For the ipaq use fixed point maths, don't compile the mmx or css code 208 # For the ipaq use fixed point maths, don't compile the mmx or css code
209 ;; *ipaq*) 209 ;; *ipaq*)
210 PLATFORM_CFLAGS="-DUSE_FIXED_POINT" 210 PLATFORM_CFLAGS="-DUSE_FIXED_POINT"
211 ;; *) 211 ;; *)
212 # For 'other platforms', turn off optimizations and use fixed point 212 # For 'other platforms', turn off optimizations and use fixed point
213 PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT" 213 PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT"
214 esac 214 esac
215 elif [ "$f" = "libmad" ] 215 elif [ "$f" = "libmad" ]
216 then 216 then
217 # Patch our Makefile.in file with the platform specifics for the libmad library 217 # Patch our Makefile.in file with the platform specifics for the libmad library
218 case $PLATFORM 218 case $PLATFORM
219 in 219 in
220 # For x86 use intel optimizations 220 # For x86 use intel optimizations
221 *x86*) 221 *x86*)
222 PLATFORM_CFLAGS="-DFPM_INTEL" 222 PLATFORM_CFLAGS="-DFPM_INTEL"
223 # For the ipaq use ARM asm optimizations 223 # For the ipaq use ARM asm optimizations
224 ;; *ipaq*) 224 ;; *ipaq*)
225 PLATFORM_CFLAGS="-DFPM_ARM" 225 PLATFORM_CFLAGS="-DFPM_ARM"
226 SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" 226 SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;"
227 # For generic platforms use the C 64-bit implementation 227 # For generic platforms use the C 64-bit implementation
228 ;; *generic*) 228 ;; *generic*)
229 PLATFORM_CFLAGS="-DFPM_64BIT" 229 PLATFORM_CFLAGS="-DFPM_64BIT"
230 # For 'other platforms' use the ARM code 230 # For 'other platforms' use the ARM code
231 ;; *) 231 ;; *)
232 PLATFORM_CFLAGS="-DFPM_ARM" 232 PLATFORM_CFLAGS="-DFPM_ARM"
233 SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" 233 SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;"
234 esac 234 esac
235 fi 235 fi
236 if [ -n "$PLATFORM_CFLAGS" ] 236 if [ -n "$PLATFORM_CFLAGS" ]
237 then 237 then
238 # Append the addition c-flags we have defined 238 # Append the addition c-flags we have defined
239 SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" 239 SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;"
240 SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" 240 SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;"
241 fi 241 fi
242 cat $TARGET >> $N 242 cat $TARGET >> $N
243 if [ -n "$SED" ] 243 if [ -n "$SED" ]
244 then 244 then
245 sed -e "$SED" $M >> $N 245 sed -e "$SED" $M >> $N
246 else 246 else
247 cat $M >> $N 247 cat $M >> $N
248 fi 248 fi
249 249
250 cat >> $N <<EOF 250 cat >> $N <<EOF
251 251
252lupdate: 252lupdate:
253 lupdate $f.pro 253 lupdate $f.pro
254 254
255lrelease: 255lrelease:
256 lrelease $f.pro 256 lrelease $f.pro
257 257
258EOF 258EOF
259 if [ -f "$O" ] 259 if [ -f "$O" ]
260 then 260 then
261 cat >> $N $O 261 cat >> $N $O
262 fi 262 fi
263 263
264done 264done
265 265
266MAKE=make 266MAKE=make
267echo 267echo
268echo "QPE is now configured for building. Just run $MAKE (or $MAKE single)." 268echo "QPE is now configured for building. Just run $MAKE (or $MAKE single)."
269echo "To reconfigure, run $MAKE clean and configure." 269echo "To reconfigure, run $MAKE clean and configure."
270echo 270echo
diff --git a/core/applets/batteryapplet/Makefile.in b/core/applets/batteryapplet/Makefile.in
index 0493fd6..ccf997b 100644
--- a/core/applets/batteryapplet/Makefile.in
+++ b/core/applets/batteryapplet/Makefile.in
@@ -1,122 +1,122 @@
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= batteryapplet 21 TARGET= batteryapplet
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =battery.h \ 26 HEADERS =battery.h \
27 batterystatus.h \ 27 batterystatus.h \
28 batteryappletimpl.h 28 batteryappletimpl.h
29 SOURCES =battery.cpp \ 29 SOURCES =battery.cpp \
30 batterystatus.cpp \ 30 batterystatus.cpp \
31 batteryappletimpl.cpp 31 batteryappletimpl.cpp
32 OBJECTS =battery.o \ 32 OBJECTS =battery.o \
33 batterystatus.o \ 33 batterystatus.o \
34 batteryappletimpl.o 34 batteryappletimpl.o
35INTERFACES = 35INTERFACES =
36UICDECLS = 36UICDECLS =
37UICIMPLS = 37UICIMPLS =
38 SRCMOC =moc_battery.cpp 38 SRCMOC =moc_battery.cpp
39 OBJMOC =moc_battery.o 39 OBJMOC =moc_battery.o
40 40
41 41
42####### Implicit rules 42####### Implicit rules
43 43
44.SUFFIXES: .cpp .cxx .cc .C .c 44.SUFFIXES: .cpp .cxx .cc .C .c
45 45
46.cpp.o: 46.cpp.o:
47 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 47 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
48 48
49.cxx.o: 49.cxx.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51 51
52.cc.o: 52.cc.o:
53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 53 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
54 54
55.C.o: 55.C.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57 57
58.c.o: 58.c.o:
59 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 59 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
60 60
61####### Build rules 61####### Build rules
62 62
63 63
64all: $(DESTDIR)$(SYSCONF_LINK_TARGET) 64all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
65 65
66$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 66$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
67 $(SYSCONF_LINK_LIB) 67 $(SYSCONF_LINK_LIB)
68 68
69moc: $(SRCMOC) 69moc: $(SRCMOC)
70 70
71tmake: 71tmake:
72 tmake batteryapplet.pro 72 tmake batteryapplet.pro
73 73
74clean: 74clean:
75 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 75 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
76 -rm -f *~ core 76 -rm -f *~ core
77 -rm -f allmoc.cpp 77 -rm -f allmoc.cpp
78 78
79####### Extension Modules 79####### Extension Modules
80 80
81listpromodules: 81listpromodules:
82 @echo 82 @echo
83 83
84listallmodules: 84listallmodules:
85 @echo 85 @echo
86 86
87listaddonpromodules: 87listaddonpromodules:
88 @echo 88 @echo
89 89
90listaddonentmodules: 90listaddonentmodules:
91 @echo 91 @echo
92 92
93 93
94REQUIRES= 94REQUIRES=
95 95
96####### Sub-libraries 96####### Sub-libraries
97 97
98 98
99###### Combined headers 99###### Combined headers
100 100
101 101
102 102
103####### Compile 103####### Compile
104 104
105battery.o: battery.cpp \ 105battery.o: battery.cpp \
106 battery.h \ 106 battery.h \
107 batterystatus.h 107 batterystatus.h
108 108
109batterystatus.o: batterystatus.cpp \ 109batterystatus.o: batterystatus.cpp \
110 batterystatus.h 110 batterystatus.h
111 111
112batteryappletimpl.o: batteryappletimpl.cpp \ 112batteryappletimpl.o: batteryappletimpl.cpp \
113 battery.h \ 113 battery.h \
114 batteryappletimpl.h 114 batteryappletimpl.h
115 115
116moc_battery.o: moc_battery.cpp \ 116moc_battery.o: moc_battery.cpp \
117 battery.h 117 battery.h
118 118
119moc_battery.cpp: battery.h 119moc_battery.cpp: battery.h
120 $(MOC) battery.h -o moc_battery.cpp 120 $(MOC) battery.h -o moc_battery.cpp
121 121
122 122
diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro
index fa0fca8..dcb606d 100644
--- a/core/applets/batteryapplet/batteryapplet.pro
+++ b/core/applets/batteryapplet/batteryapplet.pro
@@ -1,12 +1,12 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= battery.h batterystatus.h batteryappletimpl.h 3 HEADERS= battery.h batterystatus.h batteryappletimpl.h
4 SOURCES= battery.cpp batterystatus.cpp batteryappletimpl.cpp 4 SOURCES= battery.cpp batterystatus.cpp batteryappletimpl.cpp
5 TARGET = batteryapplet 5 TARGET = batteryapplet
6 DESTDIR = ../../plugins/applets 6 DESTDIR = ../../plugins/applets
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(QPEDIR)/include .. 8DEPENDPATH += ../$(OPIEDIR)/include ..
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
12TRANSLATIONS += ../../i18n/de/libbatteryapplet.ts 12TRANSLATIONS += ../../i18n/de/libbatteryapplet.ts
diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro
index b0624ef..9832984 100644
--- a/core/applets/clipboardapplet/clipboardapplet.pro
+++ b/core/applets/clipboardapplet/clipboardapplet.pro
@@ -1,10 +1,10 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= clipboard.h clipboardappletimpl.h 3 HEADERS= clipboard.h clipboardappletimpl.h
4 SOURCES= clipboard.cpp clipboardappletimpl.cpp 4 SOURCES= clipboard.cpp clipboardappletimpl.cpp
5 TARGET = clipboardapplet 5 TARGET = clipboardapplet
6 DESTDIR = ../../plugins/applets 6 DESTDIR = ../../plugins/applets
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(QPEDIR)/include 8DEPENDPATH += ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
diff --git a/core/applets/clockapplet/Makefile.in b/core/applets/clockapplet/Makefile.in
index fcf737e..742f25f 100644
--- a/core/applets/clockapplet/Makefile.in
+++ b/core/applets/clockapplet/Makefile.in
@@ -1,115 +1,115 @@
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= clockapplet 21 TARGET= clockapplet
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =clock.h \ 26 HEADERS =clock.h \
27 clockappletimpl.h 27 clockappletimpl.h
28 SOURCES =clock.cpp \ 28 SOURCES =clock.cpp \
29 clockappletimpl.cpp 29 clockappletimpl.cpp
30 OBJECTS =clock.o \ 30 OBJECTS =clock.o \
31 clockappletimpl.o 31 clockappletimpl.o
32INTERFACES = 32INTERFACES =
33UICDECLS = 33UICDECLS =
34UICIMPLS = 34UICIMPLS =
35 SRCMOC =moc_clock.cpp 35 SRCMOC =moc_clock.cpp
36 OBJMOC =moc_clock.o 36 OBJMOC =moc_clock.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:
69 tmake clockapplet.pro 69 tmake clockapplet.pro
70 70
71clean: 71clean:
72 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 72 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
73 -rm -f *~ core 73 -rm -f *~ core
74 -rm -f allmoc.cpp 74 -rm -f allmoc.cpp
75 75
76####### Extension Modules 76####### Extension Modules
77 77
78listpromodules: 78listpromodules:
79 @echo 79 @echo
80 80
81listallmodules: 81listallmodules:
82 @echo 82 @echo
83 83
84listaddonpromodules: 84listaddonpromodules:
85 @echo 85 @echo
86 86
87listaddonentmodules: 87listaddonentmodules:
88 @echo 88 @echo
89 89
90 90
91REQUIRES= 91REQUIRES=
92 92
93####### Sub-libraries 93####### Sub-libraries
94 94
95 95
96###### Combined headers 96###### Combined headers
97 97
98 98
99 99
100####### Compile 100####### Compile
101 101
102clock.o: clock.cpp \ 102clock.o: clock.cpp \
103 clock.h 103 clock.h
104 104
105clockappletimpl.o: clockappletimpl.cpp \ 105clockappletimpl.o: clockappletimpl.cpp \
106 clock.h \ 106 clock.h \
107 clockappletimpl.h 107 clockappletimpl.h
108 108
109moc_clock.o: moc_clock.cpp \ 109moc_clock.o: moc_clock.cpp \
110 clock.h 110 clock.h
111 111
112moc_clock.cpp: clock.h 112moc_clock.cpp: clock.h
113 $(MOC) clock.h -o moc_clock.cpp 113 $(MOC) clock.h -o moc_clock.cpp
114 114
115 115
diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro
index 29a4e8b..1392680 100644
--- a/core/applets/clockapplet/clockapplet.pro
+++ b/core/applets/clockapplet/clockapplet.pro
@@ -1,12 +1,12 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= clock.h clockappletimpl.h 3 HEADERS= clock.h clockappletimpl.h
4 SOURCES= clock.cpp clockappletimpl.cpp 4 SOURCES= clock.cpp clockappletimpl.cpp
5 TARGET = clockapplet 5 TARGET = clockapplet
6 DESTDIR = ../../plugins/applets 6 DESTDIR = ../../plugins/applets
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(QPEDIR)/include .. 8DEPENDPATH += ../$(OPIEDIR)/include ..
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
12TRANSLATIONS += ../../i18n/de/libclockapplet.ts 12TRANSLATIONS += ../../i18n/de/libclockapplet.ts
diff --git a/core/applets/volumeapplet/Makefile.in b/core/applets/volumeapplet/Makefile.in
index 7020cb7..49acf38 100644
--- a/core/applets/volumeapplet/Makefile.in
+++ b/core/applets/volumeapplet/Makefile.in
@@ -1,115 +1,115 @@
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= volumeapplet 21 TARGET= volumeapplet
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =volume.h \ 26 HEADERS =volume.h \
27 volumeappletimpl.h 27 volumeappletimpl.h
28 SOURCES =volume.cpp \ 28 SOURCES =volume.cpp \
29 volumeappletimpl.cpp 29 volumeappletimpl.cpp
30 OBJECTS =volume.o \ 30 OBJECTS =volume.o \
31 volumeappletimpl.o 31 volumeappletimpl.o
32INTERFACES = 32INTERFACES =
33UICDECLS = 33UICDECLS =
34UICIMPLS = 34UICIMPLS =
35 SRCMOC =moc_volume.cpp 35 SRCMOC =moc_volume.cpp
36 OBJMOC =moc_volume.o 36 OBJMOC =moc_volume.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:
69 tmake volumeapplet.pro 69 tmake volumeapplet.pro
70 70
71clean: 71clean:
72 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 72 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
73 -rm -f *~ core 73 -rm -f *~ core
74 -rm -f allmoc.cpp 74 -rm -f allmoc.cpp
75 75
76####### Extension Modules 76####### Extension Modules
77 77
78listpromodules: 78listpromodules:
79 @echo 79 @echo
80 80
81listallmodules: 81listallmodules:
82 @echo 82 @echo
83 83
84listaddonpromodules: 84listaddonpromodules:
85 @echo 85 @echo
86 86
87listaddonentmodules: 87listaddonentmodules:
88 @echo 88 @echo
89 89
90 90
91REQUIRES= 91REQUIRES=
92 92
93####### Sub-libraries 93####### Sub-libraries
94 94
95 95
96###### Combined headers 96###### Combined headers
97 97
98 98
99 99
100####### Compile 100####### Compile
101 101
102volume.o: volume.cpp \ 102volume.o: volume.cpp \
103 volume.h 103 volume.h
104 104
105volumeappletimpl.o: volumeappletimpl.cpp \ 105volumeappletimpl.o: volumeappletimpl.cpp \
106 volume.h \ 106 volume.h \
107 volumeappletimpl.h 107 volumeappletimpl.h
108 108
109moc_volume.o: moc_volume.cpp \ 109moc_volume.o: moc_volume.cpp \
110 volume.h 110 volume.h
111 111
112moc_volume.cpp: volume.h 112moc_volume.cpp: volume.h
113 $(MOC) volume.h -o moc_volume.cpp 113 $(MOC) volume.h -o moc_volume.cpp
114 114
115 115
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro
index a33cf81..fedaed7 100644
--- a/core/applets/volumeapplet/volumeapplet.pro
+++ b/core/applets/volumeapplet/volumeapplet.pro
@@ -1,12 +1,12 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= volume.h volumeappletimpl.h 3 HEADERS= volume.h volumeappletimpl.h
4 SOURCES= volume.cpp volumeappletimpl.cpp 4 SOURCES= volume.cpp volumeappletimpl.cpp
5 TARGET = volumeapplet 5 TARGET = volumeapplet
6 DESTDIR = ../../plugins/applets 6 DESTDIR = ../../plugins/applets
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(QPEDIR)/include 8DEPENDPATH += ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
12TRANSLATIONS += ../../i18n/de/libvolumeapplet.ts 12TRANSLATIONS += ../../i18n/de/libvolumeapplet.ts
diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in
index b858cd4..8a69557 100644
--- a/core/apps/embeddedkonsole/Makefile.in
+++ b/core/apps/embeddedkonsole/Makefile.in
@@ -1,285 +1,286 @@
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$(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 = $(QPEDIR)/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:
103 tmake embeddedkonsole.pro 103 tmake embeddedkonsole.pro
104 104
105clean: 105clean:
106 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 106 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
107 -rm -f *~ core 107 -rm -f *~ core
108 -rm -f allmoc.cpp 108 -rm -f allmoc.cpp
109 109
110####### Extension Modules 110####### Extension Modules
111 111
112listpromodules: 112listpromodules:
113 @echo 113 @echo
114 114
115listallmodules: 115listallmodules:
116 @echo 116 @echo
117 117
118listaddonpromodules: 118listaddonpromodules:
119 @echo 119 @echo
120 120
121listaddonentmodules: 121listaddonentmodules:
122 @echo 122 @echo
123 123
124 124
125REQUIRES=embeddedkonsole 125REQUIRES=embeddedkonsole
126 126
127####### Sub-libraries 127####### Sub-libraries
128 128
129 129
130###### Combined headers 130###### Combined headers
131 131
132 132
133 133
134####### Compile 134####### Compile
135 135
136TEScreen.o: TEScreen.cpp \ 136TEScreen.o: TEScreen.cpp \
137 TEScreen.h \ 137 TEScreen.h \
138 TECommon.h \ 138 TECommon.h \
139 TEHistory.h 139 TEHistory.h
140 140
141TEWidget.o: TEWidget.cpp \ 141TEWidget.o: TEWidget.cpp \
142 TEWidget.h \ 142 TEWidget.h \
143 TECommon.h \ 143 TECommon.h \
144 session.h \ 144 session.h \
145 MyPty.h \ 145 MyPty.h \
146 TEmuVt102.h \ 146 TEmuVt102.h \
147 TEScreen.h \ 147 TEScreen.h \
148 TEHistory.h \ 148 TEHistory.h \
149 TEmulation.h \ 149 TEmulation.h \
150 keytrans.h 150 keytrans.h
151 151
152TEHistory.o: TEHistory.cpp \ 152TEHistory.o: TEHistory.cpp \
153 TEHistory.h \ 153 TEHistory.h \
154 TECommon.h 154 TECommon.h
155 155
156TEmulation.o: TEmulation.cpp \ 156TEmulation.o: TEmulation.cpp \
157 TEmulation.h \ 157 TEmulation.h \
158 TEWidget.h \ 158 TEWidget.h \
159 TECommon.h \ 159 TECommon.h \
160 TEScreen.h \ 160 TEScreen.h \
161 TEHistory.h \ 161 TEHistory.h \
162 keytrans.h 162 keytrans.h
163 163
164TEmuVt102.o: TEmuVt102.cpp \ 164TEmuVt102.o: TEmuVt102.cpp \
165 TEmuVt102.h \ 165 TEmuVt102.h \
166 TEWidget.h \ 166 TEWidget.h \
167 TECommon.h \ 167 TECommon.h \
168 TEScreen.h \ 168 TEScreen.h \
169 TEHistory.h \ 169 TEHistory.h \
170 TEmulation.h \ 170 TEmulation.h \
171 keytrans.h 171 keytrans.h
172 172
173session.o: session.cpp \ 173session.o: session.cpp \
174 session.h \ 174 session.h \
175 MyPty.h \ 175 MyPty.h \
176 TEWidget.h \ 176 TEWidget.h \
177 TECommon.h \ 177 TECommon.h \
178 TEmuVt102.h \ 178 TEmuVt102.h \
179 TEScreen.h \ 179 TEScreen.h \
180 TEHistory.h \ 180 TEHistory.h \
181 TEmulation.h \ 181 TEmulation.h \
182 keytrans.h 182 keytrans.h
183 183
184keytrans.o: keytrans.cpp \ 184keytrans.o: keytrans.cpp \
185 keytrans.h \ 185 keytrans.h \
186 $(QPEDIR)/include/qpe/qpeapplication.h \ 186 $(OPIEDIR)/include/qpe/qpeapplication.h \
187 default.keytab.h 187 default.keytab.h
188 188
189konsole.o: konsole.cpp \ 189konsole.o: konsole.cpp \
190 $(QPEDIR)/include/qpe/resource.h \ 190 $(OPIEDIR)/include/qpe/resource.h \
191 $(QPEDIR)/include/qpe/qpetoolbar.h \ 191 $(OPIEDIR)/include/qpe/qpetoolbar.h \
192 $(QPEDIR)/include/qpe/qpemenubar.h \ 192 $(OPIEDIR)/include/qpe/qpemenubar.h \
193 $(OPIEDIR)/include/qpe/config.h \
193 konsole.h \ 194 konsole.h \
194 MyPty.h \ 195 MyPty.h \
195 TEWidget.h \ 196 TEWidget.h \
196 TECommon.h \ 197 TECommon.h \
197 TEmuVt102.h \ 198 TEmuVt102.h \
198 TEScreen.h \ 199 TEScreen.h \
199 TEHistory.h \ 200 TEHistory.h \
200 TEmulation.h \ 201 TEmulation.h \
201 keytrans.h \ 202 keytrans.h \
202 session.h 203 session.h
203 204
204main.o: main.cpp \ 205main.o: main.cpp \
205 konsole.h \ 206 konsole.h \
206 MyPty.h \ 207 MyPty.h \
207 TEWidget.h \ 208 TEWidget.h \
208 TECommon.h \ 209 TECommon.h \
209 TEmuVt102.h \ 210 TEmuVt102.h \
210 TEScreen.h \ 211 TEScreen.h \
211 TEHistory.h \ 212 TEHistory.h \
212 TEmulation.h \ 213 TEmulation.h \
213 keytrans.h \ 214 keytrans.h \
214 session.h \ 215 session.h \
215 $(QPEDIR)/include/qpe/qpeapplication.h 216 $(OPIEDIR)/include/qpe/qpeapplication.h
216 217
217MyPty.o: MyPty.cpp \ 218MyPty.o: MyPty.cpp \
218 MyPty.h 219 MyPty.h
219 220
220moc_TEWidget.o: moc_TEWidget.cpp \ 221moc_TEWidget.o: moc_TEWidget.cpp \
221 TEWidget.h \ 222 TEWidget.h \
222 TECommon.h 223 TECommon.h
223 224
224moc_TEmulation.o: moc_TEmulation.cpp \ 225moc_TEmulation.o: moc_TEmulation.cpp \
225 TEmulation.h \ 226 TEmulation.h \
226 TEWidget.h \ 227 TEWidget.h \
227 TECommon.h \ 228 TECommon.h \
228 TEScreen.h \ 229 TEScreen.h \
229 TEHistory.h \ 230 TEHistory.h \
230 keytrans.h 231 keytrans.h
231 232
232moc_TEmuVt102.o: moc_TEmuVt102.cpp \ 233moc_TEmuVt102.o: moc_TEmuVt102.cpp \
233 TEmuVt102.h \ 234 TEmuVt102.h \
234 TEWidget.h \ 235 TEWidget.h \
235 TECommon.h \ 236 TECommon.h \
236 TEScreen.h \ 237 TEScreen.h \
237 TEHistory.h \ 238 TEHistory.h \
238 TEmulation.h \ 239 TEmulation.h \
239 keytrans.h 240 keytrans.h
240 241
241moc_session.o: moc_session.cpp \ 242moc_session.o: moc_session.cpp \
242 session.h \ 243 session.h \
243 MyPty.h \ 244 MyPty.h \
244 TEWidget.h \ 245 TEWidget.h \
245 TECommon.h \ 246 TECommon.h \
246 TEmuVt102.h \ 247 TEmuVt102.h \
247 TEScreen.h \ 248 TEScreen.h \
248 TEHistory.h \ 249 TEHistory.h \
249 TEmulation.h \ 250 TEmulation.h \
250 keytrans.h 251 keytrans.h
251 252
252moc_konsole.o: moc_konsole.cpp \ 253moc_konsole.o: moc_konsole.cpp \
253 konsole.h \ 254 konsole.h \
254 MyPty.h \ 255 MyPty.h \
255 TEWidget.h \ 256 TEWidget.h \
256 TECommon.h \ 257 TECommon.h \
257 TEmuVt102.h \ 258 TEmuVt102.h \
258 TEScreen.h \ 259 TEScreen.h \
259 TEHistory.h \ 260 TEHistory.h \
260 TEmulation.h \ 261 TEmulation.h \
261 keytrans.h \ 262 keytrans.h \
262 session.h 263 session.h
263 264
264moc_MyPty.o: moc_MyPty.cpp \ 265moc_MyPty.o: moc_MyPty.cpp \
265 MyPty.h 266 MyPty.h
266 267
267moc_TEWidget.cpp: TEWidget.h 268moc_TEWidget.cpp: TEWidget.h
268 $(MOC) TEWidget.h -o moc_TEWidget.cpp 269 $(MOC) TEWidget.h -o moc_TEWidget.cpp
269 270
270moc_TEmulation.cpp: TEmulation.h 271moc_TEmulation.cpp: TEmulation.h
271 $(MOC) TEmulation.h -o moc_TEmulation.cpp 272 $(MOC) TEmulation.h -o moc_TEmulation.cpp
272 273
273moc_TEmuVt102.cpp: TEmuVt102.h 274moc_TEmuVt102.cpp: TEmuVt102.h
274 $(MOC) TEmuVt102.h -o moc_TEmuVt102.cpp 275 $(MOC) TEmuVt102.h -o moc_TEmuVt102.cpp
275 276
276moc_session.cpp: session.h 277moc_session.cpp: session.h
277 $(MOC) session.h -o moc_session.cpp 278 $(MOC) session.h -o moc_session.cpp
278 279
279moc_konsole.cpp: konsole.h 280moc_konsole.cpp: konsole.h
280 $(MOC) konsole.h -o moc_konsole.cpp 281 $(MOC) konsole.h -o moc_konsole.cpp
281 282
282moc_MyPty.cpp: MyPty.h 283moc_MyPty.cpp: MyPty.h
283 $(MOC) MyPty.h -o moc_MyPty.cpp 284 $(MOC) MyPty.h -o moc_MyPty.cpp
284 285
285 286
diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro
index b757ea5..3452014 100755
--- a/core/apps/embeddedkonsole/embeddedkonsole.pro
+++ b/core/apps/embeddedkonsole/embeddedkonsole.pro
@@ -1,38 +1,38 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 2
3 CONFIG += qt warn_on release 3 CONFIG += qt warn_on release
4 4
5 DESTDIR = $(QPEDIR)/bin 5 DESTDIR = $(OPIEDIR)/bin
6 6
7 HEADERS = TEWidget.h \ 7 HEADERS = TEWidget.h \
8 TEScreen.h \ 8 TEScreen.h \
9 TECommon.h \ 9 TECommon.h \
10 TEHistory.h \ 10 TEHistory.h \
11 TEmulation.h \ 11 TEmulation.h \
12 TEmuVt102.h \ 12 TEmuVt102.h \
13 session.h \ 13 session.h \
14 keytrans.h \ 14 keytrans.h \
15 konsole.h \ 15 konsole.h \
16 MyPty.h 16 MyPty.h
17 17
18 SOURCES = TEScreen.cpp \ 18 SOURCES = TEScreen.cpp \
19 TEWidget.cpp \ 19 TEWidget.cpp \
20 TEHistory.cpp \ 20 TEHistory.cpp \
21 TEmulation.cpp \ 21 TEmulation.cpp \
22 TEmuVt102.cpp \ 22 TEmuVt102.cpp \
23 session.cpp \ 23 session.cpp \
24 keytrans.cpp \ 24 keytrans.cpp \
25 konsole.cpp \ 25 konsole.cpp \
26 main.cpp \ 26 main.cpp \
27 MyPty.cpp 27 MyPty.cpp
28 28
29 TARGET = embeddedkonsole 29 TARGET = embeddedkonsole
30 30
31INCLUDEPATH += $(QPEDIR)/include 31INCLUDEPATH += $(OPIEDIR)/include
32 32
33 DEPENDPATH+= $(QPEDIR)/include 33 DEPENDPATH+= $(OPIEDIR)/include
34 34
35LIBS += -lqpe 35LIBS += -lqpe
36 36
37 REQUIRES= embeddedkonsole 37 REQUIRES= embeddedkonsole
38 38
diff --git a/core/apps/helpbrowser/Makefile.in b/core/apps/helpbrowser/Makefile.in
index 8f0ce0e..ed3ea03 100644
--- a/core/apps/helpbrowser/Makefile.in
+++ b/core/apps/helpbrowser/Makefile.in
@@ -1,119 +1,119 @@
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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= helpbrowser 21 TARGET= helpbrowser
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =helpbrowser.h 26 HEADERS =helpbrowser.h
27 SOURCES =helpbrowser.cpp \ 27 SOURCES =helpbrowser.cpp \
28 main.cpp 28 main.cpp
29 OBJECTS =helpbrowser.o \ 29 OBJECTS =helpbrowser.o \
30 main.o 30 main.o
31INTERFACES = 31INTERFACES =
32UICDECLS = 32UICDECLS =
33UICIMPLS = 33UICIMPLS =
34 SRCMOC =moc_helpbrowser.cpp 34 SRCMOC =moc_helpbrowser.cpp
35 OBJMOC =moc_helpbrowser.o 35 OBJMOC =moc_helpbrowser.o
36 36
37 37
38####### Implicit rules 38####### Implicit rules
39 39
40.SUFFIXES: .cpp .cxx .cc .C .c 40.SUFFIXES: .cpp .cxx .cc .C .c
41 41
42.cpp.o: 42.cpp.o:
43 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 43 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
44 44
45.cxx.o: 45.cxx.o:
46 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 46 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
47 47
48.cc.o: 48.cc.o:
49 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 49 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
50 50
51.C.o: 51.C.o:
52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
53 53
54.c.o: 54.c.o:
55 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 55 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
56 56
57####### Build rules 57####### Build rules
58 58
59 59
60all: $(DESTDIR)$(TARGET) 60all: $(DESTDIR)$(TARGET)
61 61
62$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 62$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
63 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 63 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
64 64
65moc: $(SRCMOC) 65moc: $(SRCMOC)
66 66
67tmake: 67tmake:
68 tmake helpbrowser.pro 68 tmake helpbrowser.pro
69 69
70clean: 70clean:
71 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 71 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
72 -rm -f *~ core 72 -rm -f *~ core
73 -rm -f allmoc.cpp 73 -rm -f allmoc.cpp
74 74
75####### Extension Modules 75####### Extension Modules
76 76
77listpromodules: 77listpromodules:
78 @echo 78 @echo
79 79
80listallmodules: 80listallmodules:
81 @echo 81 @echo
82 82
83listaddonpromodules: 83listaddonpromodules:
84 @echo 84 @echo
85 85
86listaddonentmodules: 86listaddonentmodules:
87 @echo 87 @echo
88 88
89 89
90REQUIRES= 90REQUIRES=
91 91
92####### Sub-libraries 92####### Sub-libraries
93 93
94 94
95###### Combined headers 95###### Combined headers
96 96
97 97
98 98
99####### Compile 99####### Compile
100 100
101helpbrowser.o: helpbrowser.cpp \ 101helpbrowser.o: helpbrowser.cpp \
102 helpbrowser.h \ 102 helpbrowser.h \
103 $(QPEDIR)/include/qpe/qpeapplication.h \ 103 $(OPIEDIR)/include/qpe/qpeapplication.h \
104 $(QPEDIR)/include/qpe/resource.h \ 104 $(OPIEDIR)/include/qpe/resource.h \
105 $(QPEDIR)/include/qpe/global.h \ 105 $(OPIEDIR)/include/qpe/global.h \
106 $(QPEDIR)/include/qpe/qpemenubar.h \ 106 $(OPIEDIR)/include/qpe/qpemenubar.h \
107 $(QPEDIR)/include/qpe/qpetoolbar.h 107 $(OPIEDIR)/include/qpe/qpetoolbar.h
108 108
109main.o: main.cpp \ 109main.o: main.cpp \
110 helpbrowser.h \ 110 helpbrowser.h \
111 $(QPEDIR)/include/qpe/qpeapplication.h 111 $(OPIEDIR)/include/qpe/qpeapplication.h
112 112
113moc_helpbrowser.o: moc_helpbrowser.cpp \ 113moc_helpbrowser.o: moc_helpbrowser.cpp \
114 helpbrowser.h 114 helpbrowser.h
115 115
116moc_helpbrowser.cpp: helpbrowser.h 116moc_helpbrowser.cpp: helpbrowser.h
117 $(MOC) helpbrowser.h -o moc_helpbrowser.cpp 117 $(MOC) helpbrowser.h -o moc_helpbrowser.cpp
118 118
119 119
diff --git a/core/apps/helpbrowser/helpbrowser.pro b/core/apps/helpbrowser/helpbrowser.pro
index 43230f1..f6ede8b 100644
--- a/core/apps/helpbrowser/helpbrowser.pro
+++ b/core/apps/helpbrowser/helpbrowser.pro
@@ -1,12 +1,12 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = helpbrowser.h 4 HEADERS = helpbrowser.h
5 SOURCES = helpbrowser.cpp \ 5 SOURCES = helpbrowser.cpp \
6 main.cpp 6 main.cpp
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(QPEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 INTERFACES= 10 INTERFACES=
11 11
12TRANSLATIONS = ../i18n/de/helpbrowser.ts 12TRANSLATIONS = ../i18n/de/helpbrowser.ts
diff --git a/core/apps/qcop/Makefile.in b/core/apps/qcop/Makefile.in
index 0a12320..fd543f5 100644
--- a/core/apps/qcop/Makefile.in
+++ b/core/apps/qcop/Makefile.in
@@ -1,102 +1,102 @@
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$(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= qcop 21 TARGET= qcop
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS = 26 HEADERS =
27 SOURCES =main.cpp 27 SOURCES =main.cpp
28 OBJECTS =main.o 28 OBJECTS =main.o
29INTERFACES = 29INTERFACES =
30UICDECLS = 30UICDECLS =
31UICIMPLS = 31UICIMPLS =
32 SRCMOC = 32 SRCMOC =
33 OBJMOC = 33 OBJMOC =
34 34
35 35
36####### Implicit rules 36####### Implicit rules
37 37
38.SUFFIXES: .cpp .cxx .cc .C .c 38.SUFFIXES: .cpp .cxx .cc .C .c
39 39
40.cpp.o: 40.cpp.o:
41 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 41 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
42 42
43.cxx.o: 43.cxx.o:
44 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 44 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
45 45
46.cc.o: 46.cc.o:
47 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 47 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
48 48
49.C.o: 49.C.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51 51
52.c.o: 52.c.o:
53 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 53 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
54 54
55####### Build rules 55####### Build rules
56 56
57 57
58all: $(DESTDIR)$(TARGET) 58all: $(DESTDIR)$(TARGET)
59 59
60$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 60$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
61 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 61 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
62 62
63moc: $(SRCMOC) 63moc: $(SRCMOC)
64 64
65tmake: 65tmake:
66 tmake qcop.pro 66 tmake qcop.pro
67 67
68clean: 68clean:
69 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 69 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
70 -rm -f *~ core 70 -rm -f *~ core
71 -rm -f allmoc.cpp 71 -rm -f allmoc.cpp
72 72
73####### Extension Modules 73####### Extension Modules
74 74
75listpromodules: 75listpromodules:
76 @echo 76 @echo
77 77
78listallmodules: 78listallmodules:
79 @echo 79 @echo
80 80
81listaddonpromodules: 81listaddonpromodules:
82 @echo 82 @echo
83 83
84listaddonentmodules: 84listaddonentmodules:
85 @echo 85 @echo
86 86
87 87
88REQUIRES= 88REQUIRES=
89 89
90####### Sub-libraries 90####### Sub-libraries
91 91
92 92
93###### Combined headers 93###### Combined headers
94 94
95 95
96 96
97####### Compile 97####### Compile
98 98
99main.o: main.cpp \ 99main.o: main.cpp \
100 $(QPEDIR)/include/qpe/qcopenvelope_qws.h 100 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
101 101
102 102
diff --git a/core/apps/qcop/qcop.pro b/core/apps/qcop/qcop.pro
index b52bfd8..3ffe796 100644
--- a/core/apps/qcop/qcop.pro
+++ b/core/apps/qcop/qcop.pro
@@ -1,10 +1,10 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = ../bin 3 DESTDIR = ../bin
4 HEADERS = 4 HEADERS =
5 SOURCES = main.cpp 5 SOURCES = main.cpp
6INCLUDEPATH += $(QPEDIR)/include 6INCLUDEPATH += $(OPIEDIR)/include
7 DEPENDPATH+= $(QPEDIR)/include 7 DEPENDPATH+= $(OPIEDIR)/include
8LIBS += -lqpe 8LIBS += -lqpe
9 INTERFACES= 9 INTERFACES=
10 TARGET = qcop 10 TARGET = qcop
diff --git a/core/apps/textedit/Makefile.in b/core/apps/textedit/Makefile.in
index 84542bb..997f2a4 100644
--- a/core/apps/textedit/Makefile.in
+++ b/core/apps/textedit/Makefile.in
@@ -1,125 +1,125 @@
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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= textedit 21 TARGET= textedit
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =textedit.h 26 HEADERS =textedit.h
27 SOURCES =main.cpp \ 27 SOURCES =main.cpp \
28 textedit.cpp 28 textedit.cpp
29 OBJECTS =main.o \ 29 OBJECTS =main.o \
30 textedit.o 30 textedit.o
31INTERFACES = 31INTERFACES =
32UICDECLS = 32UICDECLS =
33UICIMPLS = 33UICIMPLS =
34 SRCMOC =moc_textedit.cpp 34 SRCMOC =moc_textedit.cpp
35 OBJMOC =moc_textedit.o 35 OBJMOC =moc_textedit.o
36 36
37 37
38####### Implicit rules 38####### Implicit rules
39 39
40.SUFFIXES: .cpp .cxx .cc .C .c 40.SUFFIXES: .cpp .cxx .cc .C .c
41 41
42.cpp.o: 42.cpp.o:
43 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 43 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
44 44
45.cxx.o: 45.cxx.o:
46 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 46 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
47 47
48.cc.o: 48.cc.o:
49 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 49 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
50 50
51.C.o: 51.C.o:
52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
53 53
54.c.o: 54.c.o:
55 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 55 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
56 56
57####### Build rules 57####### Build rules
58 58
59 59
60all: $(DESTDIR)$(TARGET) 60all: $(DESTDIR)$(TARGET)
61 61
62$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 62$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
63 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 63 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
64 64
65moc: $(SRCMOC) 65moc: $(SRCMOC)
66 66
67tmake: 67tmake:
68 tmake textedit.pro 68 tmake textedit.pro
69 69
70clean: 70clean:
71 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 71 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
72 -rm -f *~ core 72 -rm -f *~ core
73 -rm -f allmoc.cpp 73 -rm -f allmoc.cpp
74 74
75####### Extension Modules 75####### Extension Modules
76 76
77listpromodules: 77listpromodules:
78 @echo 78 @echo
79 79
80listallmodules: 80listallmodules:
81 @echo 81 @echo
82 82
83listaddonpromodules: 83listaddonpromodules:
84 @echo 84 @echo
85 85
86listaddonentmodules: 86listaddonentmodules:
87 @echo 87 @echo
88 88
89 89
90REQUIRES= 90REQUIRES=
91 91
92####### Sub-libraries 92####### Sub-libraries
93 93
94 94
95###### Combined headers 95###### Combined headers
96 96
97 97
98 98
99####### Compile 99####### Compile
100 100
101main.o: main.cpp \ 101main.o: main.cpp \
102 textedit.h \ 102 textedit.h \
103 $(QPEDIR)/include/qpe/filemanager.h \ 103 $(OPIEDIR)/include/qpe/filemanager.h \
104 $(QPEDIR)/include/qpe/qpeapplication.h 104 $(OPIEDIR)/include/qpe/qpeapplication.h
105 105
106textedit.o: textedit.cpp \ 106textedit.o: textedit.cpp \
107 textedit.h \ 107 textedit.h \
108 $(QPEDIR)/include/qpe/filemanager.h \ 108 $(OPIEDIR)/include/qpe/filemanager.h \
109 $(QPEDIR)/include/qpe/global.h \ 109 $(OPIEDIR)/include/qpe/global.h \
110 $(QPEDIR)/include/qpe/fileselector.h \ 110 $(OPIEDIR)/include/qpe/fileselector.h \
111 $(QPEDIR)/include/qpe/applnk.h \ 111 $(OPIEDIR)/include/qpe/applnk.h \
112 $(QPEDIR)/include/qpe/resource.h \ 112 $(OPIEDIR)/include/qpe/resource.h \
113 $(QPEDIR)/include/qpe/config.h \ 113 $(OPIEDIR)/include/qpe/config.h \
114 $(QPEDIR)/include/qpe/qpeapplication.h \ 114 $(OPIEDIR)/include/qpe/qpeapplication.h \
115 $(QPEDIR)/include/qpe/qpemenubar.h \ 115 $(OPIEDIR)/include/qpe/qpemenubar.h \
116 $(QPEDIR)/include/qpe/qpetoolbar.h 116 $(OPIEDIR)/include/qpe/qpetoolbar.h
117 117
118moc_textedit.o: moc_textedit.cpp \ 118moc_textedit.o: moc_textedit.cpp \
119 textedit.h \ 119 textedit.h \
120 $(QPEDIR)/include/qpe/filemanager.h 120 $(OPIEDIR)/include/qpe/filemanager.h
121 121
122moc_textedit.cpp: textedit.h 122moc_textedit.cpp: textedit.h
123 $(MOC) textedit.h -o moc_textedit.cpp 123 $(MOC) textedit.h -o moc_textedit.cpp
124 124
125 125
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro
index 3f5473e..23b8d8d 100644
--- a/core/apps/textedit/textedit.pro
+++ b/core/apps/textedit/textedit.pro
@@ -1,16 +1,16 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 3
4 DESTDIR = $(QPEDIR)/bin 4 DESTDIR = $(OPIEDIR)/bin
5 5
6 HEADERS= textedit.h 6 HEADERS= textedit.h
7 7
8 SOURCES= main.cpp textedit.cpp 8 SOURCES= main.cpp textedit.cpp
9 9
10INCLUDEPATH += $(QPEDIR)/include 10INCLUDEPATH += $(OPIEDIR)/include
11 DEPENDPATH+= $(QPEDIR)/include 11 DEPENDPATH+= $(OPIEDIR)/include
12LIBS += -lqpe 12LIBS += -lqpe
13 13
14 TARGET = textedit 14 TARGET = textedit
15 15
16TRANSLATIONS = ../i18n/de/textedit.ts 16TRANSLATIONS = ../i18n/de/textedit.ts
diff --git a/core/launcher/Makefile.in b/core/launcher/Makefile.in
index e129fca..5e2dbe5 100644
--- a/core/launcher/Makefile.in
+++ b/core/launcher/Makefile.in
@@ -1,867 +1,876 @@
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$(QPEDIR)/include -I$(QPEDIR)/calibrate -I$(QPEDIR)/rsync 9 INCPATH =-I$(OPIEDIR)/include -I$(OPIEDIR)/calibrate -I$(OPIEDIR)/rsync
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 -lcrypt $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe -lcrypt $(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
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 =background.h \ 26 HEADERS =background.h \
27 desktop.h \ 27 desktop.h \
28 info.h \ 28 info.h \
29 appicons.h \ 29 appicons.h \
30 taskbar.h \ 30 taskbar.h \
31 sidething.h \ 31 sidething.h \
32 mrulist.h \ 32 mrulist.h \
33 stabmon.h \ 33 stabmon.h \
34 inputmethods.h \ 34 inputmethods.h \
35 systray.h \ 35 systray.h \
36 wait.h \ 36 wait.h \
37 shutdownimpl.h \ 37 shutdownimpl.h \
38 launcher.h \ 38 launcher.h \
39 launcherview.h \ 39 launcherview.h \
40 ../calibrate/calibrate.h \ 40 ../calibrate/calibrate.h \
41 startmenu.h \ 41 startmenu.h \
42 transferserver.h \ 42 transferserver.h \
43 qcopbridge.h \ 43 qcopbridge.h \
44 packageslave.h \ 44 packageslave.h \
45 irserver.h \ 45 irserver.h \
46 $(QPEDIR)/rsync/buf.h \ 46 $(OPIEDIR)/rsync/buf.h \
47 $(QPEDIR)/rsync/checksum.h \ 47 $(OPIEDIR)/rsync/checksum.h \
48 $(QPEDIR)/rsync/command.h \ 48 $(OPIEDIR)/rsync/command.h \
49 $(QPEDIR)/rsync/emit.h \ 49 $(OPIEDIR)/rsync/emit.h \
50 $(QPEDIR)/rsync/job.h \ 50 $(OPIEDIR)/rsync/job.h \
51 $(QPEDIR)/rsync/netint.h \ 51 $(OPIEDIR)/rsync/netint.h \
52 $(QPEDIR)/rsync/protocol.h \ 52 $(OPIEDIR)/rsync/protocol.h \
53 $(QPEDIR)/rsync/prototab.h \ 53 $(OPIEDIR)/rsync/prototab.h \
54 $(QPEDIR)/rsync/rsync.h \ 54 $(OPIEDIR)/rsync/rsync.h \
55 $(QPEDIR)/rsync/search.h \ 55 $(OPIEDIR)/rsync/search.h \
56 $(QPEDIR)/rsync/stream.h \ 56 $(OPIEDIR)/rsync/stream.h \
57 $(QPEDIR)/rsync/sumset.h \ 57 $(OPIEDIR)/rsync/sumset.h \
58 $(QPEDIR)/rsync/trace.h \ 58 $(OPIEDIR)/rsync/trace.h \
59 $(QPEDIR)/rsync/types.h \ 59 $(OPIEDIR)/rsync/types.h \
60 $(QPEDIR)/rsync/util.h \ 60 $(OPIEDIR)/rsync/util.h \
61 $(QPEDIR)/rsync/whole.h \ 61 $(OPIEDIR)/rsync/whole.h \
62 $(QPEDIR)/rsync/config_rsync.h \ 62 $(OPIEDIR)/rsync/config_rsync.h \
63 $(QPEDIR)/rsync/qrsync.h 63 $(OPIEDIR)/rsync/qrsync.h
64 SOURCES =background.cpp \ 64 SOURCES =background.cpp \
65 desktop.cpp \ 65 desktop.cpp \
66 info.cpp \ 66 info.cpp \
67 appicons.cpp \ 67 appicons.cpp \
68 taskbar.cpp \ 68 taskbar.cpp \
69 sidething.cpp \ 69 sidething.cpp \
70 mrulist.cpp \ 70 mrulist.cpp \
71 stabmon.cpp \ 71 stabmon.cpp \
72 inputmethods.cpp \ 72 inputmethods.cpp \
73 systray.cpp \ 73 systray.cpp \
74 wait.cpp \ 74 wait.cpp \
75 shutdownimpl.cpp \ 75 shutdownimpl.cpp \
76 launcher.cpp \ 76 launcher.cpp \
77 launcherview.cpp \ 77 launcherview.cpp \
78 $(QPEDIR)/calibrate/calibrate.cpp \ 78 $(OPIEDIR)/calibrate/calibrate.cpp \
79 transferserver.cpp \ 79 transferserver.cpp \
80 packageslave.cpp \ 80 packageslave.cpp \
81 irserver.cpp \ 81 irserver.cpp \
82 qcopbridge.cpp \ 82 qcopbridge.cpp \
83 startmenu.cpp \ 83 startmenu.cpp \
84 main.cpp \ 84 main.cpp \
85 $(QPEDIR)/rsync/base64.c \ 85 $(OPIEDIR)/rsync/base64.c \
86 $(QPEDIR)/rsync/buf.c \ 86 $(OPIEDIR)/rsync/buf.c \
87 $(QPEDIR)/rsync/checksum.c \ 87 $(OPIEDIR)/rsync/checksum.c \
88 $(QPEDIR)/rsync/command.c \ 88 $(OPIEDIR)/rsync/command.c \
89 $(QPEDIR)/rsync/delta.c \ 89 $(OPIEDIR)/rsync/delta.c \
90 $(QPEDIR)/rsync/emit.c \ 90 $(OPIEDIR)/rsync/emit.c \
91 $(QPEDIR)/rsync/hex.c \ 91 $(OPIEDIR)/rsync/hex.c \
92 $(QPEDIR)/rsync/job.c \ 92 $(OPIEDIR)/rsync/job.c \
93 $(QPEDIR)/rsync/mdfour.c \ 93 $(OPIEDIR)/rsync/mdfour.c \
94 $(QPEDIR)/rsync/mksum.c \ 94 $(OPIEDIR)/rsync/mksum.c \
95 $(QPEDIR)/rsync/msg.c \ 95 $(OPIEDIR)/rsync/msg.c \
96 $(QPEDIR)/rsync/netint.c \ 96 $(OPIEDIR)/rsync/netint.c \
97 $(QPEDIR)/rsync/patch.c \ 97 $(OPIEDIR)/rsync/patch.c \
98 $(QPEDIR)/rsync/prototab.c \ 98 $(OPIEDIR)/rsync/prototab.c \
99 $(QPEDIR)/rsync/readsums.c \ 99 $(OPIEDIR)/rsync/readsums.c \
100 $(QPEDIR)/rsync/scoop.c \ 100 $(OPIEDIR)/rsync/scoop.c \
101 $(QPEDIR)/rsync/search.c \ 101 $(OPIEDIR)/rsync/search.c \
102 $(QPEDIR)/rsync/stats.c \ 102 $(OPIEDIR)/rsync/stats.c \
103 $(QPEDIR)/rsync/stream.c \ 103 $(OPIEDIR)/rsync/stream.c \
104 $(QPEDIR)/rsync/sumset.c \ 104 $(OPIEDIR)/rsync/sumset.c \
105 $(QPEDIR)/rsync/trace.c \ 105 $(OPIEDIR)/rsync/trace.c \
106 $(QPEDIR)/rsync/tube.c \ 106 $(OPIEDIR)/rsync/tube.c \
107 $(QPEDIR)/rsync/util.c \ 107 $(OPIEDIR)/rsync/util.c \
108 $(QPEDIR)/rsync/version.c \ 108 $(OPIEDIR)/rsync/version.c \
109 $(QPEDIR)/rsync/whole.c \ 109 $(OPIEDIR)/rsync/whole.c \
110 $(QPEDIR)/rsync/qrsync.cpp 110 $(OPIEDIR)/rsync/qrsync.cpp
111 OBJECTS =background.o \ 111 OBJECTS =background.o \
112 desktop.o \ 112 desktop.o \
113 info.o \ 113 info.o \
114 appicons.o \ 114 appicons.o \
115 taskbar.o \ 115 taskbar.o \
116 sidething.o \ 116 sidething.o \
117 mrulist.o \ 117 mrulist.o \
118 stabmon.o \ 118 stabmon.o \
119 inputmethods.o \ 119 inputmethods.o \
120 systray.o \ 120 systray.o \
121 wait.o \ 121 wait.o \
122 shutdownimpl.o \ 122 shutdownimpl.o \
123 launcher.o \ 123 launcher.o \
124 launcherview.o \ 124 launcherview.o \
125 $(QPEDIR)/calibrate/calibrate.o \ 125 $(OPIEDIR)/calibrate/calibrate.o \
126 transferserver.o \ 126 transferserver.o \
127 packageslave.o \ 127 packageslave.o \
128 irserver.o \ 128 irserver.o \
129 qcopbridge.o \ 129 qcopbridge.o \
130 startmenu.o \ 130 startmenu.o \
131 main.o \ 131 main.o \
132 $(QPEDIR)/rsync/base64.o \ 132 $(OPIEDIR)/rsync/base64.o \
133 $(QPEDIR)/rsync/buf.o \ 133 $(OPIEDIR)/rsync/buf.o \
134 $(QPEDIR)/rsync/checksum.o \ 134 $(OPIEDIR)/rsync/checksum.o \
135 $(QPEDIR)/rsync/command.o \ 135 $(OPIEDIR)/rsync/command.o \
136 $(QPEDIR)/rsync/delta.o \ 136 $(OPIEDIR)/rsync/delta.o \
137 $(QPEDIR)/rsync/emit.o \ 137 $(OPIEDIR)/rsync/emit.o \
138 $(QPEDIR)/rsync/hex.o \ 138 $(OPIEDIR)/rsync/hex.o \
139 $(QPEDIR)/rsync/job.o \ 139 $(OPIEDIR)/rsync/job.o \
140 $(QPEDIR)/rsync/mdfour.o \ 140 $(OPIEDIR)/rsync/mdfour.o \
141 $(QPEDIR)/rsync/mksum.o \ 141 $(OPIEDIR)/rsync/mksum.o \
142 $(QPEDIR)/rsync/msg.o \ 142 $(OPIEDIR)/rsync/msg.o \
143 $(QPEDIR)/rsync/netint.o \ 143 $(OPIEDIR)/rsync/netint.o \
144 $(QPEDIR)/rsync/patch.o \ 144 $(OPIEDIR)/rsync/patch.o \
145 $(QPEDIR)/rsync/prototab.o \ 145 $(OPIEDIR)/rsync/prototab.o \
146 $(QPEDIR)/rsync/readsums.o \ 146 $(OPIEDIR)/rsync/readsums.o \
147 $(QPEDIR)/rsync/scoop.o \ 147 $(OPIEDIR)/rsync/scoop.o \
148 $(QPEDIR)/rsync/search.o \ 148 $(OPIEDIR)/rsync/search.o \
149 $(QPEDIR)/rsync/stats.o \ 149 $(OPIEDIR)/rsync/stats.o \
150 $(QPEDIR)/rsync/stream.o \ 150 $(OPIEDIR)/rsync/stream.o \
151 $(QPEDIR)/rsync/sumset.o \ 151 $(OPIEDIR)/rsync/sumset.o \
152 $(QPEDIR)/rsync/trace.o \ 152 $(OPIEDIR)/rsync/trace.o \
153 $(QPEDIR)/rsync/tube.o \ 153 $(OPIEDIR)/rsync/tube.o \
154 $(QPEDIR)/rsync/util.o \ 154 $(OPIEDIR)/rsync/util.o \
155 $(QPEDIR)/rsync/version.o \ 155 $(OPIEDIR)/rsync/version.o \
156 $(QPEDIR)/rsync/whole.o \ 156 $(OPIEDIR)/rsync/whole.o \
157 $(QPEDIR)/rsync/qrsync.o \ 157 $(OPIEDIR)/rsync/qrsync.o \
158 shutdown.o \ 158 shutdown.o \
159 syncdialog.o 159 syncdialog.o
160INTERFACES = shutdown.ui \ 160INTERFACES = shutdown.ui \
161 syncdialog.ui 161 syncdialog.ui
162UICDECLS = shutdown.h \ 162UICDECLS = shutdown.h \
163 syncdialog.h 163 syncdialog.h
164UICIMPLS = shutdown.cpp \ 164UICIMPLS = shutdown.cpp \
165 syncdialog.cpp 165 syncdialog.cpp
166 SRCMOC =moc_background.cpp \ 166 SRCMOC =moc_background.cpp \
167 moc_desktop.cpp \ 167 moc_desktop.cpp \
168 moc_info.cpp \ 168 moc_info.cpp \
169 moc_appicons.cpp \ 169 moc_appicons.cpp \
170 moc_taskbar.cpp \ 170 moc_taskbar.cpp \
171 moc_sidething.cpp \ 171 moc_sidething.cpp \
172 moc_inputmethods.cpp \ 172 moc_inputmethods.cpp \
173 moc_systray.cpp \ 173 moc_systray.cpp \
174 moc_shutdownimpl.cpp \ 174 moc_shutdownimpl.cpp \
175 moc_launcher.cpp \ 175 moc_launcher.cpp \
176 moc_launcherview.cpp \ 176 moc_launcherview.cpp \
177 ../calibrate/moc_calibrate.cpp \ 177 ../calibrate/moc_calibrate.cpp \
178 moc_startmenu.cpp \ 178 moc_startmenu.cpp \
179 moc_transferserver.cpp \ 179 moc_transferserver.cpp \
180 moc_qcopbridge.cpp \ 180 moc_qcopbridge.cpp \
181 moc_packageslave.cpp \ 181 moc_packageslave.cpp \
182 moc_irserver.cpp \ 182 moc_irserver.cpp \
183 appicons.moc \ 183 appicons.moc \
184 moc_shutdown.cpp \ 184 moc_shutdown.cpp \
185 moc_syncdialog.cpp 185 moc_syncdialog.cpp
186 OBJMOC =moc_background.o \ 186 OBJMOC =moc_background.o \
187 moc_desktop.o \ 187 moc_desktop.o \
188 moc_info.o \ 188 moc_info.o \
189 moc_appicons.o \ 189 moc_appicons.o \
190 moc_taskbar.o \ 190 moc_taskbar.o \
191 moc_sidething.o \ 191 moc_sidething.o \
192 moc_inputmethods.o \ 192 moc_inputmethods.o \
193 moc_systray.o \ 193 moc_systray.o \
194 moc_shutdownimpl.o \ 194 moc_shutdownimpl.o \
195 moc_launcher.o \ 195 moc_launcher.o \
196 moc_launcherview.o \ 196 moc_launcherview.o \
197 ../calibrate/moc_calibrate.o \ 197 ../calibrate/moc_calibrate.o \
198 moc_startmenu.o \ 198 moc_startmenu.o \
199 moc_transferserver.o \ 199 moc_transferserver.o \
200 moc_qcopbridge.o \ 200 moc_qcopbridge.o \
201 moc_packageslave.o \ 201 moc_packageslave.o \
202 moc_irserver.o \ 202 moc_irserver.o \
203 moc_shutdown.o \ 203 moc_shutdown.o \
204 moc_syncdialog.o 204 moc_syncdialog.o
205 205
206 206
207####### Implicit rules 207####### Implicit rules
208 208
209.SUFFIXES: .cpp .cxx .cc .C .c 209.SUFFIXES: .cpp .cxx .cc .C .c
210 210
211.cpp.o: 211.cpp.o:
212 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 212 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
213 213
214.cxx.o: 214.cxx.o:
215 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 215 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
216 216
217.cc.o: 217.cc.o:
218 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 218 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
219 219
220.C.o: 220.C.o:
221 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 221 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
222 222
223.c.o: 223.c.o:
224 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 224 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
225 225
226####### Build rules 226####### Build rules
227 227
228 228
229all: $(DESTDIR)$(TARGET) 229all: $(DESTDIR)$(TARGET)
230 230
231$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 231$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
232 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 232 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
233 233
234moc: $(SRCMOC) 234moc: $(SRCMOC)
235 235
236tmake: 236tmake:
237 tmake taskbar.pro 237 tmake taskbar.pro
238 238
239clean: 239clean:
240 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 240 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
241 -rm -f *~ core 241 -rm -f *~ core
242 -rm -f allmoc.cpp 242 -rm -f allmoc.cpp
243 243
244####### Extension Modules 244####### Extension Modules
245 245
246listpromodules: 246listpromodules:
247 @echo 247 @echo
248 248
249listallmodules: 249listallmodules:
250 @echo 250 @echo
251 251
252listaddonpromodules: 252listaddonpromodules:
253 @echo 253 @echo
254 254
255listaddonentmodules: 255listaddonentmodules:
256 @echo 256 @echo
257 257
258 258
259REQUIRES= 259REQUIRES=
260 260
261####### Sub-libraries 261####### Sub-libraries
262 262
263 263
264###### Combined headers 264###### Combined headers
265 265
266 266
267 267
268####### Compile 268####### Compile
269 269
270background.o: background.cpp \ 270background.o: background.cpp \
271 background.h \ 271 background.h \
272 desktop.h \ 272 desktop.h \
273 shutdownimpl.h \ 273 shutdownimpl.h \
274 shutdown.h \ 274 shutdown.h \
275 $(QPEDIR)/include/qpe/qpeapplication.h \ 275 $(OPIEDIR)/include/qpe/qpeapplication.h \
276 $(QPEDIR)/include/qpe/resource.h 276 $(OPIEDIR)/include/qpe/resource.h
277 277
278desktop.o: desktop.cpp \ 278desktop.o: desktop.cpp \
279 desktop.h \ 279 desktop.h \
280 shutdownimpl.h \ 280 shutdownimpl.h \
281 shutdown.h \ 281 shutdown.h \
282 $(QPEDIR)/include/qpe/qpeapplication.h \ 282 $(OPIEDIR)/include/qpe/qpeapplication.h \
283 info.h \ 283 info.h \
284 background.h \ 284 background.h \
285 launcher.h \ 285 launcher.h \
286 launcherview.h \ 286 launcherview.h \
287 $(QPEDIR)/include/qpe/storage.h \ 287 $(OPIEDIR)/include/qpe/storage.h \
288 mrulist.h \ 288 mrulist.h \
289 $(QPEDIR)/include/qpe/applnk.h \ 289 $(OPIEDIR)/include/qpe/applnk.h \
290 qcopbridge.h \ 290 qcopbridge.h \
291 startmenu.h \ 291 startmenu.h \
292 taskbar.h \ 292 taskbar.h \
293 $(QPEDIR)/include/qpe/custom.h \ 293 $(OPIEDIR)/include/qpe/custom.h \
294 transferserver.h \ 294 transferserver.h \
295 irserver.h \ 295 irserver.h \
296 packageslave.h \ 296 packageslave.h \
297 $(QPEDIR)/include/qpe/mimetype.h \ 297 $(OPIEDIR)/include/qpe/mimetype.h \
298 $(QPEDIR)/include/qpe/password.h \ 298 $(OPIEDIR)/include/qpe/password.h \
299 $(QPEDIR)/include/qpe/config.h \ 299 $(OPIEDIR)/include/qpe/config.h \
300 $(QPEDIR)/include/qpe/power.h \ 300 $(OPIEDIR)/include/qpe/power.h \
301 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 301 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
302 $(QPEDIR)/include/qpe/global.h 302 $(OPIEDIR)/include/qpe/global.h
303 303
304info.o: info.cpp \ 304info.o: info.cpp \
305 info.h \ 305 info.h \
306 background.h \ 306 background.h \
307 desktop.h \ 307 desktop.h \
308 shutdownimpl.h \ 308 shutdownimpl.h \
309 shutdown.h \ 309 shutdown.h \
310 $(QPEDIR)/include/qpe/qpeapplication.h \ 310 $(OPIEDIR)/include/qpe/qpeapplication.h \
311 $(QPEDIR)/include/qpe/resource.h \ 311 $(OPIEDIR)/include/qpe/resource.h \
312 $(QPEDIR)/include/qpe/version.h 312 $(OPIEDIR)/include/qpe/version.h
313 313
314appicons.o: appicons.cpp \ 314appicons.o: appicons.cpp \
315 appicons.moc \ 315 appicons.moc \
316 appicons.h \ 316 appicons.h \
317 $(QPEDIR)/include/qpe/qcopenvelope_qws.h 317 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
318 318
319taskbar.o: taskbar.cpp \ 319taskbar.o: taskbar.cpp \
320 startmenu.h \ 320 startmenu.h \
321 inputmethods.h \ 321 inputmethods.h \
322 $(QPEDIR)/include/qpe/inputmethodinterface.h \ 322 $(OPIEDIR)/include/qpe/inputmethodinterface.h \
323 $(QPEDIR)/include/qpe/qcom.h \ 323 $(OPIEDIR)/include/qpe/qcom.h \
324 $(QPEDIR)/include/qpe/quuid.h \ 324 $(OPIEDIR)/include/qpe/quuid.h \
325 mrulist.h \ 325 mrulist.h \
326 $(QPEDIR)/include/qpe/applnk.h \ 326 $(OPIEDIR)/include/qpe/applnk.h \
327 systray.h \ 327 systray.h \
328 $(QPEDIR)/include/qpe/taskbarappletinterface.h \ 328 $(OPIEDIR)/include/qpe/taskbarappletinterface.h \
329 $(QPEDIR)/calibrate/calibrate.h \ 329 $(OPIEDIR)/calibrate/calibrate.h \
330 wait.h \ 330 wait.h \
331 $(QPEDIR)/include/qpe/resource.h \ 331 $(OPIEDIR)/include/qpe/resource.h \
332 appicons.h \ 332 appicons.h \
333 taskbar.h \ 333 taskbar.h \
334 $(QPEDIR)/include/qpe/custom.h \ 334 $(OPIEDIR)/include/qpe/custom.h \
335 desktop.h \ 335 desktop.h \
336 shutdownimpl.h \ 336 shutdownimpl.h \
337 shutdown.h \ 337 shutdown.h \
338 $(QPEDIR)/include/qpe/qpeapplication.h \ 338 $(OPIEDIR)/include/qpe/qpeapplication.h \
339 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 339 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
340 $(QPEDIR)/include/qpe/global.h \ 340 $(OPIEDIR)/include/qpe/global.h \
341 ../taskbar/apps.h \ 341 ../taskbar/apps.h \
342 ../addressbook/addressbook.h \ 342 ../addressbook/addressbook.h \
343 ../datebook/datebook.h \ 343 ../datebook/datebook.h \
344 $(QPEDIR)/include/qpe/datebookdb.h \ 344 $(OPIEDIR)/include/qpe/datebookdb.h \
345 $(QPEDIR)/include/qpe/event.h \ 345 $(OPIEDIR)/include/qpe/event.h \
346 $(QPEDIR)/include/qpe/palmtoprecord.h \ 346 $(OPIEDIR)/include/qpe/palmtoprecord.h \
347 $(OPIEDIR)/include/qpe/timeconversion.h \
348 $(OPIEDIR)/include/qpe/qpcglobal.h \
347 ../helpbrowser/helpbrowser.h \ 349 ../helpbrowser/helpbrowser.h \
348 ../minesweep/minesweep.h \ 350 ../minesweep/minesweep.h \
349 ../textedit/textedit.h \ 351 ../textedit/textedit.h \
350 $(QPEDIR)/include/qpe/filemanager.h \ 352 $(OPIEDIR)/include/qpe/filemanager.h \
351 ../todo/mainwindow.h \ 353 ../todo/mainwindow.h \
352 ../citytime/citytime.h \ 354 ../citytime/citytime.h \
353 ../clock/clock.h \ 355 ../clock/clock.h \
354 ../calculator/calculatorimpl.h \ 356 ../calculator/calculatorimpl.h \
355 ../sysinfo/sysinfo.h \ 357 ../sysinfo/sysinfo.h \
356 ../settings/appearance/settings.h \ 358 ../settings/appearance/settings.h \
357 ../settings/systemtime/settime.h \ 359 ../settings/systemtime/settime.h \
358 $(QPEDIR)/include/qpe/timestring.h \ 360 $(OPIEDIR)/include/qpe/timestring.h \
359 ../filebrowser/filebrowser.h \ 361 ../filebrowser/filebrowser.h \
360 ../solitaire/canvascardwindow.h \ 362 ../solitaire/canvascardwindow.h \
361 ../snake/interface.h \ 363 ../snake/interface.h \
362 ../parashoot/interface.h \ 364 ../parashoot/interface.h \
363 $(QPEDIR)/include/qpe/sound.h \ 365 $(OPIEDIR)/include/qpe/sound.h \
364 ../mpegplayer/mediaplayer.h \ 366 ../mpegplayer/mediaplayer.h \
365 $(QPEDIR)/include/qpe/qlibrary.h \ 367 $(OPIEDIR)/include/qpe/qlibrary.h \
366 ../embeddedkonsole/konsole.h \ 368 ../embeddedkonsole/konsole.h \
367 ../wordgame/wordgame.h \ 369 ../wordgame/wordgame.h \
368 $(QPEDIR)/include/qpe/qdawg.h 370 $(OPIEDIR)/include/qpe/qdawg.h
369 371
370sidething.o: sidething.cpp \ 372sidething.o: sidething.cpp \
371 sidething.h \ 373 sidething.h \
372 startmenu.h \ 374 startmenu.h \
373 $(QPEDIR)/include/qpe/resource.h 375 $(OPIEDIR)/include/qpe/resource.h
374 376
375mrulist.o: mrulist.cpp \ 377mrulist.o: mrulist.cpp \
376 mrulist.h \ 378 mrulist.h \
377 $(QPEDIR)/include/qpe/applnk.h \ 379 $(OPIEDIR)/include/qpe/applnk.h \
378 $(QPEDIR)/include/qpe/global.h \ 380 $(OPIEDIR)/include/qpe/global.h \
379 $(QPEDIR)/include/qpe/resource.h 381 $(OPIEDIR)/include/qpe/resource.h
380 382
381stabmon.o: stabmon.cpp \ 383stabmon.o: stabmon.cpp \
382 stabmon.h \ 384 stabmon.h \
383 $(QPEDIR)/include/qpe/qcopenvelope_qws.h 385 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
384 386
385inputmethods.o: inputmethods.cpp \ 387inputmethods.o: inputmethods.cpp \
386 inputmethods.h \ 388 inputmethods.h \
387 $(QPEDIR)/include/qpe/inputmethodinterface.h \ 389 $(OPIEDIR)/include/qpe/inputmethodinterface.h \
388 $(QPEDIR)/include/qpe/qcom.h \ 390 $(OPIEDIR)/include/qpe/qcom.h \
389 $(QPEDIR)/include/qpe/quuid.h \ 391 $(OPIEDIR)/include/qpe/quuid.h \
390 $(QPEDIR)/include/qpe/config.h \ 392 $(OPIEDIR)/include/qpe/config.h \
391 $(QPEDIR)/include/qpe/qpeapplication.h \ 393 $(OPIEDIR)/include/qpe/qpeapplication.h \
392 $(QPEDIR)/include/qpe/qlibrary.h 394 $(OPIEDIR)/include/qpe/qlibrary.h
393 395
394systray.o: systray.cpp \ 396systray.o: systray.cpp \
395 $(QPEDIR)/include/qpe/qpeapplication.h \ 397 $(OPIEDIR)/include/qpe/qpeapplication.h \
396 $(QPEDIR)/include/qpe/qlibrary.h \ 398 $(OPIEDIR)/include/qpe/qlibrary.h \
397 $(QPEDIR)/include/qpe/qcom.h \ 399 $(OPIEDIR)/include/qpe/qcom.h \
398 $(QPEDIR)/include/qpe/quuid.h \ 400 $(OPIEDIR)/include/qpe/quuid.h \
399 $(QPEDIR)/include/qpe/config.h \ 401 $(OPIEDIR)/include/qpe/config.h \
400 quicklauncher.h \ 402 quicklauncher.h \
401 systray.h \ 403 systray.h \
402 $(QPEDIR)/include/qpe/taskbarappletinterface.h 404 $(OPIEDIR)/include/qpe/taskbarappletinterface.h
403 405
404wait.o: wait.cpp \ 406wait.o: wait.cpp \
405 wait.h \ 407 wait.h \
406 $(QPEDIR)/include/qpe/resource.h 408 $(OPIEDIR)/include/qpe/resource.h
407 409
408shutdownimpl.o: shutdownimpl.cpp \ 410shutdownimpl.o: shutdownimpl.cpp \
409 shutdownimpl.h \ 411 shutdownimpl.h \
410 shutdown.h \ 412 shutdown.h \
411 $(QPEDIR)/include/qpe/global.h 413 $(OPIEDIR)/include/qpe/global.h
412 414
413launcher.o: launcher.cpp \ 415launcher.o: launcher.cpp \
414 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 416 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
415 $(QPEDIR)/include/qpe/resource.h \ 417 $(OPIEDIR)/include/qpe/resource.h \
416 $(QPEDIR)/include/qpe/applnk.h \ 418 $(OPIEDIR)/include/qpe/applnk.h \
417 $(QPEDIR)/include/qpe/config.h \ 419 $(OPIEDIR)/include/qpe/config.h \
418 $(QPEDIR)/include/qpe/global.h \ 420 $(OPIEDIR)/include/qpe/global.h \
419 $(QPEDIR)/include/qpe/qpeapplication.h \ 421 $(OPIEDIR)/include/qpe/qpeapplication.h \
420 $(QPEDIR)/include/qpe/mimetype.h \ 422 $(OPIEDIR)/include/qpe/mimetype.h \
421 $(QPEDIR)/include/qpe/storage.h \ 423 $(OPIEDIR)/include/qpe/storage.h \
424 $(OPIEDIR)/include/qpe/palmtoprecord.h \
422 launcherview.h \ 425 launcherview.h \
423 launcher.h \ 426 launcher.h \
424 $(QPEDIR)/include/qpe/lnkproperties.h \ 427 syncdialog.h \
428 desktop.h \
429 shutdownimpl.h \
430 shutdown.h \
431 $(OPIEDIR)/include/qpe/lnkproperties.h \
425 mrulist.h \ 432 mrulist.h \
426 $(QPEDIR)/rsync/qrsync.h 433 $(OPIEDIR)/rsync/qrsync.h
427 434
428launcherview.o: launcherview.cpp \ 435launcherview.o: launcherview.cpp \
429 launcherview.h \ 436 launcherview.h \
430 $(QPEDIR)/include/qpe/storage.h \ 437 $(OPIEDIR)/include/qpe/storage.h \
431 $(QPEDIR)/include/qpe/qpeapplication.h \ 438 $(OPIEDIR)/include/qpe/qpeapplication.h \
432 $(QPEDIR)/include/qpe/applnk.h \ 439 $(OPIEDIR)/include/qpe/applnk.h \
433 $(QPEDIR)/include/qpe/qpedebug.h \ 440 $(OPIEDIR)/include/qpe/qpedebug.h \
434 $(QPEDIR)/include/qpe/categories.h \ 441 $(OPIEDIR)/include/qpe/categories.h \
435 $(QPEDIR)/include/qpe/categoryselect.h \ 442 $(OPIEDIR)/include/qpe/categoryselect.h \
436 $(QPEDIR)/include/qpe/menubutton.h \ 443 $(OPIEDIR)/include/qpe/menubutton.h \
437 $(QPEDIR)/include/qpe/resource.h \ 444 $(OPIEDIR)/include/qpe/resource.h \
438 $(QPEDIR)/include/qpe/qpetoolbar.h 445 $(OPIEDIR)/include/qpe/qpetoolbar.h
439 446
440$(QPEDIR)/calibrate/calibrate.o: $(QPEDIR)/calibrate/calibrate.cpp \ 447$(OPIEDIR)/calibrate/calibrate.o: $(OPIEDIR)/calibrate/calibrate.cpp \
441 $(QPEDIR)/calibrate/calibrate.h \ 448 $(OPIEDIR)/calibrate/calibrate.h \
442 $(QPEDIR)/include/qpe/resource.h 449 $(OPIEDIR)/include/qpe/resource.h
443 450
444transferserver.o: transferserver.cpp \ 451transferserver.o: transferserver.cpp \
445 $(QPEDIR)/include/qpe/qprocess.h \ 452 $(OPIEDIR)/include/qpe/qprocess.h \
446 $(QPEDIR)/include/qpe/process.h \ 453 $(OPIEDIR)/include/qpe/process.h \
454 $(OPIEDIR)/include/qpe/config.h \
455 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
447 transferserver.h 456 transferserver.h
448 457
449packageslave.o: packageslave.cpp \ 458packageslave.o: packageslave.cpp \
450 packageslave.h \ 459 packageslave.h \
451 $(QPEDIR)/include/qpe/process.h \ 460 $(OPIEDIR)/include/qpe/process.h \
452 $(QPEDIR)/include/qpe/qcopenvelope_qws.h 461 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
453 462
454irserver.o: irserver.cpp \ 463irserver.o: irserver.cpp \
455 irserver.h \ 464 irserver.h \
456 $(QPEDIR)/include/qpe/qlibrary.h \ 465 $(OPIEDIR)/include/qpe/qlibrary.h \
457 $(QPEDIR)/include/qpe/qcom.h \ 466 $(OPIEDIR)/include/qpe/qcom.h \
458 $(QPEDIR)/include/qpe/quuid.h \ 467 $(OPIEDIR)/include/qpe/quuid.h \
459 $(QPEDIR)/include/qpe/qpeapplication.h \ 468 $(OPIEDIR)/include/qpe/qpeapplication.h \
460 obexinterface.h 469 obexinterface.h
461 470
462qcopbridge.o: qcopbridge.cpp \ 471qcopbridge.o: qcopbridge.cpp \
463 qcopbridge.h \ 472 qcopbridge.h \
464 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 473 transferserver.h \
465 $(QPEDIR)/include/qpe/qpeapplication.h 474 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
475 $(OPIEDIR)/include/qpe/qpeapplication.h
466 476
467startmenu.o: startmenu.cpp \ 477startmenu.o: startmenu.cpp \
468 startmenu.h \ 478 startmenu.h \
469 sidething.h \ 479 sidething.h \
470 mrulist.h \ 480 mrulist.h \
471 $(QPEDIR)/include/qpe/applnk.h \ 481 $(OPIEDIR)/include/qpe/applnk.h \
472 info.h \ 482 info.h \
473 background.h \ 483 background.h \
474 $(QPEDIR)/include/qpe/qpeapplication.h \ 484 $(OPIEDIR)/include/qpe/qpeapplication.h \
475 $(QPEDIR)/include/qpe/config.h \ 485 $(OPIEDIR)/include/qpe/config.h \
476 $(QPEDIR)/include/qpe/global.h \ 486 $(OPIEDIR)/include/qpe/global.h \
477 $(QPEDIR)/include/qpe/resource.h 487 $(OPIEDIR)/include/qpe/resource.h
478 488
479main.o: main.cpp \ 489main.o: main.cpp \
480 desktop.h \ 490 desktop.h \
481 shutdownimpl.h \ 491 shutdownimpl.h \
482 shutdown.h \ 492 shutdown.h \
483 $(QPEDIR)/include/qpe/qpeapplication.h \ 493 $(OPIEDIR)/include/qpe/qpeapplication.h \
484 taskbar.h \ 494 taskbar.h \
485 $(QPEDIR)/include/qpe/custom.h \ 495 $(OPIEDIR)/include/qpe/custom.h \
486 stabmon.h \ 496 stabmon.h \
487 $(QPEDIR)/include/qpe/network.h \ 497 $(OPIEDIR)/include/qpe/network.h \
488 $(QPEDIR)/include/qpe/config.h \ 498 $(OPIEDIR)/include/qpe/config.h \
489 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 499 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
490 $(QPEDIR)/include/qpe/alarmserver.h \ 500 $(OPIEDIR)/include/qpe/alarmserver.h \
491 ../calibrate/calibrate.h \ 501 ../calibrate/calibrate.h \
492 ../login/qdmdialogimpl.h \ 502 ../login/qdmdialogimpl.h \
493 $(QPEDIR)/include/qpe/global.h 503 $(OPIEDIR)/include/qpe/global.h
494 504
495$(QPEDIR)/rsync/base64.o: $(QPEDIR)/rsync/base64.c \ 505$(OPIEDIR)/rsync/base64.o: $(OPIEDIR)/rsync/base64.c \
496 $(QPEDIR)/rsync/config_rsync.h \ 506 $(OPIEDIR)/rsync/config_rsync.h \
497 $(QPEDIR)/rsync/config_linux.h \ 507 $(OPIEDIR)/rsync/config_linux.h \
498 $(QPEDIR)/rsync/rsync.h 508 $(OPIEDIR)/rsync/rsync.h
499 509
500$(QPEDIR)/rsync/buf.o: $(QPEDIR)/rsync/buf.c \ 510$(OPIEDIR)/rsync/buf.o: $(OPIEDIR)/rsync/buf.c \
501 $(QPEDIR)/rsync/config_rsync.h \ 511 $(OPIEDIR)/rsync/config_rsync.h \
502 $(QPEDIR)/rsync/config_linux.h \ 512 $(OPIEDIR)/rsync/config_linux.h \
503 $(QPEDIR)/rsync/rsync.h \ 513 $(OPIEDIR)/rsync/rsync.h \
504 $(QPEDIR)/rsync/trace.h \ 514 $(OPIEDIR)/rsync/trace.h \
505 $(QPEDIR)/rsync/buf.h \ 515 $(OPIEDIR)/rsync/buf.h \
506 $(QPEDIR)/rsync/util.h 516 $(OPIEDIR)/rsync/util.h
507 517
508$(QPEDIR)/rsync/checksum.o: $(QPEDIR)/rsync/checksum.c \ 518$(OPIEDIR)/rsync/checksum.o: $(OPIEDIR)/rsync/checksum.c \
509 $(QPEDIR)/rsync/config_rsync.h \ 519 $(OPIEDIR)/rsync/config_rsync.h \
510 $(QPEDIR)/rsync/config_linux.h \ 520 $(OPIEDIR)/rsync/config_linux.h \
511 $(QPEDIR)/rsync/rsync.h \ 521 $(OPIEDIR)/rsync/rsync.h \
512 $(QPEDIR)/rsync/checksum.h 522 $(OPIEDIR)/rsync/checksum.h
513 523
514$(QPEDIR)/rsync/command.o: $(QPEDIR)/rsync/command.c \ 524$(OPIEDIR)/rsync/command.o: $(OPIEDIR)/rsync/command.c \
515 $(QPEDIR)/rsync/config_rsync.h \ 525 $(OPIEDIR)/rsync/config_rsync.h \
516 $(QPEDIR)/rsync/config_linux.h \ 526 $(OPIEDIR)/rsync/config_linux.h \
517 $(QPEDIR)/rsync/rsync.h \ 527 $(OPIEDIR)/rsync/rsync.h \
518 $(QPEDIR)/rsync/command.h 528 $(OPIEDIR)/rsync/command.h
519 529
520$(QPEDIR)/rsync/delta.o: $(QPEDIR)/rsync/delta.c \ 530$(OPIEDIR)/rsync/delta.o: $(OPIEDIR)/rsync/delta.c \
521 $(QPEDIR)/rsync/config_rsync.h \ 531 $(OPIEDIR)/rsync/config_rsync.h \
522 $(QPEDIR)/rsync/config_linux.h \ 532 $(OPIEDIR)/rsync/config_linux.h \
523 $(QPEDIR)/rsync/rsync.h \ 533 $(OPIEDIR)/rsync/rsync.h \
524 $(QPEDIR)/rsync/emit.h \ 534 $(OPIEDIR)/rsync/emit.h \
525 $(QPEDIR)/rsync/stream.h \ 535 $(OPIEDIR)/rsync/stream.h \
526 $(QPEDIR)/rsync/util.h \ 536 $(OPIEDIR)/rsync/util.h \
527 $(QPEDIR)/rsync/sumset.h \ 537 $(OPIEDIR)/rsync/sumset.h \
528 $(QPEDIR)/rsync/job.h \ 538 $(OPIEDIR)/rsync/job.h \
529 $(QPEDIR)/rsync/trace.h \ 539 $(OPIEDIR)/rsync/trace.h \
530 $(QPEDIR)/rsync/checksum.h \ 540 $(OPIEDIR)/rsync/checksum.h \
531 $(QPEDIR)/rsync/search.h \ 541 $(OPIEDIR)/rsync/search.h \
532 $(QPEDIR)/rsync/types.h 542 $(OPIEDIR)/rsync/types.h
533 543
534$(QPEDIR)/rsync/emit.o: $(QPEDIR)/rsync/emit.c \ 544$(OPIEDIR)/rsync/emit.o: $(OPIEDIR)/rsync/emit.c \
535 $(QPEDIR)/rsync/config_rsync.h \ 545 $(OPIEDIR)/rsync/config_rsync.h \
536 $(QPEDIR)/rsync/config_linux.h \ 546 $(OPIEDIR)/rsync/config_linux.h \
537 $(QPEDIR)/rsync/rsync.h \ 547 $(OPIEDIR)/rsync/rsync.h \
538 $(QPEDIR)/rsync/command.h \ 548 $(OPIEDIR)/rsync/command.h \
539 $(QPEDIR)/rsync/protocol.h \ 549 $(OPIEDIR)/rsync/protocol.h \
540 $(QPEDIR)/rsync/trace.h \ 550 $(OPIEDIR)/rsync/trace.h \
541 $(QPEDIR)/rsync/emit.h \ 551 $(OPIEDIR)/rsync/emit.h \
542 $(QPEDIR)/rsync/prototab.h \ 552 $(OPIEDIR)/rsync/prototab.h \
543 $(QPEDIR)/rsync/netint.h \ 553 $(OPIEDIR)/rsync/netint.h \
544 $(QPEDIR)/rsync/sumset.h \ 554 $(OPIEDIR)/rsync/sumset.h \
545 $(QPEDIR)/rsync/job.h 555 $(OPIEDIR)/rsync/job.h
546 556
547$(QPEDIR)/rsync/hex.o: $(QPEDIR)/rsync/hex.c \ 557$(OPIEDIR)/rsync/hex.o: $(OPIEDIR)/rsync/hex.c \
548 $(QPEDIR)/rsync/config_rsync.h \ 558 $(OPIEDIR)/rsync/config_rsync.h \
549 $(QPEDIR)/rsync/config_linux.h \ 559 $(OPIEDIR)/rsync/config_linux.h \
550 $(QPEDIR)/rsync/rsync.h 560 $(OPIEDIR)/rsync/rsync.h
551 561
552$(QPEDIR)/rsync/job.o: $(QPEDIR)/rsync/job.c \ 562$(OPIEDIR)/rsync/job.o: $(OPIEDIR)/rsync/job.c \
553 $(QPEDIR)/rsync/config_rsync.h \ 563 $(OPIEDIR)/rsync/config_rsync.h \
554 $(QPEDIR)/rsync/config_linux.h \ 564 $(OPIEDIR)/rsync/config_linux.h \
555 $(QPEDIR)/rsync/rsync.h \ 565 $(OPIEDIR)/rsync/rsync.h \
556 $(QPEDIR)/rsync/stream.h \ 566 $(OPIEDIR)/rsync/stream.h \
557 $(QPEDIR)/rsync/util.h \ 567 $(OPIEDIR)/rsync/util.h \
558 $(QPEDIR)/rsync/sumset.h \ 568 $(OPIEDIR)/rsync/sumset.h \
559 $(QPEDIR)/rsync/job.h \ 569 $(OPIEDIR)/rsync/job.h \
560 $(QPEDIR)/rsync/trace.h 570 $(OPIEDIR)/rsync/trace.h
561 571
562$(QPEDIR)/rsync/mdfour.o: $(QPEDIR)/rsync/mdfour.c \ 572$(OPIEDIR)/rsync/mdfour.o: $(OPIEDIR)/rsync/mdfour.c \
563 $(QPEDIR)/rsync/config_rsync.h \ 573 $(OPIEDIR)/rsync/config_rsync.h \
564 $(QPEDIR)/rsync/config_linux.h \ 574 $(OPIEDIR)/rsync/config_linux.h \
565 $(QPEDIR)/rsync/rsync.h \ 575 $(OPIEDIR)/rsync/rsync.h \
566 $(QPEDIR)/rsync/trace.h \ 576 $(OPIEDIR)/rsync/trace.h \
567 $(QPEDIR)/rsync/types.h 577 $(OPIEDIR)/rsync/types.h
568 578
569$(QPEDIR)/rsync/mksum.o: $(QPEDIR)/rsync/mksum.c \ 579$(OPIEDIR)/rsync/mksum.o: $(OPIEDIR)/rsync/mksum.c \
570 $(QPEDIR)/rsync/config_rsync.h \ 580 $(OPIEDIR)/rsync/config_rsync.h \
571 $(QPEDIR)/rsync/config_linux.h \ 581 $(OPIEDIR)/rsync/config_linux.h \
572 $(QPEDIR)/rsync/rsync.h \ 582 $(OPIEDIR)/rsync/rsync.h \
573 $(QPEDIR)/rsync/stream.h \ 583 $(OPIEDIR)/rsync/stream.h \
574 $(QPEDIR)/rsync/util.h \ 584 $(OPIEDIR)/rsync/util.h \
575 $(QPEDIR)/rsync/sumset.h \ 585 $(OPIEDIR)/rsync/sumset.h \
576 $(QPEDIR)/rsync/job.h \ 586 $(OPIEDIR)/rsync/job.h \
577 $(QPEDIR)/rsync/protocol.h \ 587 $(OPIEDIR)/rsync/protocol.h \
578 $(QPEDIR)/rsync/netint.h \ 588 $(OPIEDIR)/rsync/netint.h \
579 $(QPEDIR)/rsync/trace.h \ 589 $(OPIEDIR)/rsync/trace.h \
580 $(QPEDIR)/rsync/checksum.h 590 $(OPIEDIR)/rsync/checksum.h
581 591
582$(QPEDIR)/rsync/msg.o: $(QPEDIR)/rsync/msg.c \ 592$(OPIEDIR)/rsync/msg.o: $(OPIEDIR)/rsync/msg.c \
583 $(QPEDIR)/rsync/config_rsync.h \ 593 $(OPIEDIR)/rsync/config_rsync.h \
584 $(QPEDIR)/rsync/config_linux.h \ 594 $(OPIEDIR)/rsync/config_linux.h \
585 $(QPEDIR)/rsync/rsync.h 595 $(OPIEDIR)/rsync/rsync.h
586 596
587$(QPEDIR)/rsync/netint.o: $(QPEDIR)/rsync/netint.c \ 597$(OPIEDIR)/rsync/netint.o: $(OPIEDIR)/rsync/netint.c \
588 $(QPEDIR)/rsync/config_rsync.h \ 598 $(OPIEDIR)/rsync/config_rsync.h \
589 $(QPEDIR)/rsync/config_linux.h \ 599 $(OPIEDIR)/rsync/config_linux.h \
590 $(QPEDIR)/rsync/rsync.h \ 600 $(OPIEDIR)/rsync/rsync.h \
591 $(QPEDIR)/rsync/job.h \ 601 $(OPIEDIR)/rsync/job.h \
592 $(QPEDIR)/rsync/netint.h \ 602 $(OPIEDIR)/rsync/netint.h \
593 $(QPEDIR)/rsync/trace.h \ 603 $(OPIEDIR)/rsync/trace.h \
594 $(QPEDIR)/rsync/stream.h 604 $(OPIEDIR)/rsync/stream.h
595 605
596$(QPEDIR)/rsync/patch.o: $(QPEDIR)/rsync/patch.c \ 606$(OPIEDIR)/rsync/patch.o: $(OPIEDIR)/rsync/patch.c \
597 $(QPEDIR)/rsync/config_rsync.h \ 607 $(OPIEDIR)/rsync/config_rsync.h \
598 $(QPEDIR)/rsync/config_linux.h \ 608 $(OPIEDIR)/rsync/config_linux.h \
599 $(QPEDIR)/rsync/rsync.h \ 609 $(OPIEDIR)/rsync/rsync.h \
600 $(QPEDIR)/rsync/util.h \ 610 $(OPIEDIR)/rsync/util.h \
601 $(QPEDIR)/rsync/trace.h \ 611 $(OPIEDIR)/rsync/trace.h \
602 $(QPEDIR)/rsync/protocol.h \ 612 $(OPIEDIR)/rsync/protocol.h \
603 $(QPEDIR)/rsync/netint.h \ 613 $(OPIEDIR)/rsync/netint.h \
604 $(QPEDIR)/rsync/command.h \ 614 $(OPIEDIR)/rsync/command.h \
605 $(QPEDIR)/rsync/sumset.h \ 615 $(OPIEDIR)/rsync/sumset.h \
606 $(QPEDIR)/rsync/prototab.h \ 616 $(OPIEDIR)/rsync/prototab.h \
607 $(QPEDIR)/rsync/stream.h \ 617 $(OPIEDIR)/rsync/stream.h \
608 $(QPEDIR)/rsync/job.h 618 $(OPIEDIR)/rsync/job.h
609 619
610$(QPEDIR)/rsync/prototab.o: $(QPEDIR)/rsync/prototab.c \ 620$(OPIEDIR)/rsync/prototab.o: $(OPIEDIR)/rsync/prototab.c \
611 $(QPEDIR)/rsync/config_rsync.h \ 621 $(OPIEDIR)/rsync/config_rsync.h \
612 $(QPEDIR)/rsync/config_linux.h \ 622 $(OPIEDIR)/rsync/config_linux.h \
613 $(QPEDIR)/rsync/rsync.h \ 623 $(OPIEDIR)/rsync/rsync.h \
614 $(QPEDIR)/rsync/protocol.h \ 624 $(OPIEDIR)/rsync/protocol.h \
615 $(QPEDIR)/rsync/command.h \ 625 $(OPIEDIR)/rsync/command.h \
616 $(QPEDIR)/rsync/prototab.h 626 $(OPIEDIR)/rsync/prototab.h
617 627
618$(QPEDIR)/rsync/readsums.o: $(QPEDIR)/rsync/readsums.c \ 628$(OPIEDIR)/rsync/readsums.o: $(OPIEDIR)/rsync/readsums.c \
619 $(QPEDIR)/rsync/config_rsync.h \ 629 $(OPIEDIR)/rsync/config_rsync.h \
620 $(QPEDIR)/rsync/config_linux.h \ 630 $(OPIEDIR)/rsync/config_linux.h \
621 $(QPEDIR)/rsync/rsync.h \ 631 $(OPIEDIR)/rsync/rsync.h \
622 $(QPEDIR)/rsync/sumset.h \ 632 $(OPIEDIR)/rsync/sumset.h \
623 $(QPEDIR)/rsync/job.h \ 633 $(OPIEDIR)/rsync/job.h \
624 $(QPEDIR)/rsync/trace.h \ 634 $(OPIEDIR)/rsync/trace.h \
625 $(QPEDIR)/rsync/netint.h \ 635 $(OPIEDIR)/rsync/netint.h \
626 $(QPEDIR)/rsync/protocol.h \ 636 $(OPIEDIR)/rsync/protocol.h \
627 $(QPEDIR)/rsync/util.h \ 637 $(OPIEDIR)/rsync/util.h \
628 $(QPEDIR)/rsync/stream.h 638 $(OPIEDIR)/rsync/stream.h
629 639
630$(QPEDIR)/rsync/scoop.o: $(QPEDIR)/rsync/scoop.c \ 640$(OPIEDIR)/rsync/scoop.o: $(OPIEDIR)/rsync/scoop.c \
631 $(QPEDIR)/rsync/config_rsync.h \ 641 $(OPIEDIR)/rsync/config_rsync.h \
632 $(QPEDIR)/rsync/config_linux.h \ 642 $(OPIEDIR)/rsync/config_linux.h \
633 $(QPEDIR)/rsync/rsync.h \ 643 $(OPIEDIR)/rsync/rsync.h \
634 $(QPEDIR)/rsync/job.h \ 644 $(OPIEDIR)/rsync/job.h \
635 $(QPEDIR)/rsync/stream.h \ 645 $(OPIEDIR)/rsync/stream.h \
636 $(QPEDIR)/rsync/trace.h \ 646 $(OPIEDIR)/rsync/trace.h \
637 $(QPEDIR)/rsync/util.h 647 $(OPIEDIR)/rsync/util.h
638 648
639$(QPEDIR)/rsync/search.o: $(QPEDIR)/rsync/search.c \ 649$(OPIEDIR)/rsync/search.o: $(OPIEDIR)/rsync/search.c \
640 $(QPEDIR)/rsync/config_rsync.h \ 650 $(OPIEDIR)/rsync/config_rsync.h \
641 $(QPEDIR)/rsync/config_linux.h \ 651 $(OPIEDIR)/rsync/config_linux.h \
642 $(QPEDIR)/rsync/rsync.h \ 652 $(OPIEDIR)/rsync/rsync.h \
643 $(QPEDIR)/rsync/trace.h \ 653 $(OPIEDIR)/rsync/trace.h \
644 $(QPEDIR)/rsync/util.h \ 654 $(OPIEDIR)/rsync/util.h \
645 $(QPEDIR)/rsync/sumset.h \ 655 $(OPIEDIR)/rsync/sumset.h \
646 $(QPEDIR)/rsync/search.h \ 656 $(OPIEDIR)/rsync/search.h \
647 $(QPEDIR)/rsync/checksum.h 657 $(OPIEDIR)/rsync/checksum.h
648 658
649$(QPEDIR)/rsync/stats.o: $(QPEDIR)/rsync/stats.c \ 659$(OPIEDIR)/rsync/stats.o: $(OPIEDIR)/rsync/stats.c \
650 $(QPEDIR)/rsync/config_rsync.h \ 660 $(OPIEDIR)/rsync/config_rsync.h \
651 $(QPEDIR)/rsync/config_linux.h \ 661 $(OPIEDIR)/rsync/config_linux.h \
652 $(QPEDIR)/rsync/rsync.h \ 662 $(OPIEDIR)/rsync/rsync.h \
653 $(QPEDIR)/rsync/trace.h 663 $(OPIEDIR)/rsync/trace.h
654 664
655$(QPEDIR)/rsync/stream.o: $(QPEDIR)/rsync/stream.c \ 665$(OPIEDIR)/rsync/stream.o: $(OPIEDIR)/rsync/stream.c \
656 $(QPEDIR)/rsync/config_rsync.h \ 666 $(OPIEDIR)/rsync/config_rsync.h \
657 $(QPEDIR)/rsync/config_linux.h \ 667 $(OPIEDIR)/rsync/config_linux.h \
658 $(QPEDIR)/rsync/rsync.h \ 668 $(OPIEDIR)/rsync/rsync.h \
659 $(QPEDIR)/rsync/stream.h \ 669 $(OPIEDIR)/rsync/stream.h \
660 $(QPEDIR)/rsync/util.h \ 670 $(OPIEDIR)/rsync/util.h \
661 $(QPEDIR)/rsync/trace.h 671 $(OPIEDIR)/rsync/trace.h
662 672
663$(QPEDIR)/rsync/sumset.o: $(QPEDIR)/rsync/sumset.c \ 673$(OPIEDIR)/rsync/sumset.o: $(OPIEDIR)/rsync/sumset.c \
664 $(QPEDIR)/rsync/config_rsync.h \ 674 $(OPIEDIR)/rsync/config_rsync.h \
665 $(QPEDIR)/rsync/config_linux.h \ 675 $(OPIEDIR)/rsync/config_linux.h \
666 $(QPEDIR)/rsync/rsync.h \ 676 $(OPIEDIR)/rsync/rsync.h \
667 $(QPEDIR)/rsync/sumset.h \ 677 $(OPIEDIR)/rsync/sumset.h \
668 $(QPEDIR)/rsync/util.h \ 678 $(OPIEDIR)/rsync/util.h \
669 $(QPEDIR)/rsync/trace.h 679 $(OPIEDIR)/rsync/trace.h
670 680
671$(QPEDIR)/rsync/trace.o: $(QPEDIR)/rsync/trace.c \ 681$(OPIEDIR)/rsync/trace.o: $(OPIEDIR)/rsync/trace.c \
672 $(QPEDIR)/rsync/config_rsync.h \ 682 $(OPIEDIR)/rsync/config_rsync.h \
673 $(QPEDIR)/rsync/config_linux.h \ 683 $(OPIEDIR)/rsync/config_linux.h \
674 $(QPEDIR)/rsync/rsync.h \ 684 $(OPIEDIR)/rsync/rsync.h \
675 $(QPEDIR)/rsync/util.h \ 685 $(OPIEDIR)/rsync/util.h \
676 $(QPEDIR)/rsync/trace.h 686 $(OPIEDIR)/rsync/trace.h
677 687
678$(QPEDIR)/rsync/tube.o: $(QPEDIR)/rsync/tube.c \ 688$(OPIEDIR)/rsync/tube.o: $(OPIEDIR)/rsync/tube.c \
679 $(QPEDIR)/rsync/config_rsync.h \ 689 $(OPIEDIR)/rsync/config_rsync.h \
680 $(QPEDIR)/rsync/config_linux.h \ 690 $(OPIEDIR)/rsync/config_linux.h \
681 $(QPEDIR)/rsync/rsync.h \ 691 $(OPIEDIR)/rsync/rsync.h \
682 $(QPEDIR)/rsync/trace.h \ 692 $(OPIEDIR)/rsync/trace.h \
683 $(QPEDIR)/rsync/util.h \ 693 $(OPIEDIR)/rsync/util.h \
684 $(QPEDIR)/rsync/job.h \ 694 $(OPIEDIR)/rsync/job.h \
685 $(QPEDIR)/rsync/stream.h 695 $(OPIEDIR)/rsync/stream.h
686 696
687$(QPEDIR)/rsync/util.o: $(QPEDIR)/rsync/util.c \ 697$(OPIEDIR)/rsync/util.o: $(OPIEDIR)/rsync/util.c \
688 $(QPEDIR)/rsync/config_rsync.h \ 698 $(OPIEDIR)/rsync/config_rsync.h \
689 $(QPEDIR)/rsync/config_linux.h \ 699 $(OPIEDIR)/rsync/config_linux.h \
690 $(QPEDIR)/rsync/util.h \ 700 $(OPIEDIR)/rsync/util.h \
691 $(QPEDIR)/rsync/rsync.h \ 701 $(OPIEDIR)/rsync/rsync.h \
692 $(QPEDIR)/rsync/trace.h 702 $(OPIEDIR)/rsync/trace.h
693 703
694$(QPEDIR)/rsync/version.o: $(QPEDIR)/rsync/version.c \ 704$(OPIEDIR)/rsync/version.o: $(OPIEDIR)/rsync/version.c \
695 $(QPEDIR)/rsync/config_rsync.h \ 705 $(OPIEDIR)/rsync/config_rsync.h \
696 $(QPEDIR)/rsync/config_linux.h \ 706 $(OPIEDIR)/rsync/config_linux.h \
697 $(QPEDIR)/rsync/rsync.h 707 $(OPIEDIR)/rsync/rsync.h
698 708
699$(QPEDIR)/rsync/whole.o: $(QPEDIR)/rsync/whole.c \ 709$(OPIEDIR)/rsync/whole.o: $(OPIEDIR)/rsync/whole.c \
700 $(QPEDIR)/rsync/config_rsync.h \ 710 $(OPIEDIR)/rsync/config_rsync.h \
701 $(QPEDIR)/rsync/config_linux.h \ 711 $(OPIEDIR)/rsync/config_linux.h \
702 $(QPEDIR)/rsync/rsync.h \ 712 $(OPIEDIR)/rsync/rsync.h \
703 $(QPEDIR)/rsync/trace.h \ 713 $(OPIEDIR)/rsync/trace.h \
704 $(QPEDIR)/rsync/fileutil.h \ 714 $(OPIEDIR)/rsync/fileutil.h \
705 $(QPEDIR)/rsync/sumset.h \ 715 $(OPIEDIR)/rsync/sumset.h \
706 $(QPEDIR)/rsync/job.h \ 716 $(OPIEDIR)/rsync/job.h \
707 $(QPEDIR)/rsync/buf.h \ 717 $(OPIEDIR)/rsync/buf.h \
708 $(QPEDIR)/rsync/whole.h \ 718 $(OPIEDIR)/rsync/whole.h \
709 $(QPEDIR)/rsync/util.h 719 $(OPIEDIR)/rsync/util.h
710 720
711$(QPEDIR)/rsync/qrsync.o: $(QPEDIR)/rsync/qrsync.cpp \ 721$(OPIEDIR)/rsync/qrsync.o: $(OPIEDIR)/rsync/qrsync.cpp \
712 $(QPEDIR)/rsync/qrsync.h \ 722 $(OPIEDIR)/rsync/qrsync.h \
713 $(QPEDIR)/rsync/rsync.h 723 $(OPIEDIR)/rsync/rsync.h
714 724
715shutdown.h: shutdown.ui 725shutdown.h: shutdown.ui
716 $(UIC) shutdown.ui -o $(INTERFACE_DECL_PATH)/shutdown.h 726 $(UIC) shutdown.ui -o $(INTERFACE_DECL_PATH)/shutdown.h
717 727
718shutdown.cpp: shutdown.ui 728shutdown.cpp: shutdown.ui
719 $(UIC) shutdown.ui -i shutdown.h -o shutdown.cpp 729 $(UIC) shutdown.ui -i shutdown.h -o shutdown.cpp
720 730
721syncdialog.h: syncdialog.ui 731syncdialog.h: syncdialog.ui
722 $(UIC) syncdialog.ui -o $(INTERFACE_DECL_PATH)/syncdialog.h 732 $(UIC) syncdialog.ui -o $(INTERFACE_DECL_PATH)/syncdialog.h
723 733
724syncdialog.cpp: syncdialog.ui 734syncdialog.cpp: syncdialog.ui
725 $(UIC) syncdialog.ui -i syncdialog.h -o syncdialog.cpp 735 $(UIC) syncdialog.ui -i syncdialog.h -o syncdialog.cpp
726 736
727shutdown.o: shutdown.cpp \ 737shutdown.o: shutdown.cpp
728 shutdown.h
729 738
730syncdialog.o: syncdialog.cpp 739syncdialog.o: syncdialog.cpp
731 740
732moc_background.o: moc_background.cpp \ 741moc_background.o: moc_background.cpp \
733 background.h 742 background.h
734 743
735moc_desktop.o: moc_desktop.cpp \ 744moc_desktop.o: moc_desktop.cpp \
736 desktop.h \ 745 desktop.h \
737 shutdownimpl.h \ 746 shutdownimpl.h \
738 shutdown.h \ 747 shutdown.h \
739 $(QPEDIR)/include/qpe/qpeapplication.h 748 $(OPIEDIR)/include/qpe/qpeapplication.h
740 749
741moc_info.o: moc_info.cpp \ 750moc_info.o: moc_info.cpp \
742 info.h \ 751 info.h \
743 background.h 752 background.h
744 753
745moc_appicons.o: moc_appicons.cpp \ 754moc_appicons.o: moc_appicons.cpp \
746 appicons.h 755 appicons.h
747 756
748moc_taskbar.o: moc_taskbar.cpp \ 757moc_taskbar.o: moc_taskbar.cpp \
749 taskbar.h \ 758 taskbar.h \
750 $(QPEDIR)/include/qpe/custom.h 759 $(OPIEDIR)/include/qpe/custom.h
751 760
752moc_sidething.o: moc_sidething.cpp \ 761moc_sidething.o: moc_sidething.cpp \
753 sidething.h \ 762 sidething.h \
754 startmenu.h 763 startmenu.h
755 764
756moc_inputmethods.o: moc_inputmethods.cpp \ 765moc_inputmethods.o: moc_inputmethods.cpp \
757 inputmethods.h \ 766 inputmethods.h \
758 $(QPEDIR)/include/qpe/inputmethodinterface.h \ 767 $(OPIEDIR)/include/qpe/inputmethodinterface.h \
759 $(QPEDIR)/include/qpe/qcom.h \ 768 $(OPIEDIR)/include/qpe/qcom.h \
760 $(QPEDIR)/include/qpe/quuid.h 769 $(OPIEDIR)/include/qpe/quuid.h
761 770
762moc_systray.o: moc_systray.cpp \ 771moc_systray.o: moc_systray.cpp \
763 systray.h \ 772 systray.h \
764 $(QPEDIR)/include/qpe/taskbarappletinterface.h \ 773 $(OPIEDIR)/include/qpe/taskbarappletinterface.h \
765 $(QPEDIR)/include/qpe/qcom.h \ 774 $(OPIEDIR)/include/qpe/qcom.h \
766 $(QPEDIR)/include/qpe/quuid.h 775 $(OPIEDIR)/include/qpe/quuid.h
767 776
768moc_shutdownimpl.o: moc_shutdownimpl.cpp \ 777moc_shutdownimpl.o: moc_shutdownimpl.cpp \
769 shutdownimpl.h \ 778 shutdownimpl.h \
770 shutdown.h 779 shutdown.h
771 780
772moc_launcher.o: moc_launcher.cpp \ 781moc_launcher.o: moc_launcher.cpp \
773 launcher.h \ 782 launcher.h \
774 launcherview.h \ 783 launcherview.h \
775 $(QPEDIR)/include/qpe/storage.h 784 $(OPIEDIR)/include/qpe/storage.h
776 785
777moc_launcherview.o: moc_launcherview.cpp \ 786moc_launcherview.o: moc_launcherview.cpp \
778 launcherview.h \ 787 launcherview.h \
779 $(QPEDIR)/include/qpe/storage.h 788 $(OPIEDIR)/include/qpe/storage.h
780 789
781../calibrate/moc_calibrate.o: ../calibrate/moc_calibrate.cpp \ 790../calibrate/moc_calibrate.o: ../calibrate/moc_calibrate.cpp \
782 ../calibrate/calibrate.h 791 ../calibrate/calibrate.h
783 792
784moc_startmenu.o: moc_startmenu.cpp \ 793moc_startmenu.o: moc_startmenu.cpp \
785 startmenu.h 794 startmenu.h
786 795
787moc_transferserver.o: moc_transferserver.cpp \ 796moc_transferserver.o: moc_transferserver.cpp \
788 transferserver.h 797 transferserver.h
789 798
790moc_qcopbridge.o: moc_qcopbridge.cpp \ 799moc_qcopbridge.o: moc_qcopbridge.cpp \
791 qcopbridge.h 800 qcopbridge.h
792 801
793moc_packageslave.o: moc_packageslave.cpp \ 802moc_packageslave.o: moc_packageslave.cpp \
794 packageslave.h 803 packageslave.h
795 804
796moc_irserver.o: moc_irserver.cpp \ 805moc_irserver.o: moc_irserver.cpp \
797 irserver.h 806 irserver.h
798 807
799moc_shutdown.o: appicons.moc \ 808moc_shutdown.o: appicons.moc \
800 appicons.cpp \ 809 appicons.cpp \
801 appicons.h \ 810 appicons.h \
802 $(QPEDIR)/include/qpe/qcopenvelope_qws.h 811 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
803 812
804moc_syncdialog.o: moc_shutdown.cpp \ 813moc_syncdialog.o: moc_shutdown.cpp \
805 shutdown.h 814 shutdown.h
806 815
807moc_background.cpp: background.h 816moc_background.cpp: background.h
808 $(MOC) background.h -o moc_background.cpp 817 $(MOC) background.h -o moc_background.cpp
809 818
810moc_desktop.cpp: desktop.h 819moc_desktop.cpp: desktop.h
811 $(MOC) desktop.h -o moc_desktop.cpp 820 $(MOC) desktop.h -o moc_desktop.cpp
812 821
813moc_info.cpp: info.h 822moc_info.cpp: info.h
814 $(MOC) info.h -o moc_info.cpp 823 $(MOC) info.h -o moc_info.cpp
815 824
816moc_appicons.cpp: appicons.h 825moc_appicons.cpp: appicons.h
817 $(MOC) appicons.h -o moc_appicons.cpp 826 $(MOC) appicons.h -o moc_appicons.cpp
818 827
819moc_taskbar.cpp: taskbar.h 828moc_taskbar.cpp: taskbar.h
820 $(MOC) taskbar.h -o moc_taskbar.cpp 829 $(MOC) taskbar.h -o moc_taskbar.cpp
821 830
822moc_sidething.cpp: sidething.h 831moc_sidething.cpp: sidething.h
823 $(MOC) sidething.h -o moc_sidething.cpp 832 $(MOC) sidething.h -o moc_sidething.cpp
824 833
825moc_inputmethods.cpp: inputmethods.h 834moc_inputmethods.cpp: inputmethods.h
826 $(MOC) inputmethods.h -o moc_inputmethods.cpp 835 $(MOC) inputmethods.h -o moc_inputmethods.cpp
827 836
828moc_systray.cpp: systray.h 837moc_systray.cpp: systray.h
829 $(MOC) systray.h -o moc_systray.cpp 838 $(MOC) systray.h -o moc_systray.cpp
830 839
831moc_shutdownimpl.cpp: shutdownimpl.h 840moc_shutdownimpl.cpp: shutdownimpl.h
832 $(MOC) shutdownimpl.h -o moc_shutdownimpl.cpp 841 $(MOC) shutdownimpl.h -o moc_shutdownimpl.cpp
833 842
834moc_launcher.cpp: launcher.h 843moc_launcher.cpp: launcher.h
835 $(MOC) launcher.h -o moc_launcher.cpp 844 $(MOC) launcher.h -o moc_launcher.cpp
836 845
837moc_launcherview.cpp: launcherview.h 846moc_launcherview.cpp: launcherview.h
838 $(MOC) launcherview.h -o moc_launcherview.cpp 847 $(MOC) launcherview.h -o moc_launcherview.cpp
839 848
840../calibrate/moc_calibrate.cpp: ../calibrate/calibrate.h 849../calibrate/moc_calibrate.cpp: ../calibrate/calibrate.h
841 $(MOC) ../calibrate/calibrate.h -o ../calibrate/moc_calibrate.cpp 850 $(MOC) ../calibrate/calibrate.h -o ../calibrate/moc_calibrate.cpp
842 851
843moc_startmenu.cpp: startmenu.h 852moc_startmenu.cpp: startmenu.h
844 $(MOC) startmenu.h -o moc_startmenu.cpp 853 $(MOC) startmenu.h -o moc_startmenu.cpp
845 854
846moc_transferserver.cpp: transferserver.h 855moc_transferserver.cpp: transferserver.h
847 $(MOC) transferserver.h -o moc_transferserver.cpp 856 $(MOC) transferserver.h -o moc_transferserver.cpp
848 857
849moc_qcopbridge.cpp: qcopbridge.h 858moc_qcopbridge.cpp: qcopbridge.h
850 $(MOC) qcopbridge.h -o moc_qcopbridge.cpp 859 $(MOC) qcopbridge.h -o moc_qcopbridge.cpp
851 860
852moc_packageslave.cpp: packageslave.h 861moc_packageslave.cpp: packageslave.h
853 $(MOC) packageslave.h -o moc_packageslave.cpp 862 $(MOC) packageslave.h -o moc_packageslave.cpp
854 863
855moc_irserver.cpp: irserver.h 864moc_irserver.cpp: irserver.h
856 $(MOC) irserver.h -o moc_irserver.cpp 865 $(MOC) irserver.h -o moc_irserver.cpp
857 866
858appicons.moc: appicons.cpp 867appicons.moc: appicons.cpp
859 $(MOC) appicons.cpp -o appicons.moc 868 $(MOC) appicons.cpp -o appicons.moc
860 869
861moc_shutdown.cpp: shutdown.h 870moc_shutdown.cpp: shutdown.h
862 $(MOC) shutdown.h -o moc_shutdown.cpp 871 $(MOC) shutdown.h -o moc_shutdown.cpp
863 872
864moc_syncdialog.cpp: syncdialog.h 873moc_syncdialog.cpp: syncdialog.h
865 $(MOC) syncdialog.h -o moc_syncdialog.cpp 874 $(MOC) syncdialog.h -o moc_syncdialog.cpp
866 875
867 876
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index 7d7c9ac..0078faf 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -1,110 +1,110 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 2
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 4
5 DESTDIR = $(QPEDIR)/bin 5 DESTDIR = $(OPIEDIR)/bin
6 6
7 HEADERS = background.h \ 7 HEADERS = background.h \
8 desktop.h \ 8 desktop.h \
9 info.h \ 9 info.h \
10 appicons.h \ 10 appicons.h \
11 taskbar.h \ 11 taskbar.h \
12 sidething.h \ 12 sidething.h \
13 mrulist.h \ 13 mrulist.h \
14 stabmon.h \ 14 stabmon.h \
15 inputmethods.h \ 15 inputmethods.h \
16 systray.h \ 16 systray.h \
17 wait.h \ 17 wait.h \
18 shutdownimpl.h \ 18 shutdownimpl.h \
19 launcher.h \ 19 launcher.h \
20 launcherview.h \ 20 launcherview.h \
21 ../calibrate/calibrate.h \ 21 ../calibrate/calibrate.h \
22 startmenu.h \ 22 startmenu.h \
23 transferserver.h \ 23 transferserver.h \
24 qcopbridge.h \ 24 qcopbridge.h \
25 packageslave.h \ 25 packageslave.h \
26 irserver.h \ 26 irserver.h \
27 $(QPEDIR)/rsync/buf.h \ 27 $(OPIEDIR)/rsync/buf.h \
28 $(QPEDIR)/rsync/checksum.h \ 28 $(OPIEDIR)/rsync/checksum.h \
29 $(QPEDIR)/rsync/command.h \ 29 $(OPIEDIR)/rsync/command.h \
30 $(QPEDIR)/rsync/emit.h \ 30 $(OPIEDIR)/rsync/emit.h \
31 $(QPEDIR)/rsync/job.h \ 31 $(OPIEDIR)/rsync/job.h \
32 $(QPEDIR)/rsync/netint.h \ 32 $(OPIEDIR)/rsync/netint.h \
33 $(QPEDIR)/rsync/protocol.h \ 33 $(OPIEDIR)/rsync/protocol.h \
34 $(QPEDIR)/rsync/prototab.h \ 34 $(OPIEDIR)/rsync/prototab.h \
35 $(QPEDIR)/rsync/rsync.h \ 35 $(OPIEDIR)/rsync/rsync.h \
36 $(QPEDIR)/rsync/search.h \ 36 $(OPIEDIR)/rsync/search.h \
37 $(QPEDIR)/rsync/stream.h \ 37 $(OPIEDIR)/rsync/stream.h \
38 $(QPEDIR)/rsync/sumset.h \ 38 $(OPIEDIR)/rsync/sumset.h \
39 $(QPEDIR)/rsync/trace.h \ 39 $(OPIEDIR)/rsync/trace.h \
40 $(QPEDIR)/rsync/types.h \ 40 $(OPIEDIR)/rsync/types.h \
41 $(QPEDIR)/rsync/util.h \ 41 $(OPIEDIR)/rsync/util.h \
42 $(QPEDIR)/rsync/whole.h \ 42 $(OPIEDIR)/rsync/whole.h \
43 $(QPEDIR)/rsync/config_rsync.h \ 43 $(OPIEDIR)/rsync/config_rsync.h \
44 $(QPEDIR)/rsync/qrsync.h 44 $(OPIEDIR)/rsync/qrsync.h
45 # quicklauncher.h \ 45 # quicklauncher.h \
46 46
47 SOURCES = background.cpp \ 47 SOURCES = background.cpp \
48 desktop.cpp \ 48 desktop.cpp \
49 info.cpp \ 49 info.cpp \
50 appicons.cpp \ 50 appicons.cpp \
51 taskbar.cpp \ 51 taskbar.cpp \
52 sidething.cpp \ 52 sidething.cpp \
53 mrulist.cpp \ 53 mrulist.cpp \
54 stabmon.cpp \ 54 stabmon.cpp \
55 inputmethods.cpp \ 55 inputmethods.cpp \
56 systray.cpp \ 56 systray.cpp \
57 wait.cpp \ 57 wait.cpp \
58 shutdownimpl.cpp \ 58 shutdownimpl.cpp \
59 launcher.cpp \ 59 launcher.cpp \
60 launcherview.cpp \ 60 launcherview.cpp \
61 $(QPEDIR)/calibrate/calibrate.cpp \ 61 $(OPIEDIR)/calibrate/calibrate.cpp \
62 transferserver.cpp \ 62 transferserver.cpp \
63 packageslave.cpp \ 63 packageslave.cpp \
64 irserver.cpp \ 64 irserver.cpp \
65 qcopbridge.cpp \ 65 qcopbridge.cpp \
66 startmenu.cpp \ 66 startmenu.cpp \
67 main.cpp \ 67 main.cpp \
68 $(QPEDIR)/rsync/base64.c \ 68 $(OPIEDIR)/rsync/base64.c \
69 $(QPEDIR)/rsync/buf.c \ 69 $(OPIEDIR)/rsync/buf.c \
70 $(QPEDIR)/rsync/checksum.c \ 70 $(OPIEDIR)/rsync/checksum.c \
71 $(QPEDIR)/rsync/command.c \ 71 $(OPIEDIR)/rsync/command.c \
72 $(QPEDIR)/rsync/delta.c \ 72 $(OPIEDIR)/rsync/delta.c \
73 $(QPEDIR)/rsync/emit.c \ 73 $(OPIEDIR)/rsync/emit.c \
74 $(QPEDIR)/rsync/hex.c \ 74 $(OPIEDIR)/rsync/hex.c \
75 $(QPEDIR)/rsync/job.c \ 75 $(OPIEDIR)/rsync/job.c \
76 $(QPEDIR)/rsync/mdfour.c \ 76 $(OPIEDIR)/rsync/mdfour.c \
77 $(QPEDIR)/rsync/mksum.c \ 77 $(OPIEDIR)/rsync/mksum.c \
78 $(QPEDIR)/rsync/msg.c \ 78 $(OPIEDIR)/rsync/msg.c \
79 $(QPEDIR)/rsync/netint.c \ 79 $(OPIEDIR)/rsync/netint.c \
80 $(QPEDIR)/rsync/patch.c \ 80 $(OPIEDIR)/rsync/patch.c \
81 $(QPEDIR)/rsync/prototab.c \ 81 $(OPIEDIR)/rsync/prototab.c \
82 $(QPEDIR)/rsync/readsums.c \ 82 $(OPIEDIR)/rsync/readsums.c \
83 $(QPEDIR)/rsync/scoop.c \ 83 $(OPIEDIR)/rsync/scoop.c \
84 $(QPEDIR)/rsync/search.c \ 84 $(OPIEDIR)/rsync/search.c \
85 $(QPEDIR)/rsync/stats.c \ 85 $(OPIEDIR)/rsync/stats.c \
86 $(QPEDIR)/rsync/stream.c \ 86 $(OPIEDIR)/rsync/stream.c \
87 $(QPEDIR)/rsync/sumset.c \ 87 $(OPIEDIR)/rsync/sumset.c \
88 $(QPEDIR)/rsync/trace.c \ 88 $(OPIEDIR)/rsync/trace.c \
89 $(QPEDIR)/rsync/tube.c \ 89 $(OPIEDIR)/rsync/tube.c \
90 $(QPEDIR)/rsync/util.c \ 90 $(OPIEDIR)/rsync/util.c \
91 $(QPEDIR)/rsync/version.c \ 91 $(OPIEDIR)/rsync/version.c \
92 $(QPEDIR)/rsync/whole.c \ 92 $(OPIEDIR)/rsync/whole.c \
93 $(QPEDIR)/rsync/qrsync.cpp 93 $(OPIEDIR)/rsync/qrsync.cpp
94 94
95 INTERFACES= shutdown.ui syncdialog.ui 95 INTERFACES= shutdown.ui syncdialog.ui
96 96
97INCLUDEPATH += $(QPEDIR)/include 97INCLUDEPATH += $(OPIEDIR)/include
98 DEPENDPATH+= $(QPEDIR)/include . 98 DEPENDPATH+= $(OPIEDIR)/include .
99 99
100INCLUDEPATH += $(QPEDIR)/calibrate 100INCLUDEPATH += $(OPIEDIR)/calibrate
101 DEPENDPATH+= $(QPEDIR)/calibrate 101 DEPENDPATH+= $(OPIEDIR)/calibrate
102 102
103INCLUDEPATH += $(QPEDIR)/rsync 103INCLUDEPATH += $(OPIEDIR)/rsync
104 DEPENDPATH+= $(QPEDIR)/rsync 104 DEPENDPATH+= $(OPIEDIR)/rsync
105 105
106 TARGET = qpe 106 TARGET = qpe
107 107
108 LIBS += -lqpe -lcrypt 108 LIBS += -lqpe -lcrypt
109 109
110TRANSLATIONS = ../i18n/de/qpe.ts 110TRANSLATIONS = ../i18n/de/qpe.ts
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 024f9cc..12c2a7c 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -1,276 +1,276 @@
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 "desktop.h" 21#include "desktop.h"
22#include "taskbar.h" 22#include "taskbar.h"
23#include "stabmon.h" 23#include "stabmon.h"
24 24
25#include <qpe/qpeapplication.h> 25#include <qpe/qpeapplication.h>
26#include <qpe/network.h> 26#include <qpe/network.h>
27#include <qpe/config.h> 27#include <qpe/config.h>
28#ifdef QT_QWS_CUSTOM 28#ifdef QT_QWS_CUSTOM
29#include <qpe/custom.h> 29#include <qpe/custom.h>
30#endif 30#endif
31 31
32#include <qfile.h> 32#include <qfile.h>
33#include <qwindowsystem_qws.h> 33#include <qwindowsystem_qws.h>
34#include <qpe/qcopenvelope_qws.h> 34#include <qpe/qcopenvelope_qws.h>
35#include <qpe/alarmserver.h> 35#include <qpe/alarmserver.h>
36 36
37#include <stdlib.h> 37#include <stdlib.h>
38#include <stdio.h> 38#include <stdio.h>
39#include <signal.h> 39#include <signal.h>
40#include <unistd.h> 40#include <unistd.h>
41 41
42#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) 42#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
43#include "../calibrate/calibrate.h" 43#include "../calibrate/calibrate.h"
44#endif 44#endif
45 45
46#ifdef QT_QWS_LOGIN 46#ifdef QT_QWS_LOGIN
47#include "../login/qdmdialogimpl.h" 47#include "../login/qdmdialogimpl.h"
48#endif 48#endif
49 49
50#ifdef QT_QWS_CASSIOPEIA 50#ifdef QT_QWS_CASSIOPEIA
51static void ignoreMessage( QtMsgType, const char * ) 51static void ignoreMessage( QtMsgType, const char * )
52{ 52{
53} 53}
54#include <sys/mount.h> 54#include <sys/mount.h>
55#include <sys/types.h> 55#include <sys/types.h>
56#include <sys/stat.h> 56#include <sys/stat.h>
57#include <sys/time.h> 57#include <sys/time.h>
58#include <fcntl.h> 58#include <fcntl.h>
59#include <qdatetime.h> 59#include <qdatetime.h>
60 60
61void initCassiopeia() 61void initCassiopeia()
62{ 62{
63 // MIPSEL-specific init - make sure /proc exists for shm 63 // MIPSEL-specific init - make sure /proc exists for shm
64/* 64/*
65 if ( mount("/dev/ram0", "/", "ext2", MS_REMOUNT | MS_MGC_VAL, 0 ) ) { 65 if ( mount("/dev/ram0", "/", "ext2", MS_REMOUNT | MS_MGC_VAL, 0 ) ) {
66 perror("Remounting - / read/write"); 66 perror("Remounting - / read/write");
67 } 67 }
68*/ 68*/
69 if ( mount("none", "/tmp", "ramfs", 0, 0 ) ) { 69 if ( mount("none", "/tmp", "ramfs", 0, 0 ) ) {
70 perror("mounting ramfs /tmp"); 70 perror("mounting ramfs /tmp");
71 } else { 71 } else {
72 fprintf( stderr, "mounted /tmp\n" ); 72 fprintf( stderr, "mounted /tmp\n" );
73 } 73 }
74 if ( mount("none", "/home", "ramfs", 0, 0 ) ) { 74 if ( mount("none", "/home", "ramfs", 0, 0 ) ) {
75 perror("mounting ramfs /home"); 75 perror("mounting ramfs /home");
76 } else { 76 } else {
77 fprintf( stderr, "mounted /home\n" ); 77 fprintf( stderr, "mounted /home\n" );
78 } 78 }
79 if ( mount("none","/proc","proc",0,0) ) { 79 if ( mount("none","/proc","proc",0,0) ) {
80 perror("Mounting - /proc"); 80 perror("Mounting - /proc");
81 } else { 81 } else {
82 fprintf( stderr, "mounted /proc\n" ); 82 fprintf( stderr, "mounted /proc\n" );
83 } 83 }
84 if ( mount("none","/mnt","shm",0,0) ) { 84 if ( mount("none","/mnt","shm",0,0) ) {
85 perror("Mounting - shm"); 85 perror("Mounting - shm");
86 } 86 }
87 setenv( "QTDIR", "/", 1 ); 87 setenv( "QTDIR", "/", 1 );
88 setenv( "QPEDIR", "/", 1 ); 88 setenv( "OPIEDIR", "/", 1 );
89 setenv( "HOME", "/home", 1 ); 89 setenv( "HOME", "/home", 1 );
90 mkdir( "/home/Documents", 0755 ); 90 mkdir( "/home/Documents", 0755 );
91 91
92 // set a reasonable starting date 92 // set a reasonable starting date
93 QDateTime dt( QDate( 2001, 3, 15 ) ); 93 QDateTime dt( QDate( 2001, 3, 15 ) );
94 QDateTime now = QDateTime::currentDateTime(); 94 QDateTime now = QDateTime::currentDateTime();
95 int change = now.secsTo( dt ); 95 int change = now.secsTo( dt );
96 96
97 time_t t = ::time(0); 97 time_t t = ::time(0);
98 t += change; 98 t += change;
99 stime(&t); 99 stime(&t);
100 100
101 qInstallMsgHandler(ignoreMessage); 101 qInstallMsgHandler(ignoreMessage);
102} 102}
103#endif 103#endif
104 104
105#ifdef QPE_OWNAPM 105#ifdef QPE_OWNAPM
106#include <sys/ioctl.h> 106#include <sys/ioctl.h>
107#include <sys/types.h> 107#include <sys/types.h>
108#include <fcntl.h> 108#include <fcntl.h>
109#include <unistd.h> 109#include <unistd.h>
110#include <errno.h> 110#include <errno.h>
111#include <linux/ioctl.h> 111#include <linux/ioctl.h>
112#include <qpe/global.h> 112#include <qpe/global.h>
113 113
114static void disableAPM() 114static void disableAPM()
115{ 115{
116 116
117 int fd, cur_val, ret; 117 int fd, cur_val, ret;
118 char *device = "/dev/apm_bios"; 118 char *device = "/dev/apm_bios";
119 119
120 fd = open (device, O_WRONLY); 120 fd = open (device, O_WRONLY);
121 121
122 if (fd == -1) { 122 if (fd == -1) {
123 perror(device); 123 perror(device);
124 return; 124 return;
125 } 125 }
126 126
127 cur_val = ioctl(fd, APM_IOCGEVTSRC, 0); 127 cur_val = ioctl(fd, APM_IOCGEVTSRC, 0);
128 if (cur_val == -1) { 128 if (cur_val == -1) {
129 perror("ioctl"); 129 perror("ioctl");
130 exit(errno); 130 exit(errno);
131 } 131 }
132 132
133 ret = ioctl(fd, APM_IOCSEVTSRC, cur_val & ~APM_EVT_POWER_BUTTON); 133 ret = ioctl(fd, APM_IOCSEVTSRC, cur_val & ~APM_EVT_POWER_BUTTON);
134 if (ret == -1) { 134 if (ret == -1) {
135 perror("ioctl"); 135 perror("ioctl");
136 return; 136 return;
137 } 137 }
138 close(fd); 138 close(fd);
139} 139}
140 140
141static void initAPM() 141static void initAPM()
142{ 142{
143 // So that we have to do it ourself, but better. 143 // So that we have to do it ourself, but better.
144 disableAPM(); 144 disableAPM();
145} 145}
146#endif 146#endif
147 147
148#ifdef QT_DEMO_SINGLE_FLOPPY 148#ifdef QT_DEMO_SINGLE_FLOPPY
149#include <sys/mount.h> 149#include <sys/mount.h>
150 150
151void initFloppy() 151void initFloppy()
152{ 152{
153 mount("none","/proc","proc",0,0); 153 mount("none","/proc","proc",0,0);
154 setenv( "QTDIR", "/", 0 ); 154 setenv( "QTDIR", "/", 0 );
155 setenv( "HOME", "/root", 0 ); 155 setenv( "HOME", "/root", 0 );
156 setenv( "QWS_SIZE", "240x320", 0 ); 156 setenv( "QWS_SIZE", "240x320", 0 );
157} 157}
158#endif 158#endif
159 159
160 160
161void initEnvironment() 161void initEnvironment()
162{ 162{
163 Config config("locale"); 163 Config config("locale");
164 config.setGroup( "Location" ); 164 config.setGroup( "Location" );
165 QString tz = config.readEntry( "Timezone", getenv("TZ") ); 165 QString tz = config.readEntry( "Timezone", getenv("TZ") );
166 166
167 // if not timezone set, pick New York 167 // if not timezone set, pick New York
168 if (tz.isNull()) 168 if (tz.isNull())
169 tz = "America/New_York"; 169 tz = "America/New_York";
170 170
171 setenv( "TZ", tz, 1 ); 171 setenv( "TZ", tz, 1 );
172 config.writeEntry( "Timezone", tz); 172 config.writeEntry( "Timezone", tz);
173 173
174 config.setGroup( "Language" ); 174 config.setGroup( "Language" );
175 QString lang = config.readEntry( "Language", getenv("LANG") ); 175 QString lang = config.readEntry( "Language", getenv("LANG") );
176 if ( !lang.isNull() ) 176 if ( !lang.isNull() )
177 setenv( "LANG", lang, 1 ); 177 setenv( "LANG", lang, 1 );
178} 178}
179 179
180static void initBacklight() 180static void initBacklight()
181{ 181{
182 QCopEnvelope e("QPE/System", "setBacklight(int)" ); 182 QCopEnvelope e("QPE/System", "setBacklight(int)" );
183 e << -3; // Forced on 183 e << -3; // Forced on
184} 184}
185 185
186 186
187 187
188int initApplication( int argc, char ** argv ) 188int initApplication( int argc, char ** argv )
189{ 189{
190#ifdef QT_QWS_CASSIOPEIA 190#ifdef QT_QWS_CASSIOPEIA
191 initCassiopeia(); 191 initCassiopeia();
192#endif 192#endif
193 193
194#ifdef QPE_OWNAPM 194#ifdef QPE_OWNAPM
195 initAPM(); 195 initAPM();
196#endif 196#endif
197 197
198#ifdef QT_DEMO_SINGLE_FLOPPY 198#ifdef QT_DEMO_SINGLE_FLOPPY
199 initFloppy(); 199 initFloppy();
200#endif 200#endif
201 201
202 initEnvironment(); 202 initEnvironment();
203 203
204#if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_EBX) 204#if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_EBX)
205 setenv( "QWS_SIZE", "240x320", 0 ); 205 setenv( "QWS_SIZE", "240x320", 0 );
206#endif 206#endif
207 207
208 //Don't flicker at startup: 208 //Don't flicker at startup:
209 QWSServer::setDesktopBackground( QImage() ); 209 QWSServer::setDesktopBackground( QImage() );
210 DesktopApplication a( argc, argv, QApplication::GuiServer ); 210 DesktopApplication a( argc, argv, QApplication::GuiServer );
211 211
212 initBacklight(); 212 initBacklight();
213 213
214 AlarmServer::initialize(); 214 AlarmServer::initialize();
215 215
216#if defined(QT_QWS_LOGIN) 216#if defined(QT_QWS_LOGIN)
217 for( int i=0; i<a.argc(); i++ ) 217 for( int i=0; i<a.argc(); i++ )
218 if( strcmp( a.argv()[i], "-login" ) == 0 ) { 218 if( strcmp( a.argv()[i], "-login" ) == 0 ) {
219 QDMDialogImpl::login( ); 219 QDMDialogImpl::login( );
220 return 0; 220 return 0;
221 } 221 }
222#endif 222#endif
223 223
224 Desktop *d = new Desktop(); 224 Desktop *d = new Desktop();
225 225
226 QObject::connect( &a, SIGNAL(datebook()), d, SLOT(raiseDatebook()) ); 226 QObject::connect( &a, SIGNAL(datebook()), d, SLOT(raiseDatebook()) );
227 QObject::connect( &a, SIGNAL(contacts()), d, SLOT(raiseContacts()) ); 227 QObject::connect( &a, SIGNAL(contacts()), d, SLOT(raiseContacts()) );
228 QObject::connect( &a, SIGNAL(launch()), d, SLOT(raiseLauncher()) ); 228 QObject::connect( &a, SIGNAL(launch()), d, SLOT(raiseLauncher()) );
229 QObject::connect( &a, SIGNAL(email()), d, SLOT(raiseEmail()) ); 229 QObject::connect( &a, SIGNAL(email()), d, SLOT(raiseEmail()) );
230 QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) ); 230 QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) );
231 QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) ); 231 QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) );
232 QObject::connect( &a, SIGNAL(symbol()), d, SLOT(toggleSymbolInput()) ); 232 QObject::connect( &a, SIGNAL(symbol()), d, SLOT(toggleSymbolInput()) );
233 QObject::connect( &a, SIGNAL(numLockStateToggle()), d, SLOT(toggleNumLockState()) ); 233 QObject::connect( &a, SIGNAL(numLockStateToggle()), d, SLOT(toggleNumLockState()) );
234 QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) ); 234 QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) );
235 QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) ); 235 QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) );
236 236
237 (void)new SysFileMonitor(d); 237 (void)new SysFileMonitor(d);
238 Network::createServer(d); 238 Network::createServer(d);
239 239
240#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) 240#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
241 if ( !QFile::exists( "/etc/pointercal" ) ) { 241 if ( !QFile::exists( "/etc/pointercal" ) ) {
242 // Make sure calibration widget starts on top. 242 // Make sure calibration widget starts on top.
243 Calibrate *cal = new Calibrate; 243 Calibrate *cal = new Calibrate;
244 cal->exec(); 244 cal->exec();
245 delete cal; 245 delete cal;
246 } 246 }
247#endif 247#endif
248 248
249 d->show(); 249 d->show();
250 250
251 int rv = a.exec(); 251 int rv = a.exec();
252 252
253 delete d; 253 delete d;
254 254
255 return rv; 255 return rv;
256} 256}
257 257
258int main( int argc, char ** argv ) 258int main( int argc, char ** argv )
259{ 259{
260#ifndef SINGLE_APP 260#ifndef SINGLE_APP
261 signal( SIGCHLD, SIG_IGN ); 261 signal( SIGCHLD, SIG_IGN );
262#endif 262#endif
263 263
264 int retVal = initApplication( argc, argv ); 264 int retVal = initApplication( argc, argv );
265 265
266#ifndef SINGLE_APP 266#ifndef SINGLE_APP
267 // Kill them. Kill them all. 267 // Kill them. Kill them all.
268 setpgid( getpid(), getppid() ); 268 setpgid( getpid(), getppid() );
269 killpg( getpid(), SIGTERM ); 269 killpg( getpid(), SIGTERM );
270 sleep( 1 ); 270 sleep( 1 );
271 killpg( getpid(), SIGKILL ); 271 killpg( getpid(), SIGKILL );
272#endif 272#endif
273 273
274 return retVal; 274 return retVal;
275} 275}
276 276
diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in
index 5fca66e..6e007ec 100644
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/core/multimedia/opieplayer/Makefile.in
@@ -1,280 +1,280 @@
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 -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 = $(QPEDIR)/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:
104 tmake mpegplayer.pro 104 tmake mpegplayer.pro
105 105
106clean: 106clean:
107 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 107 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
108 -rm -f *~ core 108 -rm -f *~ core
109 -rm -f allmoc.cpp 109 -rm -f allmoc.cpp
110 110
111####### Extension Modules 111####### Extension Modules
112 112
113listpromodules: 113listpromodules:
114 @echo 114 @echo
115 115
116listallmodules: 116listallmodules:
117 @echo 117 @echo
118 118
119listaddonpromodules: 119listaddonpromodules:
120 @echo 120 @echo
121 121
122listaddonentmodules: 122listaddonentmodules:
123 @echo 123 @echo
124 124
125 125
126REQUIRES= 126REQUIRES=
127 127
128####### Sub-libraries 128####### Sub-libraries
129 129
130 130
131###### Combined headers 131###### Combined headers
132 132
133 133
134 134
135####### Compile 135####### Compile
136 136
137main.o: main.cpp \ 137main.o: main.cpp \
138 $(QPEDIR)/include/qpe/qpeapplication.h \ 138 $(OPIEDIR)/include/qpe/qpeapplication.h \
139 mediaplayerstate.h \ 139 mediaplayerstate.h \
140 playlistwidget.h \ 140 playlistwidget.h \
141 $(QPEDIR)/include/qpe/applnk.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 $(QPEDIR)/include/qpe/qlibrary.h \ 146 $(OPIEDIR)/include/qpe/qlibrary.h \
147 $(QPEDIR)/include/qpe/qcom.h \ 147 $(OPIEDIR)/include/qpe/qcom.h \
148 $(QPEDIR)/include/qpe/quuid.h \ 148 $(OPIEDIR)/include/qpe/quuid.h \
149 mediaplayerplugininterface.h 149 mediaplayerplugininterface.h
150 150
151loopcontrol.o: loopcontrol.cpp \ 151loopcontrol.o: loopcontrol.cpp \
152 $(QPEDIR)/include/qpe/qpeapplication.h \ 152 $(OPIEDIR)/include/qpe/qpeapplication.h \
153 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 153 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
154 loopcontrol.h \ 154 loopcontrol.h \
155 videowidget.h \ 155 videowidget.h \
156 audiodevice.h \ 156 audiodevice.h \
157 mediaplayerplugininterface.h \ 157 mediaplayerplugininterface.h \
158 $(QPEDIR)/include/qpe/qcom.h \ 158 $(OPIEDIR)/include/qpe/qcom.h \
159 $(QPEDIR)/include/qpe/quuid.h \ 159 $(OPIEDIR)/include/qpe/quuid.h \
160 mediaplayerstate.h 160 mediaplayerstate.h
161 161
162playlistselection.o: playlistselection.cpp \ 162playlistselection.o: playlistselection.cpp \
163 $(QPEDIR)/include/qpe/applnk.h \ 163 $(OPIEDIR)/include/qpe/applnk.h \
164 $(QPEDIR)/include/qpe/resource.h \ 164 $(OPIEDIR)/include/qpe/resource.h \
165 playlistselection.h 165 playlistselection.h
166 166
167mediaplayerstate.o: mediaplayerstate.cpp \ 167mediaplayerstate.o: mediaplayerstate.cpp \
168 $(QPEDIR)/include/qpe/qpeapplication.h \ 168 $(OPIEDIR)/include/qpe/qpeapplication.h \
169 $(QPEDIR)/include/qpe/qlibrary.h \ 169 $(OPIEDIR)/include/qpe/qlibrary.h \
170 $(QPEDIR)/include/qpe/qcom.h \ 170 $(OPIEDIR)/include/qpe/qcom.h \
171 $(QPEDIR)/include/qpe/quuid.h \ 171 $(OPIEDIR)/include/qpe/quuid.h \
172 $(QPEDIR)/include/qpe/config.h \ 172 $(OPIEDIR)/include/qpe/config.h \
173 mediaplayerplugininterface.h \ 173 mediaplayerplugininterface.h \
174 mediaplayerstate.h \ 174 mediaplayerstate.h \
175 libmad/libmadpluginimpl.h \ 175 libmad/libmadpluginimpl.h \
176 libmpeg3/libmpeg3pluginimpl.h \ 176 libmpeg3/libmpeg3pluginimpl.h \
177 wavplugin/wavpluginimpl.h 177 wavplugin/wavpluginimpl.h
178 178
179videowidget.o: videowidget.cpp \ 179videowidget.o: videowidget.cpp \
180 $(QPEDIR)/include/qpe/resource.h \ 180 $(OPIEDIR)/include/qpe/resource.h \
181 videowidget.h \ 181 videowidget.h \
182 mediaplayerplugininterface.h \ 182 mediaplayerplugininterface.h \
183 $(QPEDIR)/include/qpe/qcom.h \ 183 $(OPIEDIR)/include/qpe/qcom.h \
184 $(QPEDIR)/include/qpe/quuid.h \ 184 $(OPIEDIR)/include/qpe/quuid.h \
185 mediaplayerstate.h 185 mediaplayerstate.h
186 186
187audiowidget.o: audiowidget.cpp \ 187audiowidget.o: audiowidget.cpp \
188 $(QPEDIR)/include/qpe/resource.h \ 188 $(OPIEDIR)/include/qpe/resource.h \
189 audiowidget.h \ 189 audiowidget.h \
190 mediaplayerstate.h 190 mediaplayerstate.h
191 191
192playlistwidget.o: playlistwidget.cpp \ 192playlistwidget.o: playlistwidget.cpp \
193 $(QPEDIR)/include/qpe/qpemenubar.h \ 193 $(OPIEDIR)/include/qpe/qpemenubar.h \
194 $(QPEDIR)/include/qpe/qpetoolbar.h \ 194 $(OPIEDIR)/include/qpe/qpetoolbar.h \
195 $(QPEDIR)/include/qpe/fileselector.h \ 195 $(OPIEDIR)/include/qpe/fileselector.h \
196 $(QPEDIR)/include/qpe/applnk.h \ 196 $(OPIEDIR)/include/qpe/applnk.h \
197 $(QPEDIR)/include/qpe/config.h \ 197 $(OPIEDIR)/include/qpe/config.h \
198 $(QPEDIR)/include/qpe/global.h \ 198 $(OPIEDIR)/include/qpe/global.h \
199 $(QPEDIR)/include/qpe/resource.h \ 199 $(OPIEDIR)/include/qpe/resource.h \
200 playlistselection.h \ 200 playlistselection.h \
201 playlistwidget.h \ 201 playlistwidget.h \
202 mediaplayerstate.h 202 mediaplayerstate.h
203 203
204mediaplayer.o: mediaplayer.cpp \ 204mediaplayer.o: mediaplayer.cpp \
205 $(QPEDIR)/include/qpe/qpeapplication.h \ 205 $(OPIEDIR)/include/qpe/qpeapplication.h \
206 $(QPEDIR)/include/qpe/qlibrary.h \ 206 $(OPIEDIR)/include/qpe/qlibrary.h \
207 $(QPEDIR)/include/qpe/qcom.h \ 207 $(OPIEDIR)/include/qpe/qcom.h \
208 $(QPEDIR)/include/qpe/quuid.h \ 208 $(OPIEDIR)/include/qpe/quuid.h \
209 $(QPEDIR)/include/qpe/resource.h \ 209 $(OPIEDIR)/include/qpe/resource.h \
210 $(QPEDIR)/include/qpe/config.h \ 210 $(OPIEDIR)/include/qpe/config.h \
211 mediaplayer.h \ 211 mediaplayer.h \
212 mediaplayerplugininterface.h \ 212 mediaplayerplugininterface.h \
213 playlistwidget.h \ 213 playlistwidget.h \
214 $(QPEDIR)/include/qpe/applnk.h \ 214 $(OPIEDIR)/include/qpe/applnk.h \
215 audiowidget.h \ 215 audiowidget.h \
216 loopcontrol.h \ 216 loopcontrol.h \
217 audiodevice.h \ 217 audiodevice.h \
218 mediaplayerstate.h 218 mediaplayerstate.h
219 219
220audiodevice.o: audiodevice.cpp \ 220audiodevice.o: audiodevice.cpp \
221 $(QPEDIR)/include/qpe/qpeapplication.h \ 221 $(OPIEDIR)/include/qpe/qpeapplication.h \
222 $(QPEDIR)/include/qpe/config.h \ 222 $(OPIEDIR)/include/qpe/config.h \
223 audiodevice.h \ 223 audiodevice.h \
224 $(QPEDIR)/include/qpe/qcopenvelope_qws.h 224 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
225 225
226moc_loopcontrol.o: moc_loopcontrol.cpp \ 226moc_loopcontrol.o: moc_loopcontrol.cpp \
227 loopcontrol.h 227 loopcontrol.h
228 228
229moc_playlistselection.o: moc_playlistselection.cpp \ 229moc_playlistselection.o: moc_playlistselection.cpp \
230 playlistselection.h \ 230 playlistselection.h \
231 $(QPEDIR)/include/qpe/applnk.h 231 $(OPIEDIR)/include/qpe/applnk.h
232 232
233moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \ 233moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \
234 mediaplayerstate.h 234 mediaplayerstate.h
235 235
236moc_videowidget.o: moc_videowidget.cpp \ 236moc_videowidget.o: moc_videowidget.cpp \
237 videowidget.h 237 videowidget.h
238 238
239moc_audiowidget.o: moc_audiowidget.cpp \ 239moc_audiowidget.o: moc_audiowidget.cpp \
240 audiowidget.h 240 audiowidget.h
241 241
242moc_playlistwidget.o: moc_playlistwidget.cpp \ 242moc_playlistwidget.o: moc_playlistwidget.cpp \
243 playlistwidget.h \ 243 playlistwidget.h \
244 $(QPEDIR)/include/qpe/applnk.h 244 $(OPIEDIR)/include/qpe/applnk.h
245 245
246moc_mediaplayer.o: moc_mediaplayer.cpp \ 246moc_mediaplayer.o: moc_mediaplayer.cpp \
247 mediaplayer.h \ 247 mediaplayer.h \
248 $(QPEDIR)/include/qpe/qlibrary.h \ 248 $(OPIEDIR)/include/qpe/qlibrary.h \
249 $(QPEDIR)/include/qpe/qcom.h \ 249 $(OPIEDIR)/include/qpe/qcom.h \
250 $(QPEDIR)/include/qpe/quuid.h \ 250 $(OPIEDIR)/include/qpe/quuid.h \
251 mediaplayerplugininterface.h 251 mediaplayerplugininterface.h
252 252
253moc_audiodevice.o: moc_audiodevice.cpp \ 253moc_audiodevice.o: moc_audiodevice.cpp \
254 audiodevice.h 254 audiodevice.h
255 255
256moc_loopcontrol.cpp: loopcontrol.h 256moc_loopcontrol.cpp: loopcontrol.h
257 $(MOC) loopcontrol.h -o moc_loopcontrol.cpp 257 $(MOC) loopcontrol.h -o moc_loopcontrol.cpp
258 258
259moc_playlistselection.cpp: playlistselection.h 259moc_playlistselection.cpp: playlistselection.h
260 $(MOC) playlistselection.h -o moc_playlistselection.cpp 260 $(MOC) playlistselection.h -o moc_playlistselection.cpp
261 261
262moc_mediaplayerstate.cpp: mediaplayerstate.h 262moc_mediaplayerstate.cpp: mediaplayerstate.h
263 $(MOC) mediaplayerstate.h -o moc_mediaplayerstate.cpp 263 $(MOC) mediaplayerstate.h -o moc_mediaplayerstate.cpp
264 264
265moc_videowidget.cpp: videowidget.h 265moc_videowidget.cpp: videowidget.h
266 $(MOC) videowidget.h -o moc_videowidget.cpp 266 $(MOC) videowidget.h -o moc_videowidget.cpp
267 267
268moc_audiowidget.cpp: audiowidget.h 268moc_audiowidget.cpp: audiowidget.h
269 $(MOC) audiowidget.h -o moc_audiowidget.cpp 269 $(MOC) audiowidget.h -o moc_audiowidget.cpp
270 270
271moc_playlistwidget.cpp: playlistwidget.h 271moc_playlistwidget.cpp: playlistwidget.h
272 $(MOC) playlistwidget.h -o moc_playlistwidget.cpp 272 $(MOC) playlistwidget.h -o moc_playlistwidget.cpp
273 273
274moc_mediaplayer.cpp: mediaplayer.h 274moc_mediaplayer.cpp: mediaplayer.h
275 $(MOC) mediaplayer.h -o moc_mediaplayer.cpp 275 $(MOC) mediaplayer.h -o moc_mediaplayer.cpp
276 276
277moc_audiodevice.cpp: audiodevice.h 277moc_audiodevice.cpp: audiodevice.h
278 $(MOC) audiodevice.h -o moc_audiodevice.cpp 278 $(MOC) audiodevice.h -o moc_audiodevice.cpp
279 279
280 280
diff --git a/core/multimedia/opieplayer/libflash/libflash.pro b/core/multimedia/opieplayer/libflash/libflash.pro
index d144f0b..bf97fbf 100644
--- a/core/multimedia/opieplayer/libflash/libflash.pro
+++ b/core/multimedia/opieplayer/libflash/libflash.pro
@@ -1,15 +1,15 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS = libflashplugin.h libflashpluginimpl.h 3 HEADERS = libflashplugin.h libflashpluginimpl.h
4 SOURCES = libflashplugin.cpp libflashpluginimpl.cpp \ 4 SOURCES = libflashplugin.cpp libflashpluginimpl.cpp \
5 adpcm.cc character.cc flash.cc graphic16.cc matrix.cc script.cc \ 5 adpcm.cc character.cc flash.cc graphic16.cc matrix.cc script.cc \
6 sprite.cc bitmap.cc cxform.cc font.cc graphic24.cc movie.cc \ 6 sprite.cc bitmap.cc cxform.cc font.cc graphic24.cc movie.cc \
7 shape.cc sqrt.cc button.cc displaylist.cc graphic.cc graphic32.cc \ 7 shape.cc sqrt.cc button.cc displaylist.cc graphic.cc graphic32.cc \
8 program.cc sound.cc text.cc 8 program.cc sound.cc text.cc
9 TARGET = flashplugin 9 TARGET = flashplugin
10 DESTDIR = ../../plugins/codecs 10 DESTDIR = ../../plugins/codecs
11INCLUDEPATH += $(QPEDIR)/include .. 11INCLUDEPATH += $(OPIEDIR)/include ..
12DEPENDPATH += ../$(QPEDIR)/include .. 12DEPENDPATH += ../$(OPIEDIR)/include ..
13LIBS += -lqpe 13LIBS += -lqpe
14 VERSION = 1.0.0 14 VERSION = 1.0.0
15 15
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index 9e17769..19ded26 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -1,226 +1,226 @@
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) -DQCONFIG=\"qpe\" 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) -DQCONFIG=\"qpe\" 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/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:
104 tmake libmad.pro 104 tmake libmad.pro
105 105
106clean: 106clean:
107 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 107 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
108 -rm -f *~ core 108 -rm -f *~ core
109 -rm -f allmoc.cpp 109 -rm -f allmoc.cpp
110 110
111####### Extension Modules 111####### Extension Modules
112 112
113listpromodules: 113listpromodules:
114 @echo 114 @echo
115 115
116listallmodules: 116listallmodules:
117 @echo 117 @echo
118 118
119listaddonpromodules: 119listaddonpromodules:
120 @echo 120 @echo
121 121
122listaddonentmodules: 122listaddonentmodules:
123 @echo 123 @echo
124 124
125 125
126REQUIRES= 126REQUIRES=
127 127
128####### Sub-libraries 128####### Sub-libraries
129 129
130 130
131###### Combined headers 131###### Combined headers
132 132
133 133
134 134
135####### Compile 135####### Compile
136 136
137version.o: version.c \ 137version.o: version.c \
138 libmad_global.h \ 138 libmad_global.h \
139 libmad_version.h 139 libmad_version.h
140 140
141fixed.o: fixed.c \ 141fixed.o: fixed.c \
142 libmad_global.h \ 142 libmad_global.h \
143 fixed.h 143 fixed.h
144 144
145bit.o: bit.c \ 145bit.o: bit.c \
146 libmad_global.h \ 146 libmad_global.h \
147 bit.h 147 bit.h
148 148
149timer.o: timer.c \ 149timer.o: timer.c \
150 libmad_global.h \ 150 libmad_global.h \
151 timer.h 151 timer.h
152 152
153stream.o: stream.c \ 153stream.o: stream.c \
154 libmad_global.h \ 154 libmad_global.h \
155 bit.h \ 155 bit.h \
156 stream.h 156 stream.h
157 157
158frame.o: frame.c \ 158frame.o: frame.c \
159 libmad_global.h \ 159 libmad_global.h \
160 bit.h \ 160 bit.h \
161 stream.h \ 161 stream.h \
162 frame.h \ 162 frame.h \
163 fixed.h \ 163 fixed.h \
164 timer.h \ 164 timer.h \
165 layer12.h \ 165 layer12.h \
166 layer3.h 166 layer3.h
167 167
168synth.o: synth.c \ 168synth.o: synth.c \
169 libmad_global.h \ 169 libmad_global.h \
170 fixed.h \ 170 fixed.h \
171 frame.h \ 171 frame.h \
172 timer.h \ 172 timer.h \
173 stream.h \ 173 stream.h \
174 bit.h \ 174 bit.h \
175 synth.h \ 175 synth.h \
176 D.dat 176 D.dat
177 177
178decoder.o: decoder.c \ 178decoder.o: decoder.c \
179 libmad_global.h \ 179 libmad_global.h \
180 stream.h \ 180 stream.h \
181 bit.h \ 181 bit.h \
182 frame.h \ 182 frame.h \
183 fixed.h \ 183 fixed.h \
184 timer.h \ 184 timer.h \
185 synth.h \ 185 synth.h \
186 decoder.h 186 decoder.h
187 187
188layer12.o: layer12.c \ 188layer12.o: layer12.c \
189 libmad_global.h \ 189 libmad_global.h \
190 fixed.h \ 190 fixed.h \
191 bit.h \ 191 bit.h \
192 stream.h \ 192 stream.h \
193 frame.h \ 193 frame.h \
194 timer.h \ 194 timer.h \
195 layer12.h \ 195 layer12.h \
196 sf_table.dat \ 196 sf_table.dat \
197 qc_table.dat 197 qc_table.dat
198 198
199layer3.o: layer3.c \ 199layer3.o: layer3.c \
200 libmad_global.h \ 200 libmad_global.h \
201 fixed.h \ 201 fixed.h \
202 bit.h \ 202 bit.h \
203 stream.h \ 203 stream.h \
204 frame.h \ 204 frame.h \
205 timer.h \ 205 timer.h \
206 huffman.h \ 206 huffman.h \
207 layer3.h \ 207 layer3.h \
208 rq_table.dat \ 208 rq_table.dat \
209 imdct_s.dat 209 imdct_s.dat
210 210
211huffman.o: huffman.c \ 211huffman.o: huffman.c \
212 libmad_global.h \ 212 libmad_global.h \
213 huffman.h 213 huffman.h
214 214
215libmadplugin.o: libmadplugin.cpp \ 215libmadplugin.o: libmadplugin.cpp \
216 libmadplugin.h \ 216 libmadplugin.h \
217 ../mediaplayerplugininterface.h \ 217 ../mediaplayerplugininterface.h \
218 mad.h 218 mad.h
219 219
220libmadpluginimpl.o: libmadpluginimpl.cpp \ 220libmadpluginimpl.o: libmadpluginimpl.cpp \
221 libmadplugin.h \ 221 libmadplugin.h \
222 ../mediaplayerplugininterface.h \ 222 ../mediaplayerplugininterface.h \
223 libmadpluginimpl.h \ 223 libmadpluginimpl.h \
224 ../mediaplayerplugininterface.h 224 ../mediaplayerplugininterface.h
225 225
226 226
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro
index e3f75b7..6c40a15 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -1,12 +1,12 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \ 3 HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \
4 layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h 4 layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h
5 SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \ 5 SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \
6 layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp 6 layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp
7 TARGET = madplugin 7 TARGET = madplugin
8 DESTDIR = ../../plugins/codecs 8 DESTDIR = ../../plugins/codecs
9INCLUDEPATH += $(QPEDIR)/include .. 9INCLUDEPATH += $(OPIEDIR)/include ..
10DEPENDPATH += ../$(QPEDIR)/include .. 10DEPENDPATH += ../$(OPIEDIR)/include ..
11LIBS += -lqpe -lm 11LIBS += -lqpe -lm
12 VERSION = 1.0.0 12 VERSION = 1.0.0
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 1817902..9881815 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -1,774 +1,774 @@
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) -DQCONFIG=\"qpe\" 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) -DQCONFIG=\"qpe\" 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/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:
133 tmake libmpeg3.pro 133 tmake libmpeg3.pro
134 134
135clean: 135clean:
136 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 136 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
137 -rm -f *~ core 137 -rm -f *~ core
138 -rm -f allmoc.cpp 138 -rm -f allmoc.cpp
139 139
140####### Extension Modules 140####### Extension Modules
141 141
142listpromodules: 142listpromodules:
143 @echo 143 @echo
144 144
145listallmodules: 145listallmodules:
146 @echo 146 @echo
147 147
148listaddonpromodules: 148listaddonpromodules:
149 @echo 149 @echo
150 150
151listaddonentmodules: 151listaddonentmodules:
152 @echo 152 @echo
153 153
154 154
155REQUIRES= 155REQUIRES=
156 156
157####### Sub-libraries 157####### Sub-libraries
158 158
159 159
160###### Combined headers 160###### Combined headers
161 161
162 162
163 163
164####### Compile 164####### Compile
165 165
166libmpeg3plugin.o: libmpeg3plugin.cpp \ 166libmpeg3plugin.o: libmpeg3plugin.cpp \
167 libmpeg3plugin.h \ 167 libmpeg3plugin.h \
168 libmpeg3.h \ 168 libmpeg3.h \
169 mpeg3private.h \ 169 mpeg3private.h \
170 mpeg3atrack.h \ 170 mpeg3atrack.h \
171 mpeg3demux.h \ 171 mpeg3demux.h \
172 mpeg3title.h \ 172 mpeg3title.h \
173 mpeg3io.h \ 173 mpeg3io.h \
174 mpeg3css.h \ 174 mpeg3css.h \
175 mpeg3private.inc \ 175 mpeg3private.inc \
176 audio/mpeg3audio.h \ 176 audio/mpeg3audio.h \
177 mpeg3vtrack.h \ 177 mpeg3vtrack.h \
178 video/mpeg3video.h \ 178 video/mpeg3video.h \
179 mpeg3protos.h \ 179 mpeg3protos.h \
180 ../mediaplayerplugininterface.h 180 ../mediaplayerplugininterface.h
181 181
182libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ 182libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
183 libmpeg3plugin.h \ 183 libmpeg3plugin.h \
184 libmpeg3.h \ 184 libmpeg3.h \
185 mpeg3private.h \ 185 mpeg3private.h \
186 mpeg3atrack.h \ 186 mpeg3atrack.h \
187 mpeg3demux.h \ 187 mpeg3demux.h \
188 mpeg3title.h \ 188 mpeg3title.h \
189 mpeg3io.h \ 189 mpeg3io.h \
190 mpeg3css.h \ 190 mpeg3css.h \
191 mpeg3private.inc \ 191 mpeg3private.inc \
192 audio/mpeg3audio.h \ 192 audio/mpeg3audio.h \
193 mpeg3vtrack.h \ 193 mpeg3vtrack.h \
194 video/mpeg3video.h \ 194 video/mpeg3video.h \
195 mpeg3protos.h \ 195 mpeg3protos.h \
196 ../mediaplayerplugininterface.h \ 196 ../mediaplayerplugininterface.h \
197 libmpeg3pluginimpl.h \ 197 libmpeg3pluginimpl.h \
198 ../mediaplayerplugininterface.h 198 ../mediaplayerplugininterface.h
199 199
200bitstream.o: bitstream.c \ 200bitstream.o: bitstream.c \
201 mpeg3private.h \ 201 mpeg3private.h \
202 mpeg3atrack.h \ 202 mpeg3atrack.h \
203 mpeg3demux.h \ 203 mpeg3demux.h \
204 mpeg3title.h \ 204 mpeg3title.h \
205 mpeg3io.h \ 205 mpeg3io.h \
206 mpeg3css.h \ 206 mpeg3css.h \
207 mpeg3private.inc \ 207 mpeg3private.inc \
208 audio/mpeg3audio.h \ 208 audio/mpeg3audio.h \
209 mpeg3vtrack.h \ 209 mpeg3vtrack.h \
210 video/mpeg3video.h \ 210 video/mpeg3video.h \
211 mpeg3protos.h 211 mpeg3protos.h
212 212
213libmpeg3.o: libmpeg3.c \ 213libmpeg3.o: libmpeg3.c \
214 libmpeg3.h \ 214 libmpeg3.h \
215 mpeg3private.h \ 215 mpeg3private.h \
216 mpeg3atrack.h \ 216 mpeg3atrack.h \
217 mpeg3demux.h \ 217 mpeg3demux.h \
218 mpeg3title.h \ 218 mpeg3title.h \
219 mpeg3io.h \ 219 mpeg3io.h \
220 mpeg3css.h \ 220 mpeg3css.h \
221 mpeg3private.inc \ 221 mpeg3private.inc \
222 audio/mpeg3audio.h \ 222 audio/mpeg3audio.h \
223 mpeg3vtrack.h \ 223 mpeg3vtrack.h \
224 video/mpeg3video.h \ 224 video/mpeg3video.h \
225 mpeg3protos.h 225 mpeg3protos.h
226 226
227mpeg3atrack.o: mpeg3atrack.c \ 227mpeg3atrack.o: mpeg3atrack.c \
228 libmpeg3.h \ 228 libmpeg3.h \
229 mpeg3private.h \ 229 mpeg3private.h \
230 mpeg3atrack.h \ 230 mpeg3atrack.h \
231 mpeg3demux.h \ 231 mpeg3demux.h \
232 mpeg3title.h \ 232 mpeg3title.h \
233 mpeg3io.h \ 233 mpeg3io.h \
234 mpeg3css.h \ 234 mpeg3css.h \
235 mpeg3private.inc \ 235 mpeg3private.inc \
236 audio/mpeg3audio.h \ 236 audio/mpeg3audio.h \
237 mpeg3vtrack.h \ 237 mpeg3vtrack.h \
238 video/mpeg3video.h \ 238 video/mpeg3video.h \
239 mpeg3protos.h 239 mpeg3protos.h
240 240
241mpeg3css.o: mpeg3css.c \ 241mpeg3css.o: mpeg3css.c \
242 mpeg3css.h \ 242 mpeg3css.h \
243 mpeg3private.h \ 243 mpeg3private.h \
244 mpeg3atrack.h \ 244 mpeg3atrack.h \
245 mpeg3demux.h \ 245 mpeg3demux.h \
246 mpeg3title.h \ 246 mpeg3title.h \
247 mpeg3io.h \ 247 mpeg3io.h \
248 mpeg3private.inc \ 248 mpeg3private.inc \
249 audio/mpeg3audio.h \ 249 audio/mpeg3audio.h \
250 mpeg3vtrack.h \ 250 mpeg3vtrack.h \
251 video/mpeg3video.h 251 video/mpeg3video.h
252 252
253mpeg3demux.o: mpeg3demux.c \ 253mpeg3demux.o: mpeg3demux.c \
254 libmpeg3.h \ 254 libmpeg3.h \
255 mpeg3private.h \ 255 mpeg3private.h \
256 mpeg3atrack.h \ 256 mpeg3atrack.h \
257 mpeg3demux.h \ 257 mpeg3demux.h \
258 mpeg3title.h \ 258 mpeg3title.h \
259 mpeg3io.h \ 259 mpeg3io.h \
260 mpeg3css.h \ 260 mpeg3css.h \
261 mpeg3private.inc \ 261 mpeg3private.inc \
262 audio/mpeg3audio.h \ 262 audio/mpeg3audio.h \
263 mpeg3vtrack.h \ 263 mpeg3vtrack.h \
264 video/mpeg3video.h \ 264 video/mpeg3video.h \
265 mpeg3protos.h 265 mpeg3protos.h
266 266
267mpeg3io.o: mpeg3io.c \ 267mpeg3io.o: mpeg3io.c \
268 mpeg3private.h \ 268 mpeg3private.h \
269 mpeg3atrack.h \ 269 mpeg3atrack.h \
270 mpeg3demux.h \ 270 mpeg3demux.h \
271 mpeg3title.h \ 271 mpeg3title.h \
272 mpeg3io.h \ 272 mpeg3io.h \
273 mpeg3css.h \ 273 mpeg3css.h \
274 mpeg3private.inc \ 274 mpeg3private.inc \
275 audio/mpeg3audio.h \ 275 audio/mpeg3audio.h \
276 mpeg3vtrack.h \ 276 mpeg3vtrack.h \
277 video/mpeg3video.h \ 277 video/mpeg3video.h \
278 mpeg3protos.h 278 mpeg3protos.h
279 279
280mpeg3title.o: mpeg3title.c \ 280mpeg3title.o: mpeg3title.c \
281 mpeg3private.h \ 281 mpeg3private.h \
282 mpeg3atrack.h \ 282 mpeg3atrack.h \
283 mpeg3demux.h \ 283 mpeg3demux.h \
284 mpeg3title.h \ 284 mpeg3title.h \
285 mpeg3io.h \ 285 mpeg3io.h \
286 mpeg3css.h \ 286 mpeg3css.h \
287 mpeg3private.inc \ 287 mpeg3private.inc \
288 audio/mpeg3audio.h \ 288 audio/mpeg3audio.h \
289 mpeg3vtrack.h \ 289 mpeg3vtrack.h \
290 video/mpeg3video.h \ 290 video/mpeg3video.h \
291 mpeg3protos.h 291 mpeg3protos.h
292 292
293mpeg3vtrack.o: mpeg3vtrack.c \ 293mpeg3vtrack.o: mpeg3vtrack.c \
294 libmpeg3.h \ 294 libmpeg3.h \
295 mpeg3private.h \ 295 mpeg3private.h \
296 mpeg3atrack.h \ 296 mpeg3atrack.h \
297 mpeg3demux.h \ 297 mpeg3demux.h \
298 mpeg3title.h \ 298 mpeg3title.h \
299 mpeg3io.h \ 299 mpeg3io.h \
300 mpeg3css.h \ 300 mpeg3css.h \
301 mpeg3private.inc \ 301 mpeg3private.inc \
302 audio/mpeg3audio.h \ 302 audio/mpeg3audio.h \
303 mpeg3vtrack.h \ 303 mpeg3vtrack.h \
304 video/mpeg3video.h \ 304 video/mpeg3video.h \
305 mpeg3protos.h 305 mpeg3protos.h
306 306
307audio/ac3.o: audio/ac3.c \ 307audio/ac3.o: audio/ac3.c \
308 audio/mpeg3audio.h \ 308 audio/mpeg3audio.h \
309 audio/ac3.h \ 309 audio/ac3.h \
310 audio/mpeg3real.h \ 310 audio/mpeg3real.h \
311 audio/../bitstream.h \ 311 audio/../bitstream.h \
312 mpeg3demux.h \ 312 mpeg3demux.h \
313 mpeg3title.h \ 313 mpeg3title.h \
314 mpeg3io.h \ 314 mpeg3io.h \
315 mpeg3css.h \ 315 mpeg3css.h \
316 mpeg3private.inc \ 316 mpeg3private.inc \
317 audio/../libmpeg3.h \ 317 audio/../libmpeg3.h \
318 mpeg3private.h \ 318 mpeg3private.h \
319 mpeg3atrack.h \ 319 mpeg3atrack.h \
320 audio/mpeg3audio.h \ 320 audio/mpeg3audio.h \
321 mpeg3vtrack.h \ 321 mpeg3vtrack.h \
322 video/mpeg3video.h \ 322 video/mpeg3video.h \
323 audio/../mpeg3protos.h 323 audio/../mpeg3protos.h
324 324
325audio/bit_allocation.o: audio/bit_allocation.c \ 325audio/bit_allocation.o: audio/bit_allocation.c \
326 audio/mpeg3audio.h \ 326 audio/mpeg3audio.h \
327 audio/ac3.h \ 327 audio/ac3.h \
328 audio/mpeg3real.h \ 328 audio/mpeg3real.h \
329 audio/../bitstream.h \ 329 audio/../bitstream.h \
330 mpeg3demux.h \ 330 mpeg3demux.h \
331 mpeg3title.h \ 331 mpeg3title.h \
332 mpeg3io.h \ 332 mpeg3io.h \
333 mpeg3css.h \ 333 mpeg3css.h \
334 mpeg3private.inc \ 334 mpeg3private.inc \
335 audio/../libmpeg3.h \ 335 audio/../libmpeg3.h \
336 mpeg3private.h \ 336 mpeg3private.h \
337 mpeg3atrack.h \ 337 mpeg3atrack.h \
338 audio/mpeg3audio.h \ 338 audio/mpeg3audio.h \
339 mpeg3vtrack.h \ 339 mpeg3vtrack.h \
340 video/mpeg3video.h \ 340 video/mpeg3video.h \
341 audio/../mpeg3protos.h 341 audio/../mpeg3protos.h
342 342
343audio/dct.o: audio/dct.c \ 343audio/dct.o: audio/dct.c \
344 audio/mpeg3audio.h \ 344 audio/mpeg3audio.h \
345 audio/ac3.h \ 345 audio/ac3.h \
346 audio/mpeg3real.h \ 346 audio/mpeg3real.h \
347 audio/../bitstream.h \ 347 audio/../bitstream.h \
348 mpeg3demux.h \ 348 mpeg3demux.h \
349 mpeg3title.h \ 349 mpeg3title.h \
350 mpeg3io.h \ 350 mpeg3io.h \
351 mpeg3css.h \ 351 mpeg3css.h \
352 mpeg3private.inc \ 352 mpeg3private.inc \
353 audio/../libmpeg3.h \ 353 audio/../libmpeg3.h \
354 mpeg3private.h \ 354 mpeg3private.h \
355 mpeg3atrack.h \ 355 mpeg3atrack.h \
356 audio/mpeg3audio.h \ 356 audio/mpeg3audio.h \
357 mpeg3vtrack.h \ 357 mpeg3vtrack.h \
358 video/mpeg3video.h \ 358 video/mpeg3video.h \
359 audio/../mpeg3protos.h \ 359 audio/../mpeg3protos.h \
360 audio/tables.h \ 360 audio/tables.h \
361 audio/fptables.h 361 audio/fptables.h
362 362
363audio/exponents.o: audio/exponents.c \ 363audio/exponents.o: audio/exponents.c \
364 audio/mpeg3audio.h \ 364 audio/mpeg3audio.h \
365 audio/ac3.h \ 365 audio/ac3.h \
366 audio/mpeg3real.h \ 366 audio/mpeg3real.h \
367 audio/../bitstream.h \ 367 audio/../bitstream.h \
368 mpeg3demux.h \ 368 mpeg3demux.h \
369 mpeg3title.h \ 369 mpeg3title.h \
370 mpeg3io.h \ 370 mpeg3io.h \
371 mpeg3css.h \ 371 mpeg3css.h \
372 mpeg3private.inc \ 372 mpeg3private.inc \
373 audio/../libmpeg3.h \ 373 audio/../libmpeg3.h \
374 mpeg3private.h \ 374 mpeg3private.h \
375 mpeg3atrack.h \ 375 mpeg3atrack.h \
376 audio/mpeg3audio.h \ 376 audio/mpeg3audio.h \
377 mpeg3vtrack.h \ 377 mpeg3vtrack.h \
378 video/mpeg3video.h \ 378 video/mpeg3video.h \
379 audio/../mpeg3protos.h 379 audio/../mpeg3protos.h
380 380
381audio/header.o: audio/header.c \ 381audio/header.o: audio/header.c \
382 audio/mpeg3audio.h \ 382 audio/mpeg3audio.h \
383 audio/ac3.h \ 383 audio/ac3.h \
384 audio/mpeg3real.h \ 384 audio/mpeg3real.h \
385 audio/../bitstream.h \ 385 audio/../bitstream.h \
386 mpeg3demux.h \ 386 mpeg3demux.h \
387 mpeg3title.h \ 387 mpeg3title.h \
388 mpeg3io.h \ 388 mpeg3io.h \
389 mpeg3css.h \ 389 mpeg3css.h \
390 mpeg3private.inc \ 390 mpeg3private.inc \
391 audio/tables.h \ 391 audio/tables.h \
392 audio/../libmpeg3.h \ 392 audio/../libmpeg3.h \
393 mpeg3private.h \ 393 mpeg3private.h \
394 mpeg3atrack.h \ 394 mpeg3atrack.h \
395 audio/mpeg3audio.h \ 395 audio/mpeg3audio.h \
396 mpeg3vtrack.h \ 396 mpeg3vtrack.h \
397 video/mpeg3video.h \ 397 video/mpeg3video.h \
398 audio/../mpeg3protos.h 398 audio/../mpeg3protos.h
399 399
400audio/layer2.o: audio/layer2.c \ 400audio/layer2.o: audio/layer2.c \
401 audio/mpeg3audio.h \ 401 audio/mpeg3audio.h \
402 audio/ac3.h \ 402 audio/ac3.h \
403 audio/mpeg3real.h \ 403 audio/mpeg3real.h \
404 audio/../bitstream.h \ 404 audio/../bitstream.h \
405 mpeg3demux.h \ 405 mpeg3demux.h \
406 mpeg3title.h \ 406 mpeg3title.h \
407 mpeg3io.h \ 407 mpeg3io.h \
408 mpeg3css.h \ 408 mpeg3css.h \
409 mpeg3private.inc \ 409 mpeg3private.inc \
410 audio/../libmpeg3.h \ 410 audio/../libmpeg3.h \
411 mpeg3private.h \ 411 mpeg3private.h \
412 mpeg3atrack.h \ 412 mpeg3atrack.h \
413 audio/mpeg3audio.h \ 413 audio/mpeg3audio.h \
414 mpeg3vtrack.h \ 414 mpeg3vtrack.h \
415 video/mpeg3video.h \ 415 video/mpeg3video.h \
416 audio/../mpeg3protos.h \ 416 audio/../mpeg3protos.h \
417 audio/tables.h 417 audio/tables.h
418 418
419audio/layer3.o: audio/layer3.c \ 419audio/layer3.o: audio/layer3.c \
420 audio/huffman.h \ 420 audio/huffman.h \
421 audio/mpeg3audio.h \ 421 audio/mpeg3audio.h \
422 audio/ac3.h \ 422 audio/ac3.h \
423 audio/mpeg3real.h \ 423 audio/mpeg3real.h \
424 audio/../bitstream.h \ 424 audio/../bitstream.h \
425 mpeg3demux.h \ 425 mpeg3demux.h \
426 mpeg3title.h \ 426 mpeg3title.h \
427 mpeg3io.h \ 427 mpeg3io.h \
428 mpeg3css.h \ 428 mpeg3css.h \
429 mpeg3private.inc \ 429 mpeg3private.inc \
430 audio/../libmpeg3.h \ 430 audio/../libmpeg3.h \
431 mpeg3private.h \ 431 mpeg3private.h \
432 mpeg3atrack.h \ 432 mpeg3atrack.h \
433 audio/mpeg3audio.h \ 433 audio/mpeg3audio.h \
434 mpeg3vtrack.h \ 434 mpeg3vtrack.h \
435 video/mpeg3video.h \ 435 video/mpeg3video.h \
436 audio/../mpeg3protos.h \ 436 audio/../mpeg3protos.h \
437 audio/tables.h 437 audio/tables.h
438 438
439audio/mantissa.o: audio/mantissa.c \ 439audio/mantissa.o: audio/mantissa.c \
440 audio/mpeg3audio.h \ 440 audio/mpeg3audio.h \
441 audio/ac3.h \ 441 audio/ac3.h \
442 audio/mpeg3real.h \ 442 audio/mpeg3real.h \
443 audio/../bitstream.h \ 443 audio/../bitstream.h \
444 mpeg3demux.h \ 444 mpeg3demux.h \
445 mpeg3title.h \ 445 mpeg3title.h \
446 mpeg3io.h \ 446 mpeg3io.h \
447 mpeg3css.h \ 447 mpeg3css.h \
448 mpeg3private.inc \ 448 mpeg3private.inc \
449 audio/../libmpeg3.h \ 449 audio/../libmpeg3.h \
450 mpeg3private.h \ 450 mpeg3private.h \
451 mpeg3atrack.h \ 451 mpeg3atrack.h \
452 audio/mpeg3audio.h \ 452 audio/mpeg3audio.h \
453 mpeg3vtrack.h \ 453 mpeg3vtrack.h \
454 video/mpeg3video.h \ 454 video/mpeg3video.h \
455 audio/../mpeg3protos.h 455 audio/../mpeg3protos.h
456 456
457audio/mpeg3audio.o: audio/mpeg3audio.c \ 457audio/mpeg3audio.o: audio/mpeg3audio.c \
458 audio/../libmpeg3.h \ 458 audio/../libmpeg3.h \
459 mpeg3private.h \ 459 mpeg3private.h \
460 mpeg3atrack.h \ 460 mpeg3atrack.h \
461 mpeg3demux.h \ 461 mpeg3demux.h \
462 mpeg3title.h \ 462 mpeg3title.h \
463 mpeg3io.h \ 463 mpeg3io.h \
464 mpeg3css.h \ 464 mpeg3css.h \
465 mpeg3private.inc \ 465 mpeg3private.inc \
466 audio/mpeg3audio.h \ 466 audio/mpeg3audio.h \
467 audio/ac3.h \ 467 audio/ac3.h \
468 audio/mpeg3real.h \ 468 audio/mpeg3real.h \
469 audio/../bitstream.h \ 469 audio/../bitstream.h \
470 mpeg3vtrack.h \ 470 mpeg3vtrack.h \
471 video/mpeg3video.h \ 471 video/mpeg3video.h \
472 audio/../mpeg3protos.h \ 472 audio/../mpeg3protos.h \
473 audio/mpeg3audio.h \ 473 audio/mpeg3audio.h \
474 audio/tables.h 474 audio/tables.h
475 475
476audio/pcm.o: audio/pcm.c \ 476audio/pcm.o: audio/pcm.c \
477 audio/mpeg3audio.h \ 477 audio/mpeg3audio.h \
478 audio/ac3.h \ 478 audio/ac3.h \
479 audio/mpeg3real.h \ 479 audio/mpeg3real.h \
480 audio/../bitstream.h \ 480 audio/../bitstream.h \
481 mpeg3demux.h \ 481 mpeg3demux.h \
482 mpeg3title.h \ 482 mpeg3title.h \
483 mpeg3io.h \ 483 mpeg3io.h \
484 mpeg3css.h \ 484 mpeg3css.h \
485 mpeg3private.inc \ 485 mpeg3private.inc \
486 audio/../libmpeg3.h \ 486 audio/../libmpeg3.h \
487 mpeg3private.h \ 487 mpeg3private.h \
488 mpeg3atrack.h \ 488 mpeg3atrack.h \
489 audio/mpeg3audio.h \ 489 audio/mpeg3audio.h \
490 mpeg3vtrack.h \ 490 mpeg3vtrack.h \
491 video/mpeg3video.h \ 491 video/mpeg3video.h \
492 audio/../mpeg3protos.h 492 audio/../mpeg3protos.h
493 493
494audio/synthesizers.o: audio/synthesizers.c \ 494audio/synthesizers.o: audio/synthesizers.c \
495 audio/mpeg3audio.h \ 495 audio/mpeg3audio.h \
496 audio/ac3.h \ 496 audio/ac3.h \
497 audio/mpeg3real.h \ 497 audio/mpeg3real.h \
498 audio/../bitstream.h \ 498 audio/../bitstream.h \
499 mpeg3demux.h \ 499 mpeg3demux.h \
500 mpeg3title.h \ 500 mpeg3title.h \
501 mpeg3io.h \ 501 mpeg3io.h \
502 mpeg3css.h \ 502 mpeg3css.h \
503 mpeg3private.inc \ 503 mpeg3private.inc \
504 audio/../libmpeg3.h \ 504 audio/../libmpeg3.h \
505 mpeg3private.h \ 505 mpeg3private.h \
506 mpeg3atrack.h \ 506 mpeg3atrack.h \
507 audio/mpeg3audio.h \ 507 audio/mpeg3audio.h \
508 mpeg3vtrack.h \ 508 mpeg3vtrack.h \
509 video/mpeg3video.h \ 509 video/mpeg3video.h \
510 audio/../mpeg3protos.h \ 510 audio/../mpeg3protos.h \
511 audio/tables.h 511 audio/tables.h
512 512
513audio/tables.o: audio/tables.c \ 513audio/tables.o: audio/tables.c \
514 audio/mpeg3audio.h \ 514 audio/mpeg3audio.h \
515 audio/ac3.h \ 515 audio/ac3.h \
516 audio/mpeg3real.h \ 516 audio/mpeg3real.h \
517 audio/../bitstream.h \ 517 audio/../bitstream.h \
518 mpeg3demux.h \ 518 mpeg3demux.h \
519 mpeg3title.h \ 519 mpeg3title.h \
520 mpeg3io.h \ 520 mpeg3io.h \
521 mpeg3css.h \ 521 mpeg3css.h \
522 mpeg3private.inc \ 522 mpeg3private.inc \
523 audio/../libmpeg3.h \ 523 audio/../libmpeg3.h \
524 mpeg3private.h \ 524 mpeg3private.h \
525 mpeg3atrack.h \ 525 mpeg3atrack.h \
526 audio/mpeg3audio.h \ 526 audio/mpeg3audio.h \
527 mpeg3vtrack.h \ 527 mpeg3vtrack.h \
528 video/mpeg3video.h \ 528 video/mpeg3video.h \
529 audio/../mpeg3protos.h \ 529 audio/../mpeg3protos.h \
530 audio/tables.h \ 530 audio/tables.h \
531 audio/fptables.h 531 audio/fptables.h
532 532
533video/getpicture.o: video/getpicture.c \ 533video/getpicture.o: video/getpicture.c \
534 audio/../libmpeg3.h \ 534 audio/../libmpeg3.h \
535 mpeg3private.h \ 535 mpeg3private.h \
536 mpeg3atrack.h \ 536 mpeg3atrack.h \
537 mpeg3demux.h \ 537 mpeg3demux.h \
538 mpeg3title.h \ 538 mpeg3title.h \
539 mpeg3io.h \ 539 mpeg3io.h \
540 mpeg3css.h \ 540 mpeg3css.h \
541 mpeg3private.inc \ 541 mpeg3private.inc \
542 audio/mpeg3audio.h \ 542 audio/mpeg3audio.h \
543 audio/ac3.h \ 543 audio/ac3.h \
544 audio/mpeg3real.h \ 544 audio/mpeg3real.h \
545 audio/../bitstream.h \ 545 audio/../bitstream.h \
546 mpeg3vtrack.h \ 546 mpeg3vtrack.h \
547 video/mpeg3video.h \ 547 video/mpeg3video.h \
548 video/../mpeg3private.inc \ 548 video/../mpeg3private.inc \
549 video/idct.h \ 549 video/idct.h \
550 video/slice.h \ 550 video/slice.h \
551 video/../timecode.h \ 551 video/../timecode.h \
552 video/../mpeg3protos.h \ 552 video/../mpeg3protos.h \
553 video/mpeg3video.h \ 553 video/mpeg3video.h \
554 video/vlc.h 554 video/vlc.h
555 555
556video/headers.o: video/headers.c \ 556video/headers.o: video/headers.c \
557 video/../mpeg3demux.h \ 557 video/../mpeg3demux.h \
558 mpeg3title.h \ 558 mpeg3title.h \
559 mpeg3io.h \ 559 mpeg3io.h \
560 mpeg3css.h \ 560 mpeg3css.h \
561 mpeg3private.inc \ 561 mpeg3private.inc \
562 audio/../libmpeg3.h \ 562 audio/../libmpeg3.h \
563 mpeg3private.h \ 563 mpeg3private.h \
564 mpeg3atrack.h \ 564 mpeg3atrack.h \
565 mpeg3demux.h \ 565 mpeg3demux.h \
566 audio/mpeg3audio.h \ 566 audio/mpeg3audio.h \
567 audio/ac3.h \ 567 audio/ac3.h \
568 audio/mpeg3real.h \ 568 audio/mpeg3real.h \
569 audio/../bitstream.h \ 569 audio/../bitstream.h \
570 mpeg3vtrack.h \ 570 mpeg3vtrack.h \
571 video/mpeg3video.h \ 571 video/mpeg3video.h \
572 video/../mpeg3private.inc \ 572 video/../mpeg3private.inc \
573 video/idct.h \ 573 video/idct.h \
574 video/slice.h \ 574 video/slice.h \
575 video/../timecode.h \ 575 video/../timecode.h \
576 video/../mpeg3protos.h \ 576 video/../mpeg3protos.h \
577 video/mpeg3video.h 577 video/mpeg3video.h
578 578
579video/idct.o: video/idct.c \ 579video/idct.o: video/idct.c \
580 video/idct.h 580 video/idct.h
581 581
582video/macroblocks.o: video/macroblocks.c \ 582video/macroblocks.o: video/macroblocks.c \
583 audio/../libmpeg3.h \ 583 audio/../libmpeg3.h \
584 mpeg3private.h \ 584 mpeg3private.h \
585 mpeg3atrack.h \ 585 mpeg3atrack.h \
586 mpeg3demux.h \ 586 mpeg3demux.h \
587 mpeg3title.h \ 587 mpeg3title.h \
588 mpeg3io.h \ 588 mpeg3io.h \
589 mpeg3css.h \ 589 mpeg3css.h \
590 mpeg3private.inc \ 590 mpeg3private.inc \
591 audio/mpeg3audio.h \ 591 audio/mpeg3audio.h \
592 audio/ac3.h \ 592 audio/ac3.h \
593 audio/mpeg3real.h \ 593 audio/mpeg3real.h \
594 audio/../bitstream.h \ 594 audio/../bitstream.h \
595 mpeg3vtrack.h \ 595 mpeg3vtrack.h \
596 video/mpeg3video.h \ 596 video/mpeg3video.h \
597 video/../mpeg3private.inc \ 597 video/../mpeg3private.inc \
598 video/idct.h \ 598 video/idct.h \
599 video/slice.h \ 599 video/slice.h \
600 video/../timecode.h \ 600 video/../timecode.h \
601 video/../mpeg3protos.h \ 601 video/../mpeg3protos.h \
602 video/mpeg3video.h \ 602 video/mpeg3video.h \
603 video/vlc.h 603 video/vlc.h
604 604
605video/mmxtest.o: video/mmxtest.c \ 605video/mmxtest.o: video/mmxtest.c \
606 audio/../libmpeg3.h \ 606 audio/../libmpeg3.h \
607 mpeg3private.h \ 607 mpeg3private.h \
608 mpeg3atrack.h \ 608 mpeg3atrack.h \
609 mpeg3demux.h \ 609 mpeg3demux.h \
610 mpeg3title.h \ 610 mpeg3title.h \
611 mpeg3io.h \ 611 mpeg3io.h \
612 mpeg3css.h \ 612 mpeg3css.h \
613 mpeg3private.inc \ 613 mpeg3private.inc \
614 audio/mpeg3audio.h \ 614 audio/mpeg3audio.h \
615 audio/ac3.h \ 615 audio/ac3.h \
616 audio/mpeg3real.h \ 616 audio/mpeg3real.h \
617 audio/../bitstream.h \ 617 audio/../bitstream.h \
618 mpeg3vtrack.h \ 618 mpeg3vtrack.h \
619 video/mpeg3video.h \ 619 video/mpeg3video.h \
620 video/../mpeg3private.inc \ 620 video/../mpeg3private.inc \
621 video/idct.h \ 621 video/idct.h \
622 video/slice.h \ 622 video/slice.h \
623 video/../timecode.h \ 623 video/../timecode.h \
624 video/../mpeg3protos.h 624 video/../mpeg3protos.h
625 625
626video/motion.o: video/motion.c \ 626video/motion.o: video/motion.c \
627 video/mpeg3video.h \ 627 video/mpeg3video.h \
628 audio/../bitstream.h \ 628 audio/../bitstream.h \
629 mpeg3demux.h \ 629 mpeg3demux.h \
630 mpeg3title.h \ 630 mpeg3title.h \
631 mpeg3io.h \ 631 mpeg3io.h \
632 mpeg3css.h \ 632 mpeg3css.h \
633 mpeg3private.inc \ 633 mpeg3private.inc \
634 video/../mpeg3private.inc \ 634 video/../mpeg3private.inc \
635 video/idct.h \ 635 video/idct.h \
636 video/slice.h \ 636 video/slice.h \
637 video/../timecode.h \ 637 video/../timecode.h \
638 audio/../libmpeg3.h \ 638 audio/../libmpeg3.h \
639 mpeg3private.h \ 639 mpeg3private.h \
640 mpeg3atrack.h \ 640 mpeg3atrack.h \
641 audio/mpeg3audio.h \ 641 audio/mpeg3audio.h \
642 audio/ac3.h \ 642 audio/ac3.h \
643 audio/mpeg3real.h \ 643 audio/mpeg3real.h \
644 mpeg3vtrack.h \ 644 mpeg3vtrack.h \
645 video/mpeg3video.h \ 645 video/mpeg3video.h \
646 video/../mpeg3protos.h \ 646 video/../mpeg3protos.h \
647 video/vlc.h 647 video/vlc.h
648 648
649video/mpeg3video.o: video/mpeg3video.c \ 649video/mpeg3video.o: video/mpeg3video.c \
650 audio/../libmpeg3.h \ 650 audio/../libmpeg3.h \
651 mpeg3private.h \ 651 mpeg3private.h \
652 mpeg3atrack.h \ 652 mpeg3atrack.h \
653 mpeg3demux.h \ 653 mpeg3demux.h \
654 mpeg3title.h \ 654 mpeg3title.h \
655 mpeg3io.h \ 655 mpeg3io.h \
656 mpeg3css.h \ 656 mpeg3css.h \
657 mpeg3private.inc \ 657 mpeg3private.inc \
658 audio/mpeg3audio.h \ 658 audio/mpeg3audio.h \
659 audio/ac3.h \ 659 audio/ac3.h \
660 audio/mpeg3real.h \ 660 audio/mpeg3real.h \
661 audio/../bitstream.h \ 661 audio/../bitstream.h \
662 mpeg3vtrack.h \ 662 mpeg3vtrack.h \
663 video/mpeg3video.h \ 663 video/mpeg3video.h \
664 video/../mpeg3private.inc \ 664 video/../mpeg3private.inc \
665 video/idct.h \ 665 video/idct.h \
666 video/slice.h \ 666 video/slice.h \
667 video/../timecode.h \ 667 video/../timecode.h \
668 video/../mpeg3protos.h \ 668 video/../mpeg3protos.h \
669 video/mpeg3video.h \ 669 video/mpeg3video.h \
670 video/mpeg3videoprotos.h 670 video/mpeg3videoprotos.h
671 671
672video/output.o: video/output.c \ 672video/output.o: video/output.c \
673 audio/../libmpeg3.h \ 673 audio/../libmpeg3.h \
674 mpeg3private.h \ 674 mpeg3private.h \
675 mpeg3atrack.h \ 675 mpeg3atrack.h \
676 mpeg3demux.h \ 676 mpeg3demux.h \
677 mpeg3title.h \ 677 mpeg3title.h \
678 mpeg3io.h \ 678 mpeg3io.h \
679 mpeg3css.h \ 679 mpeg3css.h \
680 mpeg3private.inc \ 680 mpeg3private.inc \
681 audio/mpeg3audio.h \ 681 audio/mpeg3audio.h \
682 audio/ac3.h \ 682 audio/ac3.h \
683 audio/mpeg3real.h \ 683 audio/mpeg3real.h \
684 audio/../bitstream.h \ 684 audio/../bitstream.h \
685 mpeg3vtrack.h \ 685 mpeg3vtrack.h \
686 video/mpeg3video.h \ 686 video/mpeg3video.h \
687 video/../mpeg3private.inc \ 687 video/../mpeg3private.inc \
688 video/idct.h \ 688 video/idct.h \
689 video/slice.h \ 689 video/slice.h \
690 video/../timecode.h \ 690 video/../timecode.h \
691 video/../mpeg3protos.h \ 691 video/../mpeg3protos.h \
692 video/mpeg3video.h 692 video/mpeg3video.h
693 693
694video/reconstruct.o: video/reconstruct.c \ 694video/reconstruct.o: video/reconstruct.c \
695 audio/../libmpeg3.h \ 695 audio/../libmpeg3.h \
696 mpeg3private.h \ 696 mpeg3private.h \
697 mpeg3atrack.h \ 697 mpeg3atrack.h \
698 mpeg3demux.h \ 698 mpeg3demux.h \
699 mpeg3title.h \ 699 mpeg3title.h \
700 mpeg3io.h \ 700 mpeg3io.h \
701 mpeg3css.h \ 701 mpeg3css.h \
702 mpeg3private.inc \ 702 mpeg3private.inc \
703 audio/mpeg3audio.h \ 703 audio/mpeg3audio.h \
704 audio/ac3.h \ 704 audio/ac3.h \
705 audio/mpeg3real.h \ 705 audio/mpeg3real.h \
706 audio/../bitstream.h \ 706 audio/../bitstream.h \
707 mpeg3vtrack.h \ 707 mpeg3vtrack.h \
708 video/mpeg3video.h \ 708 video/mpeg3video.h \
709 video/../mpeg3private.inc \ 709 video/../mpeg3private.inc \
710 video/idct.h \ 710 video/idct.h \
711 video/slice.h \ 711 video/slice.h \
712 video/../timecode.h \ 712 video/../timecode.h \
713 video/../mpeg3protos.h \ 713 video/../mpeg3protos.h \
714 video/mpeg3video.h 714 video/mpeg3video.h
715 715
716video/seek.o: video/seek.c \ 716video/seek.o: video/seek.c \
717 video/../mpeg3private.h \ 717 video/../mpeg3private.h \
718 mpeg3atrack.h \ 718 mpeg3atrack.h \
719 mpeg3demux.h \ 719 mpeg3demux.h \
720 mpeg3title.h \ 720 mpeg3title.h \
721 mpeg3io.h \ 721 mpeg3io.h \
722 mpeg3css.h \ 722 mpeg3css.h \
723 mpeg3private.inc \ 723 mpeg3private.inc \
724 audio/mpeg3audio.h \ 724 audio/mpeg3audio.h \
725 audio/ac3.h \ 725 audio/ac3.h \
726 audio/mpeg3real.h \ 726 audio/mpeg3real.h \
727 audio/../bitstream.h \ 727 audio/../bitstream.h \
728 mpeg3vtrack.h \ 728 mpeg3vtrack.h \
729 video/mpeg3video.h \ 729 video/mpeg3video.h \
730 video/../mpeg3private.inc \ 730 video/../mpeg3private.inc \
731 video/idct.h \ 731 video/idct.h \
732 video/slice.h \ 732 video/slice.h \
733 video/../timecode.h \ 733 video/../timecode.h \
734 video/../mpeg3protos.h \ 734 video/../mpeg3protos.h \
735 video/mpeg3video.h 735 video/mpeg3video.h
736 736
737video/slice.o: video/slice.c \ 737video/slice.o: video/slice.c \
738 audio/../libmpeg3.h \ 738 audio/../libmpeg3.h \
739 mpeg3private.h \ 739 mpeg3private.h \
740 mpeg3atrack.h \ 740 mpeg3atrack.h \
741 mpeg3demux.h \ 741 mpeg3demux.h \
742 mpeg3title.h \ 742 mpeg3title.h \
743 mpeg3io.h \ 743 mpeg3io.h \
744 mpeg3css.h \ 744 mpeg3css.h \
745 mpeg3private.inc \ 745 mpeg3private.inc \
746 audio/mpeg3audio.h \ 746 audio/mpeg3audio.h \
747 audio/ac3.h \ 747 audio/ac3.h \
748 audio/mpeg3real.h \ 748 audio/mpeg3real.h \
749 audio/../bitstream.h \ 749 audio/../bitstream.h \
750 mpeg3vtrack.h \ 750 mpeg3vtrack.h \
751 video/mpeg3video.h \ 751 video/mpeg3video.h \
752 video/../mpeg3private.inc \ 752 video/../mpeg3private.inc \
753 video/idct.h \ 753 video/idct.h \
754 video/slice.h \ 754 video/slice.h \
755 video/../timecode.h \ 755 video/../timecode.h \
756 video/../mpeg3protos.h \ 756 video/../mpeg3protos.h \
757 video/mpeg3video.h \ 757 video/mpeg3video.h \
758 video/mpeg3videoprotos.h 758 video/mpeg3videoprotos.h
759 759
760video/vlc.o: video/vlc.c \ 760video/vlc.o: video/vlc.c \
761 video/mpeg3video.h \ 761 video/mpeg3video.h \
762 audio/../bitstream.h \ 762 audio/../bitstream.h \
763 mpeg3demux.h \ 763 mpeg3demux.h \
764 mpeg3title.h \ 764 mpeg3title.h \
765 mpeg3io.h \ 765 mpeg3io.h \
766 mpeg3css.h \ 766 mpeg3css.h \
767 mpeg3private.inc \ 767 mpeg3private.inc \
768 video/../mpeg3private.inc \ 768 video/../mpeg3private.inc \
769 video/idct.h \ 769 video/idct.h \
770 video/slice.h \ 770 video/slice.h \
771 video/../timecode.h \ 771 video/../timecode.h \
772 video/vlc.h 772 video/vlc.h
773 773
774 774
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
index e2c35d3..b1426d1 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
@@ -1,42 +1,42 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS = libmpeg3plugin.h libmpeg3pluginimpl.h 3 HEADERS = libmpeg3plugin.h libmpeg3pluginimpl.h
4 SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \ 4 SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
5 bitstream.c \ 5 bitstream.c \
6 libmpeg3.c \ 6 libmpeg3.c \
7 mpeg3atrack.c \ 7 mpeg3atrack.c \
8 mpeg3css.c \ 8 mpeg3css.c \
9 mpeg3demux.c \ 9 mpeg3demux.c \
10 mpeg3io.c \ 10 mpeg3io.c \
11 mpeg3title.c \ 11 mpeg3title.c \
12 mpeg3vtrack.c \ 12 mpeg3vtrack.c \
13 audio/ac3.c \ 13 audio/ac3.c \
14 audio/bit_allocation.c \ 14 audio/bit_allocation.c \
15 audio/dct.c \ 15 audio/dct.c \
16 audio/exponents.c \ 16 audio/exponents.c \
17 audio/header.c \ 17 audio/header.c \
18 audio/layer2.c \ 18 audio/layer2.c \
19 audio/layer3.c \ 19 audio/layer3.c \
20 audio/mantissa.c \ 20 audio/mantissa.c \
21 audio/mpeg3audio.c \ 21 audio/mpeg3audio.c \
22 audio/pcm.c \ 22 audio/pcm.c \
23 audio/synthesizers.c \ 23 audio/synthesizers.c \
24 audio/tables.c \ 24 audio/tables.c \
25 video/getpicture.c \ 25 video/getpicture.c \
26 video/headers.c \ 26 video/headers.c \
27 video/idct.c \ 27 video/idct.c \
28 video/macroblocks.c \ 28 video/macroblocks.c \
29 video/mmxtest.c \ 29 video/mmxtest.c \
30 video/motion.c \ 30 video/motion.c \
31 video/mpeg3video.c \ 31 video/mpeg3video.c \
32 video/output.c \ 32 video/output.c \
33 video/reconstruct.c \ 33 video/reconstruct.c \
34 video/seek.c \ 34 video/seek.c \
35 video/slice.c \ 35 video/slice.c \
36 video/vlc.c 36 video/vlc.c
37 TARGET = mpeg3plugin 37 TARGET = mpeg3plugin
38 DESTDIR = ../../plugins/codecs 38 DESTDIR = ../../plugins/codecs
39INCLUDEPATH += $(QPEDIR)/include .. 39INCLUDEPATH += $(OPIEDIR)/include ..
40DEPENDPATH += ../$(QPEDIR)/include .. 40DEPENDPATH += ../$(OPIEDIR)/include ..
41LIBS += -lqpe -lpthread -lm 41LIBS += -lqpe -lpthread -lm
42 VERSION = 1.0.0 42 VERSION = 1.0.0
diff --git a/core/multimedia/opieplayer/mpegplayer.pro b/core/multimedia/opieplayer/mpegplayer.pro
index d6952f8..3b8d4b0 100644
--- a/core/multimedia/opieplayer/mpegplayer.pro
+++ b/core/multimedia/opieplayer/mpegplayer.pro
@@ -1,21 +1,21 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \ 4 HEADERS = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \
5 videowidget.h audiowidget.h playlistwidget.h mediaplayer.h audiodevice.h 5 videowidget.h audiowidget.h playlistwidget.h mediaplayer.h audiodevice.h
6 SOURCES = main.cpp \ 6 SOURCES = main.cpp \
7 loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \ 7 loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \
8 videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp audiodevice.cpp 8 videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp audiodevice.cpp
9 TARGET = mpegplayer 9 TARGET = mpegplayer
10 INCLUDEPATH+= $(QPEDIR)/include 10 INCLUDEPATH+= $(OPIEDIR)/include
11 DEPENDPATH+= $(QPEDIR)/include 11 DEPENDPATH+= $(OPIEDIR)/include
12LIBS += -lqpe -lpthread 12LIBS += -lqpe -lpthread
13 13
14 # INTERFACES= 14 # INTERFACES=
15# INCLUDEPATH += $(QPEDIR)/include 15# INCLUDEPATH += $(OPIEDIR)/include
16# CONFIG+=static 16# CONFIG+=static
17# TMAKE_CXXFLAGS += -DQPIM_STANDALONE 17# TMAKE_CXXFLAGS += -DQPIM_STANDALONE
18 # LIBS += libmpeg3/libmpeg3.a -lpthread 18 # LIBS += libmpeg3/libmpeg3.a -lpthread
19 # LIBS += $(QPEDIR)/plugins/codecs/liblibmadplugin.so 19 # LIBS += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so
20 20
21TRANSLATIONS = ../i18n/de/mpegplayer.ts 21TRANSLATIONS = ../i18n/de/mpegplayer.ts
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index c9203f8..e9fec6c 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -1,112 +1,112 @@
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) -DQCONFIG=\"qpe\" 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) -DQCONFIG=\"qpe\" 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/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:
69 tmake wavplugin.pro 69 tmake wavplugin.pro
70 70
71clean: 71clean:
72 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 72 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
73 -rm -f *~ core 73 -rm -f *~ core
74 -rm -f allmoc.cpp 74 -rm -f allmoc.cpp
75 75
76####### Extension Modules 76####### Extension Modules
77 77
78listpromodules: 78listpromodules:
79 @echo 79 @echo
80 80
81listallmodules: 81listallmodules:
82 @echo 82 @echo
83 83
84listaddonpromodules: 84listaddonpromodules:
85 @echo 85 @echo
86 86
87listaddonentmodules: 87listaddonentmodules:
88 @echo 88 @echo
89 89
90 90
91REQUIRES= 91REQUIRES=
92 92
93####### Sub-libraries 93####### Sub-libraries
94 94
95 95
96###### Combined headers 96###### Combined headers
97 97
98 98
99 99
100####### Compile 100####### Compile
101 101
102wavplugin.o: wavplugin.cpp \ 102wavplugin.o: wavplugin.cpp \
103 wavplugin.h \ 103 wavplugin.h \
104 ../mediaplayerplugininterface.h 104 ../mediaplayerplugininterface.h
105 105
106wavpluginimpl.o: wavpluginimpl.cpp \ 106wavpluginimpl.o: wavpluginimpl.cpp \
107 wavplugin.h \ 107 wavplugin.h \
108 ../mediaplayerplugininterface.h \ 108 ../mediaplayerplugininterface.h \
109 wavpluginimpl.h \ 109 wavpluginimpl.h \
110 ../mediaplayerplugininterface.h 110 ../mediaplayerplugininterface.h
111 111
112 112
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.pro b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
index 4663813..2160431 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.pro
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
@@ -1,10 +1,10 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS = wavplugin.h wavpluginimpl.h 3 HEADERS = wavplugin.h wavpluginimpl.h
4 SOURCES = wavplugin.cpp wavpluginimpl.cpp 4 SOURCES = wavplugin.cpp wavpluginimpl.cpp
5 TARGET = wavplugin 5 TARGET = wavplugin
6 DESTDIR = ../../plugins/codecs 6 DESTDIR = ../../plugins/codecs
7INCLUDEPATH += $(QPEDIR)/include .. 7INCLUDEPATH += $(OPIEDIR)/include ..
8DEPENDPATH += ../$(QPEDIR)/include .. 8DEPENDPATH += ../$(OPIEDIR)/include ..
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
diff --git a/core/pim/addressbook/Makefile.in b/core/pim/addressbook/Makefile.in
index 93c73c3..c46d0e5 100644
--- a/core/pim/addressbook/Makefile.in
+++ b/core/pim/addressbook/Makefile.in
@@ -1,244 +1,244 @@
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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= addressbook 21 TARGET= addressbook
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =addressbook.h \ 26 HEADERS =addressbook.h \
27 abeditor.h \ 27 abeditor.h \
28 ablabel.h \ 28 ablabel.h \
29 abtable.h \ 29 abtable.h \
30 addresssettings.h 30 addresssettings.h
31 SOURCES =main.cpp \ 31 SOURCES =main.cpp \
32 addressbook.cpp \ 32 addressbook.cpp \
33 abeditor.cpp \ 33 abeditor.cpp \
34 ablabel.cpp \ 34 ablabel.cpp \
35 abtable.cpp \ 35 abtable.cpp \
36 addresssettings.cpp 36 addresssettings.cpp
37 OBJECTS =main.o \ 37 OBJECTS =main.o \
38 addressbook.o \ 38 addressbook.o \
39 abeditor.o \ 39 abeditor.o \
40 ablabel.o \ 40 ablabel.o \
41 abtable.o \ 41 abtable.o \
42 addresssettings.o \ 42 addresssettings.o \
43 addresssettingsbase.o 43 addresssettingsbase.o
44INTERFACES = addresssettingsbase.ui 44INTERFACES = addresssettingsbase.ui
45UICDECLS = addresssettingsbase.h 45UICDECLS = addresssettingsbase.h
46UICIMPLS = addresssettingsbase.cpp 46UICIMPLS = addresssettingsbase.cpp
47 SRCMOC =moc_addressbook.cpp \ 47 SRCMOC =moc_addressbook.cpp \
48 moc_abeditor.cpp \ 48 moc_abeditor.cpp \
49 moc_ablabel.cpp \ 49 moc_ablabel.cpp \
50 moc_abtable.cpp \ 50 moc_abtable.cpp \
51 moc_addresssettings.cpp \ 51 moc_addresssettings.cpp \
52 moc_addresssettingsbase.cpp 52 moc_addresssettingsbase.cpp
53 OBJMOC =moc_addressbook.o \ 53 OBJMOC =moc_addressbook.o \
54 moc_abeditor.o \ 54 moc_abeditor.o \
55 moc_ablabel.o \ 55 moc_ablabel.o \
56 moc_abtable.o \ 56 moc_abtable.o \
57 moc_addresssettings.o \ 57 moc_addresssettings.o \
58 moc_addresssettingsbase.o 58 moc_addresssettingsbase.o
59 59
60 60
61####### Implicit rules 61####### Implicit rules
62 62
63.SUFFIXES: .cpp .cxx .cc .C .c 63.SUFFIXES: .cpp .cxx .cc .C .c
64 64
65.cpp.o: 65.cpp.o:
66 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 66 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
67 67
68.cxx.o: 68.cxx.o:
69 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 69 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
70 70
71.cc.o: 71.cc.o:
72 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 72 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
73 73
74.C.o: 74.C.o:
75 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 75 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
76 76
77.c.o: 77.c.o:
78 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 78 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
79 79
80####### Build rules 80####### Build rules
81 81
82 82
83all: $(DESTDIR)$(TARGET) 83all: $(DESTDIR)$(TARGET)
84 84
85$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 85$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
86 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 86 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
87 87
88moc: $(SRCMOC) 88moc: $(SRCMOC)
89 89
90tmake: 90tmake:
91 tmake p4addressbook.pro 91 tmake addressbook.pro
92 92
93clean: 93clean:
94 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 94 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
95 -rm -f *~ core 95 -rm -f *~ core
96 -rm -f allmoc.cpp 96 -rm -f allmoc.cpp
97 97
98####### Extension Modules 98####### Extension Modules
99 99
100listpromodules: 100listpromodules:
101 @echo 101 @echo
102 102
103listallmodules: 103listallmodules:
104 @echo 104 @echo
105 105
106listaddonpromodules: 106listaddonpromodules:
107 @echo 107 @echo
108 108
109listaddonentmodules: 109listaddonentmodules:
110 @echo 110 @echo
111 111
112 112
113REQUIRES= 113REQUIRES=
114 114
115####### Sub-libraries 115####### Sub-libraries
116 116
117 117
118###### Combined headers 118###### Combined headers
119 119
120 120
121 121
122####### Compile 122####### Compile
123 123
124main.o: main.cpp \ 124main.o: main.cpp \
125 addressbook.h \ 125 addressbook.h \
126 $(QPEDIR)/include/qpe/qpeapplication.h \ 126 $(OPIEDIR)/include/qpe/qpeapplication.h \
127 $(QPEDIR)/include/qpe/qcopenvelope_qws.h 127 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
128 128
129addressbook.o: addressbook.cpp \ 129addressbook.o: addressbook.cpp \
130 abeditor.h \ 130 abeditor.h \
131 $(QPEDIR)/include/qpe/contact.h \ 131 $(OPIEDIR)/include/qpe/contact.h \
132 $(QPEDIR)/include/qpe/palmtoprecord.h \ 132 $(OPIEDIR)/include/qpe/palmtoprecord.h \
133 $(QPEDIR)/include/qpe/recordfields.h \ 133 $(OPIEDIR)/include/qpe/recordfields.h \
134 ablabel.h \ 134 ablabel.h \
135 abtable.h \ 135 abtable.h \
136 $(QPEDIR)/include/qpe/categories.h \ 136 $(OPIEDIR)/include/qpe/categories.h \
137 addresssettings.h \ 137 addresssettings.h \
138 addresssettingsbase.h \ 138 addresssettingsbase.h \
139 addressbook.h \ 139 addressbook.h \
140 $(QPEDIR)/include/qpe/qpeapplication.h \ 140 $(OPIEDIR)/include/qpe/qpeapplication.h \
141 $(QPEDIR)/include/qpe/config.h \ 141 $(OPIEDIR)/include/qpe/config.h \
142 $(QPEDIR)/include/qpe/finddialog.h \ 142 $(OPIEDIR)/include/qpe/finddialog.h \
143 $(QPEDIR)/include/qpe/global.h \ 143 $(OPIEDIR)/include/qpe/global.h \
144 $(QPEDIR)/include/qpe/resource.h \ 144 $(OPIEDIR)/include/qpe/resource.h \
145 $(QPEDIR)/include/qpe/ir.h \ 145 $(OPIEDIR)/include/qpe/ir.h \
146 $(QPEDIR)/include/qpe/qpemessagebox.h \ 146 $(OPIEDIR)/include/qpe/qpemessagebox.h \
147 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 147 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
148 $(QPEDIR)/include/qpe/qpemenubar.h \ 148 $(OPIEDIR)/include/qpe/qpemenubar.h \
149 $(QPEDIR)/include/qpe/qpetoolbar.h 149 $(OPIEDIR)/include/qpe/qpetoolbar.h
150 150
151abeditor.o: abeditor.cpp \ 151abeditor.o: abeditor.cpp \
152 abeditor.h \ 152 abeditor.h \
153 $(QPEDIR)/include/qpe/contact.h \ 153 $(OPIEDIR)/include/qpe/contact.h \
154 $(QPEDIR)/include/qpe/palmtoprecord.h \ 154 $(OPIEDIR)/include/qpe/palmtoprecord.h \
155 $(QPEDIR)/include/qpe/recordfields.h \ 155 $(OPIEDIR)/include/qpe/recordfields.h \
156 addresspicker.h \ 156 addresspicker.h \
157 $(QPEDIR)/include/qpe/categoryselect.h \ 157 $(OPIEDIR)/include/qpe/categoryselect.h \
158 $(QPEDIR)/include/qpe/qpeapplication.h \ 158 $(OPIEDIR)/include/qpe/qpeapplication.h \
159 $(QPEDIR)/include/qpe/qpedialog.h 159 $(OPIEDIR)/include/qpe/qpedialog.h
160 160
161ablabel.o: ablabel.cpp \ 161ablabel.o: ablabel.cpp \
162 ablabel.h \ 162 ablabel.h \
163 $(QPEDIR)/include/qpe/contact.h \ 163 $(OPIEDIR)/include/qpe/contact.h \
164 $(QPEDIR)/include/qpe/palmtoprecord.h \ 164 $(OPIEDIR)/include/qpe/palmtoprecord.h \
165 $(QPEDIR)/include/qpe/recordfields.h \ 165 $(OPIEDIR)/include/qpe/recordfields.h \
166 $(QPEDIR)/include/qpe/stringutil.h 166 $(OPIEDIR)/include/qpe/stringutil.h
167 167
168abtable.o: abtable.cpp \ 168abtable.o: abtable.cpp \
169 $(QPEDIR)/include/qpe/categoryselect.h \ 169 $(OPIEDIR)/include/qpe/categoryselect.h \
170 $(QPEDIR)/include/qpe/config.h \ 170 $(OPIEDIR)/include/qpe/config.h \
171 $(QPEDIR)/include/qpe/stringutil.h \ 171 $(OPIEDIR)/include/qpe/stringutil.h \
172 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 172 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
173 abtable.h \ 173 abtable.h \
174 $(QPEDIR)/include/qpe/categories.h \ 174 $(OPIEDIR)/include/qpe/categories.h \
175 $(QPEDIR)/include/qpe/contact.h \ 175 $(OPIEDIR)/include/qpe/contact.h \
176 $(QPEDIR)/include/qpe/palmtoprecord.h \ 176 $(OPIEDIR)/include/qpe/palmtoprecord.h \
177 $(QPEDIR)/include/qpe/recordfields.h 177 $(OPIEDIR)/include/qpe/recordfields.h
178 178
179addresssettings.o: addresssettings.cpp \ 179addresssettings.o: addresssettings.cpp \
180 addresssettings.h \ 180 addresssettings.h \
181 addresssettingsbase.h \ 181 addresssettingsbase.h \
182 $(QPEDIR)/include/qpe/config.h \ 182 $(OPIEDIR)/include/qpe/config.h \
183 $(QPEDIR)/include/qpe/contact.h \ 183 $(OPIEDIR)/include/qpe/contact.h \
184 $(QPEDIR)/include/qpe/palmtoprecord.h \ 184 $(OPIEDIR)/include/qpe/palmtoprecord.h \
185 $(QPEDIR)/include/qpe/recordfields.h 185 $(OPIEDIR)/include/qpe/recordfields.h
186 186
187addresssettingsbase.h: addresssettingsbase.ui 187addresssettingsbase.h: addresssettingsbase.ui
188 $(UIC) addresssettingsbase.ui -o $(INTERFACE_DECL_PATH)/addresssettingsbase.h 188 $(UIC) addresssettingsbase.ui -o $(INTERFACE_DECL_PATH)/addresssettingsbase.h
189 189
190addresssettingsbase.cpp: addresssettingsbase.ui 190addresssettingsbase.cpp: addresssettingsbase.ui
191 $(UIC) addresssettingsbase.ui -i addresssettingsbase.h -o addresssettingsbase.cpp 191 $(UIC) addresssettingsbase.ui -i addresssettingsbase.h -o addresssettingsbase.cpp
192 192
193addresssettingsbase.o: addresssettingsbase.cpp \ 193addresssettingsbase.o: addresssettingsbase.cpp \
194 addresssettingsbase.h \ 194 addresssettingsbase.h \
195 addresssettingsbase.ui 195 addresssettingsbase.ui
196 196
197moc_addressbook.o: moc_addressbook.cpp \ 197moc_addressbook.o: moc_addressbook.cpp \
198 addressbook.h 198 addressbook.h
199 199
200moc_abeditor.o: moc_abeditor.cpp \ 200moc_abeditor.o: moc_abeditor.cpp \
201 abeditor.h \ 201 abeditor.h \
202 $(QPEDIR)/include/qpe/contact.h \ 202 $(OPIEDIR)/include/qpe/contact.h \
203 $(QPEDIR)/include/qpe/palmtoprecord.h \ 203 $(OPIEDIR)/include/qpe/palmtoprecord.h \
204 $(QPEDIR)/include/qpe/recordfields.h 204 $(OPIEDIR)/include/qpe/recordfields.h
205 205
206moc_ablabel.o: moc_ablabel.cpp \ 206moc_ablabel.o: moc_ablabel.cpp \
207 ablabel.h \ 207 ablabel.h \
208 $(QPEDIR)/include/qpe/contact.h \ 208 $(OPIEDIR)/include/qpe/contact.h \
209 $(QPEDIR)/include/qpe/palmtoprecord.h \ 209 $(OPIEDIR)/include/qpe/palmtoprecord.h \
210 $(QPEDIR)/include/qpe/recordfields.h 210 $(OPIEDIR)/include/qpe/recordfields.h
211 211
212moc_abtable.o: moc_abtable.cpp \ 212moc_abtable.o: moc_abtable.cpp \
213 abtable.h \ 213 abtable.h \
214 $(QPEDIR)/include/qpe/categories.h \ 214 $(OPIEDIR)/include/qpe/categories.h \
215 $(QPEDIR)/include/qpe/contact.h \ 215 $(OPIEDIR)/include/qpe/contact.h \
216 $(QPEDIR)/include/qpe/palmtoprecord.h \ 216 $(OPIEDIR)/include/qpe/palmtoprecord.h \
217 $(QPEDIR)/include/qpe/recordfields.h 217 $(OPIEDIR)/include/qpe/recordfields.h
218 218
219moc_addresssettings.o: moc_addresssettings.cpp \ 219moc_addresssettings.o: moc_addresssettings.cpp \
220 addresssettings.h \ 220 addresssettings.h \
221 addresssettingsbase.h 221 addresssettingsbase.h
222 222
223moc_addresssettingsbase.o: moc_addresssettingsbase.cpp \ 223moc_addresssettingsbase.o: moc_addresssettingsbase.cpp \
224 addresssettingsbase.h 224 addresssettingsbase.h
225 225
226moc_addressbook.cpp: addressbook.h 226moc_addressbook.cpp: addressbook.h
227 $(MOC) addressbook.h -o moc_addressbook.cpp 227 $(MOC) addressbook.h -o moc_addressbook.cpp
228 228
229moc_abeditor.cpp: abeditor.h 229moc_abeditor.cpp: abeditor.h
230 $(MOC) abeditor.h -o moc_abeditor.cpp 230 $(MOC) abeditor.h -o moc_abeditor.cpp
231 231
232moc_ablabel.cpp: ablabel.h 232moc_ablabel.cpp: ablabel.h
233 $(MOC) ablabel.h -o moc_ablabel.cpp 233 $(MOC) ablabel.h -o moc_ablabel.cpp
234 234
235moc_abtable.cpp: abtable.h 235moc_abtable.cpp: abtable.h
236 $(MOC) abtable.h -o moc_abtable.cpp 236 $(MOC) abtable.h -o moc_abtable.cpp
237 237
238moc_addresssettings.cpp: addresssettings.h 238moc_addresssettings.cpp: addresssettings.h
239 $(MOC) addresssettings.h -o moc_addresssettings.cpp 239 $(MOC) addresssettings.h -o moc_addresssettings.cpp
240 240
241moc_addresssettingsbase.cpp: addresssettingsbase.h 241moc_addresssettingsbase.cpp: addresssettingsbase.h
242 $(MOC) addresssettingsbase.h -o moc_addresssettingsbase.cpp 242 $(MOC) addresssettingsbase.h -o moc_addresssettingsbase.cpp
243 243
244 244
diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro
index 8d3401d..32e21a2 100644
--- a/core/pim/addressbook/addressbook.pro
+++ b/core/pim/addressbook/addressbook.pro
@@ -1,22 +1,22 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS= addressbook.h \ 4 HEADERS= addressbook.h \
5 abeditor.h \ 5 abeditor.h \
6 ablabel.h \ 6 ablabel.h \
7 abtable.h \ 7 abtable.h \
8 addresssettings.h 8 addresssettings.h
9 SOURCES= main.cpp \ 9 SOURCES= main.cpp \
10 addressbook.cpp \ 10 addressbook.cpp \
11 abeditor.cpp \ 11 abeditor.cpp \
12 ablabel.cpp \ 12 ablabel.cpp \
13 abtable.cpp \ 13 abtable.cpp \
14 addresssettings.cpp 14 addresssettings.cpp
15 INTERFACES= addresssettingsbase.ui 15 INTERFACES= addresssettingsbase.ui
16 16
17 TARGET = addressbook 17 TARGET = addressbook
18INCLUDEPATH += $(QPEDIR)/include 18INCLUDEPATH += $(OPIEDIR)/include
19 DEPENDPATH+= $(QPEDIR)/include 19 DEPENDPATH+= $(OPIEDIR)/include
20LIBS += -lqpe 20LIBS += -lqpe
21 21
22TRANSLATIONS = ../i18n/de/addressbook.ts 22TRANSLATIONS = ../i18n/de/addressbook.ts
diff --git a/core/pim/datebook/Makefile.in b/core/pim/datebook/Makefile.in
index bdc69dc..0c3282e 100644
--- a/core/pim/datebook/Makefile.in
+++ b/core/pim/datebook/Makefile.in
@@ -1,385 +1,408 @@
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$(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 = $(QPEDIR)/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:
128 tmake datebook.pro 128 tmake datebook.pro
129 129
130clean: 130clean:
131 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 131 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
132 -rm -f *~ core 132 -rm -f *~ core
133 -rm -f allmoc.cpp 133 -rm -f allmoc.cpp
134 134
135####### Extension Modules 135####### Extension Modules
136 136
137listpromodules: 137listpromodules:
138 @echo 138 @echo
139 139
140listallmodules: 140listallmodules:
141 @echo 141 @echo
142 142
143listaddonpromodules: 143listaddonpromodules:
144 @echo 144 @echo
145 145
146listaddonentmodules: 146listaddonentmodules:
147 @echo 147 @echo
148 148
149 149
150REQUIRES= 150REQUIRES=
151 151
152####### Sub-libraries 152####### Sub-libraries
153 153
154 154
155###### Combined headers 155###### Combined headers
156 156
157 157
158 158
159####### Compile 159####### Compile
160 160
161main.o: main.cpp \ 161main.o: main.cpp \
162 datebook.h \ 162 datebook.h \
163 $(QPEDIR)/include/qpe/datebookdb.h \ 163 $(OPIEDIR)/include/qpe/datebookdb.h \
164 $(QPEDIR)/include/qpe/event.h \ 164 $(OPIEDIR)/include/qpe/event.h \
165 $(QPEDIR)/include/qpe/palmtoprecord.h \ 165 $(OPIEDIR)/include/qpe/palmtoprecord.h \
166 $(QPEDIR)/include/qpe/qpeapplication.h 166 $(OPIEDIR)/include/qpe/timeconversion.h \
167 $(OPIEDIR)/include/qpe/qpcglobal.h \
168 $(OPIEDIR)/include/qpe/qpeapplication.h
167 169
168datebookday.o: datebookday.cpp \ 170datebookday.o: datebookday.cpp \
169 datebookday.h \ 171 datebookday.h \
170 $(QPEDIR)/include/qpe/event.h \ 172 $(OPIEDIR)/include/qpe/event.h \
171 $(QPEDIR)/include/qpe/palmtoprecord.h \ 173 $(OPIEDIR)/include/qpe/palmtoprecord.h \
174 $(OPIEDIR)/include/qpe/timeconversion.h \
175 $(OPIEDIR)/include/qpe/qpcglobal.h \
172 datebookdayheaderimpl.h \ 176 datebookdayheaderimpl.h \
173 datebookdayheader.h \ 177 datebookdayheader.h \
174 $(QPEDIR)/include/qpe/datebookdb.h \ 178 $(OPIEDIR)/include/qpe/datebookdb.h \
175 $(QPEDIR)/include/qpe/resource.h \ 179 $(OPIEDIR)/include/qpe/resource.h \
176 $(QPEDIR)/include/qpe/qpeapplication.h \ 180 $(OPIEDIR)/include/qpe/qpeapplication.h \
177 $(QPEDIR)/include/qpe/timestring.h \ 181 $(OPIEDIR)/include/qpe/timestring.h \
178 $(QPEDIR)/include/qpe/qpedebug.h 182 $(OPIEDIR)/include/qpe/qpedebug.h
179 183
180datebook.o: datebook.cpp \ 184datebook.o: datebook.cpp \
181 datebook.h \ 185 datebook.h \
182 $(QPEDIR)/include/qpe/datebookdb.h \ 186 $(OPIEDIR)/include/qpe/datebookdb.h \
183 $(QPEDIR)/include/qpe/event.h \ 187 $(OPIEDIR)/include/qpe/event.h \
184 $(QPEDIR)/include/qpe/palmtoprecord.h \ 188 $(OPIEDIR)/include/qpe/palmtoprecord.h \
189 $(OPIEDIR)/include/qpe/timeconversion.h \
190 $(OPIEDIR)/include/qpe/qpcglobal.h \
185 datebookday.h \ 191 datebookday.h \
186 datebooksettings.h \ 192 datebooksettings.h \
187 datebooksettingsbase.h \ 193 datebooksettingsbase.h \
188 datebookweek.h \ 194 datebookweek.h \
189 dateentryimpl.h \ 195 dateentryimpl.h \
190 dateentry.h \ 196 dateentry.h \
191 $(QPEDIR)/include/qpe/datebookmonth.h \ 197 $(OPIEDIR)/include/qpe/datebookmonth.h \
192 $(QPEDIR)/include/qpe/qpeapplication.h \ 198 $(OPIEDIR)/include/qpe/qpeapplication.h \
193 $(QPEDIR)/include/qpe/config.h \ 199 $(OPIEDIR)/include/qpe/config.h \
194 $(QPEDIR)/include/qpe/qpedebug.h \ 200 $(OPIEDIR)/include/qpe/qpedebug.h \
195 $(QPEDIR)/include/qpe/finddialog.h \ 201 $(OPIEDIR)/include/qpe/finddialog.h \
196 $(QPEDIR)/include/qpe/ir.h \ 202 $(OPIEDIR)/include/qpe/ir.h \
197 $(QPEDIR)/include/qpe/qpemenubar.h \ 203 $(OPIEDIR)/include/qpe/qpemenubar.h \
198 $(QPEDIR)/include/qpe/qpemessagebox.h \ 204 $(OPIEDIR)/include/qpe/qpemessagebox.h \
199 $(QPEDIR)/include/qpe/resource.h \ 205 $(OPIEDIR)/include/qpe/resource.h \
200 $(QPEDIR)/include/qpe/sound.h \ 206 $(OPIEDIR)/include/qpe/sound.h \
201 $(QPEDIR)/include/qpe/timestring.h \ 207 $(OPIEDIR)/include/qpe/timestring.h \
202 $(QPEDIR)/include/qpe/qpetoolbar.h \ 208 $(OPIEDIR)/include/qpe/qpetoolbar.h \
203 $(QPEDIR)/include/qpe/tzselect.h \ 209 $(OPIEDIR)/include/qpe/tzselect.h \
204 $(QPEDIR)/include/qpe/xmlreader.h 210 $(OPIEDIR)/include/qpe/xmlreader.h
205 211
206dateentryimpl.o: dateentryimpl.cpp \ 212dateentryimpl.o: dateentryimpl.cpp \
207 dateentryimpl.h \ 213 dateentryimpl.h \
208 dateentry.h \ 214 dateentry.h \
209 $(QPEDIR)/include/qpe/event.h \ 215 $(OPIEDIR)/include/qpe/event.h \
210 $(QPEDIR)/include/qpe/palmtoprecord.h \ 216 $(OPIEDIR)/include/qpe/palmtoprecord.h \
217 $(OPIEDIR)/include/qpe/timeconversion.h \
218 $(OPIEDIR)/include/qpe/qpcglobal.h \
211 repeatentry.h \ 219 repeatentry.h \
212 repeatentrybase.h \ 220 repeatentrybase.h \
213 $(QPEDIR)/include/qpe/qpeapplication.h \ 221 $(OPIEDIR)/include/qpe/qpeapplication.h \
214 $(QPEDIR)/include/qpe/categoryselect.h \ 222 $(OPIEDIR)/include/qpe/categoryselect.h \
215 $(QPEDIR)/include/qpe/datebookmonth.h \ 223 $(OPIEDIR)/include/qpe/datebookmonth.h \
216 $(QPEDIR)/include/qpe/global.h \ 224 $(OPIEDIR)/include/qpe/global.h \
217 $(QPEDIR)/include/qpe/timeconversion.h \ 225 $(OPIEDIR)/include/qpe/timestring.h \
218 $(QPEDIR)/include/qpe/timestring.h \ 226 $(OPIEDIR)/include/qpe/tzselect.h
219 $(QPEDIR)/include/qpe/tzselect.h
220 227
221datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \ 228datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \
222 datebookdayheaderimpl.h \ 229 datebookdayheaderimpl.h \
223 datebookdayheader.h \ 230 datebookdayheader.h \
224 $(QPEDIR)/include/qpe/datebookmonth.h \ 231 $(OPIEDIR)/include/qpe/datebookmonth.h \
225 $(QPEDIR)/include/qpe/event.h \ 232 $(OPIEDIR)/include/qpe/event.h \
226 $(QPEDIR)/include/qpe/palmtoprecord.h \ 233 $(OPIEDIR)/include/qpe/palmtoprecord.h \
227 $(QPEDIR)/include/qpe/timestring.h 234 $(OPIEDIR)/include/qpe/timeconversion.h \
235 $(OPIEDIR)/include/qpe/qpcglobal.h \
236 $(OPIEDIR)/include/qpe/timestring.h
228 237
229datebooksettings.o: datebooksettings.cpp \ 238datebooksettings.o: datebooksettings.cpp \
230 datebooksettings.h \ 239 datebooksettings.h \
231 datebooksettingsbase.h \ 240 datebooksettingsbase.h \
232 $(QPEDIR)/include/qpe/qpeapplication.h 241 $(OPIEDIR)/include/qpe/qpeapplication.h
233 242
234datebookweek.o: datebookweek.cpp \ 243datebookweek.o: datebookweek.cpp \
235 datebookweek.h \ 244 datebookweek.h \
236 $(QPEDIR)/include/qpe/event.h \ 245 $(OPIEDIR)/include/qpe/event.h \
237 $(QPEDIR)/include/qpe/palmtoprecord.h \ 246 $(OPIEDIR)/include/qpe/palmtoprecord.h \
247 $(OPIEDIR)/include/qpe/timeconversion.h \
248 $(OPIEDIR)/include/qpe/qpcglobal.h \
238 datebookweekheaderimpl.h \ 249 datebookweekheaderimpl.h \
239 datebookweekheader.h \ 250 datebookweekheader.h \
240 $(QPEDIR)/include/qpe/calendar.h \ 251 $(OPIEDIR)/include/qpe/calendar.h \
241 $(QPEDIR)/include/qpe/datebookdb.h \ 252 $(OPIEDIR)/include/qpe/datebookdb.h \
242 $(QPEDIR)/include/qpe/qpeapplication.h \ 253 $(OPIEDIR)/include/qpe/qpeapplication.h \
243 $(QPEDIR)/include/qpe/timestring.h 254 $(OPIEDIR)/include/qpe/timestring.h
244 255
245datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \ 256datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \
246 datebookweekheaderimpl.h \ 257 datebookweekheaderimpl.h \
247 datebookweekheader.h 258 datebookweekheader.h
248 259
249repeatentry.o: repeatentry.cpp \ 260repeatentry.o: repeatentry.cpp \
250 repeatentry.h \ 261 repeatentry.h \
251 repeatentrybase.h \ 262 repeatentrybase.h \
252 $(QPEDIR)/include/qpe/event.h \ 263 $(OPIEDIR)/include/qpe/event.h \
253 $(QPEDIR)/include/qpe/palmtoprecord.h \ 264 $(OPIEDIR)/include/qpe/palmtoprecord.h \
254 $(QPEDIR)/include/qpe/datebookmonth.h \ 265 $(OPIEDIR)/include/qpe/timeconversion.h \
255 $(QPEDIR)/include/qpe/qpeapplication.h \ 266 $(OPIEDIR)/include/qpe/qpcglobal.h \
256 $(QPEDIR)/include/qpe/timestring.h 267 $(OPIEDIR)/include/qpe/datebookmonth.h \
268 $(OPIEDIR)/include/qpe/qpeapplication.h \
269 $(OPIEDIR)/include/qpe/timestring.h
257 270
258dateentry.h: dateentry.ui 271dateentry.h: dateentry.ui
259 $(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h 272 $(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h
260 273
261dateentry.cpp: dateentry.ui 274dateentry.cpp: dateentry.ui
262 $(UIC) dateentry.ui -i dateentry.h -o dateentry.cpp 275 $(UIC) dateentry.ui -i dateentry.h -o dateentry.cpp
263 276
264datebookdayheader.h: datebookdayheader.ui 277datebookdayheader.h: datebookdayheader.ui
265 $(UIC) datebookdayheader.ui -o $(INTERFACE_DECL_PATH)/datebookdayheader.h 278 $(UIC) datebookdayheader.ui -o $(INTERFACE_DECL_PATH)/datebookdayheader.h
266 279
267datebookdayheader.cpp: datebookdayheader.ui 280datebookdayheader.cpp: datebookdayheader.ui
268 $(UIC) datebookdayheader.ui -i datebookdayheader.h -o datebookdayheader.cpp 281 $(UIC) datebookdayheader.ui -i datebookdayheader.h -o datebookdayheader.cpp
269 282
270datebooksettingsbase.h: datebooksettingsbase.ui 283datebooksettingsbase.h: datebooksettingsbase.ui
271 $(UIC) datebooksettingsbase.ui -o $(INTERFACE_DECL_PATH)/datebooksettingsbase.h 284 $(UIC) datebooksettingsbase.ui -o $(INTERFACE_DECL_PATH)/datebooksettingsbase.h
272 285
273datebooksettingsbase.cpp: datebooksettingsbase.ui 286datebooksettingsbase.cpp: datebooksettingsbase.ui
274 $(UIC) datebooksettingsbase.ui -i datebooksettingsbase.h -o datebooksettingsbase.cpp 287 $(UIC) datebooksettingsbase.ui -i datebooksettingsbase.h -o datebooksettingsbase.cpp
275 288
276datebookweekheader.h: datebookweekheader.ui 289datebookweekheader.h: datebookweekheader.ui
277 $(UIC) datebookweekheader.ui -o $(INTERFACE_DECL_PATH)/datebookweekheader.h 290 $(UIC) datebookweekheader.ui -o $(INTERFACE_DECL_PATH)/datebookweekheader.h
278 291
279datebookweekheader.cpp: datebookweekheader.ui 292datebookweekheader.cpp: datebookweekheader.ui
280 $(UIC) datebookweekheader.ui -i datebookweekheader.h -o datebookweekheader.cpp 293 $(UIC) datebookweekheader.ui -i datebookweekheader.h -o datebookweekheader.cpp
281 294
282repeatentrybase.h: repeatentrybase.ui 295repeatentrybase.h: repeatentrybase.ui
283 $(UIC) repeatentrybase.ui -o $(INTERFACE_DECL_PATH)/repeatentrybase.h 296 $(UIC) repeatentrybase.ui -o $(INTERFACE_DECL_PATH)/repeatentrybase.h
284 297
285repeatentrybase.cpp: repeatentrybase.ui 298repeatentrybase.cpp: repeatentrybase.ui
286 $(UIC) repeatentrybase.ui -i repeatentrybase.h -o repeatentrybase.cpp 299 $(UIC) repeatentrybase.ui -i repeatentrybase.h -o repeatentrybase.cpp
287 300
288dateentry.o: dateentry.cpp 301dateentry.o: dateentry.cpp
289 302
290datebookdayheader.o: datebookdayheader.cpp 303datebookdayheader.o: datebookdayheader.cpp
291 304
292datebooksettingsbase.o: datebooksettingsbase.cpp 305datebooksettingsbase.o: datebooksettingsbase.cpp
293 306
294datebookweekheader.o: datebookweekheader.cpp 307datebookweekheader.o: datebookweekheader.cpp
295 308
296repeatentrybase.o: repeatentrybase.cpp 309repeatentrybase.o: repeatentrybase.cpp
297 310
298moc_datebookday.o: moc_datebookday.cpp \ 311moc_datebookday.o: moc_datebookday.cpp \
299 datebookday.h \ 312 datebookday.h \
300 $(QPEDIR)/include/qpe/event.h \ 313 $(OPIEDIR)/include/qpe/event.h \
301 $(QPEDIR)/include/qpe/palmtoprecord.h 314 $(OPIEDIR)/include/qpe/palmtoprecord.h \
315 $(OPIEDIR)/include/qpe/timeconversion.h \
316 $(OPIEDIR)/include/qpe/qpcglobal.h
302 317
303moc_datebook.o: moc_datebook.cpp \ 318moc_datebook.o: moc_datebook.cpp \
304 datebook.h \ 319 datebook.h \
305 $(QPEDIR)/include/qpe/datebookdb.h \ 320 $(OPIEDIR)/include/qpe/datebookdb.h \
306 $(QPEDIR)/include/qpe/event.h \ 321 $(OPIEDIR)/include/qpe/event.h \
307 $(QPEDIR)/include/qpe/palmtoprecord.h 322 $(OPIEDIR)/include/qpe/palmtoprecord.h \
323 $(OPIEDIR)/include/qpe/timeconversion.h \
324 $(OPIEDIR)/include/qpe/qpcglobal.h
308 325
309moc_dateentryimpl.o: moc_dateentryimpl.cpp \ 326moc_dateentryimpl.o: moc_dateentryimpl.cpp \
310 dateentryimpl.h \ 327 dateentryimpl.h \
311 dateentry.h \ 328 dateentry.h \
312 $(QPEDIR)/include/qpe/event.h \ 329 $(OPIEDIR)/include/qpe/event.h \
313 $(QPEDIR)/include/qpe/palmtoprecord.h 330 $(OPIEDIR)/include/qpe/palmtoprecord.h \
331 $(OPIEDIR)/include/qpe/timeconversion.h \
332 $(OPIEDIR)/include/qpe/qpcglobal.h
314 333
315moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \ 334moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \
316 datebookdayheaderimpl.h \ 335 datebookdayheaderimpl.h \
317 datebookdayheader.h 336 datebookdayheader.h
318 337
319moc_datebookweek.o: moc_datebookweek.cpp \ 338moc_datebookweek.o: moc_datebookweek.cpp \
320 datebookweek.h \ 339 datebookweek.h \
321 $(QPEDIR)/include/qpe/event.h \ 340 $(OPIEDIR)/include/qpe/event.h \
322 $(QPEDIR)/include/qpe/palmtoprecord.h 341 $(OPIEDIR)/include/qpe/palmtoprecord.h \
342 $(OPIEDIR)/include/qpe/timeconversion.h \
343 $(OPIEDIR)/include/qpe/qpcglobal.h
323 344
324moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \ 345moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \
325 datebookweekheaderimpl.h \ 346 datebookweekheaderimpl.h \
326 datebookweekheader.h 347 datebookweekheader.h
327 348
328moc_repeatentry.o: moc_repeatentry.cpp \ 349moc_repeatentry.o: moc_repeatentry.cpp \
329 repeatentry.h \ 350 repeatentry.h \
330 repeatentrybase.h \ 351 repeatentrybase.h \
331 $(QPEDIR)/include/qpe/event.h \ 352 $(OPIEDIR)/include/qpe/event.h \
332 $(QPEDIR)/include/qpe/palmtoprecord.h 353 $(OPIEDIR)/include/qpe/palmtoprecord.h \
354 $(OPIEDIR)/include/qpe/timeconversion.h \
355 $(OPIEDIR)/include/qpe/qpcglobal.h
333 356
334moc_dateentry.o: moc_dateentry.cpp \ 357moc_dateentry.o: moc_dateentry.cpp \
335 dateentry.h 358 dateentry.h
336 359
337moc_datebookdayheader.o: moc_datebookdayheader.cpp \ 360moc_datebookdayheader.o: moc_datebookdayheader.cpp \
338 datebookdayheader.h 361 datebookdayheader.h
339 362
340moc_datebooksettingsbase.o: moc_datebooksettingsbase.cpp \ 363moc_datebooksettingsbase.o: moc_datebooksettingsbase.cpp \
341 datebooksettingsbase.h 364 datebooksettingsbase.h
342 365
343moc_datebookweekheader.o: moc_datebookweekheader.cpp \ 366moc_datebookweekheader.o: moc_datebookweekheader.cpp \
344 datebookweekheader.h 367 datebookweekheader.h
345 368
346moc_repeatentrybase.o: moc_repeatentrybase.cpp \ 369moc_repeatentrybase.o: moc_repeatentrybase.cpp \
347 repeatentrybase.h 370 repeatentrybase.h
348 371
349moc_datebookday.cpp: datebookday.h 372moc_datebookday.cpp: datebookday.h
350 $(MOC) datebookday.h -o moc_datebookday.cpp 373 $(MOC) datebookday.h -o moc_datebookday.cpp
351 374
352moc_datebook.cpp: datebook.h 375moc_datebook.cpp: datebook.h
353 $(MOC) datebook.h -o moc_datebook.cpp 376 $(MOC) datebook.h -o moc_datebook.cpp
354 377
355moc_dateentryimpl.cpp: dateentryimpl.h 378moc_dateentryimpl.cpp: dateentryimpl.h
356 $(MOC) dateentryimpl.h -o moc_dateentryimpl.cpp 379 $(MOC) dateentryimpl.h -o moc_dateentryimpl.cpp
357 380
358moc_datebookdayheaderimpl.cpp: datebookdayheaderimpl.h 381moc_datebookdayheaderimpl.cpp: datebookdayheaderimpl.h
359 $(MOC) datebookdayheaderimpl.h -o moc_datebookdayheaderimpl.cpp 382 $(MOC) datebookdayheaderimpl.h -o moc_datebookdayheaderimpl.cpp
360 383
361moc_datebookweek.cpp: datebookweek.h 384moc_datebookweek.cpp: datebookweek.h
362 $(MOC) datebookweek.h -o moc_datebookweek.cpp 385 $(MOC) datebookweek.h -o moc_datebookweek.cpp
363 386
364moc_datebookweekheaderimpl.cpp: datebookweekheaderimpl.h 387moc_datebookweekheaderimpl.cpp: datebookweekheaderimpl.h
365 $(MOC) datebookweekheaderimpl.h -o moc_datebookweekheaderimpl.cpp 388 $(MOC) datebookweekheaderimpl.h -o moc_datebookweekheaderimpl.cpp
366 389
367moc_repeatentry.cpp: repeatentry.h 390moc_repeatentry.cpp: repeatentry.h
368 $(MOC) repeatentry.h -o moc_repeatentry.cpp 391 $(MOC) repeatentry.h -o moc_repeatentry.cpp
369 392
370moc_dateentry.cpp: dateentry.h 393moc_dateentry.cpp: dateentry.h
371 $(MOC) dateentry.h -o moc_dateentry.cpp 394 $(MOC) dateentry.h -o moc_dateentry.cpp
372 395
373moc_datebookdayheader.cpp: datebookdayheader.h 396moc_datebookdayheader.cpp: datebookdayheader.h
374 $(MOC) datebookdayheader.h -o moc_datebookdayheader.cpp 397 $(MOC) datebookdayheader.h -o moc_datebookdayheader.cpp
375 398
376moc_datebooksettingsbase.cpp: datebooksettingsbase.h 399moc_datebooksettingsbase.cpp: datebooksettingsbase.h
377 $(MOC) datebooksettingsbase.h -o moc_datebooksettingsbase.cpp 400 $(MOC) datebooksettingsbase.h -o moc_datebooksettingsbase.cpp
378 401
379moc_datebookweekheader.cpp: datebookweekheader.h 402moc_datebookweekheader.cpp: datebookweekheader.h
380 $(MOC) datebookweekheader.h -o moc_datebookweekheader.cpp 403 $(MOC) datebookweekheader.h -o moc_datebookweekheader.cpp
381 404
382moc_repeatentrybase.cpp: repeatentrybase.h 405moc_repeatentrybase.cpp: repeatentrybase.h
383 $(MOC) repeatentrybase.h -o moc_repeatentrybase.cpp 406 $(MOC) repeatentrybase.h -o moc_repeatentrybase.cpp
384 407
385 408
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index 17c02ec..fae5d2b 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -1,36 +1,36 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 4
5 HEADERS= datebookday.h \ 5 HEADERS= datebookday.h \
6 datebook.h \ 6 datebook.h \
7 dateentryimpl.h \ 7 dateentryimpl.h \
8 datebookdayheaderimpl.h \ 8 datebookdayheaderimpl.h \
9 datebooksettings.h \ 9 datebooksettings.h \
10 datebookweek.h \ 10 datebookweek.h \
11 datebookweekheaderimpl.h \ 11 datebookweekheaderimpl.h \
12 repeatentry.h 12 repeatentry.h
13 13
14 SOURCES= main.cpp \ 14 SOURCES= main.cpp \
15 datebookday.cpp \ 15 datebookday.cpp \
16 datebook.cpp \ 16 datebook.cpp \
17 dateentryimpl.cpp \ 17 dateentryimpl.cpp \
18 datebookdayheaderimpl.cpp \ 18 datebookdayheaderimpl.cpp \
19 datebooksettings.cpp \ 19 datebooksettings.cpp \
20 datebookweek.cpp \ 20 datebookweek.cpp \
21 datebookweekheaderimpl.cpp \ 21 datebookweekheaderimpl.cpp \
22 repeatentry.cpp 22 repeatentry.cpp
23 23
24 INTERFACES= dateentry.ui \ 24 INTERFACES= dateentry.ui \
25 datebookdayheader.ui \ 25 datebookdayheader.ui \
26 datebooksettingsbase.ui \ 26 datebooksettingsbase.ui \
27 datebookweekheader.ui \ 27 datebookweekheader.ui \
28 repeatentrybase.ui 28 repeatentrybase.ui
29 29
30INCLUDEPATH += $(QPEDIR)/include 30INCLUDEPATH += $(OPIEDIR)/include
31 DEPENDPATH+= $(QPEDIR)/include 31 DEPENDPATH+= $(OPIEDIR)/include
32LIBS += -lqpe 32LIBS += -lqpe
33 33
34 TARGET = datebook 34 TARGET = datebook
35 35
36TRANSLATIONS = ../i18n/de/datebook.ts 36TRANSLATIONS = ../i18n/de/datebook.ts
diff --git a/core/pim/todo/Makefile.in b/core/pim/todo/Makefile.in
index f3c5f0e..efe6a35 100644
--- a/core/pim/todo/Makefile.in
+++ b/core/pim/todo/Makefile.in
@@ -1,201 +1,203 @@
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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= todolist 21 TARGET= todolist
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =mainwindow.h \ 26 HEADERS =mainwindow.h \
27 todotable.h \ 27 todotable.h \
28 todoentryimpl.h 28 todoentryimpl.h
29 SOURCES =main.cpp \ 29 SOURCES =main.cpp \
30 mainwindow.cpp \ 30 mainwindow.cpp \
31 todotable.cpp \ 31 todotable.cpp \
32 todoentryimpl.cpp 32 todoentryimpl.cpp
33 OBJECTS =main.o \ 33 OBJECTS =main.o \
34 mainwindow.o \ 34 mainwindow.o \
35 todotable.o \ 35 todotable.o \
36 todoentryimpl.o \ 36 todoentryimpl.o \
37 todoentry.o 37 todoentry.o
38INTERFACES = todoentry.ui 38INTERFACES = todoentry.ui
39UICDECLS = todoentry.h 39UICDECLS = todoentry.h
40UICIMPLS = todoentry.cpp 40UICIMPLS = todoentry.cpp
41 SRCMOC =moc_mainwindow.cpp \ 41 SRCMOC =moc_mainwindow.cpp \
42 moc_todotable.cpp \ 42 moc_todotable.cpp \
43 moc_todoentryimpl.cpp \ 43 moc_todoentryimpl.cpp \
44 moc_todoentry.cpp 44 moc_todoentry.cpp
45 OBJMOC =moc_mainwindow.o \ 45 OBJMOC =moc_mainwindow.o \
46 moc_todotable.o \ 46 moc_todotable.o \
47 moc_todoentryimpl.o \ 47 moc_todoentryimpl.o \
48 moc_todoentry.o 48 moc_todoentry.o
49 49
50 50
51####### Implicit rules 51####### Implicit rules
52 52
53.SUFFIXES: .cpp .cxx .cc .C .c 53.SUFFIXES: .cpp .cxx .cc .C .c
54 54
55.cpp.o: 55.cpp.o:
56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 56 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
57 57
58.cxx.o: 58.cxx.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60 60
61.cc.o: 61.cc.o:
62 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 62 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
63 63
64.C.o: 64.C.o:
65 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 65 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
66 66
67.c.o: 67.c.o:
68 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 68 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
69 69
70####### Build rules 70####### Build rules
71 71
72 72
73all: $(DESTDIR)$(TARGET) 73all: $(DESTDIR)$(TARGET)
74 74
75$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 75$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
76 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 76 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
77 77
78moc: $(SRCMOC) 78moc: $(SRCMOC)
79 79
80tmake: 80tmake:
81 tmake todo.pro 81 tmake todo.pro
82 82
83clean: 83clean:
84 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 84 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
85 -rm -f *~ core 85 -rm -f *~ core
86 -rm -f allmoc.cpp 86 -rm -f allmoc.cpp
87 87
88####### Extension Modules 88####### Extension Modules
89 89
90listpromodules: 90listpromodules:
91 @echo 91 @echo
92 92
93listallmodules: 93listallmodules:
94 @echo 94 @echo
95 95
96listaddonpromodules: 96listaddonpromodules:
97 @echo 97 @echo
98 98
99listaddonentmodules: 99listaddonentmodules:
100 @echo 100 @echo
101 101
102 102
103REQUIRES= 103REQUIRES=
104 104
105####### Sub-libraries 105####### Sub-libraries
106 106
107 107
108###### Combined headers 108###### Combined headers
109 109
110 110
111 111
112####### Compile 112####### Compile
113 113
114main.o: main.cpp \ 114main.o: main.cpp \
115 mainwindow.h \ 115 mainwindow.h \
116 $(QPEDIR)/include/qpe/qpeapplication.h 116 $(OPIEDIR)/include/qpe/qpeapplication.h
117 117
118mainwindow.o: mainwindow.cpp \ 118mainwindow.o: mainwindow.cpp \
119 mainwindow.h \ 119 mainwindow.h \
120 todoentryimpl.h \ 120 todoentryimpl.h \
121 todoentry.h \ 121 todoentry.h \
122 $(QPEDIR)/include/qpe/task.h \ 122 $(OPIEDIR)/include/qpe/task.h \
123 $(QPEDIR)/include/qpe/palmtoprecord.h \ 123 $(OPIEDIR)/include/qpe/palmtoprecord.h \
124 $(QPEDIR)/include/qpe/stringutil.h \ 124 $(OPIEDIR)/include/qpe/stringutil.h \
125 todotable.h \ 125 todotable.h \
126 $(QPEDIR)/include/qpe/categories.h \ 126 $(OPIEDIR)/include/qpe/categories.h \
127 $(QPEDIR)/include/qpe/qpeapplication.h \ 127 $(OPIEDIR)/include/qpe/qpeapplication.h \
128 $(QPEDIR)/include/qpe/config.h \ 128 $(OPIEDIR)/include/qpe/config.h \
129 $(QPEDIR)/include/qpe/finddialog.h \ 129 $(OPIEDIR)/include/qpe/finddialog.h \
130 $(QPEDIR)/include/qpe/global.h \ 130 $(OPIEDIR)/include/qpe/global.h \
131 $(QPEDIR)/include/qpe/ir.h \ 131 $(OPIEDIR)/include/qpe/ir.h \
132 $(QPEDIR)/include/qpe/qpemenubar.h \ 132 $(OPIEDIR)/include/qpe/qpemenubar.h \
133 $(QPEDIR)/include/qpe/qpemessagebox.h \ 133 $(OPIEDIR)/include/qpe/qpemessagebox.h \
134 $(QPEDIR)/include/qpe/resource.h \ 134 $(OPIEDIR)/include/qpe/resource.h \
135 $(QPEDIR)/include/qpe/qpetoolbar.h 135 $(OPIEDIR)/include/qpe/qpetoolbar.h
136 136
137todotable.o: todotable.cpp \ 137todotable.o: todotable.cpp \
138 todotable.h \ 138 todotable.h \
139 $(QPEDIR)/include/qpe/categories.h \ 139 $(OPIEDIR)/include/qpe/categories.h \
140 $(QPEDIR)/include/qpe/task.h \ 140 $(OPIEDIR)/include/qpe/stringutil.h \
141 $(QPEDIR)/include/qpe/palmtoprecord.h \ 141 $(OPIEDIR)/include/qpe/task.h \
142 $(QPEDIR)/include/qpe/stringutil.h \ 142 $(OPIEDIR)/include/qpe/palmtoprecord.h \
143 $(QPEDIR)/include/qpe/categoryselect.h \ 143 $(OPIEDIR)/include/qpe/categoryselect.h \
144 $(QPEDIR)/include/qpe/xmlreader.h 144 $(OPIEDIR)/include/qpe/xmlreader.h
145 145
146todoentryimpl.o: todoentryimpl.cpp \ 146todoentryimpl.o: todoentryimpl.cpp \
147 todoentryimpl.h \ 147 todoentryimpl.h \
148 todoentry.h \ 148 todoentry.h \
149 $(QPEDIR)/include/qpe/task.h \ 149 $(OPIEDIR)/include/qpe/task.h \
150 $(QPEDIR)/include/qpe/palmtoprecord.h \ 150 $(OPIEDIR)/include/qpe/palmtoprecord.h \
151 $(QPEDIR)/include/qpe/stringutil.h \ 151 $(OPIEDIR)/include/qpe/stringutil.h \
152 $(QPEDIR)/include/qpe/categoryselect.h \ 152 $(OPIEDIR)/include/qpe/categoryselect.h \
153 $(QPEDIR)/include/qpe/datebookmonth.h \ 153 $(OPIEDIR)/include/qpe/datebookmonth.h \
154 $(QPEDIR)/include/qpe/event.h \ 154 $(OPIEDIR)/include/qpe/event.h \
155 $(QPEDIR)/include/qpe/global.h \ 155 $(OPIEDIR)/include/qpe/timeconversion.h \
156 $(QPEDIR)/include/qpe/imageedit.h \ 156 $(OPIEDIR)/include/qpe/qpcglobal.h \
157 $(QPEDIR)/include/qpe/timestring.h 157 $(OPIEDIR)/include/qpe/global.h \
158 $(OPIEDIR)/include/qpe/imageedit.h \
159 $(OPIEDIR)/include/qpe/timestring.h
158 160
159todoentry.h: todoentry.ui 161todoentry.h: todoentry.ui
160 $(UIC) todoentry.ui -o $(INTERFACE_DECL_PATH)/todoentry.h 162 $(UIC) todoentry.ui -o $(INTERFACE_DECL_PATH)/todoentry.h
161 163
162todoentry.cpp: todoentry.ui 164todoentry.cpp: todoentry.ui
163 $(UIC) todoentry.ui -i todoentry.h -o todoentry.cpp 165 $(UIC) todoentry.ui -i todoentry.h -o todoentry.cpp
164 166
165todoentry.o: todoentry.cpp \ 167todoentry.o: todoentry.cpp \
166 todoentry.h \ 168 todoentry.h \
167 todoentry.ui 169 todoentry.ui
168 170
169moc_mainwindow.o: moc_mainwindow.cpp \ 171moc_mainwindow.o: moc_mainwindow.cpp \
170 mainwindow.h 172 mainwindow.h
171 173
172moc_todotable.o: moc_todotable.cpp \ 174moc_todotable.o: moc_todotable.cpp \
173 todotable.h \ 175 todotable.h \
174 $(QPEDIR)/include/qpe/categories.h \ 176 $(OPIEDIR)/include/qpe/categories.h \
175 $(QPEDIR)/include/qpe/task.h \ 177 $(OPIEDIR)/include/qpe/stringutil.h \
176 $(QPEDIR)/include/qpe/palmtoprecord.h \ 178 $(OPIEDIR)/include/qpe/task.h \
177 $(QPEDIR)/include/qpe/stringutil.h 179 $(OPIEDIR)/include/qpe/palmtoprecord.h
178 180
179moc_todoentryimpl.o: moc_todoentryimpl.cpp \ 181moc_todoentryimpl.o: moc_todoentryimpl.cpp \
180 todoentryimpl.h \ 182 todoentryimpl.h \
181 todoentry.h \ 183 todoentry.h \
182 $(QPEDIR)/include/qpe/task.h \ 184 $(OPIEDIR)/include/qpe/task.h \
183 $(QPEDIR)/include/qpe/palmtoprecord.h \ 185 $(OPIEDIR)/include/qpe/palmtoprecord.h \
184 $(QPEDIR)/include/qpe/stringutil.h 186 $(OPIEDIR)/include/qpe/stringutil.h
185 187
186moc_todoentry.o: moc_todoentry.cpp \ 188moc_todoentry.o: moc_todoentry.cpp \
187 todoentry.h 189 todoentry.h
188 190
189moc_mainwindow.cpp: mainwindow.h 191moc_mainwindow.cpp: mainwindow.h
190 $(MOC) mainwindow.h -o moc_mainwindow.cpp 192 $(MOC) mainwindow.h -o moc_mainwindow.cpp
191 193
192moc_todotable.cpp: todotable.h 194moc_todotable.cpp: todotable.h
193 $(MOC) todotable.h -o moc_todotable.cpp 195 $(MOC) todotable.h -o moc_todotable.cpp
194 196
195moc_todoentryimpl.cpp: todoentryimpl.h 197moc_todoentryimpl.cpp: todoentryimpl.h
196 $(MOC) todoentryimpl.h -o moc_todoentryimpl.cpp 198 $(MOC) todoentryimpl.h -o moc_todoentryimpl.cpp
197 199
198moc_todoentry.cpp: todoentry.h 200moc_todoentry.cpp: todoentry.h
199 $(MOC) todoentry.h -o moc_todoentry.cpp 201 $(MOC) todoentry.h -o moc_todoentry.cpp
200 202
201 203
diff --git a/core/pim/todo/todo.pro b/core/pim/todo/todo.pro
index e28ea1c..5eb02a2 100644
--- a/core/pim/todo/todo.pro
+++ b/core/pim/todo/todo.pro
@@ -1,19 +1,19 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS= mainwindow.h \ 4 HEADERS= mainwindow.h \
5 todotable.h \ 5 todotable.h \
6 todoentryimpl.h 6 todoentryimpl.h
7 SOURCES= main.cpp \ 7 SOURCES= main.cpp \
8 mainwindow.cpp \ 8 mainwindow.cpp \
9 todotable.cpp \ 9 todotable.cpp \
10 todoentryimpl.cpp 10 todoentryimpl.cpp
11 11
12 INTERFACES= todoentry.ui 12 INTERFACES= todoentry.ui
13 13
14 TARGET = todolist 14 TARGET = todolist
15INCLUDEPATH += $(QPEDIR)/include 15INCLUDEPATH += $(OPIEDIR)/include
16 DEPENDPATH+= $(QPEDIR)/include 16 DEPENDPATH+= $(OPIEDIR)/include
17LIBS += -lqpe 17LIBS += -lqpe
18 18
19TRANSLATIONS = ../i18n/de/todolist.ts 19TRANSLATIONS = ../i18n/de/todolist.ts
diff --git a/core/settings/citytime/Makefile.in b/core/settings/citytime/Makefile.in
index b058021..4112a68 100644
--- a/core/settings/citytime/Makefile.in
+++ b/core/settings/citytime/Makefile.in
@@ -1,184 +1,184 @@
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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= citytime 21 TARGET= citytime
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =citytime.h \ 26 HEADERS =citytime.h \
27 zonemap.h \ 27 zonemap.h \
28 sun.h \ 28 sun.h \
29 stylusnormalizer.h 29 stylusnormalizer.h
30 SOURCES =citytime.cpp \ 30 SOURCES =citytime.cpp \
31 zonemap.cpp \ 31 zonemap.cpp \
32 main.cpp \ 32 main.cpp \
33 sun.c \ 33 sun.c \
34 stylusnormalizer.cpp 34 stylusnormalizer.cpp
35 OBJECTS =citytime.o \ 35 OBJECTS =citytime.o \
36 zonemap.o \ 36 zonemap.o \
37 main.o \ 37 main.o \
38 sun.o \ 38 sun.o \
39 stylusnormalizer.o \ 39 stylusnormalizer.o \
40 citytimebase.o 40 citytimebase.o
41INTERFACES = citytimebase.ui 41INTERFACES = citytimebase.ui
42UICDECLS = citytimebase.h 42UICDECLS = citytimebase.h
43UICIMPLS = citytimebase.cpp 43UICIMPLS = citytimebase.cpp
44 SRCMOC =moc_citytime.cpp \ 44 SRCMOC =moc_citytime.cpp \
45 moc_zonemap.cpp \ 45 moc_zonemap.cpp \
46 moc_stylusnormalizer.cpp \ 46 moc_stylusnormalizer.cpp \
47 moc_citytimebase.cpp 47 moc_citytimebase.cpp
48 OBJMOC =moc_citytime.o \ 48 OBJMOC =moc_citytime.o \
49 moc_zonemap.o \ 49 moc_zonemap.o \
50 moc_stylusnormalizer.o \ 50 moc_stylusnormalizer.o \
51 moc_citytimebase.o 51 moc_citytimebase.o
52 52
53 53
54####### Implicit rules 54####### Implicit rules
55 55
56.SUFFIXES: .cpp .cxx .cc .C .c 56.SUFFIXES: .cpp .cxx .cc .C .c
57 57
58.cpp.o: 58.cpp.o:
59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 59 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60 60
61.cxx.o: 61.cxx.o:
62 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 62 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
63 63
64.cc.o: 64.cc.o:
65 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 65 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
66 66
67.C.o: 67.C.o:
68 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 68 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
69 69
70.c.o: 70.c.o:
71 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 71 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
72 72
73####### Build rules 73####### Build rules
74 74
75 75
76all: $(DESTDIR)$(TARGET) 76all: $(DESTDIR)$(TARGET)
77 77
78$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 78$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
79 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 79 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
80 80
81moc: $(SRCMOC) 81moc: $(SRCMOC)
82 82
83tmake: 83tmake:
84 tmake citytime.pro 84 tmake citytime.pro
85 85
86clean: 86clean:
87 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 87 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
88 -rm -f *~ core 88 -rm -f *~ core
89 -rm -f allmoc.cpp 89 -rm -f allmoc.cpp
90 90
91####### Extension Modules 91####### Extension Modules
92 92
93listpromodules: 93listpromodules:
94 @echo 94 @echo
95 95
96listallmodules: 96listallmodules:
97 @echo 97 @echo
98 98
99listaddonpromodules: 99listaddonpromodules:
100 @echo 100 @echo
101 101
102listaddonentmodules: 102listaddonentmodules:
103 @echo 103 @echo
104 104
105 105
106REQUIRES= 106REQUIRES=
107 107
108####### Sub-libraries 108####### Sub-libraries
109 109
110 110
111###### Combined headers 111###### Combined headers
112 112
113 113
114 114
115####### Compile 115####### Compile
116 116
117citytime.o: citytime.cpp \ 117citytime.o: citytime.cpp \
118 zonemap.h \ 118 zonemap.h \
119 stylusnormalizer.h \ 119 stylusnormalizer.h \
120 citytime.h \ 120 citytime.h \
121 citytimebase.h \ 121 citytimebase.h \
122 $(QPEDIR)/include/qpe/qpeapplication.h \ 122 $(OPIEDIR)/include/qpe/qpeapplication.h \
123 $(QPEDIR)/include/qpe/config.h \ 123 $(OPIEDIR)/include/qpe/config.h \
124 $(QPEDIR)/include/qpe/timestring.h \ 124 $(OPIEDIR)/include/qpe/timestring.h \
125 $(QPEDIR)/include/qpe/tzselect.h \ 125 $(OPIEDIR)/include/qpe/tzselect.h \
126 $(QPEDIR)/include/qpe/qcopenvelope_qws.h 126 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
127 127
128zonemap.o: zonemap.cpp \ 128zonemap.o: zonemap.cpp \
129 sun.h \ 129 sun.h \
130 zonemap.h \ 130 zonemap.h \
131 stylusnormalizer.h \ 131 stylusnormalizer.h \
132 $(QPEDIR)/include/qpe/resource.h \ 132 $(OPIEDIR)/include/qpe/resource.h \
133 $(QPEDIR)/include/qpe/timestring.h \ 133 $(OPIEDIR)/include/qpe/timestring.h \
134 $(QPEDIR)/include/qpe/qpeapplication.h 134 $(OPIEDIR)/include/qpe/qpeapplication.h
135 135
136main.o: main.cpp \ 136main.o: main.cpp \
137 citytime.h \ 137 citytime.h \
138 citytimebase.h \ 138 citytimebase.h \
139 $(QPEDIR)/include/qpe/qpeapplication.h 139 $(OPIEDIR)/include/qpe/qpeapplication.h
140 140
141sun.o: sun.c \ 141sun.o: sun.c \
142 sun.h \ 142 sun.h \
143 $(QPEDIR)/include/qpe/qmath.h 143 $(OPIEDIR)/include/qpe/qmath.h
144 144
145stylusnormalizer.o: stylusnormalizer.cpp \ 145stylusnormalizer.o: stylusnormalizer.cpp \
146 stylusnormalizer.h 146 stylusnormalizer.h
147 147
148citytimebase.h: citytimebase.ui 148citytimebase.h: citytimebase.ui
149 $(UIC) citytimebase.ui -o $(INTERFACE_DECL_PATH)/citytimebase.h 149 $(UIC) citytimebase.ui -o $(INTERFACE_DECL_PATH)/citytimebase.h
150 150
151citytimebase.cpp: citytimebase.ui 151citytimebase.cpp: citytimebase.ui
152 $(UIC) citytimebase.ui -i citytimebase.h -o citytimebase.cpp 152 $(UIC) citytimebase.ui -i citytimebase.h -o citytimebase.cpp
153 153
154citytimebase.o: citytimebase.cpp \ 154citytimebase.o: citytimebase.cpp \
155 citytimebase.h \ 155 citytimebase.h \
156 citytimebase.ui 156 citytimebase.ui
157 157
158moc_citytime.o: moc_citytime.cpp \ 158moc_citytime.o: moc_citytime.cpp \
159 citytime.h \ 159 citytime.h \
160 citytimebase.h 160 citytimebase.h
161 161
162moc_zonemap.o: moc_zonemap.cpp \ 162moc_zonemap.o: moc_zonemap.cpp \
163 zonemap.h \ 163 zonemap.h \
164 stylusnormalizer.h 164 stylusnormalizer.h
165 165
166moc_stylusnormalizer.o: moc_stylusnormalizer.cpp \ 166moc_stylusnormalizer.o: moc_stylusnormalizer.cpp \
167 stylusnormalizer.h 167 stylusnormalizer.h
168 168
169moc_citytimebase.o: moc_citytimebase.cpp \ 169moc_citytimebase.o: moc_citytimebase.cpp \
170 citytimebase.h 170 citytimebase.h
171 171
172moc_citytime.cpp: citytime.h 172moc_citytime.cpp: citytime.h
173 $(MOC) citytime.h -o moc_citytime.cpp 173 $(MOC) citytime.h -o moc_citytime.cpp
174 174
175moc_zonemap.cpp: zonemap.h 175moc_zonemap.cpp: zonemap.h
176 $(MOC) zonemap.h -o moc_zonemap.cpp 176 $(MOC) zonemap.h -o moc_zonemap.cpp
177 177
178moc_stylusnormalizer.cpp: stylusnormalizer.h 178moc_stylusnormalizer.cpp: stylusnormalizer.h
179 $(MOC) stylusnormalizer.h -o moc_stylusnormalizer.cpp 179 $(MOC) stylusnormalizer.h -o moc_stylusnormalizer.cpp
180 180
181moc_citytimebase.cpp: citytimebase.h 181moc_citytimebase.cpp: citytimebase.h
182 $(MOC) citytimebase.h -o moc_citytimebase.cpp 182 $(MOC) citytimebase.h -o moc_citytimebase.cpp
183 183
184 184
diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro
index d988b48..3420499 100644
--- a/core/settings/citytime/citytime.pro
+++ b/core/settings/citytime/citytime.pro
@@ -1,13 +1,13 @@
1# $Id$ 1# $Id$
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3TEMPLATE = app 3TEMPLATE = app
4DESTDIR = $(QPEDIR)/bin 4DESTDIR = $(OPIEDIR)/bin
5INTERFACES = citytimebase.ui 5INTERFACES = citytimebase.ui
6HEADERS = citytime.h zonemap.h sun.h stylusnormalizer.h 6HEADERS = citytime.h zonemap.h sun.h stylusnormalizer.h
7SOURCES = citytime.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp 7SOURCES = citytime.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp
8TARGET = citytime 8TARGET = citytime
9INCLUDEPATH += $(QPEDIR)/include 9INCLUDEPATH += $(OPIEDIR)/include
10DEPENDPATH += $(QPEDIR)/include 10DEPENDPATH += $(OPIEDIR)/include
11LIBS += -lqpe 11LIBS += -lqpe
12 12
13TRANSLATIONS = ../i18n/de/citytime.ts 13TRANSLATIONS = ../i18n/de/citytime.ts
diff --git a/core/settings/light-and-power/Makefile.in b/core/settings/light-and-power/Makefile.in
index 8236ed0..5caa249 100644
--- a/core/settings/light-and-power/Makefile.in
+++ b/core/settings/light-and-power/Makefile.in
@@ -1,135 +1,135 @@
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$(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= light-and-power 21 TARGET= light-and-power
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =settings.h 26 HEADERS =settings.h
27 SOURCES =light.cpp \ 27 SOURCES =light.cpp \
28 main.cpp 28 main.cpp
29 OBJECTS =light.o \ 29 OBJECTS =light.o \
30 main.o \ 30 main.o \
31 lightsettingsbase.o 31 lightsettingsbase.o
32INTERFACES = lightsettingsbase.ui 32INTERFACES = lightsettingsbase.ui
33UICDECLS = lightsettingsbase.h 33UICDECLS = lightsettingsbase.h
34UICIMPLS = lightsettingsbase.cpp 34UICIMPLS = lightsettingsbase.cpp
35 SRCMOC =moc_settings.cpp \ 35 SRCMOC =moc_settings.cpp \
36 moc_lightsettingsbase.cpp 36 moc_lightsettingsbase.cpp
37 OBJMOC =moc_settings.o \ 37 OBJMOC =moc_settings.o \
38 moc_lightsettingsbase.o 38 moc_lightsettingsbase.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:
71 tmake light-and-power.pro 71 tmake light-and-power.pro
72 72
73clean: 73clean:
74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
75 -rm -f *~ core 75 -rm -f *~ core
76 -rm -f allmoc.cpp 76 -rm -f allmoc.cpp
77 77
78####### Extension Modules 78####### Extension Modules
79 79
80listpromodules: 80listpromodules:
81 @echo 81 @echo
82 82
83listallmodules: 83listallmodules:
84 @echo 84 @echo
85 85
86listaddonpromodules: 86listaddonpromodules:
87 @echo 87 @echo
88 88
89listaddonentmodules: 89listaddonentmodules:
90 @echo 90 @echo
91 91
92 92
93REQUIRES= 93REQUIRES=
94 94
95####### Sub-libraries 95####### Sub-libraries
96 96
97 97
98###### Combined headers 98###### Combined headers
99 99
100 100
101 101
102####### Compile 102####### Compile
103 103
104light.o: light.cpp \ 104light.o: light.cpp \
105 settings.h \ 105 settings.h \
106 lightsettingsbase.h 106 lightsettingsbase.h
107 107
108main.o: main.cpp \ 108main.o: main.cpp \
109 settings.h \ 109 settings.h \
110 lightsettingsbase.h 110 lightsettingsbase.h
111 111
112lightsettingsbase.h: lightsettingsbase.ui 112lightsettingsbase.h: lightsettingsbase.ui
113 $(UIC) lightsettingsbase.ui -o $(INTERFACE_DECL_PATH)/lightsettingsbase.h 113 $(UIC) lightsettingsbase.ui -o $(INTERFACE_DECL_PATH)/lightsettingsbase.h
114 114
115lightsettingsbase.cpp: lightsettingsbase.ui 115lightsettingsbase.cpp: lightsettingsbase.ui
116 $(UIC) lightsettingsbase.ui -i lightsettingsbase.h -o lightsettingsbase.cpp 116 $(UIC) lightsettingsbase.ui -i lightsettingsbase.h -o lightsettingsbase.cpp
117 117
118lightsettingsbase.o: lightsettingsbase.cpp \ 118lightsettingsbase.o: lightsettingsbase.cpp \
119 lightsettingsbase.h \ 119 lightsettingsbase.h \
120 lightsettingsbase.ui 120 lightsettingsbase.ui
121 121
122moc_settings.o: moc_settings.cpp \ 122moc_settings.o: moc_settings.cpp \
123 settings.h \ 123 settings.h \
124 lightsettingsbase.h 124 lightsettingsbase.h
125 125
126moc_lightsettingsbase.o: moc_lightsettingsbase.cpp \ 126moc_lightsettingsbase.o: moc_lightsettingsbase.cpp \
127 lightsettingsbase.h 127 lightsettingsbase.h
128 128
129moc_settings.cpp: settings.h 129moc_settings.cpp: settings.h
130 $(MOC) settings.h -o moc_settings.cpp 130 $(MOC) settings.h -o moc_settings.cpp
131 131
132moc_lightsettingsbase.cpp: lightsettingsbase.h 132moc_lightsettingsbase.cpp: lightsettingsbase.h
133 $(MOC) lightsettingsbase.h -o moc_lightsettingsbase.cpp 133 $(MOC) lightsettingsbase.h -o moc_lightsettingsbase.cpp
134 134
135 135
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro
index 87bb111..35b51a7 100644
--- a/core/settings/light-and-power/light-and-power.pro
+++ b/core/settings/light-and-power/light-and-power.pro
@@ -1,12 +1,12 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = ../../bin 3 DESTDIR = ../../bin
4 HEADERS = settings.h 4 HEADERS = settings.h
5 SOURCES = light.cpp main.cpp 5 SOURCES = light.cpp main.cpp
6 INTERFACES= lightsettingsbase.ui 6 INTERFACES= lightsettingsbase.ui
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= ../$(QPEDIR)/include 8 DEPENDPATH+= ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 TARGET = light-and-power 10 TARGET = light-and-power
11 11
12TRANSLATIONS = ../../i18n/de/light-and-power.ts 12TRANSLATIONS = ../../i18n/de/light-and-power.ts
diff --git a/core/settings/security/Makefile.in b/core/settings/security/Makefile.in
index 803edc5..f190e79 100644
--- a/core/settings/security/Makefile.in
+++ b/core/settings/security/Makefile.in
@@ -1,135 +1,135 @@
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$(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= security 21 TARGET= security
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =security.h 26 HEADERS =security.h
27 SOURCES =security.cpp \ 27 SOURCES =security.cpp \
28 main.cpp 28 main.cpp
29 OBJECTS =security.o \ 29 OBJECTS =security.o \
30 main.o \ 30 main.o \
31 securitybase.o 31 securitybase.o
32INTERFACES = securitybase.ui 32INTERFACES = securitybase.ui
33UICDECLS = securitybase.h 33UICDECLS = securitybase.h
34UICIMPLS = securitybase.cpp 34UICIMPLS = securitybase.cpp
35 SRCMOC =moc_security.cpp \ 35 SRCMOC =moc_security.cpp \
36 moc_securitybase.cpp 36 moc_securitybase.cpp
37 OBJMOC =moc_security.o \ 37 OBJMOC =moc_security.o \
38 moc_securitybase.o 38 moc_securitybase.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:
71 tmake security.pro 71 tmake security.pro
72 72
73clean: 73clean:
74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
75 -rm -f *~ core 75 -rm -f *~ core
76 -rm -f allmoc.cpp 76 -rm -f allmoc.cpp
77 77
78####### Extension Modules 78####### Extension Modules
79 79
80listpromodules: 80listpromodules:
81 @echo 81 @echo
82 82
83listallmodules: 83listallmodules:
84 @echo 84 @echo
85 85
86listaddonpromodules: 86listaddonpromodules:
87 @echo 87 @echo
88 88
89listaddonentmodules: 89listaddonentmodules:
90 @echo 90 @echo
91 91
92 92
93REQUIRES= 93REQUIRES=
94 94
95####### Sub-libraries 95####### Sub-libraries
96 96
97 97
98###### Combined headers 98###### Combined headers
99 99
100 100
101 101
102####### Compile 102####### Compile
103 103
104security.o: security.cpp \ 104security.o: security.cpp \
105 security.h \ 105 security.h \
106 securitybase.h 106 securitybase.h
107 107
108main.o: main.cpp \ 108main.o: main.cpp \
109 security.h \ 109 security.h \
110 securitybase.h 110 securitybase.h
111 111
112securitybase.h: securitybase.ui 112securitybase.h: securitybase.ui
113 $(UIC) securitybase.ui -o $(INTERFACE_DECL_PATH)/securitybase.h 113 $(UIC) securitybase.ui -o $(INTERFACE_DECL_PATH)/securitybase.h
114 114
115securitybase.cpp: securitybase.ui 115securitybase.cpp: securitybase.ui
116 $(UIC) securitybase.ui -i securitybase.h -o securitybase.cpp 116 $(UIC) securitybase.ui -i securitybase.h -o securitybase.cpp
117 117
118securitybase.o: securitybase.cpp \ 118securitybase.o: securitybase.cpp \
119 securitybase.h \ 119 securitybase.h \
120 securitybase.ui 120 securitybase.ui
121 121
122moc_security.o: moc_security.cpp \ 122moc_security.o: moc_security.cpp \
123 security.h \ 123 security.h \
124 securitybase.h 124 securitybase.h
125 125
126moc_securitybase.o: moc_securitybase.cpp \ 126moc_securitybase.o: moc_securitybase.cpp \
127 securitybase.h 127 securitybase.h
128 128
129moc_security.cpp: security.h 129moc_security.cpp: security.h
130 $(MOC) security.h -o moc_security.cpp 130 $(MOC) security.h -o moc_security.cpp
131 131
132moc_securitybase.cpp: securitybase.h 132moc_securitybase.cpp: securitybase.h
133 $(MOC) securitybase.h -o moc_securitybase.cpp 133 $(MOC) securitybase.h -o moc_securitybase.cpp
134 134
135 135
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index 282127e..f22e7a6 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -1,12 +1,12 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = ../../bin 3 DESTDIR = ../../bin
4 HEADERS = security.h 4 HEADERS = security.h
5 SOURCES = security.cpp main.cpp 5 SOURCES = security.cpp main.cpp
6 INTERFACES= securitybase.ui 6 INTERFACES= securitybase.ui
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= ../$(QPEDIR)/include 8 DEPENDPATH+= ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 TARGET = security 10 TARGET = security
11 11
12TRANSLATIONS = ../../i18n/de/security.ts 12TRANSLATIONS = ../../i18n/de/security.ts
diff --git a/docs/qcop.doc b/docs/qcop.doc
index 6fe4c71..e62f91d 100644
--- a/docs/qcop.doc
+++ b/docs/qcop.doc
@@ -1,179 +1,179 @@
1/*! 1/*!
2 2
3\page qcop.html 3\page qcop.html
4 4
5\title QCop Messages 5\title QCop Messages
6 6
7QCop messages allow applications to communicate with each other. 7QCop messages allow applications to communicate with each other.
8These messages are send using QCopEnvelope, and received by connecting 8These messages are send using QCopEnvelope, and received by connecting
9to a QCopChannel. 9to a QCopChannel.
10 10
11The <tt>channelname</tt> of channels within Qtopia all start with "QPE/". 11The <tt>channelname</tt> of channels within Qtopia all start with "QPE/".
12The <tt>messagename</tt> is a function identifier followed by a list of types 12The <tt>messagename</tt> is a function identifier followed by a list of types
13in parentheses. There are no spaces in the message name. 13in parentheses. There are no spaces in the message name.
14 14
15The variable names shown in this documentation are purely for information 15The variable names shown in this documentation are purely for information
16purposes. A message shown as 16purposes. A message shown as
17"messageName(Type1 varname1, Type2 varname2, Type2 varname3)" would be 17"messageName(Type1 varname1, Type2 varname2, Type2 varname3)" would be
18used in program code as: 18used in program code as:
19 19
20\code 20\code
21 QCopEnvelope e(channelname, "messageName(Type1,Type2,Type2)"); 21 QCopEnvelope e(channelname, "messageName(Type1,Type2,Type2)");
22 e << parameter1 << parameter2 << parameter3; 22 e << parameter1 << parameter2 << parameter3;
23\endcode 23\endcode
24 24
25 25
26The system-wide channels and messages. 26The system-wide channels and messages.
27 27
28<dl> 28<dl>
29<dt><b>QPE/System</b> 29<dt><b>QPE/System</b>
30 <dd> 30 <dd>
31 <ul> 31 <ul>
32 <li>busy() 32 <li>busy()
33 <br> Causes a wait indicator to be shown to the user. 33 <br> Causes a wait indicator to be shown to the user.
34 <li>notBusy() 34 <li>notBusy()
35 <br> Cancels the wait indicator. 35 <br> Cancels the wait indicator.
36 <li>linkChanged(QString) 36 <li>linkChanged(QString)
37 <br> Sent whenever a link is changed. 37 <br> Sent whenever a link is changed.
38 It is sent by FileManager::saveFile() and others, and 38 It is sent by FileManager::saveFile() and others, and
39 received by the Launcher. 39 received by the Launcher.
40 <li>applyStyle() 40 <li>applyStyle()
41 <br> Sent when user changes style. 41 <br> Sent when user changes style.
42 It is received by QPEApplication and the application 42 It is received by QPEApplication and the application
43 will redraw accordingly. 43 will redraw accordingly.
44 <li>quit() 44 <li>quit()
45 <br> Terminates the Qtopia environment. 45 <br> Terminates the Qtopia environment.
46 <li>shutdown() 46 <li>shutdown()
47 <br> Terminates the system. 47 <br> Terminates the system.
48 <li>restart() 48 <li>restart()
49 <br> Restarts the Qtopia environment. 49 <br> Restarts the Qtopia environment.
50 <li>execute(QString) 50 <li>execute(QString)
51 <br> Executes or raises the given application. 51 <br> Executes or raises the given application.
52 <li>execute(QString,QString) 52 <li>execute(QString,QString)
53 <br> Executes or raises the given application, passing an argument. 53 <br> Executes or raises the given application, passing an argument.
54 Note that you should consider using the 54 Note that you should consider using the
55 <b>QPE/Application/<i>appname</i></b> channels described below. 55 <b>QPE/Application/<i>appname</i></b> channels described below.
56 <li>addAlarm(QDateTime,QCString,QCString,int) 56 <li>addAlarm(QDateTime,QCString,QCString,int)
57 <br> Internal. See AlarmServer::addAlarm() 57 <br> Internal. See AlarmServer::addAlarm()
58 <li>deleteAlarm(QDateTime,QCString,QCString,int) 58 <li>deleteAlarm(QDateTime,QCString,QCString,int)
59 <br> Internal. See AlarmServer::deleteAlarm() 59 <br> Internal. See AlarmServer::deleteAlarm()
60 <li>setDefaultRotation(int) 60 <li>setDefaultRotation(int)
61 <br> Internal. 61 <br> Internal.
62 <li>grabKeyboard(QString) 62 <li>grabKeyboard(QString)
63 <br> Internal. 63 <br> Internal.
64 <li>timeChange(QString) 64 <li>timeChange(QString)
65 <br> Internal. 65 <br> Internal.
66 <li>clockChange(bool) 66 <li>clockChange(bool)
67 <br> Internal. 67 <br> Internal.
68 <li>setScreenSaverInterval(int) 68 <li>setScreenSaverInterval(int)
69 <br> Internal. 69 <br> Internal.
70 <li>language(QString) 70 <li>language(QString)
71 <br> Internal. 71 <br> Internal.
72 </ul> 72 </ul>
73 73
74<dt><b>QPE/Sync</b> 74<dt><b>QPE/Sync</b>
75 <ul> 75 <ul>
76 <li>flush() 76 <li>flush()
77 <br> Sent at the start of synchronization. Synchable applications 77 <br> Sent at the start of synchronization. Synchable applications
78 should save any synchable data to disk. 78 should save any synchable data to disk.
79 <i>Note: this message is currently asynchronous. Stay tuned 79 <i>Note: this message is currently asynchronous. Stay tuned
80 to discussions regarding synchronization, as this message 80 to discussions regarding synchronization, as this message
81 may become synchronous, requiring slight midification to 81 may become synchronous, requiring slight midification to
82 your code. For now, just respond in a timely fashion, 82 your code. For now, just respond in a timely fashion,
83 since the sync server merely waits a small time.</i> 83 since the sync server merely waits a small time.</i>
84 <li>reload() 84 <li>reload()
85 <br> Sent at the end of synchronization. Synchable applications 85 <br> Sent at the end of synchronization. Synchable applications
86 should reload any synchable data from disk. 86 should reload any synchable data from disk.
87 </ul> 87 </ul>
88 88
89<dt><b>QPE/TaskBar</b> 89<dt><b>QPE/TaskBar</b>
90 <ul> 90 <ul>
91 <li>message(QString) 91 <li>message(QString)
92 <br> Internal. See Global::statusMessage() 92 <br> Internal. See Global::statusMessage()
93 <li>showInputMethod() 93 <li>showInputMethod()
94 <br> Internal. 94 <br> Internal.
95 <li>hideInputMethod() 95 <li>hideInputMethod()
96 <br> Internal. 96 <br> Internal.
97 <li>reloadInputMethods() 97 <li>reloadInputMethods()
98 <br> Internal. 98 <br> Internal.
99 <li>reloadApplets() 99 <li>reloadApplets()
100 <br> Internal. 100 <br> Internal.
101 </ul> 101 </ul>
102 102
103<dt><b>QPE/Card</b> 103<dt><b>QPE/Card</b>
104 <ul> 104 <ul>
105 <li>stabChanged() 105 <li>stabChanged()
106 <br> Sent when <tt>/var/run/stab</tt>, <tt>/var/state/pcmcia/stab</tt>, 106 <br> Sent when <tt>/var/run/stab</tt>, <tt>/var/state/pcmcia/stab</tt>,
107 or <tt>/var/lib/pcmcia/stab</tt> may have changed. 107 or <tt>/var/lib/pcmcia/stab</tt> may have changed.
108 <li>netUp() 108 <li>netUp()
109 <br> Sent when a network connection is running. 109 <br> Sent when a network connection is running.
110 <li>netDown() 110 <li>netDown()
111 <br> Sent when a network connection is available, but not running. 111 <br> Sent when a network connection is available, but not running.
112 <li>netUnavailable() 112 <li>netUnavailable()
113 <br> Sent when a network connection is not available. 113 <br> Sent when a network connection is not available.
114 </ul> 114 </ul>
115 115
116<dt><b>Qt/Tray</b> 116<dt><b>Qt/Tray</b>
117 This channel allows Qt applications (not just Qtopia applications) 117 This channel allows Qt applications (not just Qtopia applications)
118 to show system-tray status in a cross-platform manner, 118 to show system-tray status in a cross-platform manner,
119 but it is not currently supported. See TaskbarAppletInterface for 119 but it is not currently supported. See TaskbarAppletInterface for
120 a more powerful alternative for system tray applications. 120 a more powerful alternative for system tray applications.
121 <ul> 121 <ul>
122 <li>popup(int,QPoint) 122 <li>popup(int,QPoint)
123 <li>remove(int) 123 <li>remove(int)
124 <li>setIcon(int,QPixmap) 124 <li>setIcon(int,QPixmap)
125 <li>setToolTip(int,QString) 125 <li>setToolTip(int,QString)
126 <li>doubleClicked(int,QPoint) 126 <li>doubleClicked(int,QPoint)
127 <li>clicked(int,QPoint) 127 <li>clicked(int,QPoint)
128 </ul> 128 </ul>
129</dl> 129</dl>
130 130
131Each application listens on a channel called 131Each application listens on a channel called
132<b>QPE/Application/<i>appname</i></b>, where <b><i>appname</i></b> is 132<b>QPE/Application/<i>appname</i></b>, where <b><i>appname</i></b> is
133the executable name (the application identifier). Standard messages on 133the executable name (the application identifier). Standard messages on
134this channel are: 134this channel are:
135 135
136<dl> 136<dl>
137 <dt><b>QPE/Application/<i>appname</i></b> 137 <dt><b>QPE/Application/<i>appname</i></b>
138 <ul> 138 <ul>
139 <li>setDocument(QString) 139 <li>setDocument(QString)
140 <br>Internal. Causes the setDocument(const QString&) slot 140 <br>Internal. Causes the setDocument(const QString&) slot
141 of <a href=docwidget.html>the main document widget</a> 141 of <a href=docwidget.html>the main document widget</a>
142 to be called. 142 to be called.
143 <li>nextView() 143 <li>nextView()
144 <br>Applications connected to hardware buttons will receive 144 <br>Applications connected to hardware buttons will receive
145 this message if they are already visible. 145 this message if they are already visible.
146 <li>raise() 146 <li>raise()
147 <br>Internal. Causes the the main document widget and the 147 <br>Internal. Causes the the main document widget and the
148 current modal widget to be raised. 148 current modal widget to be raised.
149 <li>quit() 149 <li>quit()
150 <br>Internal. Terminates the application. 150 <br>Internal. Terminates the application.
151 <li>quitIfInvisible() 151 <li>quitIfInvisible()
152 <br>Internal. Terminates the application if it is not shown. 152 <br>Internal. Terminates the application if it is not shown.
153 </ul> 153 </ul>
154</dl> 154</dl>
155 155
156The QPE/Application/<i>appname</i> channel has a special property: when 156The QPE/Application/<i>appname</i> channel has a special property: when
157messages are sent to these channels vie QCopEnvelope, the message is 157messages are sent to these channels vie QCopEnvelope, the message is
158delivered even if the application is not yet running (the application 158delivered even if the application is not yet running (the application
159is run and the message is then sent). 159is run and the message is then sent).
160 160
161Applications also respond to messages specific to the application. 161Applications also respond to messages specific to the application.
162Such messages in the base Qtopia applications are: 162Such messages in the base Qtopia applications are:
163 163
164<dl> 164<dl>
165 <dt><b>QPE/Application/helpbrowser</b> 165 <dt><b>QPE/Application/helpbrowser</b>
166 <ul> 166 <ul>
167 <li>showFile(QString <i>file</i>) 167 <li>showFile(QString <i>file</i>)
168 <br>Send this message to have the Help Browser show a file. 168 <br>Send this message to have the Help Browser show a file.
169 The <i>file</i> may be an absolute filename or relative 169 The <i>file</i> may be an absolute filename or relative
170 to the system HTML documentation directory ($QPEDIR/help/html). 170 to the system HTML documentation directory ($OPIEDIR/help/html).
171 </ul> 171 </ul>
172 <dt><b>QPE/Application/datebook</b> 172 <dt><b>QPE/Application/datebook</b>
173 <ul> 173 <ul>
174 <li>alarm(QDateTime,int) 174 <li>alarm(QDateTime,int)
175 <br>Internal. Causes the Calendar application to sound alarms. 175 <br>Internal. Causes the Calendar application to sound alarms.
176 </ul> 176 </ul>
177</dl> 177</dl>
178 178
179*/ 179*/
diff --git a/docs/start.doc b/docs/start.doc
index 9745d9a..01b6ab1 100644
--- a/docs/start.doc
+++ b/docs/start.doc
@@ -1,191 +1,191 @@
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 QPEDIR=/opt/Qtopia 61 export OPIEDIR=/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 $QPEDIR/example . 72 cp -r $OPIEDIR/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 $QPEDIR/apps/Applications 92 cp example.desktop $OPIEDIR/apps/Applications
93 cp Example.png $QPEDIR/pics 93 cp Example.png $OPIEDIR/pics
94 cp example $QPEDIR/bin 94 cp example $OPIEDIR/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 QPEDIR=/opt/Qtopia/sharp 138 export OPIEDIR=/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> Build and install exactly the same as you did for the desktop
145 (note that the generated Makefile is different): 145 (note that the generated Makefile is different):
146<pre> 146<pre>
147 make clean 147 make clean
148 tmake -o Makefile example.pro 148 tmake -o Makefile example.pro
149 ... <i>etc.</i> 149 ... <i>etc.</i>
150</pre> 150</pre>
151 151
152 <li> To install it on a device, build an ipk package file (you should be root 152 <li> To install it on a device, build an ipk package file (you should be root
153 to do this, since then it will strip the executable for you): 153 to do this, since then it will strip the executable for you):
154<pre> 154<pre>
155 mkipks example.control 155 mkipks example.control
156</pre> 156</pre>
157 157
158<p> 158<p>
159 The resulting <tt>example-1.0.0.ipk</tt> can be installed on the 159 The resulting <tt>example-1.0.0.ipk</tt> can be installed on the
160SL5000 by using <i>Qtopia Desktop</i>. 160SL5000 by using <i>Qtopia Desktop</i>.
161</p> 161</p>
162 162
163</ol> 163</ol>
164 164
165<h3>Building Your Own Applications</h3> 165<h3>Building Your Own Applications</h3>
166 166
167Once you have built the example, you can proceed with writing 167Once you have built the example, you can proceed with writing
168your own applicatons. If you are not familiar with Qt, you should 168your own applicatons. If you are not familiar with Qt, you should
169consult the Qt documentation by pointing your web browser at 169consult 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> 170<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 171when you have installed the SDK, or use the online
172<a href=http://doc.trolltech.com/>Trolltech Documentation Site</a>. 172<a href=http://doc.trolltech.com/>Trolltech Documentation Site</a>.
173The <a href="http://www.trolltech.com/products/qt/whitepaper.html">Qt 173The <a href="http://www.trolltech.com/products/qt/whitepaper.html">Qt
174Whitepaper</a> provides a good overview of, and introduction to, the 174Whitepaper</a> provides a good overview of, and introduction to, the
175Qt API. 175Qt API.
176 176
177<p> 177<p>
178When you add more files to your application, just edit the project 178When you add more files to your application, just edit the project
179file (e.g. <tt>example.pro</tt>) and rerun the <tt>tmake</tt> 179file (e.g. <tt>example.pro</tt>) and rerun the <tt>tmake</tt>
180command. 180command.
181 181
182<p> 182<p>
183The <tt>.ui</tt> files are <i>Qt Designer</i> user interface files. 183The <tt>.ui</tt> files are <i>Qt Designer</i> user interface files.
184You can create and edit these using <i>Qt Designer</i>: 184You can create and edit these using <i>Qt Designer</i>:
185<pre> 185<pre>
186 designer example.ui 186 designer example.ui
187</pre> 187</pre>
188<i>Qt Designer</i>'s online documentation includes a complete 188<i>Qt Designer</i>'s online documentation includes a complete
189tutorial. 189tutorial.
190 190
191*/ 191*/
diff --git a/etc/init.d/qpe b/etc/init.d/qpe
index 12bb1df..8791e73 100755
--- a/etc/init.d/qpe
+++ b/etc/init.d/qpe
@@ -1,39 +1,39 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3 3
4export LOGNAME=root 4export LOGNAME=root
5export HOME=/$LOGNAME 5export HOME=/$LOGNAME
6export QWS_DISPLAY=Transformed:Rot270:0 6export QWS_DISPLAY=Transformed:Rot270:0
7export QTDIR=/usr 7export QTDIR=/usr
8export QPEDIR=/opt/QtPalmtop 8export OPIEDIR=/opt/QtPalmtop
9if [ ! -x $QPEDIR/bin/qpe ] ; then exit 0 ; fi 9if [ ! -x $OPIEDIR/bin/qpe ] ; then exit 0 ; fi
10 10
11$QPEDIR/bin/qpe-reorgfiles 11$OPIEDIR/bin/qpe-reorgfiles
12 12
13. /etc/profile 13. /etc/profile
14 14
15killproc() { 15killproc() {
16 pid=`/bin/ps -e | /bin/sed -n -e '/\<'$1'\>/ s/^ *\([0-9][0-9]*\).*/\1/p'` 16 pid=`/bin/ps -e | /bin/sed -n -e '/\<'$1'\>/ s/^ *\([0-9][0-9]*\).*/\1/p'`
17 [ "$pid" != "" ] && kill $pid 17 [ "$pid" != "" ] && kill $pid
18} 18}
19 19
20case $1 in 20case $1 in
21'start') 21'start')
22 echo "Starting QPE..." 22 echo "Starting QPE..."
23 23
24 cd $HOME 24 cd $HOME
25 25
26 rm -f /etc/rc2.d/S99x # Can't have both running! 26 rm -f /etc/rc2.d/S99x # Can't have both running!
27 27
28 $QPEDIR/bin/qpe 2>/dev/null >/dev/null & 28 $OPIEDIR/bin/qpe 2>/dev/null >/dev/null &
29 29
30 ;; 30 ;;
31'stop') 31'stop')
32 echo "Killing QPE..." 32 echo "Killing QPE..."
33 killproc qpe 33 killproc qpe
34 ;; 34 ;;
35*) 35*)
36 echo "usage: $0 { start | stop }" 36 echo "usage: $0 { start | stop }"
37 ;; 37 ;;
38esac 38esac
39 39
diff --git a/example/example.pro b/example/example.pro
index 2d89311..d150b1c 100644
--- a/example/example.pro
+++ b/example/example.pro
@@ -1,10 +1,10 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 #CONFIG = qt warn_on debug 2 #CONFIG = qt warn_on debug
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = example.h 4 HEADERS = example.h
5 SOURCES = main.cpp example.cpp 5 SOURCES = main.cpp example.cpp
6 INCLUDEPATH+= $(QPEDIR)/include 6 INCLUDEPATH+= $(OPIEDIR)/include
7 DEPENDPATH+= $(QPEDIR)/include 7 DEPENDPATH+= $(OPIEDIR)/include
8LIBS += -lqpe 8LIBS += -lqpe
9 INTERFACES= examplebase.ui 9 INTERFACES= examplebase.ui
10 TARGET = example 10 TARGET = example
diff --git a/freetype/freetype.pro b/freetype/freetype.pro
index 841f6d4..f63a087 100644
--- a/freetype/freetype.pro
+++ b/freetype/freetype.pro
@@ -1,13 +1,13 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS =fontfactoryttf_qws.h freetypefactoryimpl.h 3 HEADERS =fontfactoryttf_qws.h freetypefactoryimpl.h
4 SOURCES =fontfactoryttf_qws.cpp freetypefactoryimpl.cpp 4 SOURCES =fontfactoryttf_qws.cpp freetypefactoryimpl.cpp
5 qt2:HEADERS+= qfontdata_p.h 5 qt2:HEADERS+= qfontdata_p.h
6 TARGET = freetypefactory 6 TARGET = freetypefactory
7 DESTDIR = ../plugins/fontfactories 7 DESTDIR = ../plugins/fontfactories
8INCLUDEPATH += $(QPEDIR)/include 8INCLUDEPATH += $(OPIEDIR)/include
9DEPENDPATH += $(QPEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10#INCLUDEPATH += $(QPEDIR)/include 10#INCLUDEPATH += $(OPIEDIR)/include
11 #DEPENDPATH+= /usr/local/include/freetype2 11 #DEPENDPATH+= /usr/local/include/freetype2
12LIBS += -lqpe -lfreetype 12LIBS += -lqpe -lfreetype
13 VERSION = 1.0.0 13 VERSION = 1.0.0
diff --git a/inputmethods/handwriting/Makefile.in b/inputmethods/handwriting/Makefile.in
index aabb5aa..cd2b47c 100644
--- a/inputmethods/handwriting/Makefile.in
+++ b/inputmethods/handwriting/Makefile.in
@@ -1,281 +1,281 @@
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/inputmethods/ 17DESTDIR = ../../plugins/inputmethods/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= qhandwriting 21 TARGET= qhandwriting
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =qimpenchar.h \ 26 HEADERS =qimpenchar.h \
27 qimpenprofile.h \ 27 qimpenprofile.h \
28 qimpencombining.h \ 28 qimpencombining.h \
29 qimpenhelp.h \ 29 qimpenhelp.h \
30 qimpeninput.h \ 30 qimpeninput.h \
31 qimpenmatch.h \ 31 qimpenmatch.h \
32 qimpensetup.h \ 32 qimpensetup.h \
33 qimpenstroke.h \ 33 qimpenstroke.h \
34 qimpenwidget.h \ 34 qimpenwidget.h \
35 qimpenwordpick.h \ 35 qimpenwordpick.h \
36 handwritingimpl.h 36 handwritingimpl.h
37 SOURCES =qimpenchar.cpp \ 37 SOURCES =qimpenchar.cpp \
38 qimpenprofile.cpp \ 38 qimpenprofile.cpp \
39 qimpencombining.cpp \ 39 qimpencombining.cpp \
40 qimpenhelp.cpp \ 40 qimpenhelp.cpp \
41 qimpeninput.cpp \ 41 qimpeninput.cpp \
42 qimpenmatch.cpp \ 42 qimpenmatch.cpp \
43 qimpensetup.cpp \ 43 qimpensetup.cpp \
44 qimpenstroke.cpp \ 44 qimpenstroke.cpp \
45 qimpenwidget.cpp \ 45 qimpenwidget.cpp \
46 qimpenwordpick.cpp \ 46 qimpenwordpick.cpp \
47 handwritingimpl.cpp 47 handwritingimpl.cpp
48 OBJECTS =qimpenchar.o \ 48 OBJECTS =qimpenchar.o \
49 qimpenprofile.o \ 49 qimpenprofile.o \
50 qimpencombining.o \ 50 qimpencombining.o \
51 qimpenhelp.o \ 51 qimpenhelp.o \
52 qimpeninput.o \ 52 qimpeninput.o \
53 qimpenmatch.o \ 53 qimpenmatch.o \
54 qimpensetup.o \ 54 qimpensetup.o \
55 qimpenstroke.o \ 55 qimpenstroke.o \
56 qimpenwidget.o \ 56 qimpenwidget.o \
57 qimpenwordpick.o \ 57 qimpenwordpick.o \
58 handwritingimpl.o \ 58 handwritingimpl.o \
59 qimpenprefbase.o 59 qimpenprefbase.o
60INTERFACES = qimpenprefbase.ui 60INTERFACES = qimpenprefbase.ui
61UICDECLS = qimpenprefbase.h 61UICDECLS = qimpenprefbase.h
62UICIMPLS = qimpenprefbase.cpp 62UICIMPLS = qimpenprefbase.cpp
63 SRCMOC =moc_qimpenhelp.cpp \ 63 SRCMOC =moc_qimpenhelp.cpp \
64 moc_qimpeninput.cpp \ 64 moc_qimpeninput.cpp \
65 moc_qimpenmatch.cpp \ 65 moc_qimpenmatch.cpp \
66 moc_qimpensetup.cpp \ 66 moc_qimpensetup.cpp \
67 moc_qimpenwidget.cpp \ 67 moc_qimpenwidget.cpp \
68 moc_qimpenwordpick.cpp \ 68 moc_qimpenwordpick.cpp \
69 moc_qimpenprefbase.cpp 69 moc_qimpenprefbase.cpp
70 OBJMOC =moc_qimpenhelp.o \ 70 OBJMOC =moc_qimpenhelp.o \
71 moc_qimpeninput.o \ 71 moc_qimpeninput.o \
72 moc_qimpenmatch.o \ 72 moc_qimpenmatch.o \
73 moc_qimpensetup.o \ 73 moc_qimpensetup.o \
74 moc_qimpenwidget.o \ 74 moc_qimpenwidget.o \
75 moc_qimpenwordpick.o \ 75 moc_qimpenwordpick.o \
76 moc_qimpenprefbase.o 76 moc_qimpenprefbase.o
77 77
78 78
79####### Implicit rules 79####### Implicit rules
80 80
81.SUFFIXES: .cpp .cxx .cc .C .c 81.SUFFIXES: .cpp .cxx .cc .C .c
82 82
83.cpp.o: 83.cpp.o:
84 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 84 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
85 85
86.cxx.o: 86.cxx.o:
87 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 87 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
88 88
89.cc.o: 89.cc.o:
90 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 90 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
91 91
92.C.o: 92.C.o:
93 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 93 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
94 94
95.c.o: 95.c.o:
96 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 96 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
97 97
98####### Build rules 98####### Build rules
99 99
100 100
101all: $(DESTDIR)$(SYSCONF_LINK_TARGET) 101all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
102 102
103$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 103$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
104 $(SYSCONF_LINK_LIB) 104 $(SYSCONF_LINK_LIB)
105 105
106moc: $(SRCMOC) 106moc: $(SRCMOC)
107 107
108tmake: 108tmake:
109 tmake handwriting.pro 109 tmake handwriting.pro
110 110
111clean: 111clean:
112 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 112 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
113 -rm -f *~ core 113 -rm -f *~ core
114 -rm -f allmoc.cpp 114 -rm -f allmoc.cpp
115 115
116####### Extension Modules 116####### Extension Modules
117 117
118listpromodules: 118listpromodules:
119 @echo 119 @echo
120 120
121listallmodules: 121listallmodules:
122 @echo 122 @echo
123 123
124listaddonpromodules: 124listaddonpromodules:
125 @echo 125 @echo
126 126
127listaddonentmodules: 127listaddonentmodules:
128 @echo 128 @echo
129 129
130 130
131REQUIRES= 131REQUIRES=
132 132
133####### Sub-libraries 133####### Sub-libraries
134 134
135 135
136###### Combined headers 136###### Combined headers
137 137
138 138
139 139
140####### Compile 140####### Compile
141 141
142qimpenchar.o: qimpenchar.cpp \ 142qimpenchar.o: qimpenchar.cpp \
143 qimpencombining.h \ 143 qimpencombining.h \
144 qimpenchar.h \ 144 qimpenchar.h \
145 qimpenstroke.h 145 qimpenstroke.h
146 146
147qimpenprofile.o: qimpenprofile.cpp \ 147qimpenprofile.o: qimpenprofile.cpp \
148 qimpencombining.h \ 148 qimpencombining.h \
149 qimpenchar.h \ 149 qimpenchar.h \
150 qimpenstroke.h \ 150 qimpenstroke.h \
151 qimpenprofile.h 151 qimpenprofile.h
152 152
153qimpencombining.o: qimpencombining.cpp \ 153qimpencombining.o: qimpencombining.cpp \
154 qimpencombining.h \ 154 qimpencombining.h \
155 qimpenchar.h \ 155 qimpenchar.h \
156 qimpenstroke.h 156 qimpenstroke.h
157 157
158qimpenhelp.o: qimpenhelp.cpp \ 158qimpenhelp.o: qimpenhelp.cpp \
159 qimpenwidget.h \ 159 qimpenwidget.h \
160 qimpenchar.h \ 160 qimpenchar.h \
161 qimpenstroke.h \ 161 qimpenstroke.h \
162 qimpencombining.h \ 162 qimpencombining.h \
163 qimpenmatch.h \ 163 qimpenmatch.h \
164 qimpenhelp.h \ 164 qimpenhelp.h \
165 qimpenprofile.h 165 qimpenprofile.h
166 166
167qimpeninput.o: qimpeninput.cpp \ 167qimpeninput.o: qimpeninput.cpp \
168 qimpenwidget.h \ 168 qimpenwidget.h \
169 qimpenchar.h \ 169 qimpenchar.h \
170 qimpenstroke.h \ 170 qimpenstroke.h \
171 qimpensetup.h \ 171 qimpensetup.h \
172 qimpenprofile.h \ 172 qimpenprofile.h \
173 qimpeninput.h \ 173 qimpeninput.h \
174 qimpencombining.h \ 174 qimpencombining.h \
175 qimpenwordpick.h \ 175 qimpenwordpick.h \
176 qimpenmatch.h \ 176 qimpenmatch.h \
177 qimpenhelp.h 177 qimpenhelp.h
178 178
179qimpenmatch.o: qimpenmatch.cpp \ 179qimpenmatch.o: qimpenmatch.cpp \
180 qimpenmatch.h \ 180 qimpenmatch.h \
181 qimpenchar.h \ 181 qimpenchar.h \
182 qimpenstroke.h 182 qimpenstroke.h
183 183
184qimpensetup.o: qimpensetup.cpp \ 184qimpensetup.o: qimpensetup.cpp \
185 qimpenwidget.h \ 185 qimpenwidget.h \
186 qimpenchar.h \ 186 qimpenchar.h \
187 qimpenstroke.h \ 187 qimpenstroke.h \
188 qimpenprefbase.h \ 188 qimpenprefbase.h \
189 qimpensetup.h \ 189 qimpensetup.h \
190 qimpenprofile.h 190 qimpenprofile.h
191 191
192qimpenstroke.o: qimpenstroke.cpp \ 192qimpenstroke.o: qimpenstroke.cpp \
193 qimpenstroke.h 193 qimpenstroke.h
194 194
195qimpenwidget.o: qimpenwidget.cpp \ 195qimpenwidget.o: qimpenwidget.cpp \
196 qimpenchar.h \ 196 qimpenchar.h \
197 qimpenstroke.h \ 197 qimpenstroke.h \
198 qimpenwidget.h 198 qimpenwidget.h
199 199
200qimpenwordpick.o: qimpenwordpick.cpp \ 200qimpenwordpick.o: qimpenwordpick.cpp \
201 qimpenwordpick.h \ 201 qimpenwordpick.h \
202 qimpenmatch.h \ 202 qimpenmatch.h \
203 qimpenchar.h \ 203 qimpenchar.h \
204 qimpenstroke.h 204 qimpenstroke.h
205 205
206handwritingimpl.o: handwritingimpl.cpp \ 206handwritingimpl.o: handwritingimpl.cpp \
207 qimpeninput.h \ 207 qimpeninput.h \
208 qimpenprofile.h \ 208 qimpenprofile.h \
209 qimpenchar.h \ 209 qimpenchar.h \
210 qimpenstroke.h \ 210 qimpenstroke.h \
211 handwritingimpl.h 211 handwritingimpl.h
212 212
213qimpenprefbase.h: qimpenprefbase.ui 213qimpenprefbase.h: qimpenprefbase.ui
214 $(UIC) qimpenprefbase.ui -o $(INTERFACE_DECL_PATH)/qimpenprefbase.h 214 $(UIC) qimpenprefbase.ui -o $(INTERFACE_DECL_PATH)/qimpenprefbase.h
215 215
216qimpenprefbase.cpp: qimpenprefbase.ui 216qimpenprefbase.cpp: qimpenprefbase.ui
217 $(UIC) qimpenprefbase.ui -i qimpenprefbase.h -o qimpenprefbase.cpp 217 $(UIC) qimpenprefbase.ui -i qimpenprefbase.h -o qimpenprefbase.cpp
218 218
219qimpenprefbase.o: qimpenprefbase.cpp \ 219qimpenprefbase.o: qimpenprefbase.cpp \
220 qimpenprefbase.h \ 220 qimpenprefbase.h \
221 qimpenprefbase.ui 221 qimpenprefbase.ui
222 222
223moc_qimpenhelp.o: moc_qimpenhelp.cpp \ 223moc_qimpenhelp.o: moc_qimpenhelp.cpp \
224 qimpenhelp.h \ 224 qimpenhelp.h \
225 qimpenchar.h \ 225 qimpenchar.h \
226 qimpenstroke.h \ 226 qimpenstroke.h \
227 qimpenprofile.h 227 qimpenprofile.h
228 228
229moc_qimpeninput.o: moc_qimpeninput.cpp \ 229moc_qimpeninput.o: moc_qimpeninput.cpp \
230 qimpeninput.h \ 230 qimpeninput.h \
231 qimpenprofile.h \ 231 qimpenprofile.h \
232 qimpenchar.h \ 232 qimpenchar.h \
233 qimpenstroke.h 233 qimpenstroke.h
234 234
235moc_qimpenmatch.o: moc_qimpenmatch.cpp \ 235moc_qimpenmatch.o: moc_qimpenmatch.cpp \
236 qimpenmatch.h \ 236 qimpenmatch.h \
237 qimpenchar.h \ 237 qimpenchar.h \
238 qimpenstroke.h 238 qimpenstroke.h
239 239
240moc_qimpensetup.o: moc_qimpensetup.cpp \ 240moc_qimpensetup.o: moc_qimpensetup.cpp \
241 qimpensetup.h \ 241 qimpensetup.h \
242 qimpenprofile.h \ 242 qimpenprofile.h \
243 qimpenchar.h \ 243 qimpenchar.h \
244 qimpenstroke.h 244 qimpenstroke.h
245 245
246moc_qimpenwidget.o: moc_qimpenwidget.cpp \ 246moc_qimpenwidget.o: moc_qimpenwidget.cpp \
247 qimpenwidget.h \ 247 qimpenwidget.h \
248 qimpenchar.h \ 248 qimpenchar.h \
249 qimpenstroke.h 249 qimpenstroke.h
250 250
251moc_qimpenwordpick.o: moc_qimpenwordpick.cpp \ 251moc_qimpenwordpick.o: moc_qimpenwordpick.cpp \
252 qimpenwordpick.h \ 252 qimpenwordpick.h \
253 qimpenmatch.h \ 253 qimpenmatch.h \
254 qimpenchar.h \ 254 qimpenchar.h \
255 qimpenstroke.h 255 qimpenstroke.h
256 256
257moc_qimpenprefbase.o: moc_qimpenprefbase.cpp \ 257moc_qimpenprefbase.o: moc_qimpenprefbase.cpp \
258 qimpenprefbase.h 258 qimpenprefbase.h
259 259
260moc_qimpenhelp.cpp: qimpenhelp.h 260moc_qimpenhelp.cpp: qimpenhelp.h
261 $(MOC) qimpenhelp.h -o moc_qimpenhelp.cpp 261 $(MOC) qimpenhelp.h -o moc_qimpenhelp.cpp
262 262
263moc_qimpeninput.cpp: qimpeninput.h 263moc_qimpeninput.cpp: qimpeninput.h
264 $(MOC) qimpeninput.h -o moc_qimpeninput.cpp 264 $(MOC) qimpeninput.h -o moc_qimpeninput.cpp
265 265
266moc_qimpenmatch.cpp: qimpenmatch.h 266moc_qimpenmatch.cpp: qimpenmatch.h
267 $(MOC) qimpenmatch.h -o moc_qimpenmatch.cpp 267 $(MOC) qimpenmatch.h -o moc_qimpenmatch.cpp
268 268
269moc_qimpensetup.cpp: qimpensetup.h 269moc_qimpensetup.cpp: qimpensetup.h
270 $(MOC) qimpensetup.h -o moc_qimpensetup.cpp 270 $(MOC) qimpensetup.h -o moc_qimpensetup.cpp
271 271
272moc_qimpenwidget.cpp: qimpenwidget.h 272moc_qimpenwidget.cpp: qimpenwidget.h
273 $(MOC) qimpenwidget.h -o moc_qimpenwidget.cpp 273 $(MOC) qimpenwidget.h -o moc_qimpenwidget.cpp
274 274
275moc_qimpenwordpick.cpp: qimpenwordpick.h 275moc_qimpenwordpick.cpp: qimpenwordpick.h
276 $(MOC) qimpenwordpick.h -o moc_qimpenwordpick.cpp 276 $(MOC) qimpenwordpick.h -o moc_qimpenwordpick.cpp
277 277
278moc_qimpenprefbase.cpp: qimpenprefbase.h 278moc_qimpenprefbase.cpp: qimpenprefbase.h
279 $(MOC) qimpenprefbase.h -o moc_qimpenprefbase.cpp 279 $(MOC) qimpenprefbase.h -o moc_qimpenprefbase.cpp
280 280
281 281
diff --git a/inputmethods/handwriting/handwriting.pro b/inputmethods/handwriting/handwriting.pro
index 999552b..9bccbb9 100644
--- a/inputmethods/handwriting/handwriting.pro
+++ b/inputmethods/handwriting/handwriting.pro
@@ -1,33 +1,33 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= qimpenchar.h \ 3 HEADERS= qimpenchar.h \
4 qimpenprofile.h \ 4 qimpenprofile.h \
5 qimpencombining.h \ 5 qimpencombining.h \
6 qimpenhelp.h \ 6 qimpenhelp.h \
7 qimpeninput.h \ 7 qimpeninput.h \
8 qimpenmatch.h \ 8 qimpenmatch.h \
9 qimpensetup.h \ 9 qimpensetup.h \
10 qimpenstroke.h \ 10 qimpenstroke.h \
11 qimpenwidget.h \ 11 qimpenwidget.h \
12 qimpenwordpick.h \ 12 qimpenwordpick.h \
13 handwritingimpl.h 13 handwritingimpl.h
14 SOURCES= qimpenchar.cpp \ 14 SOURCES= qimpenchar.cpp \
15 qimpenprofile.cpp \ 15 qimpenprofile.cpp \
16 qimpencombining.cpp \ 16 qimpencombining.cpp \
17 qimpenhelp.cpp \ 17 qimpenhelp.cpp \
18 qimpeninput.cpp \ 18 qimpeninput.cpp \
19 qimpenmatch.cpp \ 19 qimpenmatch.cpp \
20 qimpensetup.cpp \ 20 qimpensetup.cpp \
21 qimpenstroke.cpp \ 21 qimpenstroke.cpp \
22 qimpenwidget.cpp \ 22 qimpenwidget.cpp \
23 qimpenwordpick.cpp \ 23 qimpenwordpick.cpp \
24 handwritingimpl.cpp 24 handwritingimpl.cpp
25INTERFACES = qimpenprefbase.ui 25INTERFACES = qimpenprefbase.ui
26 TARGET = qhandwriting 26 TARGET = qhandwriting
27 DESTDIR = ../../plugins/inputmethods 27 DESTDIR = ../../plugins/inputmethods
28INCLUDEPATH += $(QPEDIR)/include 28INCLUDEPATH += $(OPIEDIR)/include
29DEPENDPATH += ../$(QPEDIR)/include ../../taskbar 29DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
30LIBS += -lqpe 30LIBS += -lqpe
31 VERSION = 1.0.0 31 VERSION = 1.0.0
32 32
33TRANSLATIONS += ../../i18n/de/libqhandwriting.ts 33TRANSLATIONS += ../../i18n/de/libqhandwriting.ts
diff --git a/inputmethods/keyboard/Makefile.in b/inputmethods/keyboard/Makefile.in
index 3631807..16fdcb7 100644
--- a/inputmethods/keyboard/Makefile.in
+++ b/inputmethods/keyboard/Makefile.in
@@ -1,151 +1,151 @@
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/inputmethods/ 17DESTDIR = ../../plugins/inputmethods/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= qkeyboard 21 TARGET= qkeyboard
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =keyboard.h \ 26 HEADERS =keyboard.h \
27 ../pickboard/pickboardcfg.h \ 27 ../pickboard/pickboardcfg.h \
28 ../pickboard/pickboardpicks.h \ 28 ../pickboard/pickboardpicks.h \
29 keyboardimpl.h 29 keyboardimpl.h
30 SOURCES =keyboard.cpp \ 30 SOURCES =keyboard.cpp \
31 ../pickboard/pickboardcfg.cpp \ 31 ../pickboard/pickboardcfg.cpp \
32 ../pickboard/pickboardpicks.cpp \ 32 ../pickboard/pickboardpicks.cpp \
33 keyboardimpl.cpp 33 keyboardimpl.cpp
34 OBJECTS =keyboard.o \ 34 OBJECTS =keyboard.o \
35 ../pickboard/pickboardcfg.o \ 35 ../pickboard/pickboardcfg.o \
36 ../pickboard/pickboardpicks.o \ 36 ../pickboard/pickboardpicks.o \
37 keyboardimpl.o 37 keyboardimpl.o
38INTERFACES = 38INTERFACES =
39UICDECLS = 39UICDECLS =
40UICIMPLS = 40UICIMPLS =
41 SRCMOC =moc_keyboard.cpp \ 41 SRCMOC =moc_keyboard.cpp \
42 ../pickboard/moc_pickboardcfg.cpp \ 42 ../pickboard/moc_pickboardcfg.cpp \
43 ../pickboard/moc_pickboardpicks.cpp 43 ../pickboard/moc_pickboardpicks.cpp
44 OBJMOC =moc_keyboard.o \ 44 OBJMOC =moc_keyboard.o \
45 ../pickboard/moc_pickboardcfg.o \ 45 ../pickboard/moc_pickboardcfg.o \
46 ../pickboard/moc_pickboardpicks.o 46 ../pickboard/moc_pickboardpicks.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)$(SYSCONF_LINK_TARGET) 71all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
72 72
73$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 73$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
74 $(SYSCONF_LINK_LIB) 74 $(SYSCONF_LINK_LIB)
75 75
76moc: $(SRCMOC) 76moc: $(SRCMOC)
77 77
78tmake: 78tmake:
79 tmake keyboard.pro 79 tmake keyboard.pro
80 80
81clean: 81clean:
82 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 82 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
83 -rm -f *~ core 83 -rm -f *~ core
84 -rm -f allmoc.cpp 84 -rm -f allmoc.cpp
85 85
86####### Extension Modules 86####### Extension Modules
87 87
88listpromodules: 88listpromodules:
89 @echo 89 @echo
90 90
91listallmodules: 91listallmodules:
92 @echo 92 @echo
93 93
94listaddonpromodules: 94listaddonpromodules:
95 @echo 95 @echo
96 96
97listaddonentmodules: 97listaddonentmodules:
98 @echo 98 @echo
99 99
100 100
101REQUIRES= 101REQUIRES=
102 102
103####### Sub-libraries 103####### Sub-libraries
104 104
105 105
106###### Combined headers 106###### Combined headers
107 107
108 108
109 109
110####### Compile 110####### Compile
111 111
112keyboard.o: keyboard.cpp \ 112keyboard.o: keyboard.cpp \
113 keyboard.h \ 113 keyboard.h \
114 ../pickboard/pickboardcfg.h \ 114 ../pickboard/pickboardcfg.h \
115 ../pickboard/pickboardpicks.h 115 ../pickboard/pickboardpicks.h
116 116
117../pickboard/pickboardcfg.o: ../pickboard/pickboardcfg.cpp \ 117../pickboard/pickboardcfg.o: ../pickboard/pickboardcfg.cpp \
118 ../pickboard/pickboardcfg.h \ 118 ../pickboard/pickboardcfg.h \
119 ../pickboard/pickboardpicks.h 119 ../pickboard/pickboardpicks.h
120 120
121../pickboard/pickboardpicks.o: ../pickboard/pickboardpicks.cpp \ 121../pickboard/pickboardpicks.o: ../pickboard/pickboardpicks.cpp \
122 ../pickboard/pickboardpicks.h \ 122 ../pickboard/pickboardpicks.h \
123 ../pickboard/pickboardcfg.h 123 ../pickboard/pickboardcfg.h
124 124
125keyboardimpl.o: keyboardimpl.cpp \ 125keyboardimpl.o: keyboardimpl.cpp \
126 keyboard.h \ 126 keyboard.h \
127 ../pickboard/pickboardcfg.h \ 127 ../pickboard/pickboardcfg.h \
128 ../pickboard/pickboardpicks.h \ 128 ../pickboard/pickboardpicks.h \
129 keyboardimpl.h 129 keyboardimpl.h
130 130
131moc_keyboard.o: moc_keyboard.cpp \ 131moc_keyboard.o: moc_keyboard.cpp \
132 keyboard.h \ 132 keyboard.h \
133 ../pickboard/pickboardcfg.h \ 133 ../pickboard/pickboardcfg.h \
134 ../pickboard/pickboardpicks.h 134 ../pickboard/pickboardpicks.h
135 135
136../pickboard/moc_pickboardcfg.o: ../pickboard/moc_pickboardcfg.cpp \ 136../pickboard/moc_pickboardcfg.o: ../pickboard/moc_pickboardcfg.cpp \
137 ../pickboard/pickboardcfg.h 137 ../pickboard/pickboardcfg.h
138 138
139../pickboard/moc_pickboardpicks.o: ../pickboard/moc_pickboardpicks.cpp \ 139../pickboard/moc_pickboardpicks.o: ../pickboard/moc_pickboardpicks.cpp \
140 ../pickboard/pickboardpicks.h 140 ../pickboard/pickboardpicks.h
141 141
142moc_keyboard.cpp: keyboard.h 142moc_keyboard.cpp: keyboard.h
143 $(MOC) keyboard.h -o moc_keyboard.cpp 143 $(MOC) keyboard.h -o moc_keyboard.cpp
144 144
145../pickboard/moc_pickboardcfg.cpp: ../pickboard/pickboardcfg.h 145../pickboard/moc_pickboardcfg.cpp: ../pickboard/pickboardcfg.h
146 $(MOC) ../pickboard/pickboardcfg.h -o ../pickboard/moc_pickboardcfg.cpp 146 $(MOC) ../pickboard/pickboardcfg.h -o ../pickboard/moc_pickboardcfg.cpp
147 147
148../pickboard/moc_pickboardpicks.cpp: ../pickboard/pickboardpicks.h 148../pickboard/moc_pickboardpicks.cpp: ../pickboard/pickboardpicks.h
149 $(MOC) ../pickboard/pickboardpicks.h -o ../pickboard/moc_pickboardpicks.cpp 149 $(MOC) ../pickboard/pickboardpicks.h -o ../pickboard/moc_pickboardpicks.cpp
150 150
151 151
diff --git a/inputmethods/keyboard/keyboard.pro b/inputmethods/keyboard/keyboard.pro
index 87c838e..6e9df79 100644
--- a/inputmethods/keyboard/keyboard.pro
+++ b/inputmethods/keyboard/keyboard.pro
@@ -1,18 +1,18 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= keyboard.h \ 3 HEADERS= keyboard.h \
4 ../pickboard/pickboardcfg.h \ 4 ../pickboard/pickboardcfg.h \
5 ../pickboard/pickboardpicks.h \ 5 ../pickboard/pickboardpicks.h \
6 keyboardimpl.h 6 keyboardimpl.h
7 SOURCES= keyboard.cpp \ 7 SOURCES= keyboard.cpp \
8 ../pickboard/pickboardcfg.cpp \ 8 ../pickboard/pickboardcfg.cpp \
9 ../pickboard/pickboardpicks.cpp \ 9 ../pickboard/pickboardpicks.cpp \
10 keyboardimpl.cpp 10 keyboardimpl.cpp
11 TARGET = qkeyboard 11 TARGET = qkeyboard
12 DESTDIR = ../../plugins/inputmethods 12 DESTDIR = ../../plugins/inputmethods
13INCLUDEPATH += $(QPEDIR)/include 13INCLUDEPATH += $(OPIEDIR)/include
14DEPENDPATH += ../$(QPEDIR)/include ../../taskbar 14DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
15LIBS += -lqpe 15LIBS += -lqpe
16 VERSION = 1.0.0 16 VERSION = 1.0.0
17 17
18TRANSLATIONS += ../../i18n/de/libqkeyboard.ts 18TRANSLATIONS += ../../i18n/de/libqkeyboard.ts
diff --git a/inputmethods/pickboard/Makefile.in b/inputmethods/pickboard/Makefile.in
index d72e82d..44310a4 100644
--- a/inputmethods/pickboard/Makefile.in
+++ b/inputmethods/pickboard/Makefile.in
@@ -1,147 +1,147 @@
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/inputmethods/ 17DESTDIR = ../../plugins/inputmethods/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= qpickboard 21 TARGET= qpickboard
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =pickboard.h \ 26 HEADERS =pickboard.h \
27 pickboardcfg.h \ 27 pickboardcfg.h \
28 pickboardimpl.h \ 28 pickboardimpl.h \
29 pickboardpicks.h 29 pickboardpicks.h
30 SOURCES =pickboard.cpp \ 30 SOURCES =pickboard.cpp \
31 pickboardcfg.cpp \ 31 pickboardcfg.cpp \
32 pickboardimpl.cpp \ 32 pickboardimpl.cpp \
33 pickboardpicks.cpp 33 pickboardpicks.cpp
34 OBJECTS =pickboard.o \ 34 OBJECTS =pickboard.o \
35 pickboardcfg.o \ 35 pickboardcfg.o \
36 pickboardimpl.o \ 36 pickboardimpl.o \
37 pickboardpicks.o 37 pickboardpicks.o
38INTERFACES = 38INTERFACES =
39UICDECLS = 39UICDECLS =
40UICIMPLS = 40UICIMPLS =
41 SRCMOC =moc_pickboard.cpp \ 41 SRCMOC =moc_pickboard.cpp \
42 moc_pickboardcfg.cpp \ 42 moc_pickboardcfg.cpp \
43 moc_pickboardpicks.cpp 43 moc_pickboardpicks.cpp
44 OBJMOC =moc_pickboard.o \ 44 OBJMOC =moc_pickboard.o \
45 moc_pickboardcfg.o \ 45 moc_pickboardcfg.o \
46 moc_pickboardpicks.o 46 moc_pickboardpicks.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)$(SYSCONF_LINK_TARGET) 71all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
72 72
73$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 73$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
74 $(SYSCONF_LINK_LIB) 74 $(SYSCONF_LINK_LIB)
75 75
76moc: $(SRCMOC) 76moc: $(SRCMOC)
77 77
78tmake: 78tmake:
79 tmake pickboard.pro 79 tmake pickboard.pro
80 80
81clean: 81clean:
82 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 82 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
83 -rm -f *~ core 83 -rm -f *~ core
84 -rm -f allmoc.cpp 84 -rm -f allmoc.cpp
85 85
86####### Extension Modules 86####### Extension Modules
87 87
88listpromodules: 88listpromodules:
89 @echo 89 @echo
90 90
91listallmodules: 91listallmodules:
92 @echo 92 @echo
93 93
94listaddonpromodules: 94listaddonpromodules:
95 @echo 95 @echo
96 96
97listaddonentmodules: 97listaddonentmodules:
98 @echo 98 @echo
99 99
100 100
101REQUIRES= 101REQUIRES=
102 102
103####### Sub-libraries 103####### Sub-libraries
104 104
105 105
106###### Combined headers 106###### Combined headers
107 107
108 108
109 109
110####### Compile 110####### Compile
111 111
112pickboard.o: pickboard.cpp \ 112pickboard.o: pickboard.cpp \
113 pickboard.h \ 113 pickboard.h \
114 pickboardpicks.h \ 114 pickboardpicks.h \
115 pickboardcfg.h 115 pickboardcfg.h
116 116
117pickboardcfg.o: pickboardcfg.cpp \ 117pickboardcfg.o: pickboardcfg.cpp \
118 pickboardcfg.h \ 118 pickboardcfg.h \
119 pickboardpicks.h 119 pickboardpicks.h
120 120
121pickboardimpl.o: pickboardimpl.cpp \ 121pickboardimpl.o: pickboardimpl.cpp \
122 pickboard.h \ 122 pickboard.h \
123 pickboardimpl.h 123 pickboardimpl.h
124 124
125pickboardpicks.o: pickboardpicks.cpp \ 125pickboardpicks.o: pickboardpicks.cpp \
126 pickboardpicks.h \ 126 pickboardpicks.h \
127 pickboardcfg.h 127 pickboardcfg.h
128 128
129moc_pickboard.o: moc_pickboard.cpp \ 129moc_pickboard.o: moc_pickboard.cpp \
130 pickboard.h 130 pickboard.h
131 131
132moc_pickboardcfg.o: moc_pickboardcfg.cpp \ 132moc_pickboardcfg.o: moc_pickboardcfg.cpp \
133 pickboardcfg.h 133 pickboardcfg.h
134 134
135moc_pickboardpicks.o: moc_pickboardpicks.cpp \ 135moc_pickboardpicks.o: moc_pickboardpicks.cpp \
136 pickboardpicks.h 136 pickboardpicks.h
137 137
138moc_pickboard.cpp: pickboard.h 138moc_pickboard.cpp: pickboard.h
139 $(MOC) pickboard.h -o moc_pickboard.cpp 139 $(MOC) pickboard.h -o moc_pickboard.cpp
140 140
141moc_pickboardcfg.cpp: pickboardcfg.h 141moc_pickboardcfg.cpp: pickboardcfg.h
142 $(MOC) pickboardcfg.h -o moc_pickboardcfg.cpp 142 $(MOC) pickboardcfg.h -o moc_pickboardcfg.cpp
143 143
144moc_pickboardpicks.cpp: pickboardpicks.h 144moc_pickboardpicks.cpp: pickboardpicks.h
145 $(MOC) pickboardpicks.h -o moc_pickboardpicks.cpp 145 $(MOC) pickboardpicks.h -o moc_pickboardpicks.cpp
146 146
147 147
diff --git a/inputmethods/pickboard/pickboard.pro b/inputmethods/pickboard/pickboard.pro
index 50bc342..ad86370 100644
--- a/inputmethods/pickboard/pickboard.pro
+++ b/inputmethods/pickboard/pickboard.pro
@@ -1,12 +1,12 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= pickboard.h pickboardcfg.h pickboardimpl.h pickboardpicks.h 3 HEADERS= pickboard.h pickboardcfg.h pickboardimpl.h pickboardpicks.h
4 SOURCES= pickboard.cpp pickboardcfg.cpp pickboardimpl.cpp pickboardpicks.cpp 4 SOURCES= pickboard.cpp pickboardcfg.cpp pickboardimpl.cpp pickboardpicks.cpp
5 TARGET = qpickboard 5 TARGET = qpickboard
6 DESTDIR = ../../plugins/inputmethods 6 DESTDIR = ../../plugins/inputmethods
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(QPEDIR)/include ../../taskbar 8DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
12TRANSLATIONS += ../../i18n/de/libqpickboard.ts 12TRANSLATIONS += ../../i18n/de/libqpickboard.ts
diff --git a/inputmethods/unikeyboard/Makefile.in b/inputmethods/unikeyboard/Makefile.in
index ebbab50..f64d6c8 100644
--- a/inputmethods/unikeyboard/Makefile.in
+++ b/inputmethods/unikeyboard/Makefile.in
@@ -1,115 +1,115 @@
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/inputmethods/ 17DESTDIR = ../../plugins/inputmethods/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= qunikeyboard 21 TARGET= qunikeyboard
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =unikeyboard.h \ 26 HEADERS =unikeyboard.h \
27 unikeyboardimpl.h 27 unikeyboardimpl.h
28 SOURCES =unikeyboard.cpp \ 28 SOURCES =unikeyboard.cpp \
29 unikeyboardimpl.cpp 29 unikeyboardimpl.cpp
30 OBJECTS =unikeyboard.o \ 30 OBJECTS =unikeyboard.o \
31 unikeyboardimpl.o 31 unikeyboardimpl.o
32INTERFACES = 32INTERFACES =
33UICDECLS = 33UICDECLS =
34UICIMPLS = 34UICIMPLS =
35 SRCMOC =moc_unikeyboard.cpp 35 SRCMOC =moc_unikeyboard.cpp
36 OBJMOC =moc_unikeyboard.o 36 OBJMOC =moc_unikeyboard.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:
69 tmake unikeyboard.pro 69 tmake unikeyboard.pro
70 70
71clean: 71clean:
72 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 72 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
73 -rm -f *~ core 73 -rm -f *~ core
74 -rm -f allmoc.cpp 74 -rm -f allmoc.cpp
75 75
76####### Extension Modules 76####### Extension Modules
77 77
78listpromodules: 78listpromodules:
79 @echo 79 @echo
80 80
81listallmodules: 81listallmodules:
82 @echo 82 @echo
83 83
84listaddonpromodules: 84listaddonpromodules:
85 @echo 85 @echo
86 86
87listaddonentmodules: 87listaddonentmodules:
88 @echo 88 @echo
89 89
90 90
91REQUIRES= 91REQUIRES=
92 92
93####### Sub-libraries 93####### Sub-libraries
94 94
95 95
96###### Combined headers 96###### Combined headers
97 97
98 98
99 99
100####### Compile 100####### Compile
101 101
102unikeyboard.o: unikeyboard.cpp \ 102unikeyboard.o: unikeyboard.cpp \
103 unikeyboard.h 103 unikeyboard.h
104 104
105unikeyboardimpl.o: unikeyboardimpl.cpp \ 105unikeyboardimpl.o: unikeyboardimpl.cpp \
106 unikeyboard.h \ 106 unikeyboard.h \
107 unikeyboardimpl.h 107 unikeyboardimpl.h
108 108
109moc_unikeyboard.o: moc_unikeyboard.cpp \ 109moc_unikeyboard.o: moc_unikeyboard.cpp \
110 unikeyboard.h 110 unikeyboard.h
111 111
112moc_unikeyboard.cpp: unikeyboard.h 112moc_unikeyboard.cpp: unikeyboard.h
113 $(MOC) unikeyboard.h -o moc_unikeyboard.cpp 113 $(MOC) unikeyboard.h -o moc_unikeyboard.cpp
114 114
115 115
diff --git a/inputmethods/unikeyboard/unikeyboard.pro b/inputmethods/unikeyboard/unikeyboard.pro
index c0aad42..509db07 100644
--- a/inputmethods/unikeyboard/unikeyboard.pro
+++ b/inputmethods/unikeyboard/unikeyboard.pro
@@ -1,12 +1,12 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= unikeyboard.h unikeyboardimpl.h 3 HEADERS= unikeyboard.h unikeyboardimpl.h
4 SOURCES= unikeyboard.cpp unikeyboardimpl.cpp 4 SOURCES= unikeyboard.cpp unikeyboardimpl.cpp
5 TARGET = qunikeyboard 5 TARGET = qunikeyboard
6 DESTDIR = ../../plugins/inputmethods 6 DESTDIR = ../../plugins/inputmethods
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(QPEDIR)/include ../../taskbar 8DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
12TRANSLATIONS += ../../i18n/de/libqunikeyboard.ts 12TRANSLATIONS += ../../i18n/de/libqunikeyboard.ts
diff --git a/library/Makefile.in b/library/Makefile.in
index c89390f..b74b818 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -1,905 +1,903 @@
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 -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 \ 34 proxies.h \
35 filemanager.h \ 35 filemanager.h \
36 fontmanager.h \ 36 fontmanager.h \
37 qdawg.h \ 37 qdawg.h \
38 datebookmonth.h \ 38 datebookmonth.h \
39 fileselector.h \ 39 fileselector.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 \ 82 quuid.h \
83 qcom.h \ 83 qcom.h \
84 qlibrary.h \ 84 qlibrary.h \
85 qlibrary_p.h \ 85 qlibrary_p.h \
86 qprocess.h 86 qprocess.h
87 SOURCES =calendar.cpp \ 87 SOURCES =calendar.cpp \
88 global.cpp \ 88 global.cpp \
89 xmlreader.cpp \ 89 xmlreader.cpp \
90 mimetype.cpp \ 90 mimetype.cpp \
91 menubutton.cpp \ 91 menubutton.cpp \
92 network.cpp \ 92 network.cpp \
93 networkinterface.cpp \ 93 networkinterface.cpp \
94 proxies.cpp \ 94 proxies.cpp \
95 filemanager.cpp \ 95 filemanager.cpp \
96 fontmanager.cpp \ 96 fontmanager.cpp \
97 qdawg.cpp \ 97 qdawg.cpp \
98 datebookmonth.cpp \ 98 datebookmonth.cpp \
99 fileselector.cpp \ 99 fileselector.cpp \
100 imageedit.cpp \ 100 imageedit.cpp \
101 resource.cpp \ 101 resource.cpp \
102 qpedecoration_qws.cpp \ 102 qpedecoration_qws.cpp \
103 qcopenvelope_qws.cpp \ 103 qcopenvelope_qws.cpp \
104 qpeapplication.cpp \ 104 qpeapplication.cpp \
105 qpestyle.cpp \ 105 qpestyle.cpp \
106 qpedialog.cpp \ 106 qpedialog.cpp \
107 lightstyle.cpp \ 107 lightstyle.cpp \
108 config.cpp \ 108 config.cpp \
109 applnk.cpp \ 109 applnk.cpp \
110 sound.cpp \ 110 sound.cpp \
111 tzselect.cpp \ 111 tzselect.cpp \
112 qmath.c \ 112 qmath.c \
113 datebookdb.cpp \ 113 datebookdb.cpp \
114 alarmserver.cpp \ 114 alarmserver.cpp \
115 password.cpp \ 115 password.cpp \
116 process.cpp \ 116 process.cpp \
117 process_unix.cpp \ 117 process_unix.cpp \
118 timestring.cpp \ 118 timestring.cpp \
119 fontdatabase.cpp \ 119 fontdatabase.cpp \
120 power.cpp \ 120 power.cpp \
121 storage.cpp \ 121 storage.cpp \
122 qpemessagebox.cpp \ 122 qpemessagebox.cpp \
123 backend/timeconversion.cpp \ 123 backend/timeconversion.cpp \
124 qpedebug.cpp \ 124 qpedebug.cpp \
125 qpemenubar.cpp \ 125 qpemenubar.cpp \
126 qpetoolbar.cpp \ 126 qpetoolbar.cpp \
127 backend/categories.cpp \ 127 backend/categories.cpp \
128 backend/stringutil.cpp \ 128 backend/stringutil.cpp \
129 backend/palmtoprecord.cpp \ 129 backend/palmtoprecord.cpp \
130 backend/task.cpp \ 130 backend/task.cpp \
131 backend/event.cpp \ 131 backend/event.cpp \
132 backend/contact.cpp \ 132 backend/contact.cpp \
133 categorymenu.cpp \ 133 categorymenu.cpp \
134 categoryedit_p.cpp \ 134 categoryedit_p.cpp \
135 categoryselect.cpp \ 135 categoryselect.cpp \
136 categorywidget.cpp \ 136 categorywidget.cpp \
137 ir.cpp \ 137 ir.cpp \
138 backend/vcc_yacc.cpp \ 138 backend/vcc_yacc.cpp \
139 backend/vobject.cpp \ 139 backend/vobject.cpp \
140 findwidget_p.cpp \ 140 findwidget_p.cpp \
141 finddialog.cpp \ 141 finddialog.cpp \
142 lnkproperties.cpp \ 142 lnkproperties.cpp \
143 quuid.cpp \ 143 quuid.cpp \
144 qlibrary.cpp \ 144 qlibrary.cpp \
145 qlibrary_unix.cpp \ 145 qlibrary_unix.cpp \
146 qprocess.cpp \ 146 qprocess.cpp \
147 qprocess_unix.cpp 147 qprocess_unix.cpp
148 OBJECTS =calendar.o \ 148 OBJECTS =calendar.o \
149 global.o \ 149 global.o \
150 xmlreader.o \ 150 xmlreader.o \
151 mimetype.o \ 151 mimetype.o \
152 menubutton.o \ 152 menubutton.o \
153 network.o \ 153 network.o \
154 networkinterface.o \ 154 networkinterface.o \
155 proxies.o \ 155 proxies.o \
156 filemanager.o \ 156 filemanager.o \
157 fontmanager.o \ 157 fontmanager.o \
158 qdawg.o \ 158 qdawg.o \
159 datebookmonth.o \ 159 datebookmonth.o \
160 fileselector.o \ 160 fileselector.o \
161 imageedit.o \ 161 imageedit.o \
162 resource.o \ 162 resource.o \
163 qpedecoration_qws.o \ 163 qpedecoration_qws.o \
164 qcopenvelope_qws.o \ 164 qcopenvelope_qws.o \
165 qpeapplication.o \ 165 qpeapplication.o \
166 qpestyle.o \ 166 qpestyle.o \
167 qpedialog.o \ 167 qpedialog.o \
168 lightstyle.o \ 168 lightstyle.o \
169 config.o \ 169 config.o \
170 applnk.o \ 170 applnk.o \
171 sound.o \ 171 sound.o \
172 tzselect.o \ 172 tzselect.o \
173 qmath.o \ 173 qmath.o \
174 datebookdb.o \ 174 datebookdb.o \
175 alarmserver.o \ 175 alarmserver.o \
176 password.o \ 176 password.o \
177 process.o \ 177 process.o \
178 process_unix.o \ 178 process_unix.o \
179 timestring.o \ 179 timestring.o \
180 fontdatabase.o \ 180 fontdatabase.o \
181 power.o \ 181 power.o \
182 storage.o \ 182 storage.o \
183 qpemessagebox.o \ 183 qpemessagebox.o \
184 backend/timeconversion.o \ 184 backend/timeconversion.o \
185 qpedebug.o \ 185 qpedebug.o \
186 qpemenubar.o \ 186 qpemenubar.o \
187 qpetoolbar.o \ 187 qpetoolbar.o \
188 backend/categories.o \ 188 backend/categories.o \
189 backend/stringutil.o \ 189 backend/stringutil.o \
190 backend/palmtoprecord.o \ 190 backend/palmtoprecord.o \
191 backend/task.o \ 191 backend/task.o \
192 backend/event.o \ 192 backend/event.o \
193 backend/contact.o \ 193 backend/contact.o \
194 categorymenu.o \ 194 categorymenu.o \
195 categoryedit_p.o \ 195 categoryedit_p.o \
196 categoryselect.o \ 196 categoryselect.o \
197 categorywidget.o \ 197 categorywidget.o \
198 ir.o \ 198 ir.o \
199 backend/vcc_yacc.o \ 199 backend/vcc_yacc.o \
200 backend/vobject.o \ 200 backend/vobject.o \
201 findwidget_p.o \ 201 findwidget_p.o \
202 finddialog.o \ 202 finddialog.o \
203 lnkproperties.o \ 203 lnkproperties.o \
204 quuid.o \ 204 quuid.o \
205 qlibrary.o \ 205 qlibrary.o \
206 qlibrary_unix.o \ 206 qlibrary_unix.o \
207 qprocess.o \ 207 qprocess.o \
208 qprocess_unix.o \ 208 qprocess_unix.o \
209 passwordbase_p.o \ 209 passwordbase_p.o \
210 proxiesbase_p.o \ 210 proxiesbase_p.o \
211 categoryeditbase_p.o \ 211 categoryeditbase_p.o \
212 findwidgetbase_p.o \ 212 findwidgetbase_p.o \
213 lnkpropertiesbase_p.o 213 lnkpropertiesbase_p.o
214INTERFACES = passwordbase_p.ui \ 214INTERFACES = passwordbase_p.ui \
215 proxiesbase_p.ui \ 215 proxiesbase_p.ui \
216 categoryeditbase_p.ui \ 216 categoryeditbase_p.ui \
217 findwidgetbase_p.ui \ 217 findwidgetbase_p.ui \
218 lnkpropertiesbase_p.ui 218 lnkpropertiesbase_p.ui
219UICDECLS = passwordbase_p.h \ 219UICDECLS = passwordbase_p.h \
220 proxiesbase_p.h \ 220 proxiesbase_p.h \
221 categoryeditbase_p.h \ 221 categoryeditbase_p.h \
222 findwidgetbase_p.h \ 222 findwidgetbase_p.h \
223 lnkpropertiesbase_p.h 223 lnkpropertiesbase_p.h
224UICIMPLS = passwordbase_p.cpp \ 224UICIMPLS = passwordbase_p.cpp \
225 proxiesbase_p.cpp \ 225 proxiesbase_p.cpp \
226 categoryeditbase_p.cpp \ 226 categoryeditbase_p.cpp \
227 findwidgetbase_p.cpp \ 227 findwidgetbase_p.cpp \
228 lnkpropertiesbase_p.cpp 228 lnkpropertiesbase_p.cpp
229 SRCMOC =moc_menubutton.cpp \ 229 SRCMOC =moc_menubutton.cpp \
230 moc_proxies.cpp \ 230 moc_proxies.cpp \
231 moc_datebookmonth.cpp \ 231 moc_datebookmonth.cpp \
232 moc_fileselector.cpp \ 232 moc_fileselector.cpp \
233 moc_imageedit.cpp \ 233 moc_imageedit.cpp \
234 moc_qpedecoration_qws.cpp \ 234 moc_qpedecoration_qws.cpp \
235 moc_qpeapplication.cpp \ 235 moc_qpeapplication.cpp \
236 moc_qpedialog.cpp \ 236 moc_qpedialog.cpp \
237 moc_tzselect.cpp \ 237 moc_tzselect.cpp \
238 moc_process.cpp \ 238 moc_process.cpp \
239 moc_storage.cpp \ 239 moc_storage.cpp \
240 moc_qpemenubar.cpp \ 240 moc_qpemenubar.cpp \
241 moc_qpetoolbar.cpp \ 241 moc_qpetoolbar.cpp \
242 backend/moc_categories.cpp \ 242 backend/moc_categories.cpp \
243 moc_categorymenu.cpp \ 243 moc_categorymenu.cpp \
244 moc_categoryedit_p.cpp \ 244 moc_categoryedit_p.cpp \
245 moc_categoryselect.cpp \ 245 moc_categoryselect.cpp \
246 moc_ir.cpp \ 246 moc_ir.cpp \
247 moc_findwidget_p.cpp \ 247 moc_findwidget_p.cpp \
248 moc_finddialog.cpp \ 248 moc_finddialog.cpp \
249 moc_lnkproperties.cpp \ 249 moc_lnkproperties.cpp \
250 moc_qlibrary_p.cpp \ 250 moc_qlibrary_p.cpp \
251 moc_qprocess.cpp \ 251 moc_qprocess.cpp \
252 global.moc \ 252 global.moc \
253 network.moc \ 253 network.moc \
254 password.moc \ 254 password.moc \
255 process_unix.moc \ 255 process_unix.moc \
256 timestring.moc \ 256 timestring.moc \
257 qprocess_unix.moc \ 257 qprocess_unix.moc \
258 moc_passwordbase_p.cpp \ 258 moc_passwordbase_p.cpp \
259 moc_proxiesbase_p.cpp \ 259 moc_proxiesbase_p.cpp \
260 moc_categoryeditbase_p.cpp \ 260 moc_categoryeditbase_p.cpp \
261 moc_findwidgetbase_p.cpp \ 261 moc_findwidgetbase_p.cpp \
262 moc_lnkpropertiesbase_p.cpp 262 moc_lnkpropertiesbase_p.cpp
263 OBJMOC =moc_menubutton.o \ 263 OBJMOC =moc_menubutton.o \
264 moc_proxies.o \ 264 moc_proxies.o \
265 moc_datebookmonth.o \ 265 moc_datebookmonth.o \
266 moc_fileselector.o \ 266 moc_fileselector.o \
267 moc_imageedit.o \ 267 moc_imageedit.o \
268 moc_qpedecoration_qws.o \ 268 moc_qpedecoration_qws.o \
269 moc_qpeapplication.o \ 269 moc_qpeapplication.o \
270 moc_qpedialog.o \ 270 moc_qpedialog.o \
271 moc_tzselect.o \ 271 moc_tzselect.o \
272 moc_process.o \ 272 moc_process.o \
273 moc_storage.o \ 273 moc_storage.o \
274 moc_qpemenubar.o \ 274 moc_qpemenubar.o \
275 moc_qpetoolbar.o \ 275 moc_qpetoolbar.o \
276 backend/moc_categories.o \ 276 backend/moc_categories.o \
277 moc_categorymenu.o \ 277 moc_categorymenu.o \
278 moc_categoryedit_p.o \ 278 moc_categoryedit_p.o \
279 moc_categoryselect.o \ 279 moc_categoryselect.o \
280 moc_ir.o \ 280 moc_ir.o \
281 moc_findwidget_p.o \ 281 moc_findwidget_p.o \
282 moc_finddialog.o \ 282 moc_finddialog.o \
283 moc_lnkproperties.o \ 283 moc_lnkproperties.o \
284 moc_qlibrary_p.o \ 284 moc_qlibrary_p.o \
285 moc_qprocess.o \ 285 moc_qprocess.o \
286 moc_passwordbase_p.o \ 286 moc_passwordbase_p.o \
287 moc_proxiesbase_p.o \ 287 moc_proxiesbase_p.o \
288 moc_categoryeditbase_p.o \ 288 moc_categoryeditbase_p.o \
289 moc_findwidgetbase_p.o \ 289 moc_findwidgetbase_p.o \
290 moc_lnkpropertiesbase_p.o 290 moc_lnkpropertiesbase_p.o
291 291
292 292
293####### Implicit rules 293####### Implicit rules
294 294
295.SUFFIXES: .cpp .cxx .cc .C .c 295.SUFFIXES: .cpp .cxx .cc .C .c
296 296
297.cpp.o: 297.cpp.o:
298 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 298 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
299 299
300.cxx.o: 300.cxx.o:
301 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 301 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
302 302
303.cc.o: 303.cc.o:
304 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 304 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
305 305
306.C.o: 306.C.o:
307 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 307 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
308 308
309.c.o: 309.c.o:
310 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 310 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
311 311
312####### Build rules 312####### Build rules
313 313
314 314
315all: $(DESTDIR)$(SYSCONF_LINK_TARGET) 315all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
316 316
317$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 317$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
318 $(SYSCONF_LINK_LIB) 318 $(SYSCONF_LINK_LIB)
319 319
320moc: $(SRCMOC) 320moc: $(SRCMOC)
321 321
322tmake: 322tmake:
323 tmake library.pro 323 tmake library.pro
324 324
325clean: 325clean:
326 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 326 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
327 -rm -f *~ core 327 -rm -f *~ core
328 -rm -f allmoc.cpp 328 -rm -f allmoc.cpp
329 329
330####### Extension Modules 330####### Extension Modules
331 331
332listpromodules: 332listpromodules:
333 @echo 333 @echo
334 334
335listallmodules: 335listallmodules:
336 @echo 336 @echo
337 337
338listaddonpromodules: 338listaddonpromodules:
339 @echo 339 @echo
340 340
341listaddonentmodules: 341listaddonentmodules:
342 @echo 342 @echo
343 343
344 344
345REQUIRES= 345REQUIRES=
346 346
347####### Sub-libraries 347####### Sub-libraries
348 348
349 349
350###### Combined headers 350###### Combined headers
351 351
352 352
353 353
354####### Compile 354####### Compile
355 355
356calendar.o: calendar.cpp \ 356calendar.o: calendar.cpp \
357 calendar.h 357 calendar.h
358 358
359global.o: global.cpp \ 359global.o: global.cpp \
360 global.moc 360 global.moc
361 361
362xmlreader.o: xmlreader.cpp \ 362xmlreader.o: xmlreader.cpp \
363 xmlreader.h 363 xmlreader.h
364 364
365mimetype.o: mimetype.cpp \ 365mimetype.o: mimetype.cpp \
366 mimetype.h \ 366 mimetype.h \
367 applnk.h \ 367 applnk.h \
368 resource.h \ 368 resource.h \
369 qpeapplication.h \ 369 qpeapplication.h \
370 qpedecoration_qws.h \ 370 qpedecoration_qws.h \
371 timestring.h 371 timestring.h
372 372
373menubutton.o: menubutton.cpp \ 373menubutton.o: menubutton.cpp \
374 menubutton.h 374 menubutton.h
375 375
376network.o: network.cpp \ 376network.o: network.cpp \
377 network.moc 377 network.moc
378 378
379networkinterface.o: networkinterface.cpp \ 379networkinterface.o: networkinterface.cpp \
380 networkinterface.h \ 380 networkinterface.h \
381 network.h \ 381 network.h \
382 config.h 382 config.h
383 383
384proxies.o: proxies.cpp \ 384proxies.o: proxies.cpp \
385 proxies.h \ 385 proxies.h \
386 config.h \ 386 config.h \
387 proxiesbase_p.h 387 proxiesbase_p.h
388 388
389filemanager.o: filemanager.cpp \ 389filemanager.o: filemanager.cpp \
390 filemanager.h \ 390 filemanager.h \
391 applnk.h 391 applnk.h
392 392
393fontmanager.o: fontmanager.cpp \ 393fontmanager.o: fontmanager.cpp \
394 fontmanager.h 394 fontmanager.h
395 395
396qdawg.o: qdawg.cpp \ 396qdawg.o: qdawg.cpp \
397 qdawg.h 397 qdawg.h
398 398
399datebookmonth.o: datebookmonth.cpp \ 399datebookmonth.o: datebookmonth.cpp \
400 config.h \ 400 config.h \
401 datebookmonth.h \ 401 datebookmonth.h \
402 calendar.h \ 402 calendar.h \
403 timestring.h \ 403 timestring.h \
404 datebookdb.h \ 404 datebookdb.h \
405 resource.h \ 405 resource.h \
406 qpeapplication.h \ 406 qpeapplication.h \
407 qpedecoration_qws.h 407 qpedecoration_qws.h
408 408
409fileselector.o: fileselector.cpp \ 409fileselector.o: fileselector.cpp \
410 fileselector.h \ 410 fileselector.h \
411 filemanager.h \ 411 filemanager.h \
412 applnk.h \ 412 applnk.h \
413 global.h \ 413 global.h \
414 resource.h \ 414 resource.h \
415 config.h \ 415 config.h \
416 storage.h \ 416 storage.h \
417 qpemenubar.h \ 417 qpemenubar.h \
418 lnkproperties.h \ 418 lnkproperties.h \
419 qpeapplication.h \ 419 qpeapplication.h \
420 qpedecoration_qws.h \ 420 qpedecoration_qws.h \
421 timestring.h \ 421 timestring.h \
422 categorymenu.h 422 categorymenu.h
423 423
424imageedit.o: imageedit.cpp \ 424imageedit.o: imageedit.cpp \
425 imageedit.h 425 imageedit.h
426 426
427resource.o: resource.cpp \ 427resource.o: resource.cpp \
428 qpeapplication.h \ 428 qpeapplication.h \
429 qpedecoration_qws.h \ 429 qpedecoration_qws.h \
430 timestring.h \ 430 timestring.h \
431 resource.h \ 431 resource.h \
432 inlinepics_p.h 432 inlinepics_p.h
433 433
434qpedecoration_qws.o: qpedecoration_qws.cpp \ 434qpedecoration_qws.o: qpedecoration_qws.cpp \
435 qcopenvelope_qws.h \ 435 qcopenvelope_qws.h \
436 qpedecoration_qws.h \ 436 qpedecoration_qws.h \
437 qpeapplication.h \ 437 qpeapplication.h \
438 timestring.h \ 438 timestring.h \
439 resource.h \ 439 resource.h \
440 global.h 440 global.h
441 441
442qcopenvelope_qws.o: qcopenvelope_qws.cpp \ 442qcopenvelope_qws.o: qcopenvelope_qws.cpp \
443 qcopenvelope_qws.h \ 443 qcopenvelope_qws.h \
444 global.h 444 global.h
445 445
446qpeapplication.o: qpeapplication.cpp \ 446qpeapplication.o: qpeapplication.cpp \
447 qcopenvelope_qws.h \ 447 qcopenvelope_qws.h \
448 qpeapplication.h \ 448 qpeapplication.h \
449 qpedecoration_qws.h \ 449 qpedecoration_qws.h \
450 timestring.h \ 450 timestring.h \
451 qpestyle.h \ 451 qpestyle.h \
452 lightstyle.h \ 452 lightstyle.h \
453 global.h \ 453 global.h \
454 resource.h \ 454 resource.h \
455 config.h \ 455 config.h \
456 network.h \ 456 network.h \
457 fontmanager.h \ 457 fontmanager.h \
458 power.h \ 458 power.h \
459 alarmserver.h \ 459 alarmserver.h \
460 applnk.h 460 applnk.h \
461 qpemenubar.h
461 462
462qpestyle.o: qpestyle.cpp \ 463qpestyle.o: qpestyle.cpp \
463 qpestyle.h \ 464 qpestyle.h \
464 qpeapplication.h \ 465 qpeapplication.h \
465 qpedecoration_qws.h \ 466 qpedecoration_qws.h \
466 timestring.h 467 timestring.h
467 468
468qpedialog.o: qpedialog.cpp \ 469qpedialog.o: qpedialog.cpp \
469 qpedialog.h \ 470 qpedialog.h \
470 qpeapplication.h \ 471 qpeapplication.h \
471 qpedecoration_qws.h \ 472 qpedecoration_qws.h \
472 timestring.h 473 timestring.h
473 474
474lightstyle.o: lightstyle.cpp \ 475lightstyle.o: lightstyle.cpp \
475 lightstyle.h 476 lightstyle.h
476 477
477config.o: config.cpp \ 478config.o: config.cpp \
478 config.h 479 config.h
479 480
480applnk.o: applnk.cpp \ 481applnk.o: applnk.cpp \
481 applnk.h 482 applnk.h
482 483
483sound.o: sound.cpp 484sound.o: sound.cpp
484 485
485tzselect.o: tzselect.cpp \ 486tzselect.o: tzselect.cpp \
486 tzselect.h \ 487 tzselect.h \
487 resource.h \ 488 resource.h \
488 global.h \ 489 global.h \
489 config.h 490 config.h
490 491
491qmath.o: qmath.c \ 492qmath.o: qmath.c \
492 qmath.h 493 qmath.h
493 494
494datebookdb.o: datebookdb.cpp \ 495datebookdb.o: datebookdb.cpp \
495 datebookdb.h 496 datebookdb.h
496 497
497alarmserver.o: alarmserver.cpp \ 498alarmserver.o: alarmserver.cpp \
498 qpeapplication.h \ 499 qpeapplication.h \
499 qpedecoration_qws.h \ 500 qpedecoration_qws.h \
500 timestring.h \ 501 timestring.h \
501 global.h \ 502 global.h \
502 resource.h \ 503 resource.h \
503 qcopenvelope_qws.h \ 504 qcopenvelope_qws.h \
504 alarmserver.h 505 alarmserver.h
505 506
506password.o: password.cpp \ 507password.o: password.cpp \
507 password.moc \ 508 password.moc \
508 password.h \ 509 password.h \
509 config.h \ 510 config.h \
510 global.h \ 511 global.h \
511 backend/contact.h \ 512 backend/contact.h \
512 passwordbase_p.h 513 passwordbase_p.h
513 514
514process.o: process.cpp \ 515process.o: process.cpp \
515 process.h 516 process.h
516 517
517process_unix.o: process_unix.cpp \ 518process_unix.o: process_unix.cpp \
518 process_unix.moc \ 519 process_unix.moc \
519 process.h 520 process.h
520 521
521timestring.o: timestring.cpp \ 522timestring.o: timestring.cpp \
522 timestring.moc \ 523 timestring.moc \
523 timestring.h \ 524 timestring.h \
524 qpeapplication.h \ 525 qpeapplication.h \
525 qpedecoration_qws.h \ 526 qpedecoration_qws.h \
526 config.h 527 config.h
527 528
528fontdatabase.o: fontdatabase.cpp \ 529fontdatabase.o: fontdatabase.cpp \
529 qpeapplication.h \ 530 qpeapplication.h \
530 qpedecoration_qws.h \ 531 qpedecoration_qws.h \
531 timestring.h \ 532 timestring.h \
532 fontfactoryinterface.h \ 533 fontfactoryinterface.h \
533 fontdatabase.h 534 fontdatabase.h
534 535
535power.o: power.cpp \ 536power.o: power.cpp \
536 power.h 537 power.h \
538 custom.h
537 539
538storage.o: storage.cpp 540storage.o: storage.cpp
539 541
540qpemessagebox.o: qpemessagebox.cpp \ 542qpemessagebox.o: qpemessagebox.cpp \
541 qpemessagebox.h 543 qpemessagebox.h
542 544
543backend/timeconversion.o: backend/timeconversion.cpp \ 545backend/timeconversion.o: backend/timeconversion.cpp \
544 backend/timeconversion.h 546 backend/timeconversion.h
545 547
546qpedebug.o: qpedebug.cpp \ 548qpedebug.o: qpedebug.cpp \
547 qpedebug.h 549 qpedebug.h
548 550
549qpemenubar.o: qpemenubar.cpp \ 551qpemenubar.o: qpemenubar.cpp \
550 qpemenubar.h 552 qpemenubar.h
551 553
552qpetoolbar.o: qpetoolbar.cpp \ 554qpetoolbar.o: qpetoolbar.cpp \
553 qpetoolbar.h \ 555 qpetoolbar.h \
554 qpemenubar.h 556 qpemenubar.h
555 557
556backend/categories.o: backend/categories.cpp \ 558backend/categories.o: backend/categories.cpp \
557 backend/categories.h \ 559 backend/categories.h \
558 backend/qpcglobal.h \ 560 backend/qpcglobal.h \
559 backend/palmtopuidgen.h \ 561 backend/palmtopuidgen.h \
560 backend/stringutil.h 562 backend/stringutil.h
561 563
562backend/stringutil.o: backend/stringutil.cpp \ 564backend/stringutil.o: backend/stringutil.cpp \
563 backend/stringutil.h \ 565 backend/stringutil.h \
564 backend/qpcglobal.h 566 backend/qpcglobal.h
565 567
566backend/palmtoprecord.o: backend/palmtoprecord.cpp \ 568backend/palmtoprecord.o: backend/palmtoprecord.cpp \
567 backend/palmtoprecord.h \ 569 backend/palmtoprecord.h \
568 backend/qpcglobal.h \ 570 backend/qpcglobal.h \
569 backend/palmtopuidgen.h \ 571 backend/palmtopuidgen.h \
570 backend/stringutil.h 572 backend/stringutil.h
571 573
572backend/task.o: backend/task.cpp \ 574backend/task.o: backend/task.cpp \
573 backend/vobject_p.h \ 575 backend/vobject_p.h \
574 backend/timeconversion.h \ 576 backend/timeconversion.h \
575 backend/qfiledirect_p.h 577 backend/qfiledirect_p.h
576 578
577backend/event.o: backend/event.cpp \ 579backend/event.o: backend/event.cpp \
578 backend/event.h \ 580 backend/event.h \
579 backend/qfiledirect_p.h \ 581 backend/qfiledirect_p.h \
580 backend/vobject_p.h 582 backend/vobject_p.h
581 583
582backend/contact.o: backend/contact.cpp \ 584backend/contact.o: backend/contact.cpp \
583 backend/contact.h \ 585 backend/contact.h \
584 backend/vobject_p.h \ 586 backend/vobject_p.h \
585 backend/qfiledirect_p.h 587 backend/qfiledirect_p.h
586 588
587categorymenu.o: categorymenu.cpp \ 589categorymenu.o: categorymenu.cpp \
588 categorymenu.h \ 590 categorymenu.h \
589 backend/categories.h \ 591 backend/categories.h \
590 backend/qpcglobal.h \ 592 backend/qpcglobal.h \
591 backend/palmtopuidgen.h \ 593 backend/palmtopuidgen.h \
592 categoryselect.h 594 categoryselect.h
593 595
594categoryedit_p.o: categoryedit_p.cpp \ 596categoryedit_p.o: categoryedit_p.cpp \
595 categoryedit_p.h \ 597 categoryedit_p.h \
596 categoryeditbase_p.h 598 categoryeditbase_p.h
597 599
598categoryselect.o: categoryselect.cpp \ 600categoryselect.o: categoryselect.cpp \
599 categorywidget.h \ 601 categorywidget.h \
600 categoryselect.h 602 categoryselect.h
601 603
602categorywidget.o: categorywidget.cpp \ 604categorywidget.o: categorywidget.cpp \
603 categoryedit_p.h \ 605 categoryedit_p.h \
604 categoryeditbase_p.h \ 606 categoryeditbase_p.h \
605 categorywidget.h 607 categorywidget.h
606 608
607ir.o: ir.cpp \ 609ir.o: ir.cpp \
608 ir.h \ 610 ir.h \
609 qcopenvelope_qws.h \ 611 qcopenvelope_qws.h \
610 applnk.h 612 applnk.h
611 613
612backend/vcc_yacc.o: backend/vcc_yacc.cpp \ 614backend/vcc_yacc.o: backend/vcc_yacc.cpp \
613 backend/vobject_p.h 615 backend/vobject_p.h \
616 backend/qfiledirect_p.h
614 617
615backend/vobject.o: backend/vobject.cpp \ 618backend/vobject.o: backend/vobject.cpp \
616 backend/vobject_p.h \ 619 backend/vobject_p.h \
617 backend/qfiledirect_p.h 620 backend/qfiledirect_p.h
618 621
619findwidget_p.o: findwidget_p.cpp \ 622findwidget_p.o: findwidget_p.cpp \
620 findwidget_p.h \ 623 findwidget_p.h \
621 findwidgetbase_p.h 624 findwidgetbase_p.h
622 625
623finddialog.o: finddialog.cpp \ 626finddialog.o: finddialog.cpp \
624 finddialog.h \ 627 finddialog.h \
625 findwidget_p.h \ 628 findwidget_p.h \
626 findwidgetbase_p.h 629 findwidgetbase_p.h
627 630
628lnkproperties.o: lnkproperties.cpp \ 631lnkproperties.o: lnkproperties.cpp \
629 lnkproperties.h \ 632 lnkproperties.h \
630 lnkpropertiesbase_p.h \ 633 lnkpropertiesbase_p.h \
631 ir.h 634 ir.h
632 635
633quuid.o: quuid.cpp \ 636quuid.o: quuid.cpp \
634 quuid.h 637 quuid.h
635 638
636qlibrary.o: qlibrary.cpp \ 639qlibrary.o: qlibrary.cpp \
637 qlibrary_p.h \ 640 qlibrary_p.h \
638 qlibrary.h 641 qlibrary.h
639 642
640qlibrary_unix.o: qlibrary_unix.cpp \ 643qlibrary_unix.o: qlibrary_unix.cpp \
641 qlibrary_p.h \ 644 qlibrary_p.h \
642 qlibrary.h 645 qlibrary.h
643 646
644qprocess.o: qprocess.cpp \ 647qprocess.o: qprocess.cpp \
645 qprocess.h 648 qprocess.h
646 649
647qprocess_unix.o: qprocess_unix.cpp \ 650qprocess_unix.o: qprocess_unix.cpp \
648 qprocess_unix.moc \ 651 qprocess_unix.moc \
649 qprocess.h \ 652 qprocess.h \
650 qcleanuphandler_p.h 653 qcleanuphandler_p.h
651 654
652passwordbase_p.h: passwordbase_p.ui 655passwordbase_p.h: passwordbase_p.ui
653 $(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h 656 $(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h
654 657
655passwordbase_p.cpp: passwordbase_p.ui 658passwordbase_p.cpp: passwordbase_p.ui
656 $(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp 659 $(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp
657 660
658proxiesbase_p.h: proxiesbase_p.ui 661proxiesbase_p.h: proxiesbase_p.ui
659 $(UIC) proxiesbase_p.ui -o $(INTERFACE_DECL_PATH)/proxiesbase_p.h 662 $(UIC) proxiesbase_p.ui -o $(INTERFACE_DECL_PATH)/proxiesbase_p.h
660 663
661proxiesbase_p.cpp: proxiesbase_p.ui 664proxiesbase_p.cpp: proxiesbase_p.ui
662 $(UIC) proxiesbase_p.ui -i proxiesbase_p.h -o proxiesbase_p.cpp 665 $(UIC) proxiesbase_p.ui -i proxiesbase_p.h -o proxiesbase_p.cpp
663 666
664categoryeditbase_p.h: categoryeditbase_p.ui 667categoryeditbase_p.h: categoryeditbase_p.ui
665 $(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h 668 $(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h
666 669
667categoryeditbase_p.cpp: categoryeditbase_p.ui 670categoryeditbase_p.cpp: categoryeditbase_p.ui
668 $(UIC) categoryeditbase_p.ui -i categoryeditbase_p.h -o categoryeditbase_p.cpp 671 $(UIC) categoryeditbase_p.ui -i categoryeditbase_p.h -o categoryeditbase_p.cpp
669 672
670findwidgetbase_p.h: findwidgetbase_p.ui 673findwidgetbase_p.h: findwidgetbase_p.ui
671 $(UIC) findwidgetbase_p.ui -o $(INTERFACE_DECL_PATH)/findwidgetbase_p.h 674 $(UIC) findwidgetbase_p.ui -o $(INTERFACE_DECL_PATH)/findwidgetbase_p.h
672 675
673findwidgetbase_p.cpp: findwidgetbase_p.ui 676findwidgetbase_p.cpp: findwidgetbase_p.ui
674 $(UIC) findwidgetbase_p.ui -i findwidgetbase_p.h -o findwidgetbase_p.cpp 677 $(UIC) findwidgetbase_p.ui -i findwidgetbase_p.h -o findwidgetbase_p.cpp
675 678
676lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui 679lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui
677 $(UIC) lnkpropertiesbase_p.ui -o $(INTERFACE_DECL_PATH)/lnkpropertiesbase_p.h 680 $(UIC) lnkpropertiesbase_p.ui -o $(INTERFACE_DECL_PATH)/lnkpropertiesbase_p.h
678 681
679lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui 682lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui
680 $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp 683 $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp
681 684
682passwordbase_p.o: passwordbase_p.cpp \ 685passwordbase_p.o: passwordbase_p.cpp
683 passwordbase_p.h
684 686
685proxiesbase_p.o: proxiesbase_p.cpp \ 687proxiesbase_p.o: proxiesbase_p.cpp
686 proxiesbase_p.h
687 688
688categoryeditbase_p.o: categoryeditbase_p.cpp \ 689categoryeditbase_p.o: categoryeditbase_p.cpp
689 categoryeditbase_p.h
690 690
691findwidgetbase_p.o: findwidgetbase_p.cpp \ 691findwidgetbase_p.o: findwidgetbase_p.cpp
692 findwidgetbase_p.h
693 692
694lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp \ 693lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp
695 lnkpropertiesbase_p.h
696 694
697moc_menubutton.o: moc_menubutton.cpp \ 695moc_menubutton.o: moc_menubutton.cpp \
698 menubutton.h 696 menubutton.h
699 697
700moc_proxies.o: moc_proxies.cpp \ 698moc_proxies.o: moc_proxies.cpp \
701 proxies.h \ 699 proxies.h \
702 config.h 700 config.h
703 701
704moc_datebookmonth.o: moc_datebookmonth.cpp \ 702moc_datebookmonth.o: moc_datebookmonth.cpp \
705 datebookmonth.h \ 703 datebookmonth.h \
706 calendar.h \ 704 calendar.h \
707 timestring.h 705 timestring.h
708 706
709moc_fileselector.o: moc_fileselector.cpp \ 707moc_fileselector.o: moc_fileselector.cpp \
710 fileselector.h \ 708 fileselector.h \
711 filemanager.h \ 709 filemanager.h \
712 applnk.h 710 applnk.h
713 711
714moc_imageedit.o: moc_imageedit.cpp \ 712moc_imageedit.o: moc_imageedit.cpp \
715 imageedit.h 713 imageedit.h
716 714
717moc_qpedecoration_qws.o: moc_qpedecoration_qws.cpp \ 715moc_qpedecoration_qws.o: moc_qpedecoration_qws.cpp \
718 qpedecoration_qws.h 716 qpedecoration_qws.h
719 717
720moc_qpeapplication.o: moc_qpeapplication.cpp \ 718moc_qpeapplication.o: moc_qpeapplication.cpp \
721 qpeapplication.h \ 719 qpeapplication.h \
722 qpedecoration_qws.h \ 720 qpedecoration_qws.h \
723 timestring.h 721 timestring.h
724 722
725moc_qpedialog.o: moc_qpedialog.cpp \ 723moc_qpedialog.o: moc_qpedialog.cpp \
726 qpedialog.h 724 qpedialog.h
727 725
728moc_tzselect.o: moc_tzselect.cpp \ 726moc_tzselect.o: moc_tzselect.cpp \
729 tzselect.h 727 tzselect.h
730 728
731moc_process.o: moc_process.cpp \ 729moc_process.o: moc_process.cpp \
732 process.h 730 process.h
733 731
734moc_storage.o: moc_storage.cpp \ 732moc_storage.o: moc_storage.cpp \
735 storage.h 733 storage.h
736 734
737moc_qpemenubar.o: moc_qpemenubar.cpp \ 735moc_qpemenubar.o: moc_qpemenubar.cpp \
738 qpemenubar.h 736 qpemenubar.h
739 737
740moc_qpetoolbar.o: moc_qpetoolbar.cpp \ 738moc_qpetoolbar.o: moc_qpetoolbar.cpp \
741 qpetoolbar.h 739 qpetoolbar.h
742 740
743backend/moc_categories.o: backend/moc_categories.cpp \ 741backend/moc_categories.o: backend/moc_categories.cpp \
744 backend/categories.h \ 742 backend/categories.h \
745 backend/qpcglobal.h \ 743 backend/qpcglobal.h \
746 backend/palmtopuidgen.h 744 backend/palmtopuidgen.h
747 745
748moc_categorymenu.o: moc_categorymenu.cpp \ 746moc_categorymenu.o: moc_categorymenu.cpp \
749 categorymenu.h 747 categorymenu.h
750 748
751moc_categoryedit_p.o: moc_categoryedit_p.cpp \ 749moc_categoryedit_p.o: moc_categoryedit_p.cpp \
752 categoryedit_p.h \ 750 categoryedit_p.h \
753 categoryeditbase_p.h 751 categoryeditbase_p.h
754 752
755moc_categoryselect.o: moc_categoryselect.cpp \ 753moc_categoryselect.o: moc_categoryselect.cpp \
756 categoryselect.h 754 categoryselect.h
757 755
758moc_ir.o: moc_ir.cpp \ 756moc_ir.o: moc_ir.cpp \
759 ir.h 757 ir.h
760 758
761moc_findwidget_p.o: moc_findwidget_p.cpp \ 759moc_findwidget_p.o: moc_findwidget_p.cpp \
762 findwidget_p.h \ 760 findwidget_p.h \
763 findwidgetbase_p.h 761 findwidgetbase_p.h
764 762
765moc_finddialog.o: moc_finddialog.cpp \ 763moc_finddialog.o: moc_finddialog.cpp \
766 finddialog.h 764 finddialog.h
767 765
768moc_lnkproperties.o: moc_lnkproperties.cpp \ 766moc_lnkproperties.o: moc_lnkproperties.cpp \
769 lnkproperties.h 767 lnkproperties.h
770 768
771moc_qlibrary_p.o: moc_qlibrary_p.cpp \ 769moc_qlibrary_p.o: moc_qlibrary_p.cpp \
772 qlibrary_p.h \ 770 qlibrary_p.h \
773 qlibrary.h 771 qlibrary.h
774 772
775moc_qprocess.o: moc_qprocess.cpp \ 773moc_qprocess.o: moc_qprocess.cpp \
776 qprocess.h 774 qprocess.h
777 775
778moc_passwordbase_p.o: global.moc \ 776moc_passwordbase_p.o: global.moc \
779 global.cpp 777 global.cpp
780 778
781moc_proxiesbase_p.o: network.moc \ 779moc_proxiesbase_p.o: network.moc \
782 network.cpp 780 network.cpp
783 781
784moc_categoryeditbase_p.o: password.moc \ 782moc_categoryeditbase_p.o: password.moc \
785 password.cpp \ 783 password.cpp \
786 password.h \ 784 password.h \
787 config.h \ 785 config.h \
788 global.h \ 786 global.h \
789 backend/contact.h \ 787 backend/contact.h \
790 passwordbase_p.h 788 passwordbase_p.h
791 789
792moc_findwidgetbase_p.o: process_unix.moc \ 790moc_findwidgetbase_p.o: process_unix.moc \
793 process_unix.cpp \ 791 process_unix.cpp \
794 process.h 792 process.h
795 793
796moc_lnkpropertiesbase_p.o: timestring.moc \ 794moc_lnkpropertiesbase_p.o: timestring.moc \
797 timestring.cpp \ 795 timestring.cpp \
798 timestring.h \ 796 timestring.h \
799 qpeapplication.h \ 797 qpeapplication.h \
800 qpedecoration_qws.h \ 798 qpedecoration_qws.h \
801 config.h 799 config.h
802 800
803moc_menubutton.cpp: menubutton.h 801moc_menubutton.cpp: menubutton.h
804 $(MOC) menubutton.h -o moc_menubutton.cpp 802 $(MOC) menubutton.h -o moc_menubutton.cpp
805 803
806moc_proxies.cpp: proxies.h 804moc_proxies.cpp: proxies.h
807 $(MOC) proxies.h -o moc_proxies.cpp 805 $(MOC) proxies.h -o moc_proxies.cpp
808 806
809moc_datebookmonth.cpp: datebookmonth.h 807moc_datebookmonth.cpp: datebookmonth.h
810 $(MOC) datebookmonth.h -o moc_datebookmonth.cpp 808 $(MOC) datebookmonth.h -o moc_datebookmonth.cpp
811 809
812moc_fileselector.cpp: fileselector.h 810moc_fileselector.cpp: fileselector.h
813 $(MOC) fileselector.h -o moc_fileselector.cpp 811 $(MOC) fileselector.h -o moc_fileselector.cpp
814 812
815moc_imageedit.cpp: imageedit.h 813moc_imageedit.cpp: imageedit.h
816 $(MOC) imageedit.h -o moc_imageedit.cpp 814 $(MOC) imageedit.h -o moc_imageedit.cpp
817 815
818moc_qpedecoration_qws.cpp: qpedecoration_qws.h 816moc_qpedecoration_qws.cpp: qpedecoration_qws.h
819 $(MOC) qpedecoration_qws.h -o moc_qpedecoration_qws.cpp 817 $(MOC) qpedecoration_qws.h -o moc_qpedecoration_qws.cpp
820 818
821moc_qpeapplication.cpp: qpeapplication.h 819moc_qpeapplication.cpp: qpeapplication.h
822 $(MOC) qpeapplication.h -o moc_qpeapplication.cpp 820 $(MOC) qpeapplication.h -o moc_qpeapplication.cpp
823 821
824moc_qpedialog.cpp: qpedialog.h 822moc_qpedialog.cpp: qpedialog.h
825 $(MOC) qpedialog.h -o moc_qpedialog.cpp 823 $(MOC) qpedialog.h -o moc_qpedialog.cpp
826 824
827moc_tzselect.cpp: tzselect.h 825moc_tzselect.cpp: tzselect.h
828 $(MOC) tzselect.h -o moc_tzselect.cpp 826 $(MOC) tzselect.h -o moc_tzselect.cpp
829 827
830moc_process.cpp: process.h 828moc_process.cpp: process.h
831 $(MOC) process.h -o moc_process.cpp 829 $(MOC) process.h -o moc_process.cpp
832 830
833moc_storage.cpp: storage.h 831moc_storage.cpp: storage.h
834 $(MOC) storage.h -o moc_storage.cpp 832 $(MOC) storage.h -o moc_storage.cpp
835 833
836moc_qpemenubar.cpp: qpemenubar.h 834moc_qpemenubar.cpp: qpemenubar.h
837 $(MOC) qpemenubar.h -o moc_qpemenubar.cpp 835 $(MOC) qpemenubar.h -o moc_qpemenubar.cpp
838 836
839moc_qpetoolbar.cpp: qpetoolbar.h 837moc_qpetoolbar.cpp: qpetoolbar.h
840 $(MOC) qpetoolbar.h -o moc_qpetoolbar.cpp 838 $(MOC) qpetoolbar.h -o moc_qpetoolbar.cpp
841 839
842backend/moc_categories.cpp: backend/categories.h 840backend/moc_categories.cpp: backend/categories.h
843 $(MOC) backend/categories.h -o backend/moc_categories.cpp 841 $(MOC) backend/categories.h -o backend/moc_categories.cpp
844 842
845moc_categorymenu.cpp: categorymenu.h 843moc_categorymenu.cpp: categorymenu.h
846 $(MOC) categorymenu.h -o moc_categorymenu.cpp 844 $(MOC) categorymenu.h -o moc_categorymenu.cpp
847 845
848moc_categoryedit_p.cpp: categoryedit_p.h 846moc_categoryedit_p.cpp: categoryedit_p.h
849 $(MOC) categoryedit_p.h -o moc_categoryedit_p.cpp 847 $(MOC) categoryedit_p.h -o moc_categoryedit_p.cpp
850 848
851moc_categoryselect.cpp: categoryselect.h 849moc_categoryselect.cpp: categoryselect.h
852 $(MOC) categoryselect.h -o moc_categoryselect.cpp 850 $(MOC) categoryselect.h -o moc_categoryselect.cpp
853 851
854moc_ir.cpp: ir.h 852moc_ir.cpp: ir.h
855 $(MOC) ir.h -o moc_ir.cpp 853 $(MOC) ir.h -o moc_ir.cpp
856 854
857moc_findwidget_p.cpp: findwidget_p.h 855moc_findwidget_p.cpp: findwidget_p.h
858 $(MOC) findwidget_p.h -o moc_findwidget_p.cpp 856 $(MOC) findwidget_p.h -o moc_findwidget_p.cpp
859 857
860moc_finddialog.cpp: finddialog.h 858moc_finddialog.cpp: finddialog.h
861 $(MOC) finddialog.h -o moc_finddialog.cpp 859 $(MOC) finddialog.h -o moc_finddialog.cpp
862 860
863moc_lnkproperties.cpp: lnkproperties.h 861moc_lnkproperties.cpp: lnkproperties.h
864 $(MOC) lnkproperties.h -o moc_lnkproperties.cpp 862 $(MOC) lnkproperties.h -o moc_lnkproperties.cpp
865 863
866moc_qlibrary_p.cpp: qlibrary_p.h 864moc_qlibrary_p.cpp: qlibrary_p.h
867 $(MOC) qlibrary_p.h -o moc_qlibrary_p.cpp 865 $(MOC) qlibrary_p.h -o moc_qlibrary_p.cpp
868 866
869moc_qprocess.cpp: qprocess.h 867moc_qprocess.cpp: qprocess.h
870 $(MOC) qprocess.h -o moc_qprocess.cpp 868 $(MOC) qprocess.h -o moc_qprocess.cpp
871 869
872global.moc: global.cpp 870global.moc: global.cpp
873 $(MOC) global.cpp -o global.moc 871 $(MOC) global.cpp -o global.moc
874 872
875network.moc: network.cpp 873network.moc: network.cpp
876 $(MOC) network.cpp -o network.moc 874 $(MOC) network.cpp -o network.moc
877 875
878password.moc: password.cpp 876password.moc: password.cpp
879 $(MOC) password.cpp -o password.moc 877 $(MOC) password.cpp -o password.moc
880 878
881process_unix.moc: process_unix.cpp 879process_unix.moc: process_unix.cpp
882 $(MOC) process_unix.cpp -o process_unix.moc 880 $(MOC) process_unix.cpp -o process_unix.moc
883 881
884timestring.moc: timestring.cpp 882timestring.moc: timestring.cpp
885 $(MOC) timestring.cpp -o timestring.moc 883 $(MOC) timestring.cpp -o timestring.moc
886 884
887qprocess_unix.moc: qprocess_unix.cpp 885qprocess_unix.moc: qprocess_unix.cpp
888 $(MOC) qprocess_unix.cpp -o qprocess_unix.moc 886 $(MOC) qprocess_unix.cpp -o qprocess_unix.moc
889 887
890moc_passwordbase_p.cpp: passwordbase_p.h 888moc_passwordbase_p.cpp: passwordbase_p.h
891 $(MOC) passwordbase_p.h -o moc_passwordbase_p.cpp 889 $(MOC) passwordbase_p.h -o moc_passwordbase_p.cpp
892 890
893moc_proxiesbase_p.cpp: proxiesbase_p.h 891moc_proxiesbase_p.cpp: proxiesbase_p.h
894 $(MOC) proxiesbase_p.h -o moc_proxiesbase_p.cpp 892 $(MOC) proxiesbase_p.h -o moc_proxiesbase_p.cpp
895 893
896moc_categoryeditbase_p.cpp: categoryeditbase_p.h 894moc_categoryeditbase_p.cpp: categoryeditbase_p.h
897 $(MOC) categoryeditbase_p.h -o moc_categoryeditbase_p.cpp 895 $(MOC) categoryeditbase_p.h -o moc_categoryeditbase_p.cpp
898 896
899moc_findwidgetbase_p.cpp: findwidgetbase_p.h 897moc_findwidgetbase_p.cpp: findwidgetbase_p.h
900 $(MOC) findwidgetbase_p.h -o moc_findwidgetbase_p.cpp 898 $(MOC) findwidgetbase_p.h -o moc_findwidgetbase_p.cpp
901 899
902moc_lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.h 900moc_lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.h
903 $(MOC) lnkpropertiesbase_p.h -o moc_lnkpropertiesbase_p.cpp 901 $(MOC) lnkpropertiesbase_p.h -o moc_lnkpropertiesbase_p.cpp
904 902
905 903
diff --git a/library/global.cpp b/library/global.cpp
index e1bbf3e..e5fc2b3 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -1,644 +1,644 @@
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#include <qpe/qpedebug.h> 20#include <qpe/qpedebug.h>
21#include <qpe/global.h> 21#include <qpe/global.h>
22#include <qpe/qdawg.h> 22#include <qpe/qdawg.h>
23#include <qpe/qpeapplication.h> 23#include <qpe/qpeapplication.h>
24#include <qpe/resource.h> 24#include <qpe/resource.h>
25#include <qpe/storage.h> 25#include <qpe/storage.h>
26#include <qpe/applnk.h> 26#include <qpe/applnk.h>
27#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 27#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
28#include "qpe/qcopenvelope_qws.h" 28#include "qpe/qcopenvelope_qws.h"
29#endif 29#endif
30 30
31#include <qfile.h> 31#include <qfile.h>
32#include <qlabel.h> 32#include <qlabel.h>
33#include <qtimer.h> 33#include <qtimer.h>
34#include <qmap.h> 34#include <qmap.h>
35#include <qdict.h> 35#include <qdict.h>
36#include <qdir.h> 36#include <qdir.h>
37#include <qmessagebox.h> 37#include <qmessagebox.h>
38#include <qregexp.h> 38#include <qregexp.h>
39 39
40#include <stdlib.h> 40#include <stdlib.h>
41#include <sys/stat.h> 41#include <sys/stat.h>
42#include <sys/wait.h> 42#include <sys/wait.h>
43#include <sys/types.h> 43#include <sys/types.h>
44#include <fcntl.h> 44#include <fcntl.h>
45#include <unistd.h> 45#include <unistd.h>
46 46
47#include <qwindowsystem_qws.h> // for qwsServer 47#include <qwindowsystem_qws.h> // for qwsServer
48#include <qdatetime.h> 48#include <qdatetime.h>
49 49
50//#include "quickexec_p.h" 50//#include "quickexec_p.h"
51 51
52class Emitter : public QObject { 52class Emitter : public QObject {
53 Q_OBJECT 53 Q_OBJECT
54public: 54public:
55 Emitter( QWidget* receiver, const QString& document ) 55 Emitter( QWidget* receiver, const QString& document )
56 { 56 {
57 connect(this, SIGNAL(setDocument(const QString&)), 57 connect(this, SIGNAL(setDocument(const QString&)),
58 receiver, SLOT(setDocument(const QString&))); 58 receiver, SLOT(setDocument(const QString&)));
59 emit setDocument(document); 59 emit setDocument(document);
60 disconnect(this, SIGNAL(setDocument(const QString&)), 60 disconnect(this, SIGNAL(setDocument(const QString&)),
61 receiver, SLOT(setDocument(const QString&))); 61 receiver, SLOT(setDocument(const QString&)));
62 } 62 }
63 63
64signals: 64signals:
65 void setDocument(const QString&); 65 void setDocument(const QString&);
66}; 66};
67 67
68 68
69class StartingAppList : public QObject { 69class StartingAppList : public QObject {
70 Q_OBJECT 70 Q_OBJECT
71public: 71public:
72 static void add( const QString& name ); 72 static void add( const QString& name );
73 static bool isStarting( const QString name ); 73 static bool isStarting( const QString name );
74private slots: 74private slots:
75 void handleNewChannel( const QString &); 75 void handleNewChannel( const QString &);
76private: 76private:
77 StartingAppList( QObject *parent=0, const char* name=0 ) ; 77 StartingAppList( QObject *parent=0, const char* name=0 ) ;
78 78
79 QDict<QTime> dict; 79 QDict<QTime> dict;
80 static StartingAppList *appl; 80 static StartingAppList *appl;
81}; 81};
82 82
83StartingAppList* StartingAppList::appl = 0; 83StartingAppList* StartingAppList::appl = 0;
84 84
85StartingAppList::StartingAppList( QObject *parent, const char* name ) 85StartingAppList::StartingAppList( QObject *parent, const char* name )
86 :QObject( parent, name ) 86 :QObject( parent, name )
87{ 87{
88#if QT_VERSION >= 232 && !defined(QT_NO_COP) 88#if QT_VERSION >= 232 && !defined(QT_NO_COP)
89 connect( qwsServer, SIGNAL( newChannel(const QString&)), 89 connect( qwsServer, SIGNAL( newChannel(const QString&)),
90 this, SLOT( handleNewChannel(const QString&)) ); 90 this, SLOT( handleNewChannel(const QString&)) );
91 dict.setAutoDelete( TRUE ); 91 dict.setAutoDelete( TRUE );
92#endif 92#endif
93} 93}
94 94
95void StartingAppList::add( const QString& name ) 95void StartingAppList::add( const QString& name )
96{ 96{
97#if QT_VERSION >= 232 && !defined(QT_NO_COP) 97#if QT_VERSION >= 232 && !defined(QT_NO_COP)
98 if ( !appl ) 98 if ( !appl )
99 appl = new StartingAppList; 99 appl = new StartingAppList;
100 QTime *t = new QTime; 100 QTime *t = new QTime;
101 t->start(); 101 t->start();
102 appl->dict.insert( "QPE/Application/" + name, t ); 102 appl->dict.insert( "QPE/Application/" + name, t );
103#endif 103#endif
104} 104}
105 105
106bool StartingAppList::isStarting( const QString name ) 106bool StartingAppList::isStarting( const QString name )
107{ 107{
108#if QT_VERSION >= 232 && !defined(QT_NO_COP) 108#if QT_VERSION >= 232 && !defined(QT_NO_COP)
109 if ( appl ) { 109 if ( appl ) {
110 QTime *t = appl->dict.find( "QPE/Application/" + name ); 110 QTime *t = appl->dict.find( "QPE/Application/" + name );
111 if ( !t ) 111 if ( !t )
112 return FALSE; 112 return FALSE;
113 if ( t->elapsed() > 10000 ) { 113 if ( t->elapsed() > 10000 ) {
114 // timeout in case of crash or something 114 // timeout in case of crash or something
115 appl->dict.remove( "QPE/Application/" + name ); 115 appl->dict.remove( "QPE/Application/" + name );
116 return FALSE; 116 return FALSE;
117 } 117 }
118 return TRUE; 118 return TRUE;
119 } 119 }
120#endif 120#endif
121 return FALSE; 121 return FALSE;
122} 122}
123 123
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("QPEDIR"); 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 06dfc8f..058d216 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -1,132 +1,132 @@
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 \ 11 proxies.h \
12 filemanager.h \ 12 filemanager.h \
13 fontmanager.h \ 13 fontmanager.h \
14 qdawg.h \ 14 qdawg.h \
15 datebookmonth.h \ 15 datebookmonth.h \
16 fileselector.h \ 16 fileselector.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 \ 67 proxies.cpp \
68 filemanager.cpp \ 68 filemanager.cpp \
69 fontmanager.cpp \ 69 fontmanager.cpp \
70 qdawg.cpp \ 70 qdawg.cpp \
71 datebookmonth.cpp \ 71 datebookmonth.cpp \
72 fileselector.cpp \ 72 fileselector.cpp \
73 imageedit.cpp \ 73 imageedit.cpp \
74 resource.cpp \ 74 resource.cpp \
75 qpedecoration_qws.cpp \ 75 qpedecoration_qws.cpp \
76 qcopenvelope_qws.cpp \ 76 qcopenvelope_qws.cpp \
77 qpeapplication.cpp \ 77 qpeapplication.cpp \
78 qpestyle.cpp \ 78 qpestyle.cpp \
79 qpedialog.cpp \ 79 qpedialog.cpp \
80 lightstyle.cpp \ 80 lightstyle.cpp \
81 config.cpp \ 81 config.cpp \
82 applnk.cpp \ 82 applnk.cpp \
83 sound.cpp \ 83 sound.cpp \
84 tzselect.cpp \ 84 tzselect.cpp \
85 qmath.c \ 85 qmath.c \
86 datebookdb.cpp \ 86 datebookdb.cpp \
87 alarmserver.cpp \ 87 alarmserver.cpp \
88 password.cpp \ 88 password.cpp \
89 process.cpp \ 89 process.cpp \
90 process_unix.cpp \ 90 process_unix.cpp \
91 timestring.cpp \ 91 timestring.cpp \
92 fontdatabase.cpp \ 92 fontdatabase.cpp \
93 power.cpp \ 93 power.cpp \
94 storage.cpp \ 94 storage.cpp \
95 qpemessagebox.cpp \ 95 qpemessagebox.cpp \
96 backend/timeconversion.cpp \ 96 backend/timeconversion.cpp \
97 qpedebug.cpp \ 97 qpedebug.cpp \
98 qpemenubar.cpp \ 98 qpemenubar.cpp \
99 qpetoolbar.cpp \ 99 qpetoolbar.cpp \
100 backend/categories.cpp \ 100 backend/categories.cpp \
101 backend/stringutil.cpp \ 101 backend/stringutil.cpp \
102 backend/palmtoprecord.cpp \ 102 backend/palmtoprecord.cpp \
103 backend/task.cpp \ 103 backend/task.cpp \
104 backend/event.cpp \ 104 backend/event.cpp \
105 backend/contact.cpp \ 105 backend/contact.cpp \
106 categorymenu.cpp \ 106 categorymenu.cpp \
107 categoryedit_p.cpp \ 107 categoryedit_p.cpp \
108 categoryselect.cpp \ 108 categoryselect.cpp \
109 categorywidget.cpp \ 109 categorywidget.cpp \
110 ir.cpp \ 110 ir.cpp \
111 backend/vcc_yacc.cpp \ 111 backend/vcc_yacc.cpp \
112 backend/vobject.cpp \ 112 backend/vobject.cpp \
113 findwidget_p.cpp \ 113 findwidget_p.cpp \
114 finddialog.cpp \ 114 finddialog.cpp \
115 lnkproperties.cpp 115 lnkproperties.cpp
116 116
117# Qt 3 compatibility 117# Qt 3 compatibility
118qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h 118qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h
119qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \ 119qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \
120 qprocess_unix.cpp 120 qprocess_unix.cpp
121 121
122INCLUDEPATH += $(QPEDIR)/include backend 122INCLUDEPATH += $(OPIEDIR)/include backend
123 LIBS += -ldl -lcrypt -lm 123 LIBS += -ldl -lcrypt -lm
124 124
125INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui 125INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
126 126
127 TARGET = qpe 127 TARGET = qpe
128 DESTDIR = $(QTDIR)/lib$(PROJMAK) 128 DESTDIR = $(QTDIR)/lib$(PROJMAK)
129# This is set by configure$(QPEDIR). 129# This is set by configure$(OPIEDIR).
130 VERSION = 1.5.0 130 VERSION = 1.5.0
131 131
132TRANSLATIONS = ../i18n/de/libqpe.ts 132TRANSLATIONS = ../i18n/de/libqpe.ts
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index f0a68cf..70ffec1 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -25,1541 +25,1541 @@
25#ifdef Q_WS_QWS 25#ifdef Q_WS_QWS
26#ifndef QT_NO_COP 26#ifndef QT_NO_COP
27#if QT_VERSION <= 231 27#if QT_VERSION <= 231
28#define private public 28#define private public
29#define sendLocally processEvent 29#define sendLocally processEvent
30#include "qcopenvelope_qws.h" 30#include "qcopenvelope_qws.h"
31#undef private 31#undef private
32#else 32#else
33#include "qcopenvelope_qws.h" 33#include "qcopenvelope_qws.h"
34#endif 34#endif
35#endif 35#endif
36#include <qwindowsystem_qws.h> 36#include <qwindowsystem_qws.h>
37#endif 37#endif
38#include <qtextstream.h> 38#include <qtextstream.h>
39#include <qpalette.h> 39#include <qpalette.h>
40#include <qbuffer.h> 40#include <qbuffer.h>
41#include <qptrdict.h> 41#include <qptrdict.h>
42#include <qregexp.h> 42#include <qregexp.h>
43#include <qdir.h> 43#include <qdir.h>
44#include <qlabel.h> 44#include <qlabel.h>
45#include <qdialog.h> 45#include <qdialog.h>
46#include <qdragobject.h> 46#include <qdragobject.h>
47#include <qevent.h> 47#include <qevent.h>
48#include <qtooltip.h> 48#include <qtooltip.h>
49#include <qsignal.h> 49#include <qsignal.h>
50#include "qpeapplication.h" 50#include "qpeapplication.h"
51#include "qpestyle.h" 51#include "qpestyle.h"
52#if QT_VERSION >= 300 52#if QT_VERSION >= 300
53#include <qstylefactory.h> 53#include <qstylefactory.h>
54#else 54#else
55#include <qplatinumstyle.h> 55#include <qplatinumstyle.h>
56#include <qwindowsstyle.h> 56#include <qwindowsstyle.h>
57#include <qmotifstyle.h> 57#include <qmotifstyle.h>
58#include <qmotifplusstyle.h> 58#include <qmotifplusstyle.h>
59#include "lightstyle.h" 59#include "lightstyle.h"
60#endif 60#endif
61#include "global.h" 61#include "global.h"
62#include "resource.h" 62#include "resource.h"
63#if QT_VERSION <= 230 && defined(QT_NO_CODECS) 63#if QT_VERSION <= 230 && defined(QT_NO_CODECS)
64#include "qutfcodec.h" 64#include "qutfcodec.h"
65#endif 65#endif
66#include "config.h" 66#include "config.h"
67#include "network.h" 67#include "network.h"
68#include "fontmanager.h" 68#include "fontmanager.h"
69#include "power.h" 69#include "power.h"
70#include "alarmserver.h" 70#include "alarmserver.h"
71#include "applnk.h" 71#include "applnk.h"
72#include "qpemenubar.h" 72#include "qpemenubar.h"
73 73
74#include <unistd.h> 74#include <unistd.h>
75#include <sys/file.h> 75#include <sys/file.h>
76#include <sys/ioctl.h> 76#include <sys/ioctl.h>
77#include <sys/soundcard.h> 77#include <sys/soundcard.h>
78 78
79// for setBacklight() 79// for setBacklight()
80#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) 80#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
81#include <linux/fb.h> 81#include <linux/fb.h>
82#include <sys/types.h> 82#include <sys/types.h>
83#include <sys/stat.h> 83#include <sys/stat.h>
84#endif 84#endif
85#include <stdlib.h> 85#include <stdlib.h>
86 86
87 87
88class QPEApplicationData { 88class QPEApplicationData {
89public: 89public:
90 QPEApplicationData() : presstimer(0), presswidget(0), rightpressed(FALSE), 90 QPEApplicationData() : presstimer(0), presswidget(0), rightpressed(FALSE),
91 kbgrabber(0), kbregrab(FALSE), notbusysent(FALSE), preloaded(FALSE), 91 kbgrabber(0), kbregrab(FALSE), notbusysent(FALSE), preloaded(FALSE),
92 forceshow(FALSE), nomaximize(FALSE), qpe_main_widget(0), 92 forceshow(FALSE), nomaximize(FALSE), qpe_main_widget(0),
93 keep_running(TRUE) 93 keep_running(TRUE)
94 { 94 {
95 qcopq.setAutoDelete(TRUE); 95 qcopq.setAutoDelete(TRUE);
96 } 96 }
97 97
98 int presstimer; 98 int presstimer;
99 QWidget* presswidget; 99 QWidget* presswidget;
100 QPoint presspos; 100 QPoint presspos;
101 bool rightpressed; 101 bool rightpressed;
102 int kbgrabber; 102 int kbgrabber;
103 bool kbregrab; 103 bool kbregrab;
104 bool notbusysent; 104 bool notbusysent;
105 QString appName; 105 QString appName;
106 struct QCopRec { 106 struct QCopRec {
107 QCopRec(const QCString &ch, const QCString &msg, 107 QCopRec(const QCString &ch, const QCString &msg,
108 const QByteArray &d) : 108 const QByteArray &d) :
109 channel(ch), message(msg), data(d) { } 109 channel(ch), message(msg), data(d) { }
110 110
111 QCString channel; 111 QCString channel;
112 QCString message; 112 QCString message;
113 QByteArray data; 113 QByteArray data;
114 }; 114 };
115 bool preloaded; 115 bool preloaded;
116 bool forceshow; 116 bool forceshow;
117 bool nomaximize; 117 bool nomaximize;
118 QWidget* qpe_main_widget; 118 QWidget* qpe_main_widget;
119 bool keep_running; 119 bool keep_running;
120 QList<QCopRec> qcopq; 120 QList<QCopRec> qcopq;
121 121
122 void enqueueQCop(const QCString &ch, const QCString &msg, 122 void enqueueQCop(const QCString &ch, const QCString &msg,
123 const QByteArray &data) 123 const QByteArray &data)
124 { 124 {
125 qcopq.append(new QCopRec(ch,msg,data)); 125 qcopq.append(new QCopRec(ch,msg,data));
126 } 126 }
127 void sendQCopQ() 127 void sendQCopQ()
128 { 128 {
129 QCopRec* r; 129 QCopRec* r;
130 for (QListIterator<QCopRec> it(qcopq); (r=it.current()); ++it) 130 for (QListIterator<QCopRec> it(qcopq); (r=it.current()); ++it)
131 QCopChannel::sendLocally(r->channel,r->message,r->data); 131 QCopChannel::sendLocally(r->channel,r->message,r->data);
132 qcopq.clear(); 132 qcopq.clear();
133 } 133 }
134}; 134};
135 135
136class ResourceMimeFactory : public QMimeSourceFactory { 136class ResourceMimeFactory : public QMimeSourceFactory {
137public: 137public:
138 ResourceMimeFactory() 138 ResourceMimeFactory()
139 { 139 {
140 QStringList path; 140 QStringList path;
141 QString lang = getenv("LANG"); 141 QString lang = getenv("LANG");
142 if ( !lang.isEmpty() ) 142 if ( !lang.isEmpty() )
143 path += QPEApplication::qpeDir() + "/help/" + lang + "/html"; 143 path += QPEApplication::qpeDir() + "/help/" + lang + "/html";
144 path += QPEApplication::qpeDir() + "/pics"; 144 path += QPEApplication::qpeDir() + "/pics";
145 path += QPEApplication::qpeDir() + "/help/en/html"; 145 path += QPEApplication::qpeDir() + "/help/en/html";
146 path += QPEApplication::qpeDir() + "/docs"; 146 path += QPEApplication::qpeDir() + "/docs";
147 QString dir = QDir::current().canonicalPath(); 147 QString dir = QDir::current().canonicalPath();
148 if ( dir == "/" ) 148 if ( dir == "/" )
149 dir += "/docs"; 149 dir += "/docs";
150 else { 150 else {
151 path += dir + "/../pics"; 151 path += dir + "/../pics";
152 dir += "/../docs"; 152 dir += "/../docs";
153 path += dir; 153 path += dir;
154 } 154 }
155 setFilePath( path ); 155 setFilePath( path );
156 setExtensionType("html","text/html;charset=UTF-8"); 156 setExtensionType("html","text/html;charset=UTF-8");
157 } 157 }
158 158
159 const QMimeSource* data(const QString& abs_name) const 159 const QMimeSource* data(const QString& abs_name) const
160 { 160 {
161 const QMimeSource* r = QMimeSourceFactory::data(abs_name); 161 const QMimeSource* r = QMimeSourceFactory::data(abs_name);
162 if ( !r ) { 162 if ( !r ) {
163 int sl = abs_name.length(); 163 int sl = abs_name.length();
164 do { 164 do {
165 sl = abs_name.findRev('/',sl-1); 165 sl = abs_name.findRev('/',sl-1);
166 QString name = sl>=0 ? abs_name.mid(sl+1) : abs_name; 166 QString name = sl>=0 ? abs_name.mid(sl+1) : abs_name;
167 int dot = name.findRev('.'); 167 int dot = name.findRev('.');
168 if ( dot >= 0 ) 168 if ( dot >= 0 )
169 name = name.left(dot); 169 name = name.left(dot);
170 QImage img = Resource::loadImage(name); 170 QImage img = Resource::loadImage(name);
171 if ( !img.isNull() ) 171 if ( !img.isNull() )
172 r = new QImageDrag(img); 172 r = new QImageDrag(img);
173 } while (!r && sl>0); 173 } while (!r && sl>0);
174 } 174 }
175 return r; 175 return r;
176 } 176 }
177}; 177};
178 178
179static int muted=0; 179static int muted=0;
180 180
181static void setVolume(int t=0, int percent=-1) 181static void setVolume(int t=0, int percent=-1)
182{ 182{
183 switch (t) { 183 switch (t) {
184 case 0: { 184 case 0: {
185 Config cfg("Sound"); 185 Config cfg("Sound");
186 cfg.setGroup("System"); 186 cfg.setGroup("System");
187 if ( percent < 0 ) 187 if ( percent < 0 )
188 percent = cfg.readNumEntry("Volume",50); 188 percent = cfg.readNumEntry("Volume",50);
189 int fd = 0; 189 int fd = 0;
190 if ((fd = open("/dev/mixer", O_RDWR))>=0) { 190 if ((fd = open("/dev/mixer", O_RDWR))>=0) {
191 int vol = muted ? 0 : percent; 191 int vol = muted ? 0 : percent;
192 // set both channels to same volume 192 // set both channels to same volume
193 vol |= vol << 8; 193 vol |= vol << 8;
194 ioctl(fd, MIXER_WRITE(0), &vol); 194 ioctl(fd, MIXER_WRITE(0), &vol);
195 ::close(fd); 195 ::close(fd);
196 } 196 }
197 } break; 197 } break;
198 } 198 }
199} 199}
200 200
201int qpe_sysBrightnessSteps() 201int qpe_sysBrightnessSteps()
202{ 202{
203#if defined(QT_QWS_IPAQ) 203#if defined(QT_QWS_IPAQ)
204 return 255; 204 return 255;
205#elif defined(QT_QWS_EBX) 205#elif defined(QT_QWS_EBX)
206 return 4; 206 return 4;
207#else 207#else
208 return 255; // ? 208 return 255; // ?
209#endif 209#endif
210} 210}
211 211
212 212
213static int& hack(int& i) 213static int& hack(int& i)
214{ 214{
215#if QT_VERSION <= 230 && defined(QT_NO_CODECS) 215#if QT_VERSION <= 230 && defined(QT_NO_CODECS)
216 // These should be created, but aren't in Qt 2.3.0 216 // These should be created, but aren't in Qt 2.3.0
217 (void)new QUtf8Codec; 217 (void)new QUtf8Codec;
218 (void)new QUtf16Codec; 218 (void)new QUtf16Codec;
219#endif 219#endif
220 return i; 220 return i;
221} 221}
222 222
223static bool forced_off = FALSE; 223static bool forced_off = FALSE;
224static int curbl=-1; 224static int curbl=-1;
225 225
226static int backlight() 226static int backlight()
227{ 227{
228 if ( curbl == -1 ) { 228 if ( curbl == -1 ) {
229 // Read from config 229 // Read from config
230 Config config( "qpe" ); 230 Config config( "qpe" );
231 config.setGroup( "Screensaver" ); 231 config.setGroup( "Screensaver" );
232 curbl = config.readNumEntry("Brightness",255); 232 curbl = config.readNumEntry("Brightness",255);
233 } 233 }
234 return curbl; 234 return curbl;
235} 235}
236 236
237static void setBacklight(int bright) 237static void setBacklight(int bright)
238{ 238{
239 if ( bright == -3 ) { 239 if ( bright == -3 ) {
240 // Forced on 240 // Forced on
241 forced_off = FALSE; 241 forced_off = FALSE;
242 bright = -1; 242 bright = -1;
243 } 243 }
244 if ( forced_off && bright != -2 ) 244 if ( forced_off && bright != -2 )
245 return; 245 return;
246 if ( bright == -2 ) { 246 if ( bright == -2 ) {
247 // Toggle between off and on 247 // Toggle between off and on
248 bright = curbl ? 0 : -1; 248 bright = curbl ? 0 : -1;
249 forced_off = !bright; 249 forced_off = !bright;
250 } 250 }
251 if ( bright == -1 ) { 251 if ( bright == -1 ) {
252 // Read from config 252 // Read from config
253 Config config( "qpe" ); 253 Config config( "qpe" );
254 config.setGroup( "Screensaver" ); 254 config.setGroup( "Screensaver" );
255 bright = config.readNumEntry("Brightness",255); 255 bright = config.readNumEntry("Brightness",255);
256 } 256 }
257#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) 257#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
258 if ( QFile::exists("/usr/bin/bl") ) { 258 if ( QFile::exists("/usr/bin/bl") ) {
259 QString cmd = "/usr/bin/bl 1 "; 259 QString cmd = "/usr/bin/bl 1 ";
260 cmd += bright<=0 ? "0 " : "1 "; 260 cmd += bright<=0 ? "0 " : "1 ";
261 cmd += QString::number(bright); 261 cmd += QString::number(bright);
262 system(cmd.latin1()); 262 system(cmd.latin1());
263#if defined(QT_QWS_EBX) 263#if defined(QT_QWS_EBX)
264 } else if ( QFile::exists("/dev/fl") ) { 264 } else if ( QFile::exists("/dev/fl") ) {
265#define FL_IOCTL_STEP_CONTRAST 100 265#define FL_IOCTL_STEP_CONTRAST 100
266 int fd = open("/dev/fl", O_WRONLY); 266 int fd = open("/dev/fl", O_WRONLY);
267 if (fd >= 0 ) { 267 if (fd >= 0 ) {
268 int steps = qpe_sysBrightnessSteps(); 268 int steps = qpe_sysBrightnessSteps();
269 int bl = ( bright * steps + 127 ) / 255; 269 int bl = ( bright * steps + 127 ) / 255;
270 if ( bright && !bl ) bl = 1; 270 if ( bright && !bl ) bl = 1;
271 bl = ioctl(fd, FL_IOCTL_STEP_CONTRAST, bl); 271 bl = ioctl(fd, FL_IOCTL_STEP_CONTRAST, bl);
272 close(fd); 272 close(fd);
273 } 273 }
274 } 274 }
275#elif defined(QT_QWS_IPAQ) 275#elif defined(QT_QWS_IPAQ)
276 } else if ( QFile::exists("/dev/ts") || QFile::exists("/dev/h3600_ts") ) { 276 } else if ( QFile::exists("/dev/ts") || QFile::exists("/dev/h3600_ts") ) {
277 typedef struct { 277 typedef struct {
278 unsigned char mode; 278 unsigned char mode;
279 unsigned char pwr; 279 unsigned char pwr;
280 unsigned char brightness; 280 unsigned char brightness;
281 } FLITE_IN; 281 } FLITE_IN;
282# ifndef FLITE_ON 282# ifndef FLITE_ON
283# ifndef _LINUX_IOCTL_H 283# ifndef _LINUX_IOCTL_H
284# include <linux/ioctl.h> 284# include <linux/ioctl.h>
285# endif 285# endif
286# define FLITE_ON _IOW('f', 7, FLITE_IN) 286# define FLITE_ON _IOW('f', 7, FLITE_IN)
287# endif 287# endif
288 int fd; 288 int fd;
289 if ( QFile::exists("/dev/ts") ) 289 if ( QFile::exists("/dev/ts") )
290 fd = open("/dev/ts", O_WRONLY); 290 fd = open("/dev/ts", O_WRONLY);
291 else 291 else
292 fd = open("/dev/h3600_ts", O_WRONLY); 292 fd = open("/dev/h3600_ts", O_WRONLY);
293 if (fd >= 0 ) { 293 if (fd >= 0 ) {
294 FLITE_IN bl; 294 FLITE_IN bl;
295 bl.mode = 1; 295 bl.mode = 1;
296 bl.pwr = bright ? 1 : 0; 296 bl.pwr = bright ? 1 : 0;
297 bl.brightness = bright; 297 bl.brightness = bright;
298 ioctl(fd, FLITE_ON, &bl); 298 ioctl(fd, FLITE_ON, &bl);
299 close(fd); 299 close(fd);
300 } 300 }
301 } 301 }
302#endif 302#endif
303#endif 303#endif
304 curbl = bright; 304 curbl = bright;
305} 305}
306 306
307void qpe_setBacklight(int bright) { setBacklight(bright); } 307void qpe_setBacklight(int bright) { setBacklight(bright); }
308 308
309static bool dim_on = FALSE; 309static bool dim_on = FALSE;
310static bool lightoff_on = FALSE; 310static bool lightoff_on = FALSE;
311static int disable_suspend = 100; 311static int disable_suspend = 100;
312 312
313static bool powerOnline() 313static bool powerOnline()
314{ 314{
315 return PowerStatusManager::readStatus().acStatus() == PowerStatus::Online; 315 return PowerStatusManager::readStatus().acStatus() == PowerStatus::Online;
316} 316}
317 317
318static bool networkOnline() 318static bool networkOnline()
319{ 319{
320 return Network::networkOnline(); 320 return Network::networkOnline();
321} 321}
322 322
323class QPEScreenSaver : public QWSScreenSaver 323class QPEScreenSaver : public QWSScreenSaver
324{ 324{
325 325
326public: 326public:
327 QPEScreenSaver() 327 QPEScreenSaver()
328 { 328 {
329 } 329 }
330 void restore() 330 void restore()
331 { 331 {
332 setBacklight(-1); 332 setBacklight(-1);
333 } 333 }
334 bool save(int level) 334 bool save(int level)
335 { 335 {
336 switch ( level ) { 336 switch ( level ) {
337 case 0: 337 case 0:
338 if ( disable_suspend > 0 && dim_on ) { 338 if ( disable_suspend > 0 && dim_on ) {
339 if (backlight() > 1) 339 if (backlight() > 1)
340 setBacklight(1); // lowest non-off 340 setBacklight(1); // lowest non-off
341 } 341 }
342 return TRUE; 342 return TRUE;
343 break; 343 break;
344 case 1: 344 case 1:
345 if ( disable_suspend > 1 && lightoff_on ) { 345 if ( disable_suspend > 1 && lightoff_on ) {
346 setBacklight(0); // off 346 setBacklight(0); // off
347 } 347 }
348 return TRUE; 348 return TRUE;
349 break; 349 break;
350 case 2: 350 case 2:
351 if ( disable_suspend > 2 && !powerOnline() && !networkOnline() ) { 351 if ( disable_suspend > 2 && !powerOnline() && !networkOnline() ) {
352 QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE ); 352 QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );
353 return TRUE; 353 return TRUE;
354 } 354 }
355 break; 355 break;
356 } 356 }
357 return FALSE; 357 return FALSE;
358 } 358 }
359}; 359};
360 360
361static int ssi(int interval, Config &config, const QString &enable, const QString& value, int def) 361static int ssi(int interval, Config &config, const QString &enable, const QString& value, int def)
362{ 362{
363 if ( !enable.isEmpty() && config.readNumEntry(enable,0) == 0 ) 363 if ( !enable.isEmpty() && config.readNumEntry(enable,0) == 0 )
364 return 0; 364 return 0;
365 365
366 if ( interval < 0 ) { 366 if ( interval < 0 ) {
367 // Restore screen blanking and power saving state 367 // Restore screen blanking and power saving state
368 interval = config.readNumEntry( value, def ); 368 interval = config.readNumEntry( value, def );
369 } 369 }
370 return interval; 370 return interval;
371} 371}
372 372
373static void setScreenSaverIntervals(int i1, int i2, int i3) 373static void setScreenSaverIntervals(int i1, int i2, int i3)
374{ 374{
375 Config config( "qpe" ); 375 Config config( "qpe" );
376 config.setGroup( "Screensaver" ); 376 config.setGroup( "Screensaver" );
377 377
378 int v[4]; 378 int v[4];
379 i1 = ssi(i1, config, "Dim","Interval_Dim", 30); 379 i1 = ssi(i1, config, "Dim","Interval_Dim", 30);
380 i2 = ssi(i2, config, "LightOff","Interval_LightOff", 20); 380 i2 = ssi(i2, config, "LightOff","Interval_LightOff", 20);
381 i3 = ssi(i3, config, "","Interval", 60); 381 i3 = ssi(i3, config, "","Interval", 60);
382 382
383 //qDebug("screen saver intervals: %d %d %d", i1, i2, i3); 383 //qDebug("screen saver intervals: %d %d %d", i1, i2, i3);
384 384
385 v[0] = QMAX( 1000*i1, 100); 385 v[0] = QMAX( 1000*i1, 100);
386 v[1] = QMAX( 1000*i2, 100); 386 v[1] = QMAX( 1000*i2, 100);
387 v[2] = QMAX( 1000*i3, 100); 387 v[2] = QMAX( 1000*i3, 100);
388 v[3] = 0; 388 v[3] = 0;
389 dim_on = ( (i1 != 0) ? config.readNumEntry("Dim",1) : FALSE ); 389 dim_on = ( (i1 != 0) ? config.readNumEntry("Dim",1) : FALSE );
390 lightoff_on = ( (i2 != 0 ) ? config.readNumEntry("LightOff",1) : FALSE ); 390 lightoff_on = ( (i2 != 0 ) ? config.readNumEntry("LightOff",1) : FALSE );
391 if ( !i1 && !i2 && !i3 ) 391 if ( !i1 && !i2 && !i3 )
392 QWSServer::setScreenSaverInterval(0); 392 QWSServer::setScreenSaverInterval(0);
393 else 393 else
394 QWSServer::setScreenSaverIntervals(v); 394 QWSServer::setScreenSaverIntervals(v);
395} 395}
396 396
397static void setScreenSaverInterval(int interval) 397static void setScreenSaverInterval(int interval)
398{ 398{
399 setScreenSaverIntervals(-1,-1,interval); 399 setScreenSaverIntervals(-1,-1,interval);
400} 400}
401 401
402 402
403/*! 403/*!
404 \class QPEApplication qpeapplication.h 404 \class QPEApplication qpeapplication.h
405 \brief The QPEApplication class implements various system services 405 \brief The QPEApplication class implements various system services
406 that are available to all Qtopia applications. 406 that are available to all Qtopia applications.
407 407
408 Simply by using QPEApplication instead of QApplication, a plain Qt 408 Simply by using QPEApplication instead of QApplication, a plain Qt
409 application becomes a Qtopia application. It automatically follows 409 application becomes a Qtopia application. It automatically follows
410 style changes, quits and raises, and in the 410 style changes, quits and raises, and in the
411 case of \link docwidget.html document-oriented\endlink applications, 411 case of \link docwidget.html document-oriented\endlink applications,
412 changes the current displayed document in response to the environment. 412 changes the current displayed document in response to the environment.
413*/ 413*/
414 414
415/*! 415/*!
416 \fn void QPEApplication::clientMoused() 416 \fn void QPEApplication::clientMoused()
417 417
418 \internal 418 \internal
419*/ 419*/
420 420
421/*! 421/*!
422 \fn void QPEApplication::timeChanged(); 422 \fn void QPEApplication::timeChanged();
423 423
424 This signal is emitted when the time jumps forward or backwards 424 This signal is emitted when the time jumps forward or backwards
425 by more than the normal passage of time. 425 by more than the normal passage of time.
426*/ 426*/
427 427
428/*! 428/*!
429 \fn void QPEApplication::clockChanged( bool ampm ); 429 \fn void QPEApplication::clockChanged( bool ampm );
430 430
431 This signal is emitted when the user changes the style 431 This signal is emitted when the user changes the style
432 of clock. If \a ampm is TRUE, the user wants a 12-hour 432 of clock. If \a ampm is TRUE, the user wants a 12-hour
433 AM/PM close, otherwise, they want a 24-hour clock. 433 AM/PM close, otherwise, they want a 24-hour clock.
434*/ 434*/
435 435
436/*! 436/*!
437 \fn void QPEApplication::appMessage( const QCString& msg, const QByteArray& data ) 437 \fn void QPEApplication::appMessage( const QCString& msg, const QByteArray& data )
438 438
439 This signal is emitted when a message is received on the 439 This signal is emitted when a message is received on the
440 QPE/Application/<i>appname</i> QCop channel for this application. 440 QPE/Application/<i>appname</i> QCop channel for this application.
441 441
442 The slot to which you connect this signal uses \a msg and \a data 442 The slot to which you connect this signal uses \a msg and \a data
443 in the following way: 443 in the following way:
444 444
445\code 445\code
446 void MyWidget::receive( const QCString& msg, const QByteArray& data ) 446 void MyWidget::receive( const QCString& msg, const QByteArray& data )
447 { 447 {
448 QDataStream stream( data, IO_ReadOnly ); 448 QDataStream stream( data, IO_ReadOnly );
449 if ( msg == "someMessage(int,int,int)" ) { 449 if ( msg == "someMessage(int,int,int)" ) {
450 int a,b,c; 450 int a,b,c;
451 stream >> a >> b >> c; 451 stream >> a >> b >> c;
452 ... 452 ...
453 } else if ( msg == "otherMessage(QString)" ) { 453 } else if ( msg == "otherMessage(QString)" ) {
454 ... 454 ...
455 } 455 }
456 } 456 }
457\endcode 457\endcode
458 458
459 \sa qcop.html 459 \sa qcop.html
460*/ 460*/
461 461
462/*! 462/*!
463 Constructs a QPEApplication just as you would construct 463 Constructs a QPEApplication just as you would construct
464 a QApplication, passing \a argc, \a argv, and \a t. 464 a QApplication, passing \a argc, \a argv, and \a t.
465*/ 465*/
466QPEApplication::QPEApplication( int& argc, char **argv, Type t ) 466QPEApplication::QPEApplication( int& argc, char **argv, Type t )
467 : QApplication( hack(argc), argv, t ) 467 : QApplication( hack(argc), argv, t )
468{ 468{
469 int dw = desktop()->width(); 469 int dw = desktop()->width();
470 if ( dw < 200 ) { 470 if ( dw < 200 ) {
471 setFont( QFont( "helvetica", 8 ) ); 471 setFont( QFont( "helvetica", 8 ) );
472 AppLnk::setSmallIconSize(10); 472 AppLnk::setSmallIconSize(10);
473 AppLnk::setBigIconSize(28); 473 AppLnk::setBigIconSize(28);
474 } 474 }
475 475
476 d = new QPEApplicationData; 476 d = new QPEApplicationData;
477 QMimeSourceFactory::setDefaultFactory(new ResourceMimeFactory); 477 QMimeSourceFactory::setDefaultFactory(new ResourceMimeFactory);
478 478
479 connect(this, SIGNAL(lastWindowClosed()), this, SLOT(hideOrQuit())); 479 connect(this, SIGNAL(lastWindowClosed()), this, SLOT(hideOrQuit()));
480#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 480#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
481 481
482 QString qcopfn("/tmp/qcop-msg-"); 482 QString qcopfn("/tmp/qcop-msg-");
483 qcopfn += QString(argv[0]); // append command name 483 qcopfn += QString(argv[0]); // append command name
484 484
485 QFile f(qcopfn); 485 QFile f(qcopfn);
486 if ( f.open(IO_ReadOnly) ) { 486 if ( f.open(IO_ReadOnly) ) {
487 flock(f.handle(), LOCK_EX); 487 flock(f.handle(), LOCK_EX);
488 } 488 }
489 489
490 sysChannel = new QCopChannel( "QPE/System", this ); 490 sysChannel = new QCopChannel( "QPE/System", this );
491 connect( sysChannel, SIGNAL(received(const QCString &, const QByteArray &)), 491 connect( sysChannel, SIGNAL(received(const QCString &, const QByteArray &)),
492 this, SLOT(systemMessage( const QCString &, const QByteArray &)) ); 492 this, SLOT(systemMessage( const QCString &, const QByteArray &)) );
493 493
494 QCString channel = QCString(argv[0]); 494 QCString channel = QCString(argv[0]);
495 channel.replace(QRegExp(".*/"),""); 495 channel.replace(QRegExp(".*/"),"");
496 d->appName = channel; 496 d->appName = channel;
497 channel = "QPE/Application/" + channel; 497 channel = "QPE/Application/" + channel;
498 pidChannel = new QCopChannel( channel, this); 498 pidChannel = new QCopChannel( channel, this);
499 connect( pidChannel, SIGNAL(received(const QCString &, const QByteArray &)), 499 connect( pidChannel, SIGNAL(received(const QCString &, const QByteArray &)),
500 this, SLOT(pidMessage(const QCString &, const QByteArray &))); 500 this, SLOT(pidMessage(const QCString &, const QByteArray &)));
501 501
502 if ( f.isOpen() ) { 502 if ( f.isOpen() ) {
503 d->keep_running = FALSE; 503 d->keep_running = FALSE;
504 QDataStream ds(&f); 504 QDataStream ds(&f);
505 QCString channel, message; 505 QCString channel, message;
506 QByteArray data; 506 QByteArray data;
507 while(!ds.atEnd()) { 507 while(!ds.atEnd()) {
508 ds >> channel >> message >> data; 508 ds >> channel >> message >> data;
509 d->enqueueQCop(channel,message,data); 509 d->enqueueQCop(channel,message,data);
510 } 510 }
511 511
512 flock(f.handle(), LOCK_UN); 512 flock(f.handle(), LOCK_UN);
513 f.close(); 513 f.close();
514 f.remove(); 514 f.remove();
515 } 515 }
516 516
517 for (int a=0; a<argc; a++) { 517 for (int a=0; a<argc; a++) {
518 if ( qstrcmp(argv[a],"-preload")==0 ) { 518 if ( qstrcmp(argv[a],"-preload")==0 ) {
519 argv[a] = argv[a+1]; 519 argv[a] = argv[a+1];
520 a++; 520 a++;
521 d->preloaded = TRUE; 521 d->preloaded = TRUE;
522 argc-=1; 522 argc-=1;
523 } else if ( qstrcmp(argv[a],"-preload-show")==0 ) { 523 } else if ( qstrcmp(argv[a],"-preload-show")==0 ) {
524 argv[a] = argv[a+1]; 524 argv[a] = argv[a+1];
525 a++; 525 a++;
526 d->preloaded = TRUE; 526 d->preloaded = TRUE;
527 d->forceshow = TRUE; 527 d->forceshow = TRUE;
528 argc-=1; 528 argc-=1;
529 } 529 }
530 } 530 }
531 531
532 /* overide stored arguments */ 532 /* overide stored arguments */
533 setArgs(argc, argv); 533 setArgs(argc, argv);
534 534
535#endif 535#endif
536 536
537 qwsSetDecoration( new QPEDecoration() ); 537 qwsSetDecoration( new QPEDecoration() );
538 538
539#ifndef QT_NO_TRANSLATION 539#ifndef QT_NO_TRANSLATION
540 char *l = getenv( "LANG" ); 540 char *l = getenv( "LANG" );
541 QString lang; 541 QString lang;
542 if ( l ) { 542 if ( l ) {
543 lang = l; 543 lang = l;
544 544
545 /* 545 /*
546 Config config("qpe"); 546 Config config("qpe");
547 config.setGroup( "Appearance" ); 547 config.setGroup( "Appearance" );
548 lang = config.readEntry( "Language", lang ); 548 lang = config.readEntry( "Language", lang );
549 */ 549 */
550 550
551 QTranslator * trans = new QTranslator(this); 551 QTranslator * trans = new QTranslator(this);
552 QString tfn = qpeDir()+"/i18n/"+lang+"/"+d->appName+".qm"; 552 QString tfn = qpeDir()+"/i18n/"+lang+"/"+d->appName+".qm";
553 if ( trans->load( tfn )) 553 if ( trans->load( tfn ))
554 installTranslator( trans ); 554 installTranslator( trans );
555 else 555 else
556 delete trans; 556 delete trans;
557 557
558 trans = new QTranslator(this); 558 trans = new QTranslator(this);
559 tfn = qpeDir()+"/i18n/"+lang+"/libqpe.qm"; 559 tfn = qpeDir()+"/i18n/"+lang+"/libqpe.qm";
560 if ( trans->load( tfn )) 560 if ( trans->load( tfn ))
561 installTranslator( trans ); 561 installTranslator( trans );
562 else 562 else
563 delete trans; 563 delete trans;
564 564
565 //###language/font hack; should look it up somewhere 565 //###language/font hack; should look it up somewhere
566 if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) { 566 if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) {
567 QFont fn = FontManager::unicodeFont( FontManager::Proportional ); 567 QFont fn = FontManager::unicodeFont( FontManager::Proportional );
568 setFont( fn ); 568 setFont( fn );
569 } 569 }
570 } 570 }
571#endif 571#endif
572 572
573 applyStyle(); 573 applyStyle();
574 574
575 if ( type() == GuiServer ) { 575 if ( type() == GuiServer ) {
576 setScreenSaverInterval(-1); 576 setScreenSaverInterval(-1);
577 setVolume(); 577 setVolume();
578 QWSServer::setScreenSaver(new QPEScreenSaver); 578 QWSServer::setScreenSaver(new QPEScreenSaver);
579 } 579 }
580 580
581 installEventFilter( this ); 581 installEventFilter( this );
582 582
583 QPEMenuToolFocusManager::initialize(); 583 QPEMenuToolFocusManager::initialize();
584 584
585#ifdef QT_NO_QWS_CURSOR 585#ifdef QT_NO_QWS_CURSOR
586 // if we have no cursor, probably don't want tooltips 586 // if we have no cursor, probably don't want tooltips
587 QToolTip::setEnabled( FALSE ); 587 QToolTip::setEnabled( FALSE );
588#endif 588#endif
589} 589}
590 590
591static QPtrDict<void>* inputMethodDict=0; 591static QPtrDict<void>* inputMethodDict=0;
592static void createInputMethodDict() 592static void createInputMethodDict()
593{ 593{
594 if ( !inputMethodDict ) 594 if ( !inputMethodDict )
595 inputMethodDict = new QPtrDict<void>; 595 inputMethodDict = new QPtrDict<void>;
596} 596}
597 597
598/*! 598/*!
599 Returns the currently set hint to the system as to whether 599 Returns the currently set hint to the system as to whether
600 \a w has any use for text input methods. 600 \a w has any use for text input methods.
601 601
602 \sa setInputMethodHint() 602 \sa setInputMethodHint()
603*/ 603*/
604QPEApplication::InputMethodHint QPEApplication::inputMethodHint( QWidget* w ) 604QPEApplication::InputMethodHint QPEApplication::inputMethodHint( QWidget* w )
605{ 605{
606 if ( inputMethodDict && w ) 606 if ( inputMethodDict && w )
607 return (InputMethodHint)(int)inputMethodDict->find(w); 607 return (InputMethodHint)(int)inputMethodDict->find(w);
608 return Normal; 608 return Normal;
609} 609}
610 610
611/*! 611/*!
612 \enum QPEApplication::InputMethodHint 612 \enum QPEApplication::InputMethodHint
613 613
614 \value Normal the application sometimes needs text input (the default). 614 \value Normal the application sometimes needs text input (the default).
615 \value AlwaysOff the application never needs text input. 615 \value AlwaysOff the application never needs text input.
616 \value AlwaysOn the application always needs text input. 616 \value AlwaysOn the application always needs text input.
617*/ 617*/
618 618
619/*! 619/*!
620 Hints to the system that \a w has use for text input methods 620 Hints to the system that \a w has use for text input methods
621 as specified by \a mode. 621 as specified by \a mode.
622 622
623 \sa inputMethodHint() 623 \sa inputMethodHint()
624*/ 624*/
625void QPEApplication::setInputMethodHint( QWidget* w, InputMethodHint mode ) 625void QPEApplication::setInputMethodHint( QWidget* w, InputMethodHint mode )
626{ 626{
627 createInputMethodDict(); 627 createInputMethodDict();
628 if ( mode == Normal ) { 628 if ( mode == Normal ) {
629 inputMethodDict->remove(w); 629 inputMethodDict->remove(w);
630 } else { 630 } else {
631 inputMethodDict->insert(w,(void*)mode); 631 inputMethodDict->insert(w,(void*)mode);
632 } 632 }
633} 633}
634 634
635class HackDialog : public QDialog 635class HackDialog : public QDialog
636{ 636{
637public: 637public:
638 void acceptIt() { accept(); } 638 void acceptIt() { accept(); }
639 void rejectIt() { reject(); } 639 void rejectIt() { reject(); }
640}; 640};
641 641
642 642
643void QPEApplication::mapToDefaultAction( QWSKeyEvent *ke, int key ) 643void QPEApplication::mapToDefaultAction( QWSKeyEvent *ke, int key )
644{ 644{
645 // specialised actions for certain widgets. May want to 645 // specialised actions for certain widgets. May want to
646 // add more stuff here. 646 // add more stuff here.
647 if ( activePopupWidget() && activePopupWidget()->inherits( "QListBox" ) 647 if ( activePopupWidget() && activePopupWidget()->inherits( "QListBox" )
648 && activePopupWidget()->parentWidget() 648 && activePopupWidget()->parentWidget()
649 && activePopupWidget()->parentWidget()->inherits( "QComboBox" ) ) 649 && activePopupWidget()->parentWidget()->inherits( "QComboBox" ) )
650 key = Qt::Key_Return; 650 key = Qt::Key_Return;
651 651
652 if ( activePopupWidget() && activePopupWidget()->inherits( "QPopupMenu" ) ) 652 if ( activePopupWidget() && activePopupWidget()->inherits( "QPopupMenu" ) )
653 key = Qt::Key_Return; 653 key = Qt::Key_Return;
654 654
655 ke->simpleData.keycode = key; 655 ke->simpleData.keycode = key;
656} 656}
657 657
658class HackWidget : public QWidget 658class HackWidget : public QWidget
659{ 659{
660public: 660public:
661 bool needsOk() 661 bool needsOk()
662 { return (getWState() & WState_Reserved1 ); } 662 { return (getWState() & WState_Reserved1 ); }
663}; 663};
664 664
665/*! 665/*!
666 \internal 666 \internal
667*/ 667*/
668bool QPEApplication::qwsEventFilter( QWSEvent *e ) 668bool QPEApplication::qwsEventFilter( QWSEvent *e )
669{ 669{
670 if ( !d->notbusysent && e->type == QWSEvent::Focus ) { 670 if ( !d->notbusysent && e->type == QWSEvent::Focus ) {
671 if ( qApp->type() != QApplication::GuiServer ) { 671 if ( qApp->type() != QApplication::GuiServer ) {
672 QCopEnvelope e("QPE/System", "notBusy(QString)" ); 672 QCopEnvelope e("QPE/System", "notBusy(QString)" );
673 e << d->appName; 673 e << d->appName;
674 } 674 }
675 d->notbusysent=TRUE; 675 d->notbusysent=TRUE;
676 } 676 }
677 if ( type() == GuiServer ) { 677 if ( type() == GuiServer ) {
678 switch ( e->type ) { 678 switch ( e->type ) {
679 case QWSEvent::Mouse: 679 case QWSEvent::Mouse:
680 if ( e->asMouse()->simpleData.state && !QWidget::find(e->window()) ) 680 if ( e->asMouse()->simpleData.state && !QWidget::find(e->window()) )
681 emit clientMoused(); 681 emit clientMoused();
682 } 682 }
683 } 683 }
684 if ( e->type == QWSEvent::Key ) { 684 if ( e->type == QWSEvent::Key ) {
685 if ( d->kbgrabber == 1 ) 685 if ( d->kbgrabber == 1 )
686 return TRUE; 686 return TRUE;
687 QWSKeyEvent *ke = (QWSKeyEvent *)e; 687 QWSKeyEvent *ke = (QWSKeyEvent *)e;
688 if ( ke->simpleData.keycode == Qt::Key_F33 ) { 688 if ( ke->simpleData.keycode == Qt::Key_F33 ) {
689 // Use special "OK" key to press "OK" on top level widgets 689 // Use special "OK" key to press "OK" on top level widgets
690 QWidget *active = activeWindow(); 690 QWidget *active = activeWindow();
691 QWidget *popup = 0; 691 QWidget *popup = 0;
692 if ( active && active->isPopup() ) { 692 if ( active && active->isPopup() ) {
693 popup = active; 693 popup = active;
694 active = active->parentWidget(); 694 active = active->parentWidget();
695 } 695 }
696 if ( active && (int)active->winId() == ke->simpleData.window && 696 if ( active && (int)active->winId() == ke->simpleData.window &&
697 !active->testWFlags( WStyle_Customize|WType_Popup|WType_Desktop )) { 697 !active->testWFlags( WStyle_Customize|WType_Popup|WType_Desktop )) {
698 if ( ke->simpleData.is_press ) { 698 if ( ke->simpleData.is_press ) {
699 if ( popup ) 699 if ( popup )
700 popup->close(); 700 popup->close();
701 if ( active->inherits( "QDialog" ) ) { 701 if ( active->inherits( "QDialog" ) ) {
702 HackDialog *d = (HackDialog *)active; 702 HackDialog *d = (HackDialog *)active;
703 d->acceptIt(); 703 d->acceptIt();
704 return TRUE; 704 return TRUE;
705 } else if ( ((HackWidget *)active)->needsOk() ) { 705 } else if ( ((HackWidget *)active)->needsOk() ) {
706 QSignal s; 706 QSignal s;
707 s.connect( active, SLOT( accept() ) ); 707 s.connect( active, SLOT( accept() ) );
708 s.activate(); 708 s.activate();
709 } else { 709 } else {
710 // do the same as with the select key: Map to the default action of the widget: 710 // do the same as with the select key: Map to the default action of the widget:
711 mapToDefaultAction( ke, Qt::Key_Return ); 711 mapToDefaultAction( ke, Qt::Key_Return );
712 } 712 }
713 } 713 }
714 } 714 }
715 } else if ( ke->simpleData.keycode == Qt::Key_F30 ) { 715 } else if ( ke->simpleData.keycode == Qt::Key_F30 ) {
716 // Use special "select" key to do whatever default action a widget has 716 // Use special "select" key to do whatever default action a widget has
717 mapToDefaultAction( ke, Qt::Key_Space ); 717 mapToDefaultAction( ke, Qt::Key_Space );
718 } else if ( ke->simpleData.keycode == Qt::Key_Escape && 718 } else if ( ke->simpleData.keycode == Qt::Key_Escape &&
719 ke->simpleData.is_press ) { 719 ke->simpleData.is_press ) {
720 // Escape key closes app if focus on toplevel 720 // Escape key closes app if focus on toplevel
721 QWidget *active = activeWindow(); 721 QWidget *active = activeWindow();
722 if ( active && active->testWFlags( WType_TopLevel ) && 722 if ( active && active->testWFlags( WType_TopLevel ) &&
723 (int)active->winId() == ke->simpleData.window && 723 (int)active->winId() == ke->simpleData.window &&
724 !active->testWFlags( WStyle_Dialog|WStyle_Customize|WType_Popup|WType_Desktop )) { 724 !active->testWFlags( WStyle_Dialog|WStyle_Customize|WType_Popup|WType_Desktop )) {
725 if ( active->inherits( "QDialog" ) ) { 725 if ( active->inherits( "QDialog" ) ) {
726 HackDialog *d = (HackDialog *)active; 726 HackDialog *d = (HackDialog *)active;
727 d->rejectIt(); 727 d->rejectIt();
728 return TRUE; 728 return TRUE;
729 } else if ( strcmp( argv()[0], "embeddedkonsole") != 0 ) { 729 } else if ( strcmp( argv()[0], "embeddedkonsole") != 0 ) {
730 active->close(); 730 active->close();
731 } 731 }
732 } 732 }
733 } 733 }
734 734
735#if QT_VERSION < 231 735#if QT_VERSION < 231
736 // Filter out the F4/Launcher key from apps 736 // Filter out the F4/Launcher key from apps
737 // ### The launcher key may not always be F4 on all devices 737 // ### The launcher key may not always be F4 on all devices
738 if ( ((QWSKeyEvent *)e)->simpleData.keycode == Qt::Key_F4 ) 738 if ( ((QWSKeyEvent *)e)->simpleData.keycode == Qt::Key_F4 )
739 return TRUE; 739 return TRUE;
740#endif 740#endif
741 } 741 }
742 if ( e->type == QWSEvent::Focus ) { 742 if ( e->type == QWSEvent::Focus ) {
743 QWSFocusEvent *fe = (QWSFocusEvent*)e; 743 QWSFocusEvent *fe = (QWSFocusEvent*)e;
744 QWidget* nfw = QWidget::find(e->window()); 744 QWidget* nfw = QWidget::find(e->window());
745 if ( !fe->simpleData.get_focus ) { 745 if ( !fe->simpleData.get_focus ) {
746 QWidget *active = activeWindow(); 746 QWidget *active = activeWindow();
747 while ( active && active->isPopup() ) { 747 while ( active && active->isPopup() ) {
748 active->close(); 748 active->close();
749 active = activeWindow(); 749 active = activeWindow();
750 } 750 }
751 if ( !nfw && d->kbgrabber == 2 ) { 751 if ( !nfw && d->kbgrabber == 2 ) {
752 ungrabKeyboard(); 752 ungrabKeyboard();
753 d->kbregrab = TRUE; // want kb back when we're active 753 d->kbregrab = TRUE; // want kb back when we're active
754 } 754 }
755 } else { 755 } else {
756 // make sure our modal widget is ALWAYS on top 756 // make sure our modal widget is ALWAYS on top
757 QWidget *topm = activeModalWidget(); 757 QWidget *topm = activeModalWidget();
758 if ( topm ) { 758 if ( topm ) {
759 topm->raise(); 759 topm->raise();
760 } 760 }
761 if ( d->kbregrab ) { 761 if ( d->kbregrab ) {
762 grabKeyboard(); 762 grabKeyboard();
763 d->kbregrab = FALSE; 763 d->kbregrab = FALSE;
764 } 764 }
765 } 765 }
766 if ( fe->simpleData.get_focus && inputMethodDict ) { 766 if ( fe->simpleData.get_focus && inputMethodDict ) {
767 InputMethodHint m = inputMethodHint( QWidget::find(e->window()) ); 767 InputMethodHint m = inputMethodHint( QWidget::find(e->window()) );
768 if ( m == AlwaysOff ) 768 if ( m == AlwaysOff )
769 Global::hideInputMethod(); 769 Global::hideInputMethod();
770 if ( m == AlwaysOn ) 770 if ( m == AlwaysOn )
771 Global::showInputMethod(); 771 Global::showInputMethod();
772 } 772 }
773 } 773 }
774 return QApplication::qwsEventFilter( e ); 774 return QApplication::qwsEventFilter( e );
775} 775}
776 776
777/*! 777/*!
778 Destroys the QPEApplication. 778 Destroys the QPEApplication.
779*/ 779*/
780QPEApplication::~QPEApplication() 780QPEApplication::~QPEApplication()
781{ 781{
782 ungrabKeyboard(); 782 ungrabKeyboard();
783#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 783#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
784 // Need to delete QCopChannels early, since the display will 784 // Need to delete QCopChannels early, since the display will
785 // be gone by the time we get to ~QObject(). 785 // be gone by the time we get to ~QObject().
786 delete sysChannel; 786 delete sysChannel;
787 delete pidChannel; 787 delete pidChannel;
788#endif 788#endif
789 delete d; 789 delete d;
790} 790}
791 791
792/*! 792/*!
793 Returns <tt>$QPEDIR/</tt>. 793 Returns <tt>$OPIEDIR/</tt>.
794*/ 794*/
795QString QPEApplication::qpeDir() 795QString QPEApplication::qpeDir()
796{ 796{
797 const char *base = getenv( "QPEDIR" ); 797 const char *base = getenv( "OPIEDIR" );
798 if ( base ) 798 if ( base )
799 return QString( base ) + "/"; 799 return QString( base ) + "/";
800 800
801 return QString( "../" ); 801 return QString( "../" );
802} 802}
803 803
804/*! 804/*!
805 Returns the user's current Document directory. There is a trailing "/". 805 Returns the user's current Document directory. There is a trailing "/".
806*/ 806*/
807QString QPEApplication::documentDir() 807QString QPEApplication::documentDir()
808{ 808{
809 const char *base = getenv( "HOME" ); 809 const char *base = getenv( "HOME" );
810 if ( base ) 810 if ( base )
811 return QString( base ) + "/Documents/"; 811 return QString( base ) + "/Documents/";
812 812
813 return QString( "../Documents/" ); 813 return QString( "../Documents/" );
814} 814}
815 815
816static int deforient=-1; 816static int deforient=-1;
817 817
818/*! 818/*!
819 \internal 819 \internal
820*/ 820*/
821int QPEApplication::defaultRotation() 821int QPEApplication::defaultRotation()
822{ 822{
823 if ( deforient < 0 ) { 823 if ( deforient < 0 ) {
824 QString d = getenv("QWS_DISPLAY"); 824 QString d = getenv("QWS_DISPLAY");
825 if ( d.contains("Rot90") ) { 825 if ( d.contains("Rot90") ) {
826 deforient = 90; 826 deforient = 90;
827 } else if ( d.contains("Rot180") ) { 827 } else if ( d.contains("Rot180") ) {
828 deforient = 180; 828 deforient = 180;
829 } else if ( d.contains("Rot270") ) { 829 } else if ( d.contains("Rot270") ) {
830 deforient = 270; 830 deforient = 270;
831 } else { 831 } else {
832 deforient=0; 832 deforient=0;
833 } 833 }
834 } 834 }
835 return deforient; 835 return deforient;
836} 836}
837 837
838/*! 838/*!
839 \internal 839 \internal
840*/ 840*/
841void QPEApplication::setDefaultRotation(int r) 841void QPEApplication::setDefaultRotation(int r)
842{ 842{
843 if ( qApp->type() == GuiServer ) { 843 if ( qApp->type() == GuiServer ) {
844 deforient = r; 844 deforient = r;
845 setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(r).latin1(), 1); 845 setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(r).latin1(), 1);
846 } else { 846 } else {
847 QCopEnvelope("QPE/System", "setDefaultRotation(int)") << r; 847 QCopEnvelope("QPE/System", "setDefaultRotation(int)") << r;
848 } 848 }
849} 849}
850 850
851/*! 851/*!
852 \internal 852 \internal
853*/ 853*/
854void QPEApplication::applyStyle() 854void QPEApplication::applyStyle()
855{ 855{
856 Config config( "qpe" ); 856 Config config( "qpe" );
857 857
858 config.setGroup( "Appearance" ); 858 config.setGroup( "Appearance" );
859 859
860 // Widget style 860 // Widget style
861 QString style = config.readEntry( "Style", "Light" ); 861 QString style = config.readEntry( "Style", "Light" );
862 internalSetStyle( style ); 862 internalSetStyle( style );
863 863
864 // Colors 864 // Colors
865 QColor bgcolor( config.readEntry( "Background", "#E5E1D5" ) ); 865 QColor bgcolor( config.readEntry( "Background", "#E5E1D5" ) );
866 QColor btncolor( config.readEntry( "Button", "#D6CDBB" ) ); 866 QColor btncolor( config.readEntry( "Button", "#D6CDBB" ) );
867 QPalette pal( btncolor, bgcolor ); 867 QPalette pal( btncolor, bgcolor );
868 QString color = config.readEntry( "Highlight", "#800000" ); 868 QString color = config.readEntry( "Highlight", "#800000" );
869 pal.setColor( QColorGroup::Highlight, QColor(color) ); 869 pal.setColor( QColorGroup::Highlight, QColor(color) );
870 color = config.readEntry( "HighlightedText", "#FFFFFF" ); 870 color = config.readEntry( "HighlightedText", "#FFFFFF" );
871 pal.setColor( QColorGroup::HighlightedText, QColor(color) ); 871 pal.setColor( QColorGroup::HighlightedText, QColor(color) );
872 color = config.readEntry( "Text", "#000000" ); 872 color = config.readEntry( "Text", "#000000" );
873 pal.setColor( QColorGroup::Text, QColor(color) ); 873 pal.setColor( QColorGroup::Text, QColor(color) );
874 color = config.readEntry( "ButtonText", "#000000" ); 874 color = config.readEntry( "ButtonText", "#000000" );
875 pal.setColor( QPalette::Active, QColorGroup::ButtonText, QColor(color) ); 875 pal.setColor( QPalette::Active, QColorGroup::ButtonText, QColor(color) );
876 color = config.readEntry( "Base", "#FFFFFF" ); 876 color = config.readEntry( "Base", "#FFFFFF" );
877 pal.setColor( QColorGroup::Base, QColor(color) ); 877 pal.setColor( QColorGroup::Base, QColor(color) );
878 878
879 pal.setColor( QPalette::Disabled, QColorGroup::Text, 879 pal.setColor( QPalette::Disabled, QColorGroup::Text,
880 pal.color(QPalette::Active, QColorGroup::Background).dark() ); 880 pal.color(QPalette::Active, QColorGroup::Background).dark() );
881 881
882 setPalette( pal, TRUE ); 882 setPalette( pal, TRUE );
883} 883}
884 884
885void QPEApplication::systemMessage( const QCString &msg, const QByteArray &data) 885void QPEApplication::systemMessage( const QCString &msg, const QByteArray &data)
886{ 886{
887#ifdef Q_WS_QWS 887#ifdef Q_WS_QWS
888 QDataStream stream( data, IO_ReadOnly ); 888 QDataStream stream( data, IO_ReadOnly );
889 if ( msg == "applyStyle()" ) { 889 if ( msg == "applyStyle()" ) {
890 applyStyle(); 890 applyStyle();
891 } else if ( msg == "setScreenSaverInterval(int)" ) { 891 } else if ( msg == "setScreenSaverInterval(int)" ) {
892 if ( type() == GuiServer ) { 892 if ( type() == GuiServer ) {
893 int time; 893 int time;
894 stream >> time; 894 stream >> time;
895 setScreenSaverInterval(time); 895 setScreenSaverInterval(time);
896 } 896 }
897 } else if ( msg == "setScreenSaverIntervals(int,int,int)" ) { 897 } else if ( msg == "setScreenSaverIntervals(int,int,int)" ) {
898 if ( type() == GuiServer ) { 898 if ( type() == GuiServer ) {
899 int t1,t2,t3; 899 int t1,t2,t3;
900 stream >> t1 >> t2 >> t3; 900 stream >> t1 >> t2 >> t3;
901 setScreenSaverIntervals(t1,t2,t3); 901 setScreenSaverIntervals(t1,t2,t3);
902 } 902 }
903 } else if ( msg == "setBacklight(int)" ) { 903 } else if ( msg == "setBacklight(int)" ) {
904 if ( type() == GuiServer ) { 904 if ( type() == GuiServer ) {
905 int bright; 905 int bright;
906 stream >> bright; 906 stream >> bright;
907 setBacklight(bright); 907 setBacklight(bright);
908 } 908 }
909 } else if ( msg == "setDefaultRotation(int)" ) { 909 } else if ( msg == "setDefaultRotation(int)" ) {
910 if ( type() == GuiServer ) { 910 if ( type() == GuiServer ) {
911 int r; 911 int r;
912 stream >> r; 912 stream >> r;
913 setDefaultRotation(r); 913 setDefaultRotation(r);
914 } 914 }
915 } else if ( msg == "shutdown()" ) { 915 } else if ( msg == "shutdown()" ) {
916 if ( type() == GuiServer ) 916 if ( type() == GuiServer )
917 shutdown(); 917 shutdown();
918 } else if ( msg == "quit()" ) { 918 } else if ( msg == "quit()" ) {
919 if ( type() != GuiServer ) 919 if ( type() != GuiServer )
920 tryQuit(); 920 tryQuit();
921 } else if ( msg == "forceQuit()" ) { 921 } else if ( msg == "forceQuit()" ) {
922 if ( type() != GuiServer ) 922 if ( type() != GuiServer )
923 quit(); 923 quit();
924 } else if ( msg == "restart()" ) { 924 } else if ( msg == "restart()" ) {
925 if ( type() == GuiServer ) 925 if ( type() == GuiServer )
926 restart(); 926 restart();
927 } else if ( msg == "grabKeyboard(QString)" ) { 927 } else if ( msg == "grabKeyboard(QString)" ) {
928 QString who; 928 QString who;
929 stream >> who; 929 stream >> who;
930 if ( who.isEmpty() ) 930 if ( who.isEmpty() )
931 d->kbgrabber = 0; 931 d->kbgrabber = 0;
932 else if ( who != d->appName ) 932 else if ( who != d->appName )
933 d->kbgrabber = 1; 933 d->kbgrabber = 1;
934 else 934 else
935 d->kbgrabber = 2; 935 d->kbgrabber = 2;
936 } else if ( msg == "language(QString)" ) { 936 } else if ( msg == "language(QString)" ) {
937 if ( type() == GuiServer ) { 937 if ( type() == GuiServer ) {
938 QString l; 938 QString l;
939 stream >> l; 939 stream >> l;
940 QString cl = getenv("LANG"); 940 QString cl = getenv("LANG");
941 if ( cl != l ) { 941 if ( cl != l ) {
942 if ( l.isNull() ) 942 if ( l.isNull() )
943 unsetenv( "LANG" ); 943 unsetenv( "LANG" );
944 else 944 else
945 setenv( "LANG", l.latin1(), 1 ); 945 setenv( "LANG", l.latin1(), 1 );
946 restart(); 946 restart();
947 } 947 }
948 } 948 }
949 } else if ( msg == "timeChange(QString)" ) { 949 } else if ( msg == "timeChange(QString)" ) {
950 QString t; 950 QString t;
951 stream >> t; 951 stream >> t;
952 if ( t.isNull() ) 952 if ( t.isNull() )
953 unsetenv( "TZ" ); 953 unsetenv( "TZ" );
954 else 954 else
955 setenv( "TZ", t.latin1(), 1 ); 955 setenv( "TZ", t.latin1(), 1 );
956 // emit the signal so everyone else knows... 956 // emit the signal so everyone else knows...
957 emit timeChanged(); 957 emit timeChanged();
958 } else if ( msg == "execute(QString)" ) { 958 } else if ( msg == "execute(QString)" ) {
959 if ( type() == GuiServer ) { 959 if ( type() == GuiServer ) {
960 QString t; 960 QString t;
961 stream >> t; 961 stream >> t;
962 Global::execute( t ); 962 Global::execute( t );
963 } 963 }
964 } else if ( msg == "execute(QString,QString)" ) { 964 } else if ( msg == "execute(QString,QString)" ) {
965 if ( type() == GuiServer ) { 965 if ( type() == GuiServer ) {
966 QString t,d; 966 QString t,d;
967 stream >> t >> d; 967 stream >> t >> d;
968 Global::execute( t, d ); 968 Global::execute( t, d );
969 } 969 }
970 } else if ( msg == "addAlarm(QDateTime,QCString,QCString,int)" ) { 970 } else if ( msg == "addAlarm(QDateTime,QCString,QCString,int)" ) {
971 if ( type() == GuiServer ) { 971 if ( type() == GuiServer ) {
972 QDateTime when; 972 QDateTime when;
973 QCString channel, message; 973 QCString channel, message;
974 int data; 974 int data;
975 stream >> when >> channel >> message >> data; 975 stream >> when >> channel >> message >> data;
976 AlarmServer::addAlarm( when, channel, message, data ); 976 AlarmServer::addAlarm( when, channel, message, data );
977 } 977 }
978 } else if ( msg == "deleteAlarm(QDateTime,QCString,QCString,int)" ) { 978 } else if ( msg == "deleteAlarm(QDateTime,QCString,QCString,int)" ) {
979 if ( type() == GuiServer ) { 979 if ( type() == GuiServer ) {
980 QDateTime when; 980 QDateTime when;
981 QCString channel, message; 981 QCString channel, message;
982 int data; 982 int data;
983 stream >> when >> channel >> message >> data; 983 stream >> when >> channel >> message >> data;
984 AlarmServer::deleteAlarm( when, channel, message, data ); 984 AlarmServer::deleteAlarm( when, channel, message, data );
985 } 985 }
986 } else if ( msg == "clockChange(bool)" ) { 986 } else if ( msg == "clockChange(bool)" ) {
987 int tmp; 987 int tmp;
988 stream >> tmp; 988 stream >> tmp;
989 emit clockChanged( tmp ); 989 emit clockChanged( tmp );
990 } else if ( msg == "weekChange(bool)" ) { 990 } else if ( msg == "weekChange(bool)" ) {
991 int tmp; 991 int tmp;
992 stream >> tmp; 992 stream >> tmp;
993 emit weekChanged( tmp ); 993 emit weekChanged( tmp );
994 } else if ( msg == "setDateFormat(DateFormat)" ) { 994 } else if ( msg == "setDateFormat(DateFormat)" ) {
995 DateFormat tmp; 995 DateFormat tmp;
996 stream >> tmp; 996 stream >> tmp;
997 emit dateFormatChanged( tmp ); 997 emit dateFormatChanged( tmp );
998 } else if ( msg == "setVolume(int,int)" ) { 998 } else if ( msg == "setVolume(int,int)" ) {
999 int t,v; 999 int t,v;
1000 stream >> t >> v; 1000 stream >> t >> v;
1001 setVolume(t,v); 1001 setVolume(t,v);
1002 emit volumeChanged( muted ); 1002 emit volumeChanged( muted );
1003 } else if ( msg == "volumeChange(bool)" ) { 1003 } else if ( msg == "volumeChange(bool)" ) {
1004 stream >> muted; 1004 stream >> muted;
1005 setVolume(); 1005 setVolume();
1006 emit volumeChanged( muted ); 1006 emit volumeChanged( muted );
1007 } else if ( msg == "setScreenSaverMode(int)" ) { 1007 } else if ( msg == "setScreenSaverMode(int)" ) {
1008 if ( type() == GuiServer ) { 1008 if ( type() == GuiServer ) {
1009 int old = disable_suspend; 1009 int old = disable_suspend;
1010 stream >> disable_suspend; 1010 stream >> disable_suspend;
1011 //qDebug("setScreenSaverMode(%d)", disable_suspend ); 1011 //qDebug("setScreenSaverMode(%d)", disable_suspend );
1012 if ( disable_suspend > old ) 1012 if ( disable_suspend > old )
1013 setScreenSaverInterval( -1 ); 1013 setScreenSaverInterval( -1 );
1014 } 1014 }
1015 } 1015 }
1016#endif 1016#endif
1017} 1017}
1018 1018
1019/*! 1019/*!
1020 \internal 1020 \internal
1021*/ 1021*/
1022bool QPEApplication::raiseAppropriateWindow() 1022bool QPEApplication::raiseAppropriateWindow()
1023{ 1023{
1024 bool r=FALSE; 1024 bool r=FALSE;
1025 // ########## raise()ing main window should raise and set active 1025 // ########## raise()ing main window should raise and set active
1026 // ########## it and then all childen. This belongs in Qt/Embedded 1026 // ########## it and then all childen. This belongs in Qt/Embedded
1027 QWidget *top = d->qpe_main_widget; 1027 QWidget *top = d->qpe_main_widget;
1028 if ( !top ) top =mainWidget(); 1028 if ( !top ) top =mainWidget();
1029 if ( top && d->keep_running ) { 1029 if ( top && d->keep_running ) {
1030 if ( top->isVisible() ) 1030 if ( top->isVisible() )
1031 r = TRUE; 1031 r = TRUE;
1032#ifdef Q_WS_QWS 1032#ifdef Q_WS_QWS
1033 if ( !d->nomaximize ) 1033 if ( !d->nomaximize )
1034 top->showMaximized(); 1034 top->showMaximized();
1035 else 1035 else
1036#endif 1036#endif
1037 top->show(); 1037 top->show();
1038 top->raise(); 1038 top->raise();
1039 top->setActiveWindow(); 1039 top->setActiveWindow();
1040 } 1040 }
1041 QWidget *topm = activeModalWidget(); 1041 QWidget *topm = activeModalWidget();
1042 if ( topm && topm != top ) { 1042 if ( topm && topm != top ) {
1043 topm->show(); 1043 topm->show();
1044 topm->raise(); 1044 topm->raise();
1045 topm->setActiveWindow(); 1045 topm->setActiveWindow();
1046 r = FALSE; 1046 r = FALSE;
1047 } 1047 }
1048 return r; 1048 return r;
1049} 1049}
1050 1050
1051void QPEApplication::pidMessage( const QCString &msg, const QByteArray & data) 1051void QPEApplication::pidMessage( const QCString &msg, const QByteArray & data)
1052{ 1052{
1053#ifdef Q_WS_QWS 1053#ifdef Q_WS_QWS
1054 1054
1055 if ( msg == "quit()" ) { 1055 if ( msg == "quit()" ) {
1056 tryQuit(); 1056 tryQuit();
1057 } else if ( msg == "quitIfInvisible()" ) { 1057 } else if ( msg == "quitIfInvisible()" ) {
1058 if ( d->qpe_main_widget && !d->qpe_main_widget->isVisible() ) 1058 if ( d->qpe_main_widget && !d->qpe_main_widget->isVisible() )
1059 quit(); 1059 quit();
1060 } else if ( msg == "close()" ) { 1060 } else if ( msg == "close()" ) {
1061 hideOrQuit(); 1061 hideOrQuit();
1062 } else if ( msg == "disablePreload()" ) { 1062 } else if ( msg == "disablePreload()" ) {
1063 d->preloaded = FALSE; 1063 d->preloaded = FALSE;
1064 d->keep_running = TRUE; 1064 d->keep_running = TRUE;
1065 /* so that quit will quit */ 1065 /* so that quit will quit */
1066 } else if ( msg == "enablePreload()" ) { 1066 } else if ( msg == "enablePreload()" ) {
1067 d->preloaded = TRUE; 1067 d->preloaded = TRUE;
1068 d->keep_running = TRUE; 1068 d->keep_running = TRUE;
1069 /* so next quit won't quit */ 1069 /* so next quit won't quit */
1070 } else if ( msg == "raise()" ) { 1070 } else if ( msg == "raise()" ) {
1071 d->keep_running = TRUE; 1071 d->keep_running = TRUE;
1072 d->notbusysent = FALSE; 1072 d->notbusysent = FALSE;
1073 raiseAppropriateWindow(); 1073 raiseAppropriateWindow();
1074 } else if ( msg == "flush()" ) { 1074 } else if ( msg == "flush()" ) {
1075 emit flush(); 1075 emit flush();
1076 // we need to tell the desktop 1076 // we need to tell the desktop
1077 QCopEnvelope e( "QPE/Desktop", "flushDone(QString)" ); 1077 QCopEnvelope e( "QPE/Desktop", "flushDone(QString)" );
1078 e << d->appName; 1078 e << d->appName;
1079 } else if ( msg == "reload()" ) { 1079 } else if ( msg == "reload()" ) {
1080 emit reload(); 1080 emit reload();
1081 } else if ( msg == "setDocument(QString)" ) { 1081 } else if ( msg == "setDocument(QString)" ) {
1082 d->keep_running = TRUE; 1082 d->keep_running = TRUE;
1083 QDataStream stream( data, IO_ReadOnly ); 1083 QDataStream stream( data, IO_ReadOnly );
1084 QString doc; 1084 QString doc;
1085 stream >> doc; 1085 stream >> doc;
1086 QWidget *mw = mainWidget(); 1086 QWidget *mw = mainWidget();
1087 if ( !mw ) 1087 if ( !mw )
1088 mw = d->qpe_main_widget; 1088 mw = d->qpe_main_widget;
1089 if ( mw ) 1089 if ( mw )
1090 Global::setDocument( mw, doc ); 1090 Global::setDocument( mw, doc );
1091 } else if ( msg == "nextView()" ) { 1091 } else if ( msg == "nextView()" ) {
1092 if ( raiseAppropriateWindow() ) 1092 if ( raiseAppropriateWindow() )
1093 emit appMessage( msg, data); 1093 emit appMessage( msg, data);
1094 } else { 1094 } else {
1095 emit appMessage( msg, data); 1095 emit appMessage( msg, data);
1096 } 1096 }
1097#endif 1097#endif
1098} 1098}
1099 1099
1100 1100
1101static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ ) 1101static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ )
1102{ 1102{
1103/* 1103/*
1104 // This works but disable it for now until it is safe to apply 1104 // This works but disable it for now until it is safe to apply
1105 // What is does is scan the .desktop files of all the apps for 1105 // What is does is scan the .desktop files of all the apps for
1106 // the applnk that has the corresponding argv[0] as this program 1106 // the applnk that has the corresponding argv[0] as this program
1107 // then it uses the name stored in the .desktop file as the caption 1107 // then it uses the name stored in the .desktop file as the caption
1108 // for the main widget. This saves duplicating translations for 1108 // for the main widget. This saves duplicating translations for
1109 // the app name in the program and in the .desktop files. 1109 // the app name in the program and in the .desktop files.
1110 1110
1111 AppLnkSet apps( appsPath ); 1111 AppLnkSet apps( appsPath );
1112 1112
1113 QList<AppLnk> appsList = apps.children(); 1113 QList<AppLnk> appsList = apps.children();
1114 for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) { 1114 for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) {
1115 if ( (*it)->exec() == appName ) { 1115 if ( (*it)->exec() == appName ) {
1116 mw->setCaption( (*it)->name() ); 1116 mw->setCaption( (*it)->name() );
1117 return TRUE; 1117 return TRUE;
1118 } 1118 }
1119 } 1119 }
1120*/ 1120*/
1121 return FALSE; 1121 return FALSE;
1122} 1122}
1123 1123
1124 1124
1125/*! 1125/*!
1126 Sets \a mw as the mainWidget() and shows it. For small windows, 1126 Sets \a mw as the mainWidget() and shows it. For small windows,
1127 consider passing TRUE for \a nomaximize rather than the default FALSE. 1127 consider passing TRUE for \a nomaximize rather than the default FALSE.
1128 1128
1129 \sa showMainDocumentWidget() 1129 \sa showMainDocumentWidget()
1130*/ 1130*/
1131void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize ) 1131void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
1132{ 1132{
1133 setWidgetCaptionFromAppName( mw, d->appName, qpeDir() + "apps" ); 1133 setWidgetCaptionFromAppName( mw, d->appName, qpeDir() + "apps" );
1134 1134
1135 d->nomaximize = nomaximize; 1135 d->nomaximize = nomaximize;
1136 d->qpe_main_widget = mw; 1136 d->qpe_main_widget = mw;
1137 d->sendQCopQ(); 1137 d->sendQCopQ();
1138 if ( d->preloaded ) { 1138 if ( d->preloaded ) {
1139 if(d->forceshow) { 1139 if(d->forceshow) {
1140#ifdef Q_WS_QWS 1140#ifdef Q_WS_QWS
1141 if ( !nomaximize ) 1141 if ( !nomaximize )
1142 mw->showMaximized(); 1142 mw->showMaximized();
1143 else 1143 else
1144#endif 1144#endif
1145 mw->show(); 1145 mw->show();
1146 } 1146 }
1147 } else if ( d->keep_running ) { 1147 } else if ( d->keep_running ) {
1148#ifdef Q_WS_QWS 1148#ifdef Q_WS_QWS
1149 if ( !nomaximize ) 1149 if ( !nomaximize )
1150 mw->showMaximized(); 1150 mw->showMaximized();
1151 else 1151 else
1152#endif 1152#endif
1153 mw->show(); 1153 mw->show();
1154 } 1154 }
1155} 1155}
1156 1156
1157/*! 1157/*!
1158 Sets \a mw as the mainWidget() and shows it. For small windows, 1158 Sets \a mw as the mainWidget() and shows it. For small windows,
1159 consider passing TRUE for \a nomaximize rather than the default FALSE. 1159 consider passing TRUE for \a nomaximize rather than the default FALSE.
1160 1160
1161 This calls designates the application as 1161 This calls designates the application as
1162 a \link docwidget.html document-oriented\endlink application. 1162 a \link docwidget.html document-oriented\endlink application.
1163 1163
1164 The \a mw widget must have a slot: setDocument(const QString&). 1164 The \a mw widget must have a slot: setDocument(const QString&).
1165 1165
1166 \sa showMainWidget() 1166 \sa showMainWidget()
1167*/ 1167*/
1168void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize ) 1168void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize )
1169{ 1169{
1170 setWidgetCaptionFromAppName( mw, d->appName, qpeDir() + "apps" ); 1170 setWidgetCaptionFromAppName( mw, d->appName, qpeDir() + "apps" );
1171 1171
1172 if ( mw && argc() == 2 ) 1172 if ( mw && argc() == 2 )
1173 Global::setDocument( mw, QString::fromUtf8(argv()[1]) ); 1173 Global::setDocument( mw, QString::fromUtf8(argv()[1]) );
1174 d->nomaximize = nomaximize; 1174 d->nomaximize = nomaximize;
1175 d->qpe_main_widget = mw; 1175 d->qpe_main_widget = mw;
1176 d->sendQCopQ(); 1176 d->sendQCopQ();
1177 if ( d->preloaded ) { 1177 if ( d->preloaded ) {
1178 if(d->forceshow) { 1178 if(d->forceshow) {
1179#ifdef Q_WS_QWS 1179#ifdef Q_WS_QWS
1180 if ( !nomaximize ) 1180 if ( !nomaximize )
1181 mw->showMaximized(); 1181 mw->showMaximized();
1182 else 1182 else
1183#endif 1183#endif
1184 mw->show(); 1184 mw->show();
1185 } 1185 }
1186 } else if ( d->keep_running ) { 1186 } else if ( d->keep_running ) {
1187#ifdef Q_WS_QWS 1187#ifdef Q_WS_QWS
1188 if ( !nomaximize ) 1188 if ( !nomaximize )
1189 mw->showMaximized(); 1189 mw->showMaximized();
1190 else 1190 else
1191#endif 1191#endif
1192 mw->show(); 1192 mw->show();
1193 } 1193 }
1194} 1194}
1195 1195
1196 1196
1197/*! 1197/*!
1198 Sets that the application should continue running after processing 1198 Sets that the application should continue running after processing
1199 qcop messages. Normally if an application is started via a qcop message, 1199 qcop messages. Normally if an application is started via a qcop message,
1200 the application will process the qcop message and then quit. If while 1200 the application will process the qcop message and then quit. If while
1201 processing the qcop message it calls this function, then the application 1201 processing the qcop message it calls this function, then the application
1202 will show and start proper once it has finished processing qcop messages. 1202 will show and start proper once it has finished processing qcop messages.
1203 1203
1204 \sa keepRunning() 1204 \sa keepRunning()
1205*/ 1205*/
1206void QPEApplication::setKeepRunning() 1206void QPEApplication::setKeepRunning()
1207{ 1207{
1208 if ( qApp && qApp->inherits( "QPEApplication" ) ) { 1208 if ( qApp && qApp->inherits( "QPEApplication" ) ) {
1209 QPEApplication *qpeApp = (QPEApplication*)qApp; 1209 QPEApplication *qpeApp = (QPEApplication*)qApp;
1210 qpeApp->d->keep_running = TRUE; 1210 qpeApp->d->keep_running = TRUE;
1211 } 1211 }
1212} 1212}
1213 1213
1214/*! 1214/*!
1215 Returns whether the application will quit after processing the current 1215 Returns whether the application will quit after processing the current
1216 list of qcop messages. 1216 list of qcop messages.
1217 1217
1218 \sa setKeepRunning() 1218 \sa setKeepRunning()
1219*/ 1219*/
1220bool QPEApplication::keepRunning() const 1220bool QPEApplication::keepRunning() const
1221{ 1221{
1222 return d->keep_running; 1222 return d->keep_running;
1223} 1223}
1224 1224
1225/*! 1225/*!
1226 \internal 1226 \internal
1227*/ 1227*/
1228void QPEApplication::internalSetStyle( const QString &style ) 1228void QPEApplication::internalSetStyle( const QString &style )
1229{ 1229{
1230#if QT_VERSION >= 300 1230#if QT_VERSION >= 300
1231 if ( style == "QPE" ) { 1231 if ( style == "QPE" ) {
1232 setStyle( new QPEStyle ); 1232 setStyle( new QPEStyle );
1233 } else { 1233 } else {
1234 QStyle *s = QStyleFactory::create(style); 1234 QStyle *s = QStyleFactory::create(style);
1235 if ( s ) setStyle(s); 1235 if ( s ) setStyle(s);
1236 } 1236 }
1237#else 1237#else
1238 if ( style == "Windows" ) { 1238 if ( style == "Windows" ) {
1239 setStyle( new QWindowsStyle ); 1239 setStyle( new QWindowsStyle );
1240 } else if ( style == "QPE" ) { 1240 } else if ( style == "QPE" ) {
1241 setStyle( new QPEStyle ); 1241 setStyle( new QPEStyle );
1242 } else if ( style == "Light" ) { 1242 } else if ( style == "Light" ) {
1243 setStyle( new LightStyle ); 1243 setStyle( new LightStyle );
1244 } 1244 }
1245#ifndef QT_NO_STYLE_PLATINUM 1245#ifndef QT_NO_STYLE_PLATINUM
1246 else if ( style == "Platinum" ) { 1246 else if ( style == "Platinum" ) {
1247 setStyle( new QPlatinumStyle ); 1247 setStyle( new QPlatinumStyle );
1248 } 1248 }
1249#endif 1249#endif
1250#ifndef QT_NO_STYLE_MOTIF 1250#ifndef QT_NO_STYLE_MOTIF
1251 else if ( style == "Motif" ) { 1251 else if ( style == "Motif" ) {
1252 setStyle( new QMotifStyle ); 1252 setStyle( new QMotifStyle );
1253 } 1253 }
1254#endif 1254#endif
1255#ifndef QT_NO_STYLE_MOTIFPLUS 1255#ifndef QT_NO_STYLE_MOTIFPLUS
1256 else if ( style == "MotifPlus" ) { 1256 else if ( style == "MotifPlus" ) {
1257 setStyle( new QMotifPlusStyle ); 1257 setStyle( new QMotifPlusStyle );
1258 } 1258 }
1259#endif 1259#endif
1260#endif 1260#endif
1261} 1261}
1262 1262
1263/*! 1263/*!
1264 \internal 1264 \internal
1265*/ 1265*/
1266void QPEApplication::prepareForTermination(bool willrestart) 1266void QPEApplication::prepareForTermination(bool willrestart)
1267{ 1267{
1268 if ( willrestart ) { 1268 if ( willrestart ) {
1269 // Draw a big wait icon, the image can be altered in later revisions 1269 // Draw a big wait icon, the image can be altered in later revisions
1270 //QWidget *d = QApplication::desktop(); 1270 //QWidget *d = QApplication::desktop();
1271 QImage img = Resource::loadImage( "wait" ); 1271 QImage img = Resource::loadImage( "wait" );
1272 QPixmap pix; 1272 QPixmap pix;
1273 pix.convertFromImage(img.smoothScale(3*img.width(), 3*img.height())); 1273 pix.convertFromImage(img.smoothScale(3*img.width(), 3*img.height()));
1274 QLabel *lblWait = new QLabel(0, "wait hack!", QWidget::WStyle_Customize | 1274 QLabel *lblWait = new QLabel(0, "wait hack!", QWidget::WStyle_Customize |
1275 QWidget::WStyle_NoBorder | QWidget::WStyle_Tool ); 1275 QWidget::WStyle_NoBorder | QWidget::WStyle_Tool );
1276 lblWait->setPixmap( pix ); 1276 lblWait->setPixmap( pix );
1277 lblWait->setAlignment( QWidget::AlignCenter ); 1277 lblWait->setAlignment( QWidget::AlignCenter );
1278 lblWait->show(); 1278 lblWait->show();
1279 lblWait->showMaximized(); 1279 lblWait->showMaximized();
1280 } 1280 }
1281#ifndef SINGLE_APP 1281#ifndef SINGLE_APP
1282 { QCopEnvelope envelope("QPE/System", "forceQuit()"); } 1282 { QCopEnvelope envelope("QPE/System", "forceQuit()"); }
1283 processEvents(); // ensure the message goes out. 1283 processEvents(); // ensure the message goes out.
1284 sleep(1); // You have 1 second to comply. 1284 sleep(1); // You have 1 second to comply.
1285#endif 1285#endif
1286} 1286}
1287 1287
1288/*! 1288/*!
1289 \internal 1289 \internal
1290*/ 1290*/
1291void QPEApplication::shutdown() 1291void QPEApplication::shutdown()
1292{ 1292{
1293 // Implement in server's QPEApplication subclass 1293 // Implement in server's QPEApplication subclass
1294} 1294}
1295 1295
1296/*! 1296/*!
1297 \internal 1297 \internal
1298*/ 1298*/
1299void QPEApplication::restart() 1299void QPEApplication::restart()
1300{ 1300{
1301 // Implement in server's QPEApplication subclass 1301 // Implement in server's QPEApplication subclass
1302} 1302}
1303 1303
1304static QPtrDict<void>* stylusDict=0; 1304static QPtrDict<void>* stylusDict=0;
1305static void createDict() 1305static void createDict()
1306{ 1306{
1307 if ( !stylusDict ) 1307 if ( !stylusDict )
1308 stylusDict = new QPtrDict<void>; 1308 stylusDict = new QPtrDict<void>;
1309} 1309}
1310 1310
1311/*! 1311/*!
1312 Returns the current StylusMode for \a w. 1312 Returns the current StylusMode for \a w.
1313 1313
1314 \sa setStylusOperation() 1314 \sa setStylusOperation()
1315*/ 1315*/
1316QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget* w ) 1316QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget* w )
1317{ 1317{
1318 if ( stylusDict ) 1318 if ( stylusDict )
1319 return (StylusMode)(int)stylusDict->find(w); 1319 return (StylusMode)(int)stylusDict->find(w);
1320 return LeftOnly; 1320 return LeftOnly;
1321} 1321}
1322 1322
1323/*! 1323/*!
1324 \enum QPEApplication::StylusMode 1324 \enum QPEApplication::StylusMode
1325 1325
1326 \value LeftOnly the stylus only generates LeftButton 1326 \value LeftOnly the stylus only generates LeftButton
1327 events (the default). 1327 events (the default).
1328 \value RightOnHold the stylus generates RightButton events 1328 \value RightOnHold the stylus generates RightButton events
1329 if the user uses the press-and-hold gesture. 1329 if the user uses the press-and-hold gesture.
1330 1330
1331 See setStylusOperation(). 1331 See setStylusOperation().
1332*/ 1332*/
1333 1333
1334/*! 1334/*!
1335 Causes \a w to receive mouse events according to \a mode. 1335 Causes \a w to receive mouse events according to \a mode.
1336 1336
1337 \sa stylusOperation() 1337 \sa stylusOperation()
1338*/ 1338*/
1339void QPEApplication::setStylusOperation( QWidget* w, StylusMode mode ) 1339void QPEApplication::setStylusOperation( QWidget* w, StylusMode mode )
1340{ 1340{
1341 createDict(); 1341 createDict();
1342 if ( mode == LeftOnly ) { 1342 if ( mode == LeftOnly ) {
1343 stylusDict->remove(w); 1343 stylusDict->remove(w);
1344 w->removeEventFilter(qApp); 1344 w->removeEventFilter(qApp);
1345 } else { 1345 } else {
1346 stylusDict->insert(w,(void*)mode); 1346 stylusDict->insert(w,(void*)mode);
1347 connect(w,SIGNAL(destroyed()),qApp,SLOT(removeSenderFromStylusDict())); 1347 connect(w,SIGNAL(destroyed()),qApp,SLOT(removeSenderFromStylusDict()));
1348 w->installEventFilter(qApp); 1348 w->installEventFilter(qApp);
1349 } 1349 }
1350} 1350}
1351 1351
1352 1352
1353/*! 1353/*!
1354 \reimp 1354 \reimp
1355*/ 1355*/
1356bool QPEApplication::eventFilter( QObject *o, QEvent *e ) 1356bool QPEApplication::eventFilter( QObject *o, QEvent *e )
1357{ 1357{
1358 if ( stylusDict && e->type() >= QEvent::MouseButtonPress && e->type() <= QEvent::MouseMove ) { 1358 if ( stylusDict && e->type() >= QEvent::MouseButtonPress && e->type() <= QEvent::MouseMove ) {
1359 QMouseEvent* me = (QMouseEvent*)e; 1359 QMouseEvent* me = (QMouseEvent*)e;
1360 if ( me->button() == LeftButton ) { 1360 if ( me->button() == LeftButton ) {
1361 StylusMode mode = (StylusMode)(int)stylusDict->find(o); 1361 StylusMode mode = (StylusMode)(int)stylusDict->find(o);
1362 switch (mode) { 1362 switch (mode) {
1363 case RightOnHold: 1363 case RightOnHold:
1364 switch ( me->type() ) { 1364 switch ( me->type() ) {
1365 case QEvent::MouseButtonPress: 1365 case QEvent::MouseButtonPress:
1366 d->presstimer = startTimer(500); // #### pref. 1366 d->presstimer = startTimer(500); // #### pref.
1367 d->presswidget = (QWidget*)o; 1367 d->presswidget = (QWidget*)o;
1368 d->presspos = me->pos(); 1368 d->presspos = me->pos();
1369 d->rightpressed = FALSE; 1369 d->rightpressed = FALSE;
1370 break; 1370 break;
1371 case QEvent::MouseButtonRelease: 1371 case QEvent::MouseButtonRelease:
1372 if ( d->presstimer ) { 1372 if ( d->presstimer ) {
1373 killTimer(d->presstimer); 1373 killTimer(d->presstimer);
1374 d->presstimer = 0; 1374 d->presstimer = 0;
1375 } 1375 }
1376 if ( d->rightpressed && d->presswidget ) { 1376 if ( d->rightpressed && d->presswidget ) {
1377 // Right released 1377 // Right released
1378 postEvent( d->presswidget, 1378 postEvent( d->presswidget,
1379 new QMouseEvent( QEvent::MouseButtonRelease, me->pos(), 1379 new QMouseEvent( QEvent::MouseButtonRelease, me->pos(),
1380 RightButton, LeftButton+RightButton ) ); 1380 RightButton, LeftButton+RightButton ) );
1381 // Left released, off-widget 1381 // Left released, off-widget
1382 postEvent( d->presswidget, 1382 postEvent( d->presswidget,
1383 new QMouseEvent( QEvent::MouseMove, QPoint(-1,-1), 1383 new QMouseEvent( QEvent::MouseMove, QPoint(-1,-1),
1384 LeftButton, LeftButton ) ); 1384 LeftButton, LeftButton ) );
1385 postEvent( d->presswidget, 1385 postEvent( d->presswidget,
1386 new QMouseEvent( QEvent::MouseButtonRelease, QPoint(-1,-1), 1386 new QMouseEvent( QEvent::MouseButtonRelease, QPoint(-1,-1),
1387 LeftButton, LeftButton ) ); 1387 LeftButton, LeftButton ) );
1388 d->rightpressed = FALSE; 1388 d->rightpressed = FALSE;
1389 return TRUE; // don't send the real Left release 1389 return TRUE; // don't send the real Left release
1390 } 1390 }
1391 break; 1391 break;
1392 default: 1392 default:
1393 break; 1393 break;
1394 } 1394 }
1395 break; 1395 break;
1396 default: 1396 default:
1397 ; 1397 ;
1398 } 1398 }
1399 } 1399 }
1400 } else if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) { 1400 } else if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) {
1401 QKeyEvent *ke = (QKeyEvent *)e; 1401 QKeyEvent *ke = (QKeyEvent *)e;
1402 if ( ke->key() == Key_Enter ) { 1402 if ( ke->key() == Key_Enter ) {
1403 if ( o->isA( "QRadioButton" ) || o->isA( "QCheckBox" ) ) { 1403 if ( o->isA( "QRadioButton" ) || o->isA( "QCheckBox" ) ) {
1404 postEvent( o, new QKeyEvent( e->type(), Key_Space, ' ', 1404 postEvent( o, new QKeyEvent( e->type(), Key_Space, ' ',
1405 ke->state(), " ", ke->isAutoRepeat(), ke->count() ) ); 1405 ke->state(), " ", ke->isAutoRepeat(), ke->count() ) );
1406 return TRUE; 1406 return TRUE;
1407 } 1407 }
1408 } 1408 }
1409 } 1409 }
1410 1410
1411 return FALSE; 1411 return FALSE;
1412} 1412}
1413 1413
1414/*! 1414/*!
1415 \reimp 1415 \reimp
1416*/ 1416*/
1417void QPEApplication::timerEvent( QTimerEvent *e ) 1417void QPEApplication::timerEvent( QTimerEvent *e )
1418{ 1418{
1419 if ( e->timerId() == d->presstimer && d->presswidget ) { 1419 if ( e->timerId() == d->presstimer && d->presswidget ) {
1420 // Right pressed 1420 // Right pressed
1421 postEvent( d->presswidget, 1421 postEvent( d->presswidget,
1422 new QMouseEvent( QEvent::MouseButtonPress, d->presspos, 1422 new QMouseEvent( QEvent::MouseButtonPress, d->presspos,
1423 RightButton, LeftButton ) ); 1423 RightButton, LeftButton ) );
1424 killTimer( d->presstimer ); 1424 killTimer( d->presstimer );
1425 d->presstimer = 0; 1425 d->presstimer = 0;
1426 d->rightpressed = TRUE; 1426 d->rightpressed = TRUE;
1427 } 1427 }
1428} 1428}
1429 1429
1430void QPEApplication::removeSenderFromStylusDict() 1430void QPEApplication::removeSenderFromStylusDict()
1431{ 1431{
1432 stylusDict->remove((void*)sender()); 1432 stylusDict->remove((void*)sender());
1433 if ( d->presswidget == sender() ) 1433 if ( d->presswidget == sender() )
1434 d->presswidget = 0; 1434 d->presswidget = 0;
1435} 1435}
1436 1436
1437/*! 1437/*!
1438 \internal 1438 \internal
1439*/ 1439*/
1440bool QPEApplication::keyboardGrabbed() const 1440bool QPEApplication::keyboardGrabbed() const
1441{ 1441{
1442 return d->kbgrabber; 1442 return d->kbgrabber;
1443} 1443}
1444 1444
1445 1445
1446/*! 1446/*!
1447 Reverses the effect of grabKeyboard(). This is called automatically 1447 Reverses the effect of grabKeyboard(). This is called automatically
1448 on program exit. 1448 on program exit.
1449*/ 1449*/
1450void QPEApplication::ungrabKeyboard() 1450void QPEApplication::ungrabKeyboard()
1451{ 1451{
1452 QPEApplicationData* d = ((QPEApplication*)qApp)->d; 1452 QPEApplicationData* d = ((QPEApplication*)qApp)->d;
1453 if ( d->kbgrabber == 2 ) { 1453 if ( d->kbgrabber == 2 ) {
1454 QCopEnvelope e("QPE/System", "grabKeyboard(QString)" ); 1454 QCopEnvelope e("QPE/System", "grabKeyboard(QString)" );
1455 e << QString::null; 1455 e << QString::null;
1456 d->kbregrab = FALSE; 1456 d->kbregrab = FALSE;
1457 d->kbgrabber = 0; 1457 d->kbgrabber = 0;
1458 } 1458 }
1459} 1459}
1460 1460
1461/*! 1461/*!
1462 Grabs the keyboard such that the system's application launching 1462 Grabs the keyboard such that the system's application launching
1463 keys no longer work, and instead they are receivable by this 1463 keys no longer work, and instead they are receivable by this
1464 application. 1464 application.
1465 1465
1466 \sa ungrabKeyboard() 1466 \sa ungrabKeyboard()
1467*/ 1467*/
1468void QPEApplication::grabKeyboard() 1468void QPEApplication::grabKeyboard()
1469{ 1469{
1470 QPEApplicationData* d = ((QPEApplication*)qApp)->d; 1470 QPEApplicationData* d = ((QPEApplication*)qApp)->d;
1471 if ( qApp->type() == QApplication::GuiServer ) 1471 if ( qApp->type() == QApplication::GuiServer )
1472 d->kbgrabber = 0; 1472 d->kbgrabber = 0;
1473 else { 1473 else {
1474 QCopEnvelope e("QPE/System", "grabKeyboard(QString)" ); 1474 QCopEnvelope e("QPE/System", "grabKeyboard(QString)" );
1475 e << d->appName; 1475 e << d->appName;
1476 d->kbgrabber = 2; // me 1476 d->kbgrabber = 2; // me
1477 } 1477 }
1478} 1478}
1479 1479
1480/*! 1480/*!
1481 \reimp 1481 \reimp
1482*/ 1482*/
1483int QPEApplication::exec() 1483int QPEApplication::exec()
1484{ 1484{
1485 d->sendQCopQ(); 1485 d->sendQCopQ();
1486 if ( d->keep_running) 1486 if ( d->keep_running)
1487 //|| d->qpe_main_widget && d->qpe_main_widget->isVisible() ) 1487 //|| d->qpe_main_widget && d->qpe_main_widget->isVisible() )
1488 return QApplication::exec(); 1488 return QApplication::exec();
1489 1489
1490 { 1490 {
1491 QCopEnvelope e("QPE/System", "closing(QString)" ); 1491 QCopEnvelope e("QPE/System", "closing(QString)" );
1492 e << d->appName; 1492 e << d->appName;
1493 } 1493 }
1494 processEvents(); 1494 processEvents();
1495 return 0; 1495 return 0;
1496} 1496}
1497 1497
1498/*! 1498/*!
1499 \internal 1499 \internal
1500 External request for application to quit. Quits if possible without 1500 External request for application to quit. Quits if possible without
1501 loosing state. 1501 loosing state.
1502*/ 1502*/
1503void QPEApplication::tryQuit() 1503void QPEApplication::tryQuit()
1504{ 1504{
1505 if ( activeModalWidget() || strcmp( argv()[0], "embeddedkonsole") == 0 ) 1505 if ( activeModalWidget() || strcmp( argv()[0], "embeddedkonsole") == 0 )
1506 return; // Inside modal loop or konsole. Too hard to save state. 1506 return; // Inside modal loop or konsole. Too hard to save state.
1507 { 1507 {
1508 QCopEnvelope e("QPE/System", "closing(QString)" ); 1508 QCopEnvelope e("QPE/System", "closing(QString)" );
1509 e << d->appName; 1509 e << d->appName;
1510 } 1510 }
1511 processEvents(); 1511 processEvents();
1512 1512
1513 quit(); 1513 quit();
1514} 1514}
1515 1515
1516/*! 1516/*!
1517 \internal 1517 \internal
1518 User initiated quit. Makes the window 'Go Away'. If preloaded this means 1518 User initiated quit. Makes the window 'Go Away'. If preloaded this means
1519 hiding the window. If not it means quitting the application. 1519 hiding the window. If not it means quitting the application.
1520 As this is user initiated we don't need to check state. 1520 As this is user initiated we don't need to check state.
1521*/ 1521*/
1522void QPEApplication::hideOrQuit() 1522void QPEApplication::hideOrQuit()
1523{ 1523{
1524 // notify of our demise :) 1524 // notify of our demise :)
1525 { 1525 {
1526 QCopEnvelope e("QPE/System", "closing(QString)" ); 1526 QCopEnvelope e("QPE/System", "closing(QString)" );
1527 e << d->appName; 1527 e << d->appName;
1528 } 1528 }
1529 processEvents(); 1529 processEvents();
1530 if ( d->preloaded && d->qpe_main_widget ) 1530 if ( d->preloaded && d->qpe_main_widget )
1531 d->qpe_main_widget->hide(); 1531 d->qpe_main_widget->hide();
1532 else 1532 else
1533 quit(); 1533 quit();
1534} 1534}
1535 1535
1536#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) 1536#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
1537 1537
1538// The libraries with the skiff package (and possibly others) have 1538// The libraries with the skiff package (and possibly others) have
1539// completely useless implementations of builtin new and delete that 1539// completely useless implementations of builtin new and delete that
1540// use about 50% of your CPU. Here we revert to the simple libc 1540// use about 50% of your CPU. Here we revert to the simple libc
1541// functions. 1541// functions.
1542 1542
1543void* operator new[](size_t size) 1543void* operator new[](size_t size)
1544{ 1544{
1545 return malloc(size); 1545 return malloc(size);
1546} 1546}
1547 1547
1548void* operator new(size_t size) 1548void* operator new(size_t size)
1549{ 1549{
1550 return malloc(size); 1550 return malloc(size);
1551} 1551}
1552 1552
1553void operator delete[](void* p) 1553void operator delete[](void* p)
1554{ 1554{
1555 free(p); 1555 free(p);
1556} 1556}
1557 1557
1558void operator delete[](void* p, size_t /*size*/) 1558void operator delete[](void* p, size_t /*size*/)
1559{ 1559{
1560 free(p); 1560 free(p);
1561} 1561}
1562 1562
1563void operator delete(void* p) 1563void operator delete(void* p)
1564{ 1564{
1565 free(p); 1565 free(p);
diff --git a/mkipks b/mkipks
index 947b19e..45f2fb2 100755
--- a/mkipks
+++ b/mkipks
@@ -1,220 +1,220 @@
1#!/bin/sh 1#!/bin/sh
2 2
3QTE_VERSION=2.3.2 3QTE_VERSION=2.3.2
4DEB_VERSION=2.0 4DEB_VERSION=2.0
5 5
6# Have to do this here, since CVS can't store symlinks 6# Have to do this here, since CVS can't store symlinks
7mkdir -p etc/rc2.d 7mkdir -p etc/rc2.d
8rm -f etc/rc2.d/S98qpe 8rm -f etc/rc2.d/S98qpe
9ln -s ../init.d/qpe etc/rc2.d/S98qpe 9ln -s ../init.d/qpe etc/rc2.d/S98qpe
10 10
11VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$QPEDIR/include/qpe/version.h) 11VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
12VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$QPEDIR/include/qpe/version.h) 12VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
13VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$QPEDIR/include/qpe/version.h) 13VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h)
14if grep -q 'QPE_VERSION .*snapshot' $QPEDIR/include/qpe/version.h 14if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h
15then 15then
16 VERSION_CVS="_$(date +%Y%m%d)" 16 VERSION_CVS="_$(date +%Y%m%d)"
17else 17else
18 VERSION_CVS="" 18 VERSION_CVS=""
19fi 19fi
20 20
21QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT 21QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT
22 22
23ARCH=arm 23ARCH=arm
24STRIP=arm-linux-strip 24STRIP=arm-linux-strip
25STRIP_FILES="*Advanced RISC Machines ARM*not stripped" 25STRIP_FILES="*Advanced RISC Machines ARM*not stripped"
26 26
27TDIR=/tmp/ipk$$ 27TDIR=/tmp/ipk$$
28DATADIR=$TDIR/data 28DATADIR=$TDIR/data
29CTRLDIR=$TDIR/control 29CTRLDIR=$TDIR/control
30 30
31IMAGEDIR= 31IMAGEDIR=
32VERB= 32VERB=
33LIST= 33LIST=
34RPM= 34RPM=
35 35
36while [ $# -ne 0 ] 36while [ $# -ne 0 ]
37do 37do
38 case "$1" in 38 case "$1" in
39 -v) 39 -v)
40 VERB=1 40 VERB=1
41 echo >&2 "Packaging for version $VERSION_MAJ.$VERSION_MIN.$VERSION_PAT$VERSION_CVS" 41 echo >&2 "Packaging for version $VERSION_MAJ.$VERSION_MIN.$VERSION_PAT$VERSION_CVS"
42 ;; -l) 42 ;; -l)
43 LIST=1 43 LIST=1
44 ;; -i) 44 ;; -i)
45 shift 45 shift
46 IMAGEDIR=$1 46 IMAGEDIR=$1
47 DATADIR=$IMAGEDIR 47 DATADIR=$IMAGEDIR
48 mkdir -p $IMAGEDIR 48 mkdir -p $IMAGEDIR
49 ;; -rpm) 49 ;; -rpm)
50 if [ "$QPEDIR" != "/opt/Qtopia" ] 50 if [ "$OPIEDIR" != "/opt/Qtopia" ]
51 then 51 then
52 echo >&2 '$QPEDIR is not the standard /usr/Qtopia directory.' 52 echo >&2 '$OPIEDIR is not the standard /usr/Qtopia directory.'
53 sleep 1 53 sleep 1
54 #exit 1 54 #exit 1
55 fi 55 fi
56 RPM=1 56 RPM=1
57 ;; -arch) 57 ;; -arch)
58 shift 58 shift
59 ARCH=$1 59 ARCH=$1
60 STRIP= 60 STRIP=
61 STRIP_FILES= 61 STRIP_FILES=
62 ;; /*) 62 ;; /*)
63 FILES="$FILES $1" 63 FILES="$FILES $1"
64 ;; *) 64 ;; *)
65 FILES="$FILES $PWD/$1" 65 FILES="$FILES $PWD/$1"
66 esac 66 esac
67 shift 67 shift
68done 68done
69 69
70 70
71if [ -z "$FILES" ] 71if [ -z "$FILES" ]
72then 72then
73 FILES=`find $QPEDIR -name "*.control" -print` 73 FILES=`find $OPIEDIR -name "*.control" -print`
74fi 74fi
75 75
76RDIR=$PWD 76RDIR=$PWD
77cd $QPEDIR 77cd $OPIEDIR
78 78
79for i in $FILES 79for i in $FILES
80do 80do
81 rm -rf $TDIR 81 rm -rf $TDIR
82 82
83 mkdir -p $DATADIR 83 mkdir -p $DATADIR
84 mkdir -p $CTRLDIR 84 mkdir -p $CTRLDIR
85 85
86 packagename=${i##*/}; packagename=${packagename%.control} 86 packagename=${i##*/}; packagename=${packagename%.control}
87 version=$(eval echo '"'$(sed -n -e "s/^Version: *//p" $i)'"') 87 version=$(eval echo '"'$(sed -n -e "s/^Version: *//p" $i)'"')
88 depends=$(eval echo '"'$(sed -n -e "s/^Depends: *//p" $i)'"') 88 depends=$(eval echo '"'$(sed -n -e "s/^Depends: *//p" $i)'"')
89 files=$(eval echo $(sed -n -e "s/^Files://p" $i)) 89 files=$(eval echo $(sed -n -e "s/^Files://p" $i))
90 arch=$(eval echo $(sed -n -e "s/^Arch://p" $i)) 90 arch=$(eval echo $(sed -n -e "s/^Arch://p" $i))
91 section=$(sed -n -e "s/^Section: *//p" $i) 91 section=$(sed -n -e "s/^Section: *//p" $i)
92 license=$(sed -n -e "s/^License: *//p" $i) 92 license=$(sed -n -e "s/^License: *//p" $i)
93 summary=$(sed -n -e "s/^Description: *//p" $i) 93 summary=$(sed -n -e "s/^Description: *//p" $i)
94 package=${packagename}_${version}_$ARCH 94 package=${packagename}_${version}_$ARCH
95 ERROR= 95 ERROR=
96 if [ -z "$files" ] 96 if [ -z "$files" ]
97 then 97 then
98 mkdir -p $DATADIR/usr/share/doc/$packagename 98 mkdir -p $DATADIR/usr/share/doc/$packagename
99 else 99 else
100 for f in $files 100 for f in $files
101 do 101 do
102 if [ -d $f ] 102 if [ -d $f ]
103 then 103 then
104 ffiles=$(find $f -type f -o -type b -o -type c -o -type l) 104 ffiles=$(find $f -type f -o -type b -o -type c -o -type l)
105 else 105 else
106 ffiles=$f 106 ffiles=$f
107 fi 107 fi
108 for ff in $ffiles 108 for ff in $ffiles
109 do 109 do
110 case $ff in 110 case $ff in
111 */CVS/*) 111 */CVS/*)
112 continue 112 continue
113 ;;*~) 113 ;;*~)
114 continue 114 continue
115 ;;*.control) 115 ;;*.control)
116 continue 116 continue
117 ;; $QTDIR/*) 117 ;; $QTDIR/*)
118 BASE=$(dirname /usr/${ff#$QTDIR/}) 118 BASE=$(dirname /usr/${ff#$QTDIR/})
119 ;; etc/*.d/*) 119 ;; etc/*.d/*)
120 BASE=$(dirname /$ff) 120 BASE=$(dirname /$ff)
121 ;; ipaq/*) 121 ;; ipaq/*)
122 BASE=$(dirname ${ff#ipaq}) 122 BASE=$(dirname ${ff#ipaq})
123 ;; *) 123 ;; *)
124 # For SHARP ROM compatibility. Should change to Qtopia. 124 # For SHARP ROM compatibility. Should change to Qtopia.
125 BASE=/opt/QtPalmtop/$(dirname $ff) 125 BASE=/opt/QtPalmtop/$(dirname $ff)
126 esac 126 esac
127 127
128 if [ -f $ff -o -b $ff -o -c $ff ] 128 if [ -f $ff -o -b $ff -o -c $ff ]
129 then 129 then
130 D=$DATADIR$BASE 130 D=$DATADIR$BASE
131 if [ -x $ff -a -n "$STRIP" ] 131 if [ -x $ff -a -n "$STRIP" ]
132 then 132 then
133 case $(file $ff) in 133 case $(file $ff) in
134 $STRIP_FILES) 134 $STRIP_FILES)
135 $STRIP $ff 135 $STRIP $ff
136 ;; *) 136 ;; *)
137 esac 137 esac
138 fi 138 fi
139 if [ -n "$RPM" ] 139 if [ -n "$RPM" ]
140 then 140 then
141 case "$ff" in 141 case "$ff" in
142 /*) RPMFILES="$RPMFILES $ff" 142 /*) RPMFILES="$RPMFILES $ff"
143 ;; *) RPMFILES="$RPMFILES $QPEDIR/$ff" 143 ;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff"
144 esac 144 esac
145 else 145 else
146 mkdir -p $D 146 mkdir -p $D
147 if cp -a $ff $D 147 if cp -a $ff $D
148 then 148 then
149 true 149 true
150 else 150 else
151 ERROR=1 151 ERROR=1
152 fi 152 fi
153 fi 153 fi
154 else 154 else
155 echo >&2 "$0: $i: No such file: $ff" 155 echo >&2 "$0: $i: No such file: $ff"
156 ERROR=1 156 ERROR=1
157 fi 157 fi
158 done 158 done
159 done 159 done
160 fi 160 fi
161 if [ -z "$ERROR" ] 161 if [ -z "$ERROR" ]
162 then 162 then
163 if [ -n "$RPM" ] 163 if [ -n "$RPM" ]
164 then 164 then
165 SPEC=/tmp/mkipks-rpm-$$.spec 165 SPEC=/tmp/mkipks-rpm-$$.spec
166 echo >$SPEC "Summary: $summary" 166 echo >$SPEC "Summary: $summary"
167 echo >>$SPEC "Name: $packagename" 167 echo >>$SPEC "Name: $packagename"
168 echo >>$SPEC "Group: $section" ########## 168 echo >>$SPEC "Group: $section" ##########
169 echo >>$SPEC "License: $license" 169 echo >>$SPEC "License: $license"
170 echo >>$SPEC "Version: ${version%-*}" 170 echo >>$SPEC "Version: ${version%-*}"
171 echo >>$SPEC "Release: ${version#*-}" 171 echo >>$SPEC "Release: ${version#*-}"
172 172
173 echo >>$SPEC "%description" 173 echo >>$SPEC "%description"
174 sed -n -e '/^Description:/,$ p' $i | tail +2 >>$SPEC 174 sed -n -e '/^Description:/,$ p' $i | tail +2 >>$SPEC
175 echo >>$SPEC "%files" 175 echo >>$SPEC "%files"
176 echo >>$SPEC "%defattr(-,root,root)" 176 echo >>$SPEC "%defattr(-,root,root)"
177 /bin/ls $RPMFILES >>$SPEC 177 /bin/ls $RPMFILES >>$SPEC
178 rpm -bb $SPEC --target $ARCH-unknown-linux 178 rpm -bb $SPEC --target $ARCH-unknown-linux
179 # rm $SPEC 179 # rm $SPEC
180 elif [ -z "$IMAGEDIR" ] 180 elif [ -z "$IMAGEDIR" ]
181 then 181 then
182 #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//') 182 #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//')
183 size=$(mkfs.jffs2 -r $DATADIR | wc -c) 183 size=$(mkfs.jffs2 -r $DATADIR | wc -c)
184 echo "Package: $packagename" >$CTRLDIR/control 184 echo "Package: $packagename" >$CTRLDIR/control
185 echo "Installed-Size: $size" >>$CTRLDIR/control 185 echo "Installed-Size: $size" >>$CTRLDIR/control
186 echo "Filename: ./$package.ipk" >>$CTRLDIR/control 186 echo "Filename: ./$package.ipk" >>$CTRLDIR/control
187 echo "Version: $version" >>$CTRLDIR/control 187 echo "Version: $version" >>$CTRLDIR/control
188 echo "Depends: $depends" >>$CTRLDIR/control 188 echo "Depends: $depends" >>$CTRLDIR/control
189 egrep -v "^(Files|Version|Depends):" >>$CTRLDIR/control $i 189 egrep -v "^(Files|Version|Depends):" >>$CTRLDIR/control $i
190 echo "$DEB_VERSION" >$TDIR/debian-binary 190 echo "$DEB_VERSION" >$TDIR/debian-binary
191 base=${i%.control} 191 base=${i%.control}
192 scripts="preinst postinst prerm postrm" 192 scripts="preinst postinst prerm postrm"
193 for pf in $scripts 193 for pf in $scripts
194 do 194 do
195 if [ -x ${base}.$pf ] 195 if [ -x ${base}.$pf ]
196 then 196 then
197 cp ${base}.$pf $CTRLDIR/$pf 197 cp ${base}.$pf $CTRLDIR/$pf
198 fi 198 fi
199 done 199 done
200 if [ "$UID" = 0 ] 200 if [ "$UID" = 0 ]
201 then 201 then
202 chown -R root.root $TDIR 202 chown -R root.root $TDIR
203 fi 203 fi
204 ( cd $CTRLDIR; tar cfz ../control.tar.gz ./*; ) 204 ( cd $CTRLDIR; tar cfz ../control.tar.gz ./*; )
205 ( cd $DATADIR; tar cfz ../data.tar.gz ./*; ) 205 ( cd $DATADIR; tar cfz ../data.tar.gz ./*; )
206 ( cd $TDIR; rm -rf control data; tar cf - ./debian-binary ./control.tar.gz ./data.tar.gz; ) | gzip >$RDIR/$package.ipk 206 ( cd $TDIR; rm -rf control data; tar cf - ./debian-binary ./control.tar.gz ./data.tar.gz; ) | gzip >$RDIR/$package.ipk
207 RESULT=$package.ipk 207 RESULT=$package.ipk
208 if [ -n "$VERB" ] 208 if [ -n "$VERB" ]
209 then 209 then
210 echo >&2 "Built $RESULT ($size)" 210 echo >&2 "Built $RESULT ($size)"
211 fi 211 fi
212 if [ -n "$LIST" ] 212 if [ -n "$LIST" ]
213 then 213 then
214 echo $RESULT 214 echo $RESULT
215 fi 215 fi
216 fi 216 fi
217 else 217 else
218 echo >&2 "Not building $package package" 218 echo >&2 "Not building $package package"
219 fi 219 fi
220done 220done
diff --git a/noncore/apps/dictionary/dictionary.pro b/noncore/apps/dictionary/dictionary.pro
index e829e68..fc89411 100644
--- a/noncore/apps/dictionary/dictionary.pro
+++ b/noncore/apps/dictionary/dictionary.pro
@@ -1,14 +1,14 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = ../bin 3 DESTDIR = ../bin
4 4
5 HEADERS= dicttool.h 5 HEADERS= dicttool.h
6 SOURCES= dicttool.cpp main.cpp 6 SOURCES= dicttool.cpp main.cpp
7 7
8 INTERFACES= dicttoolbase.ui 8 INTERFACES= dicttoolbase.ui
9 9
10INCLUDEPATH += $(QPEDIR)/include 10INCLUDEPATH += $(OPIEDIR)/include
11 DEPENDPATH+= $(QPEDIR)/include 11 DEPENDPATH+= $(OPIEDIR)/include
12LIBS += -lqpe 12LIBS += -lqpe
13 13
14 TARGET = dictionary 14 TARGET = dictionary
diff --git a/noncore/apps/tableviewer/tableviewer.pro b/noncore/apps/tableviewer/tableviewer.pro
index edd41c5..c9d068e 100644
--- a/noncore/apps/tableviewer/tableviewer.pro
+++ b/noncore/apps/tableviewer/tableviewer.pro
@@ -1,36 +1,36 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on debug 2 CONFIG = qt warn_on debug
3 DESTDIR = ../bin 3 DESTDIR = ../bin
4 SUBDIRS = db ui 4 SUBDIRS = db ui
5 HEADERS = tableviewer.h \ 5 HEADERS = tableviewer.h \
6 ui/commonwidgets.h \ 6 ui/commonwidgets.h \
7 ui/tvbrowseview.h \ 7 ui/tvbrowseview.h \
8 ui/tvlistview.h \ 8 ui/tvlistview.h \
9 ui/tvfilterview.h \ 9 ui/tvfilterview.h \
10 ui/tveditview.h \ 10 ui/tveditview.h \
11 ui/browsekeyentry.h \ 11 ui/browsekeyentry.h \
12 ui/filterkeyentry.h \ 12 ui/filterkeyentry.h \
13 ui/tvkeyedit.h \ 13 ui/tvkeyedit.h \
14 db/datacache.h \ 14 db/datacache.h \
15 db/common.h \ 15 db/common.h \
16 db/xmlsource.h \ 16 db/xmlsource.h \
17 db/csvsource.h 17 db/csvsource.h
18 SOURCES = main.cpp \ 18 SOURCES = main.cpp \
19 tableviewer.cpp \ 19 tableviewer.cpp \
20 ui/commonwidgets.cpp \ 20 ui/commonwidgets.cpp \
21 ui/tvbrowseview.cpp \ 21 ui/tvbrowseview.cpp \
22 ui/tvfilterview.cpp \ 22 ui/tvfilterview.cpp \
23 ui/browsekeyentry.cpp \ 23 ui/browsekeyentry.cpp \
24 ui/filterkeyentry.cpp \ 24 ui/filterkeyentry.cpp \
25 ui/tvlistview.cpp \ 25 ui/tvlistview.cpp \
26 ui/tveditview.cpp \ 26 ui/tveditview.cpp \
27 ui/tvkeyedit.cpp \ 27 ui/tvkeyedit.cpp \
28 db/datacache.cpp \ 28 db/datacache.cpp \
29 db/xmlsource.cpp \ 29 db/xmlsource.cpp \
30 db/csvsource.cpp \ 30 db/csvsource.cpp \
31 db/common.cpp 31 db/common.cpp
32 INTERFACES= ui/tvkeyedit_gen.ui 32 INTERFACES= ui/tvkeyedit_gen.ui
33 TARGET = tableviewer 33 TARGET = tableviewer
34INCLUDEPATH += $(QPEDIR)/include 34INCLUDEPATH += $(OPIEDIR)/include
35DEPENDPATH += $(QPEDIR)/include 35DEPENDPATH += $(OPIEDIR)/include
36 LIBS += -lqpe 36 LIBS += -lqpe
diff --git a/noncore/comm/keypebble/Makefile.in b/noncore/comm/keypebble/Makefile.in
index 1dbd5d2..18c43e8 100644
--- a/noncore/comm/keypebble/Makefile.in
+++ b/noncore/comm/keypebble/Makefile.in
@@ -1,286 +1,286 @@
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$(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= keypebble 21 TARGET= keypebble
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =d3des.h \ 26 HEADERS =d3des.h \
27 krfbbuffer.h \ 27 krfbbuffer.h \
28 krfbcanvas.h \ 28 krfbcanvas.h \
29 krfbconnection.h \ 29 krfbconnection.h \
30 krfbdecoder.h \ 30 krfbdecoder.h \
31 krfblogin.h \ 31 krfblogin.h \
32 krfboptions.h \ 32 krfboptions.h \
33 krfbserverinfo.h \ 33 krfbserverinfo.h \
34 kvnc.h \ 34 kvnc.h \
35 kvncconnectdlg.h \ 35 kvncconnectdlg.h \
36 kvncoptionsdlg.h \ 36 kvncoptionsdlg.h \
37 version.h \ 37 version.h \
38 vncauth.h 38 vncauth.h
39 SOURCES =d3des.c \ 39 SOURCES =d3des.c \
40 vncauth.c \ 40 vncauth.c \
41 krfbbuffer.cpp \ 41 krfbbuffer.cpp \
42 krfbcanvas.cpp \ 42 krfbcanvas.cpp \
43 krfbconnection.cpp \ 43 krfbconnection.cpp \
44 krfbdecoder.cpp \ 44 krfbdecoder.cpp \
45 krfblogin.cpp \ 45 krfblogin.cpp \
46 krfboptions.cpp \ 46 krfboptions.cpp \
47 kvnc.cpp \ 47 kvnc.cpp \
48 kvncconnectdlg.cpp \ 48 kvncconnectdlg.cpp \
49 kvncoptionsdlg.cpp \ 49 kvncoptionsdlg.cpp \
50 main.cpp 50 main.cpp
51 OBJECTS =d3des.o \ 51 OBJECTS =d3des.o \
52 vncauth.o \ 52 vncauth.o \
53 krfbbuffer.o \ 53 krfbbuffer.o \
54 krfbcanvas.o \ 54 krfbcanvas.o \
55 krfbconnection.o \ 55 krfbconnection.o \
56 krfbdecoder.o \ 56 krfbdecoder.o \
57 krfblogin.o \ 57 krfblogin.o \
58 krfboptions.o \ 58 krfboptions.o \
59 kvnc.o \ 59 kvnc.o \
60 kvncconnectdlg.o \ 60 kvncconnectdlg.o \
61 kvncoptionsdlg.o \ 61 kvncoptionsdlg.o \
62 main.o \ 62 main.o \
63 vncoptionsbase.o 63 vncoptionsbase.o
64INTERFACES = vncoptionsbase.ui 64INTERFACES = vncoptionsbase.ui
65UICDECLS = vncoptionsbase.h 65UICDECLS = vncoptionsbase.h
66UICIMPLS = vncoptionsbase.cpp 66UICIMPLS = vncoptionsbase.cpp
67 SRCMOC =moc_krfbbuffer.cpp \ 67 SRCMOC =moc_krfbbuffer.cpp \
68 moc_krfbcanvas.cpp \ 68 moc_krfbcanvas.cpp \
69 moc_krfbconnection.cpp \ 69 moc_krfbconnection.cpp \
70 moc_krfbdecoder.cpp \ 70 moc_krfbdecoder.cpp \
71 moc_krfblogin.cpp \ 71 moc_krfblogin.cpp \
72 moc_kvnc.cpp \ 72 moc_kvnc.cpp \
73 moc_kvncconnectdlg.cpp \ 73 moc_kvncconnectdlg.cpp \
74 moc_kvncoptionsdlg.cpp \ 74 moc_kvncoptionsdlg.cpp \
75 moc_vncoptionsbase.cpp 75 moc_vncoptionsbase.cpp
76 OBJMOC =moc_krfbbuffer.o \ 76 OBJMOC =moc_krfbbuffer.o \
77 moc_krfbcanvas.o \ 77 moc_krfbcanvas.o \
78 moc_krfbconnection.o \ 78 moc_krfbconnection.o \
79 moc_krfbdecoder.o \ 79 moc_krfbdecoder.o \
80 moc_krfblogin.o \ 80 moc_krfblogin.o \
81 moc_kvnc.o \ 81 moc_kvnc.o \
82 moc_kvncconnectdlg.o \ 82 moc_kvncconnectdlg.o \
83 moc_kvncoptionsdlg.o \ 83 moc_kvncoptionsdlg.o \
84 moc_vncoptionsbase.o 84 moc_vncoptionsbase.o
85 85
86 86
87####### Implicit rules 87####### Implicit rules
88 88
89.SUFFIXES: .cpp .cxx .cc .C .c 89.SUFFIXES: .cpp .cxx .cc .C .c
90 90
91.cpp.o: 91.cpp.o:
92 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 92 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
93 93
94.cxx.o: 94.cxx.o:
95 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 95 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
96 96
97.cc.o: 97.cc.o:
98 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 98 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
99 99
100.C.o: 100.C.o:
101 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 101 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
102 102
103.c.o: 103.c.o:
104 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 104 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
105 105
106####### Build rules 106####### Build rules
107 107
108 108
109all: $(DESTDIR)$(TARGET) 109all: $(DESTDIR)$(TARGET)
110 110
111$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 111$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
112 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 112 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
113 113
114moc: $(SRCMOC) 114moc: $(SRCMOC)
115 115
116tmake: 116tmake:
117 tmake keypebble.pro 117 tmake keypebble.pro
118 118
119clean: 119clean:
120 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 120 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
121 -rm -f *~ core 121 -rm -f *~ core
122 -rm -f allmoc.cpp 122 -rm -f allmoc.cpp
123 123
124####### Extension Modules 124####### Extension Modules
125 125
126listpromodules: 126listpromodules:
127 @echo 127 @echo
128 128
129listallmodules: 129listallmodules:
130 @echo 130 @echo
131 131
132listaddonpromodules: 132listaddonpromodules:
133 @echo 133 @echo
134 134
135listaddonentmodules: 135listaddonentmodules:
136 @echo 136 @echo
137 137
138 138
139REQUIRES= 139REQUIRES=
140 140
141####### Sub-libraries 141####### Sub-libraries
142 142
143 143
144###### Combined headers 144###### Combined headers
145 145
146 146
147 147
148####### Compile 148####### Compile
149 149
150d3des.o: d3des.c \ 150d3des.o: d3des.c \
151 d3des.h 151 d3des.h
152 152
153vncauth.o: vncauth.c \ 153vncauth.o: vncauth.c \
154 vncauth.h \ 154 vncauth.h \
155 d3des.h 155 d3des.h
156 156
157krfbbuffer.o: krfbbuffer.cpp \ 157krfbbuffer.o: krfbbuffer.cpp \
158 krfbdecoder.h \ 158 krfbdecoder.h \
159 krfbbuffer.h \ 159 krfbbuffer.h \
160 krfbserverinfo.h 160 krfbserverinfo.h
161 161
162krfbcanvas.o: krfbcanvas.cpp \ 162krfbcanvas.o: krfbcanvas.cpp \
163 kvncconnectdlg.h \ 163 kvncconnectdlg.h \
164 krfbconnection.h \ 164 krfbconnection.h \
165 krfbcanvas.h \ 165 krfbcanvas.h \
166 krfboptions.h \ 166 krfboptions.h \
167 krfbbuffer.h \ 167 krfbbuffer.h \
168 $(QPEDIR)/include/qpe/config.h 168 $(OPIEDIR)/include/qpe/config.h
169 169
170krfbconnection.o: krfbconnection.cpp \ 170krfbconnection.o: krfbconnection.cpp \
171 krfbconnection.h \ 171 krfbconnection.h \
172 krfblogin.h \ 172 krfblogin.h \
173 krfboptions.h \ 173 krfboptions.h \
174 krfbdecoder.h \ 174 krfbdecoder.h \
175 krfbbuffer.h 175 krfbbuffer.h
176 176
177krfbdecoder.o: krfbdecoder.cpp \ 177krfbdecoder.o: krfbdecoder.cpp \
178 krfbconnection.h \ 178 krfbconnection.h \
179 krfboptions.h \ 179 krfboptions.h \
180 krfbserverinfo.h \ 180 krfbserverinfo.h \
181 krfbdecoder.h \ 181 krfbdecoder.h \
182 krfbbuffer.h \ 182 krfbbuffer.h \
183 $(QPEDIR)/include/qpe/qpeapplication.h 183 $(OPIEDIR)/include/qpe/qpeapplication.h
184 184
185krfblogin.o: krfblogin.cpp \ 185krfblogin.o: krfblogin.cpp \
186 vncauth.h \ 186 vncauth.h \
187 krfblogin.h \ 187 krfblogin.h \
188 krfbconnection.h 188 krfbconnection.h
189 189
190krfboptions.o: krfboptions.cpp \ 190krfboptions.o: krfboptions.cpp \
191 $(QPEDIR)/include/qpe/config.h \ 191 $(OPIEDIR)/include/qpe/config.h \
192 $(QPEDIR)/include/qpe/qpeapplication.h \ 192 $(OPIEDIR)/include/qpe/qpeapplication.h \
193 krfboptions.h 193 krfboptions.h
194 194
195kvnc.o: kvnc.cpp \ 195kvnc.o: kvnc.cpp \
196 $(QPEDIR)/include/qpe/qpemenubar.h \ 196 $(OPIEDIR)/include/qpe/qpemenubar.h \
197 $(QPEDIR)/include/qpe/qpetoolbar.h \ 197 $(OPIEDIR)/include/qpe/qpetoolbar.h \
198 $(QPEDIR)/include/qpe/qpeapplication.h \ 198 $(OPIEDIR)/include/qpe/qpeapplication.h \
199 $(QPEDIR)/include/qpe/global.h \ 199 $(OPIEDIR)/include/qpe/global.h \
200 kvnc.h \ 200 kvnc.h \
201 krfbcanvas.h \ 201 krfbcanvas.h \
202 kvncoptionsdlg.h \ 202 kvncoptionsdlg.h \
203 vncoptionsbase.h \ 203 vncoptionsbase.h \
204 krfbconnection.h 204 krfbconnection.h
205 205
206kvncconnectdlg.o: kvncconnectdlg.cpp \ 206kvncconnectdlg.o: kvncconnectdlg.cpp \
207 krfbconnection.h \ 207 krfbconnection.h \
208 kvncoptionsdlg.h \ 208 kvncoptionsdlg.h \
209 vncoptionsbase.h \ 209 vncoptionsbase.h \
210 kvncconnectdlg.h 210 kvncconnectdlg.h
211 211
212kvncoptionsdlg.o: kvncoptionsdlg.cpp \ 212kvncoptionsdlg.o: kvncoptionsdlg.cpp \
213 krfboptions.h \ 213 krfboptions.h \
214 kvncoptionsdlg.h \ 214 kvncoptionsdlg.h \
215 vncoptionsbase.h 215 vncoptionsbase.h
216 216
217main.o: main.cpp \ 217main.o: main.cpp \
218 $(QPEDIR)/include/qpe/qpeapplication.h \ 218 $(OPIEDIR)/include/qpe/qpeapplication.h \
219 kvnc.h 219 kvnc.h
220 220
221vncoptionsbase.h: vncoptionsbase.ui 221vncoptionsbase.h: vncoptionsbase.ui
222 $(UIC) vncoptionsbase.ui -o $(INTERFACE_DECL_PATH)/vncoptionsbase.h 222 $(UIC) vncoptionsbase.ui -o $(INTERFACE_DECL_PATH)/vncoptionsbase.h
223 223
224vncoptionsbase.cpp: vncoptionsbase.ui 224vncoptionsbase.cpp: vncoptionsbase.ui
225 $(UIC) vncoptionsbase.ui -i vncoptionsbase.h -o vncoptionsbase.cpp 225 $(UIC) vncoptionsbase.ui -i vncoptionsbase.h -o vncoptionsbase.cpp
226 226
227vncoptionsbase.o: vncoptionsbase.cpp \ 227vncoptionsbase.o: vncoptionsbase.cpp \
228 vncoptionsbase.h \ 228 vncoptionsbase.h \
229 vncoptionsbase.ui 229 vncoptionsbase.ui
230 230
231moc_krfbbuffer.o: moc_krfbbuffer.cpp \ 231moc_krfbbuffer.o: moc_krfbbuffer.cpp \
232 krfbbuffer.h 232 krfbbuffer.h
233 233
234moc_krfbcanvas.o: moc_krfbcanvas.cpp \ 234moc_krfbcanvas.o: moc_krfbcanvas.cpp \
235 krfbcanvas.h 235 krfbcanvas.h
236 236
237moc_krfbconnection.o: moc_krfbconnection.cpp \ 237moc_krfbconnection.o: moc_krfbconnection.cpp \
238 krfbconnection.h 238 krfbconnection.h
239 239
240moc_krfbdecoder.o: moc_krfbdecoder.cpp \ 240moc_krfbdecoder.o: moc_krfbdecoder.cpp \
241 krfbdecoder.h 241 krfbdecoder.h
242 242
243moc_krfblogin.o: moc_krfblogin.cpp \ 243moc_krfblogin.o: moc_krfblogin.cpp \
244 krfblogin.h 244 krfblogin.h
245 245
246moc_kvnc.o: moc_kvnc.cpp \ 246moc_kvnc.o: moc_kvnc.cpp \
247 kvnc.h 247 kvnc.h
248 248
249moc_kvncconnectdlg.o: moc_kvncconnectdlg.cpp \ 249moc_kvncconnectdlg.o: moc_kvncconnectdlg.cpp \
250 kvncconnectdlg.h 250 kvncconnectdlg.h
251 251
252moc_kvncoptionsdlg.o: moc_kvncoptionsdlg.cpp \ 252moc_kvncoptionsdlg.o: moc_kvncoptionsdlg.cpp \
253 kvncoptionsdlg.h \ 253 kvncoptionsdlg.h \
254 vncoptionsbase.h 254 vncoptionsbase.h
255 255
256moc_vncoptionsbase.o: moc_vncoptionsbase.cpp \ 256moc_vncoptionsbase.o: moc_vncoptionsbase.cpp \
257 vncoptionsbase.h 257 vncoptionsbase.h
258 258
259moc_krfbbuffer.cpp: krfbbuffer.h 259moc_krfbbuffer.cpp: krfbbuffer.h
260 $(MOC) krfbbuffer.h -o moc_krfbbuffer.cpp 260 $(MOC) krfbbuffer.h -o moc_krfbbuffer.cpp
261 261
262moc_krfbcanvas.cpp: krfbcanvas.h 262moc_krfbcanvas.cpp: krfbcanvas.h
263 $(MOC) krfbcanvas.h -o moc_krfbcanvas.cpp 263 $(MOC) krfbcanvas.h -o moc_krfbcanvas.cpp
264 264
265moc_krfbconnection.cpp: krfbconnection.h 265moc_krfbconnection.cpp: krfbconnection.h
266 $(MOC) krfbconnection.h -o moc_krfbconnection.cpp 266 $(MOC) krfbconnection.h -o moc_krfbconnection.cpp
267 267
268moc_krfbdecoder.cpp: krfbdecoder.h 268moc_krfbdecoder.cpp: krfbdecoder.h
269 $(MOC) krfbdecoder.h -o moc_krfbdecoder.cpp 269 $(MOC) krfbdecoder.h -o moc_krfbdecoder.cpp
270 270
271moc_krfblogin.cpp: krfblogin.h 271moc_krfblogin.cpp: krfblogin.h
272 $(MOC) krfblogin.h -o moc_krfblogin.cpp 272 $(MOC) krfblogin.h -o moc_krfblogin.cpp
273 273
274moc_kvnc.cpp: kvnc.h 274moc_kvnc.cpp: kvnc.h
275 $(MOC) kvnc.h -o moc_kvnc.cpp 275 $(MOC) kvnc.h -o moc_kvnc.cpp
276 276
277moc_kvncconnectdlg.cpp: kvncconnectdlg.h 277moc_kvncconnectdlg.cpp: kvncconnectdlg.h
278 $(MOC) kvncconnectdlg.h -o moc_kvncconnectdlg.cpp 278 $(MOC) kvncconnectdlg.h -o moc_kvncconnectdlg.cpp
279 279
280moc_kvncoptionsdlg.cpp: kvncoptionsdlg.h 280moc_kvncoptionsdlg.cpp: kvncoptionsdlg.h
281 $(MOC) kvncoptionsdlg.h -o moc_kvncoptionsdlg.cpp 281 $(MOC) kvncoptionsdlg.h -o moc_kvncoptionsdlg.cpp
282 282
283moc_vncoptionsbase.cpp: vncoptionsbase.h 283moc_vncoptionsbase.cpp: vncoptionsbase.h
284 $(MOC) vncoptionsbase.h -o moc_vncoptionsbase.cpp 284 $(MOC) vncoptionsbase.h -o moc_vncoptionsbase.cpp
285 285
286 286
diff --git a/noncore/comm/keypebble/keypebble.pro b/noncore/comm/keypebble/keypebble.pro
index 6b11801..c0efc4f 100644
--- a/noncore/comm/keypebble/keypebble.pro
+++ b/noncore/comm/keypebble/keypebble.pro
@@ -1,38 +1,38 @@
1TEMPLATE = app 1TEMPLATE = app
2 2
3CONFIG += qt warn_on release 3CONFIG += qt warn_on release
4DESTDIR = ../bin 4DESTDIR = ../bin
5 5
6 HEADERS = d3des.h \ 6 HEADERS = d3des.h \
7 krfbbuffer.h \ 7 krfbbuffer.h \
8 krfbcanvas.h \ 8 krfbcanvas.h \
9 krfbconnection.h \ 9 krfbconnection.h \
10 krfbdecoder.h \ 10 krfbdecoder.h \
11 krfblogin.h \ 11 krfblogin.h \
12 krfboptions.h \ 12 krfboptions.h \
13 krfbserverinfo.h \ 13 krfbserverinfo.h \
14 kvnc.h \ 14 kvnc.h \
15 kvncconnectdlg.h \ 15 kvncconnectdlg.h \
16 kvncoptionsdlg.h \ 16 kvncoptionsdlg.h \
17 version.h \ 17 version.h \
18 vncauth.h 18 vncauth.h
19 19
20 SOURCES = d3des.c \ 20 SOURCES = d3des.c \
21 vncauth.c \ 21 vncauth.c \
22 krfbbuffer.cpp \ 22 krfbbuffer.cpp \
23 krfbcanvas.cpp \ 23 krfbcanvas.cpp \
24 krfbconnection.cpp \ 24 krfbconnection.cpp \
25 krfbdecoder.cpp \ 25 krfbdecoder.cpp \
26 krfblogin.cpp \ 26 krfblogin.cpp \
27 krfboptions.cpp \ 27 krfboptions.cpp \
28 kvnc.cpp \ 28 kvnc.cpp \
29 kvncconnectdlg.cpp \ 29 kvncconnectdlg.cpp \
30 kvncoptionsdlg.cpp \ 30 kvncoptionsdlg.cpp \
31 main.cpp 31 main.cpp
32 INTERFACES= vncoptionsbase.ui 32 INTERFACES= vncoptionsbase.ui
33TARGET = keypebble 33TARGET = keypebble
34 34
35INCLUDEPATH += $(QPEDIR)/include 35INCLUDEPATH += $(OPIEDIR)/include
36DEPENDPATH += $(QPEDIR)/include 36DEPENDPATH += $(OPIEDIR)/include
37LIBS += -lqpe 37LIBS += -lqpe
38 38
diff --git a/noncore/games/chess/chess.pro b/noncore/games/chess/chess.pro
index f6650a0..9053809 100644
--- a/noncore/games/chess/chess.pro
+++ b/noncore/games/chess/chess.pro
@@ -1,14 +1,14 @@
1 SOURCES+= chess.cpp main.cpp 1 SOURCES+= chess.cpp main.cpp
2 HEADERS+= chess.h 2 HEADERS+= chess.h
3DESTDIR = ../bin 3DESTDIR = ../bin
4TARGET = chess 4TARGET = chess
5 DEPENDPATH+= $(QPEDIR)/include 5 DEPENDPATH+= $(OPIEDIR)/include
6INTERFACES = mainwindow.ui 6INTERFACES = mainwindow.ui
7 IMAGES= images/new.png images/repeat.png images/txt.png images/back.png 7 IMAGES= images/new.png images/repeat.png images/txt.png images/back.png
8 TEMPLATE=app 8 TEMPLATE=app
9 CONFIG+= qt warn_on release 9 CONFIG+= qt warn_on release
10INCLUDEPATH += $(QPEDIR)/include 10INCLUDEPATH += $(OPIEDIR)/include
11 LIBS+= -lqpe 11 LIBS+= -lqpe
12 DBFILE= chess.db 12 DBFILE= chess.db
13 LANGUAGE= C++ 13 LANGUAGE= C++
14 CPP_ALWAYS_CREATE_SOURCE= TRUE 14 CPP_ALWAYS_CREATE_SOURCE= TRUE
diff --git a/noncore/games/fifteen/Makefile.in b/noncore/games/fifteen/Makefile.in
index 23c7334..1cae722 100644
--- a/noncore/games/fifteen/Makefile.in
+++ b/noncore/games/fifteen/Makefile.in
@@ -1,118 +1,118 @@
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$(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= fifteen 21 TARGET= fifteen
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =fifteen.h 26 HEADERS =fifteen.h
27 SOURCES =fifteen.cpp \ 27 SOURCES =fifteen.cpp \
28 main.cpp 28 main.cpp
29 OBJECTS =fifteen.o \ 29 OBJECTS =fifteen.o \
30 main.o 30 main.o
31INTERFACES = 31INTERFACES =
32UICDECLS = 32UICDECLS =
33UICIMPLS = 33UICIMPLS =
34 SRCMOC =moc_fifteen.cpp 34 SRCMOC =moc_fifteen.cpp
35 OBJMOC =moc_fifteen.o 35 OBJMOC =moc_fifteen.o
36 36
37 37
38####### Implicit rules 38####### Implicit rules
39 39
40.SUFFIXES: .cpp .cxx .cc .C .c 40.SUFFIXES: .cpp .cxx .cc .C .c
41 41
42.cpp.o: 42.cpp.o:
43 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 43 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
44 44
45.cxx.o: 45.cxx.o:
46 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 46 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
47 47
48.cc.o: 48.cc.o:
49 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 49 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
50 50
51.C.o: 51.C.o:
52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
53 53
54.c.o: 54.c.o:
55 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 55 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
56 56
57####### Build rules 57####### Build rules
58 58
59 59
60all: $(DESTDIR)$(TARGET) 60all: $(DESTDIR)$(TARGET)
61 61
62$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 62$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
63 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 63 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
64 64
65moc: $(SRCMOC) 65moc: $(SRCMOC)
66 66
67tmake: 67tmake:
68 tmake fifteen.pro 68 tmake fifteen.pro
69 69
70clean: 70clean:
71 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 71 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
72 -rm -f *~ core 72 -rm -f *~ core
73 -rm -f allmoc.cpp 73 -rm -f allmoc.cpp
74 74
75####### Extension Modules 75####### Extension Modules
76 76
77listpromodules: 77listpromodules:
78 @echo 78 @echo
79 79
80listallmodules: 80listallmodules:
81 @echo 81 @echo
82 82
83listaddonpromodules: 83listaddonpromodules:
84 @echo 84 @echo
85 85
86listaddonentmodules: 86listaddonentmodules:
87 @echo 87 @echo
88 88
89 89
90REQUIRES= 90REQUIRES=
91 91
92####### Sub-libraries 92####### Sub-libraries
93 93
94 94
95###### Combined headers 95###### Combined headers
96 96
97 97
98 98
99####### Compile 99####### Compile
100 100
101fifteen.o: fifteen.cpp \ 101fifteen.o: fifteen.cpp \
102 fifteen.h \ 102 fifteen.h \
103 $(QPEDIR)/include/qpe/resource.h \ 103 $(OPIEDIR)/include/qpe/resource.h \
104 $(QPEDIR)/include/qpe/config.h \ 104 $(OPIEDIR)/include/qpe/config.h \
105 $(QPEDIR)/include/qpe/qpetoolbar.h \ 105 $(OPIEDIR)/include/qpe/qpetoolbar.h \
106 $(QPEDIR)/include/qpe/qpemenubar.h 106 $(OPIEDIR)/include/qpe/qpemenubar.h
107 107
108main.o: main.cpp \ 108main.o: main.cpp \
109 fifteen.h \ 109 fifteen.h \
110 $(QPEDIR)/include/qpe/qpeapplication.h 110 $(OPIEDIR)/include/qpe/qpeapplication.h
111 111
112moc_fifteen.o: moc_fifteen.cpp \ 112moc_fifteen.o: moc_fifteen.cpp \
113 fifteen.h 113 fifteen.h
114 114
115moc_fifteen.cpp: fifteen.h 115moc_fifteen.cpp: fifteen.h
116 $(MOC) fifteen.h -o moc_fifteen.cpp 116 $(MOC) fifteen.h -o moc_fifteen.cpp
117 117
118 118
diff --git a/noncore/games/fifteen/fifteen.pro b/noncore/games/fifteen/fifteen.pro
index 167f4f8..92072ab 100644
--- a/noncore/games/fifteen/fifteen.pro
+++ b/noncore/games/fifteen/fifteen.pro
@@ -1,10 +1,10 @@
1 DESTDIR = ../bin 1 DESTDIR = ../bin
2 TEMPLATE= app 2 TEMPLATE= app
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = fifteen.h 4 HEADERS = fifteen.h
5 SOURCES = fifteen.cpp \ 5 SOURCES = fifteen.cpp \
6 main.cpp 6 main.cpp
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(QPEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 TARGET = fifteen 10 TARGET = fifteen
diff --git a/noncore/games/go/Makefile.in b/noncore/games/go/Makefile.in
index 27304f1..985eff0 100644
--- a/noncore/games/go/Makefile.in
+++ b/noncore/games/go/Makefile.in
@@ -1,158 +1,158 @@
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$(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= 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:
79 tmake go.pro 79 tmake go.pro
80 80
81clean: 81clean:
82 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 82 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
83 -rm -f *~ core 83 -rm -f *~ core
84 -rm -f allmoc.cpp 84 -rm -f allmoc.cpp
85 85
86####### Extension Modules 86####### Extension Modules
87 87
88listpromodules: 88listpromodules:
89 @echo 89 @echo
90 90
91listallmodules: 91listallmodules:
92 @echo 92 @echo
93 93
94listaddonpromodules: 94listaddonpromodules:
95 @echo 95 @echo
96 96
97listaddonentmodules: 97listaddonentmodules:
98 @echo 98 @echo
99 99
100 100
101REQUIRES= 101REQUIRES=
102 102
103####### Sub-libraries 103####### Sub-libraries
104 104
105 105
106###### Combined headers 106###### Combined headers
107 107
108 108
109 109
110####### Compile 110####### Compile
111 111
112amigo.o: amigo.c \ 112amigo.o: amigo.c \
113 go.h \ 113 go.h \
114 goplayutils.h \ 114 goplayutils.h \
115 amigo.h 115 amigo.h
116 116
117goplayer.o: goplayer.c \ 117goplayer.o: goplayer.c \
118 go.h \ 118 go.h \
119 goplayutils.h \ 119 goplayutils.h \
120 amigo.h 120 amigo.h
121 121
122goplayutils.o: goplayutils.c \ 122goplayutils.o: goplayutils.c \
123 goplayutils.h \ 123 goplayutils.h \
124 amigo.h \ 124 amigo.h \
125 go.h 125 go.h
126 126
127killable.o: killable.c \ 127killable.o: killable.c \
128 go.h \ 128 go.h \
129 goplayutils.h \ 129 goplayutils.h \
130 amigo.h 130 amigo.h
131 131
132gowidget.o: gowidget.cpp \ 132gowidget.o: gowidget.cpp \
133 gowidget.h \ 133 gowidget.h \
134 amigo.h \ 134 amigo.h \
135 go.h \ 135 go.h \
136 goplayutils.h \ 136 goplayutils.h \
137 $(QPEDIR)/include/qpe/config.h \ 137 $(OPIEDIR)/include/qpe/config.h \
138 $(QPEDIR)/include/qpe/resource.h \ 138 $(OPIEDIR)/include/qpe/resource.h \
139 $(QPEDIR)/include/qpe/qpetoolbar.h \ 139 $(OPIEDIR)/include/qpe/qpetoolbar.h \
140 $(QPEDIR)/include/qpe/qpemenubar.h 140 $(OPIEDIR)/include/qpe/qpemenubar.h
141 141
142main.o: main.cpp \ 142main.o: main.cpp \
143 gowidget.h \ 143 gowidget.h \
144 amigo.h \ 144 amigo.h \
145 go.h \ 145 go.h \
146 goplayutils.h \ 146 goplayutils.h \
147 $(QPEDIR)/include/qpe/qpeapplication.h 147 $(OPIEDIR)/include/qpe/qpeapplication.h
148 148
149moc_gowidget.o: moc_gowidget.cpp \ 149moc_gowidget.o: moc_gowidget.cpp \
150 gowidget.h \ 150 gowidget.h \
151 amigo.h \ 151 amigo.h \
152 go.h \ 152 go.h \
153 goplayutils.h 153 goplayutils.h
154 154
155moc_gowidget.cpp: gowidget.h 155moc_gowidget.cpp: gowidget.h
156 $(MOC) gowidget.h -o moc_gowidget.cpp 156 $(MOC) gowidget.h -o moc_gowidget.cpp
157 157
158 158
diff --git a/noncore/games/go/go.pro b/noncore/games/go/go.pro
index deb90c5..b39b5b4 100644
--- a/noncore/games/go/go.pro
+++ b/noncore/games/go/go.pro
@@ -1,19 +1,19 @@
1 DESTDIR = ../bin 1 DESTDIR = ../bin
2 TEMPLATE= app 2 TEMPLATE= app
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = amigo.h \ 4 HEADERS = amigo.h \
5 go.h \ 5 go.h \
6 goplayutils.h \ 6 goplayutils.h \
7 gowidget.h 7 gowidget.h
8 SOURCES = amigo.c \ 8 SOURCES = amigo.c \
9 goplayer.c \ 9 goplayer.c \
10 goplayutils.c \ 10 goplayutils.c \
11 killable.c \ 11 killable.c \
12 gowidget.cpp \ 12 gowidget.cpp \
13 main.cpp 13 main.cpp
14INCLUDEPATH += $(QPEDIR)/include 14INCLUDEPATH += $(OPIEDIR)/include
15 DEPENDPATH+= $(QPEDIR)/include 15 DEPENDPATH+= $(OPIEDIR)/include
16LIBS += -lqpe 16LIBS += -lqpe
17 TARGET = go 17 TARGET = go
18 18
19TRANSLATIONS = ../i18n/de/go.ts \ No newline at end of file 19TRANSLATIONS = ../i18n/de/go.ts \ No newline at end of file
diff --git a/noncore/games/mindbreaker/Makefile.in b/noncore/games/mindbreaker/Makefile.in
index 88f6fb1..ff29d19 100644
--- a/noncore/games/mindbreaker/Makefile.in
+++ b/noncore/games/mindbreaker/Makefile.in
@@ -1,117 +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) 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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= mindbreaker 21 TARGET= mindbreaker
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =mindbreaker.h 26 HEADERS =mindbreaker.h
27 SOURCES =main.cpp \ 27 SOURCES =main.cpp \
28 mindbreaker.cpp 28 mindbreaker.cpp
29 OBJECTS =main.o \ 29 OBJECTS =main.o \
30 mindbreaker.o 30 mindbreaker.o
31INTERFACES = 31INTERFACES =
32UICDECLS = 32UICDECLS =
33UICIMPLS = 33UICIMPLS =
34 SRCMOC =moc_mindbreaker.cpp 34 SRCMOC =moc_mindbreaker.cpp
35 OBJMOC =moc_mindbreaker.o 35 OBJMOC =moc_mindbreaker.o
36 36
37 37
38####### Implicit rules 38####### Implicit rules
39 39
40.SUFFIXES: .cpp .cxx .cc .C .c 40.SUFFIXES: .cpp .cxx .cc .C .c
41 41
42.cpp.o: 42.cpp.o:
43 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 43 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
44 44
45.cxx.o: 45.cxx.o:
46 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 46 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
47 47
48.cc.o: 48.cc.o:
49 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 49 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
50 50
51.C.o: 51.C.o:
52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
53 53
54.c.o: 54.c.o:
55 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 55 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
56 56
57####### Build rules 57####### Build rules
58 58
59 59
60all: $(DESTDIR)$(TARGET) 60all: $(DESTDIR)$(TARGET)
61 61
62$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 62$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
63 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 63 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
64 64
65moc: $(SRCMOC) 65moc: $(SRCMOC)
66 66
67tmake: 67tmake:
68 tmake mindbreaker.pro 68 tmake mindbreaker.pro
69 69
70clean: 70clean:
71 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 71 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
72 -rm -f *~ core 72 -rm -f *~ core
73 -rm -f allmoc.cpp 73 -rm -f allmoc.cpp
74 74
75####### Extension Modules 75####### Extension Modules
76 76
77listpromodules: 77listpromodules:
78 @echo 78 @echo
79 79
80listallmodules: 80listallmodules:
81 @echo 81 @echo
82 82
83listaddonpromodules: 83listaddonpromodules:
84 @echo 84 @echo
85 85
86listaddonentmodules: 86listaddonentmodules:
87 @echo 87 @echo
88 88
89 89
90REQUIRES= 90REQUIRES=
91 91
92####### Sub-libraries 92####### Sub-libraries
93 93
94 94
95###### Combined headers 95###### Combined headers
96 96
97 97
98 98
99####### Compile 99####### Compile
100 100
101main.o: main.cpp \ 101main.o: main.cpp \
102 mindbreaker.h \ 102 mindbreaker.h \
103 $(QPEDIR)/include/qpe/qpeapplication.h 103 $(OPIEDIR)/include/qpe/qpeapplication.h
104 104
105mindbreaker.o: mindbreaker.cpp \ 105mindbreaker.o: mindbreaker.cpp \
106 mindbreaker.h \ 106 mindbreaker.h \
107 $(QPEDIR)/include/qpe/resource.h \ 107 $(OPIEDIR)/include/qpe/resource.h \
108 $(QPEDIR)/include/qpe/config.h \ 108 $(OPIEDIR)/include/qpe/config.h \
109 $(QPEDIR)/include/qpe/qpetoolbar.h 109 $(OPIEDIR)/include/qpe/qpetoolbar.h
110 110
111moc_mindbreaker.o: moc_mindbreaker.cpp \ 111moc_mindbreaker.o: moc_mindbreaker.cpp \
112 mindbreaker.h 112 mindbreaker.h
113 113
114moc_mindbreaker.cpp: mindbreaker.h 114moc_mindbreaker.cpp: mindbreaker.h
115 $(MOC) mindbreaker.h -o moc_mindbreaker.cpp 115 $(MOC) mindbreaker.h -o moc_mindbreaker.cpp
116 116
117 117
diff --git a/noncore/games/mindbreaker/mindbreaker.pro b/noncore/games/mindbreaker/mindbreaker.pro
index 12944d1..fa7dc0c 100644
--- a/noncore/games/mindbreaker/mindbreaker.pro
+++ b/noncore/games/mindbreaker/mindbreaker.pro
@@ -1,12 +1,12 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3DESTDIR = $(QPEDIR)/bin 3DESTDIR = $(OPIEDIR)/bin
4 HEADERS = mindbreaker.h 4 HEADERS = mindbreaker.h
5 SOURCES = main.cpp \ 5 SOURCES = main.cpp \
6 mindbreaker.cpp 6 mindbreaker.cpp
7TARGET = mindbreaker 7TARGET = mindbreaker
8INCLUDEPATH += $(QPEDIR)/include 8INCLUDEPATH += $(OPIEDIR)/include
9DEPENDPATH += $(QPEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10LIBS += -lqpe 10LIBS += -lqpe
11 11
12TRANSLATIONS = ../i18n/de/mindbreaker.ts 12TRANSLATIONS = ../i18n/de/mindbreaker.ts
diff --git a/noncore/games/minesweep/Makefile.in b/noncore/games/minesweep/Makefile.in
index 9ed6234..67ea94c 100644
--- a/noncore/games/minesweep/Makefile.in
+++ b/noncore/games/minesweep/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) 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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= minesweep 21 TARGET= minesweep
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =minefield.h \ 26 HEADERS =minefield.h \
27 minesweep.h 27 minesweep.h
28 SOURCES =main.cpp \ 28 SOURCES =main.cpp \
29 minefield.cpp \ 29 minefield.cpp \
30 minesweep.cpp 30 minesweep.cpp
31 OBJECTS =main.o \ 31 OBJECTS =main.o \
32 minefield.o \ 32 minefield.o \
33 minesweep.o 33 minesweep.o
34INTERFACES = 34INTERFACES =
35UICDECLS = 35UICDECLS =
36UICIMPLS = 36UICIMPLS =
37 SRCMOC =moc_minefield.cpp \ 37 SRCMOC =moc_minefield.cpp \
38 moc_minesweep.cpp 38 moc_minesweep.cpp
39 OBJMOC =moc_minefield.o \ 39 OBJMOC =moc_minefield.o \
40 moc_minesweep.o 40 moc_minesweep.o
41 41
42 42
43####### Implicit rules 43####### Implicit rules
44 44
45.SUFFIXES: .cpp .cxx .cc .C .c 45.SUFFIXES: .cpp .cxx .cc .C .c
46 46
47.cpp.o: 47.cpp.o:
48 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 48 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
49 49
50.cxx.o: 50.cxx.o:
51 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 51 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
52 52
53.cc.o: 53.cc.o:
54 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 54 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
55 55
56.C.o: 56.C.o:
57 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 57 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
58 58
59.c.o: 59.c.o:
60 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 60 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
61 61
62####### Build rules 62####### Build rules
63 63
64 64
65all: $(DESTDIR)$(TARGET) 65all: $(DESTDIR)$(TARGET)
66 66
67$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 67$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
68 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 68 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
69 69
70moc: $(SRCMOC) 70moc: $(SRCMOC)
71 71
72tmake: 72tmake:
73 tmake minesweep.pro 73 tmake minesweep.pro
74 74
75clean: 75clean:
76 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 76 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
77 -rm -f *~ core 77 -rm -f *~ core
78 -rm -f allmoc.cpp 78 -rm -f allmoc.cpp
79 79
80####### Extension Modules 80####### Extension Modules
81 81
82listpromodules: 82listpromodules:
83 @echo 83 @echo
84 84
85listallmodules: 85listallmodules:
86 @echo 86 @echo
87 87
88listaddonpromodules: 88listaddonpromodules:
89 @echo 89 @echo
90 90
91listaddonentmodules: 91listaddonentmodules:
92 @echo 92 @echo
93 93
94 94
95REQUIRES= 95REQUIRES=
96 96
97####### Sub-libraries 97####### Sub-libraries
98 98
99 99
100###### Combined headers 100###### Combined headers
101 101
102 102
103 103
104####### Compile 104####### Compile
105 105
106main.o: main.cpp \ 106main.o: main.cpp \
107 minesweep.h \ 107 minesweep.h \
108 $(QPEDIR)/include/qpe/qpeapplication.h 108 $(OPIEDIR)/include/qpe/qpeapplication.h
109 109
110minefield.o: minefield.cpp \ 110minefield.o: minefield.cpp \
111 minefield.h \ 111 minefield.h \
112 $(QPEDIR)/include/qpe/config.h 112 $(OPIEDIR)/include/qpe/config.h
113 113
114minesweep.o: minesweep.cpp \ 114minesweep.o: minesweep.cpp \
115 minesweep.h \ 115 minesweep.h \
116 minefield.h \ 116 minefield.h \
117 $(QPEDIR)/include/qpe/resource.h \ 117 $(OPIEDIR)/include/qpe/resource.h \
118 $(QPEDIR)/include/qpe/config.h \ 118 $(OPIEDIR)/include/qpe/config.h \
119 $(QPEDIR)/include/qpe/qpetoolbar.h \ 119 $(OPIEDIR)/include/qpe/qpetoolbar.h \
120 $(QPEDIR)/include/qpe/qpemenubar.h 120 $(OPIEDIR)/include/qpe/qpemenubar.h
121 121
122moc_minefield.o: moc_minefield.cpp \ 122moc_minefield.o: moc_minefield.cpp \
123 minefield.h 123 minefield.h
124 124
125moc_minesweep.o: moc_minesweep.cpp \ 125moc_minesweep.o: moc_minesweep.cpp \
126 minesweep.h 126 minesweep.h
127 127
128moc_minefield.cpp: minefield.h 128moc_minefield.cpp: minefield.h
129 $(MOC) minefield.h -o moc_minefield.cpp 129 $(MOC) minefield.h -o moc_minefield.cpp
130 130
131moc_minesweep.cpp: minesweep.h 131moc_minesweep.cpp: minesweep.h
132 $(MOC) minesweep.h -o moc_minesweep.cpp 132 $(MOC) minesweep.h -o moc_minesweep.cpp
133 133
134 134
diff --git a/noncore/games/minesweep/minesweep.pro b/noncore/games/minesweep/minesweep.pro
index 87484bc..85f626a 100644
--- a/noncore/games/minesweep/minesweep.pro
+++ b/noncore/games/minesweep/minesweep.pro
@@ -1,14 +1,14 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = minefield.h \ 4 HEADERS = minefield.h \
5 minesweep.h 5 minesweep.h
6 SOURCES = main.cpp \ 6 SOURCES = main.cpp \
7 minefield.cpp \ 7 minefield.cpp \
8 minesweep.cpp 8 minesweep.cpp
9INCLUDEPATH += $(QPEDIR)/include 9INCLUDEPATH += $(OPIEDIR)/include
10 DEPENDPATH+= $(QPEDIR)/include 10 DEPENDPATH+= $(OPIEDIR)/include
11LIBS += -lqpe 11LIBS += -lqpe
12 INTERFACES= 12 INTERFACES=
13 13
14TRANSLATIONS = ../i18n/de/minesweep.ts 14TRANSLATIONS = ../i18n/de/minesweep.ts
diff --git a/noncore/games/parashoot/Makefile.in b/noncore/games/parashoot/Makefile.in
index ff7397e..254bcd2 100644
--- a/noncore/games/parashoot/Makefile.in
+++ b/noncore/games/parashoot/Makefile.in
@@ -1,203 +1,203 @@
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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= parashoot 21 TARGET= parashoot
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =interface.h \ 26 HEADERS =interface.h \
27 man.h \ 27 man.h \
28 cannon.h \ 28 cannon.h \
29 base.h \ 29 base.h \
30 bullet.h \ 30 bullet.h \
31 helicopter.h 31 helicopter.h
32 SOURCES =main.cpp \ 32 SOURCES =main.cpp \
33 interface.cpp \ 33 interface.cpp \
34 man.cpp \ 34 man.cpp \
35 cannon.cpp \ 35 cannon.cpp \
36 base.cpp \ 36 base.cpp \
37 bullet.cpp \ 37 bullet.cpp \
38 helicopter.cpp 38 helicopter.cpp
39 OBJECTS =main.o \ 39 OBJECTS =main.o \
40 interface.o \ 40 interface.o \
41 man.o \ 41 man.o \
42 cannon.o \ 42 cannon.o \
43 base.o \ 43 base.o \
44 bullet.o \ 44 bullet.o \
45 helicopter.o 45 helicopter.o
46INTERFACES = 46INTERFACES =
47UICDECLS = 47UICDECLS =
48UICIMPLS = 48UICIMPLS =
49 SRCMOC =moc_interface.cpp \ 49 SRCMOC =moc_interface.cpp \
50 moc_cannon.cpp \ 50 moc_cannon.cpp \
51 moc_bullet.cpp 51 moc_bullet.cpp
52 OBJMOC =moc_interface.o \ 52 OBJMOC =moc_interface.o \
53 moc_cannon.o \ 53 moc_cannon.o \
54 moc_bullet.o 54 moc_bullet.o
55 55
56 56
57####### Implicit rules 57####### Implicit rules
58 58
59.SUFFIXES: .cpp .cxx .cc .C .c 59.SUFFIXES: .cpp .cxx .cc .C .c
60 60
61.cpp.o: 61.cpp.o:
62 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 62 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
63 63
64.cxx.o: 64.cxx.o:
65 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 65 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
66 66
67.cc.o: 67.cc.o:
68 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 68 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
69 69
70.C.o: 70.C.o:
71 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 71 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
72 72
73.c.o: 73.c.o:
74 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 74 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
75 75
76####### Build rules 76####### Build rules
77 77
78 78
79all: $(DESTDIR)$(TARGET) 79all: $(DESTDIR)$(TARGET)
80 80
81$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 81$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
82 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 82 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
83 83
84moc: $(SRCMOC) 84moc: $(SRCMOC)
85 85
86tmake: 86tmake:
87 tmake parashoot.pro 87 tmake parashoot.pro
88 88
89clean: 89clean:
90 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 90 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
91 -rm -f *~ core 91 -rm -f *~ core
92 -rm -f allmoc.cpp 92 -rm -f allmoc.cpp
93 93
94####### Extension Modules 94####### Extension Modules
95 95
96listpromodules: 96listpromodules:
97 @echo 97 @echo
98 98
99listallmodules: 99listallmodules:
100 @echo 100 @echo
101 101
102listaddonpromodules: 102listaddonpromodules:
103 @echo 103 @echo
104 104
105listaddonentmodules: 105listaddonentmodules:
106 @echo 106 @echo
107 107
108 108
109REQUIRES= 109REQUIRES=
110 110
111####### Sub-libraries 111####### Sub-libraries
112 112
113 113
114###### Combined headers 114###### Combined headers
115 115
116 116
117 117
118####### Compile 118####### Compile
119 119
120main.o: main.cpp \ 120main.o: main.cpp \
121 interface.h \ 121 interface.h \
122 cannon.h \ 122 cannon.h \
123 bullet.h \ 123 bullet.h \
124 $(QPEDIR)/include/qpe/sound.h \ 124 $(OPIEDIR)/include/qpe/sound.h \
125 base.h \ 125 base.h \
126 helicopter.h \ 126 helicopter.h \
127 $(QPEDIR)/include/qpe/qpeapplication.h 127 $(OPIEDIR)/include/qpe/qpeapplication.h
128 128
129interface.o: interface.cpp \ 129interface.o: interface.cpp \
130 interface.h \ 130 interface.h \
131 cannon.h \ 131 cannon.h \
132 bullet.h \ 132 bullet.h \
133 $(QPEDIR)/include/qpe/sound.h \ 133 $(OPIEDIR)/include/qpe/sound.h \
134 base.h \ 134 base.h \
135 helicopter.h \ 135 helicopter.h \
136 man.h \ 136 man.h \
137 $(QPEDIR)/include/qpe/resource.h \ 137 $(OPIEDIR)/include/qpe/resource.h \
138 $(QPEDIR)/include/qpe/qpetoolbar.h 138 $(OPIEDIR)/include/qpe/qpetoolbar.h
139 139
140man.o: man.cpp \ 140man.o: man.cpp \
141 codes.h \ 141 codes.h \
142 man.h \ 142 man.h \
143 $(QPEDIR)/include/qpe/sound.h \ 143 $(OPIEDIR)/include/qpe/sound.h \
144 base.h \ 144 base.h \
145 $(QPEDIR)/include/qpe/resource.h 145 $(OPIEDIR)/include/qpe/resource.h
146 146
147cannon.o: cannon.cpp \ 147cannon.o: cannon.cpp \
148 $(QPEDIR)/include/qpe/resource.h \ 148 $(OPIEDIR)/include/qpe/resource.h \
149 codes.h \ 149 codes.h \
150 cannon.h \ 150 cannon.h \
151 bullet.h \ 151 bullet.h \
152 $(QPEDIR)/include/qpe/sound.h 152 $(OPIEDIR)/include/qpe/sound.h
153 153
154base.o: base.cpp \ 154base.o: base.cpp \
155 codes.h \ 155 codes.h \
156 base.h \ 156 base.h \
157 $(QPEDIR)/include/qpe/sound.h \ 157 $(OPIEDIR)/include/qpe/sound.h \
158 man.h \ 158 man.h \
159 $(QPEDIR)/include/qpe/resource.h 159 $(OPIEDIR)/include/qpe/resource.h
160 160
161bullet.o: bullet.cpp \ 161bullet.o: bullet.cpp \
162 codes.h \ 162 codes.h \
163 bullet.h \ 163 bullet.h \
164 $(QPEDIR)/include/qpe/sound.h \ 164 $(OPIEDIR)/include/qpe/sound.h \
165 man.h \ 165 man.h \
166 helicopter.h \ 166 helicopter.h \
167 $(QPEDIR)/include/qpe/resource.h \ 167 $(OPIEDIR)/include/qpe/resource.h \
168 $(QPEDIR)/include/qpe/qmath.h 168 $(OPIEDIR)/include/qpe/qmath.h
169 169
170helicopter.o: helicopter.cpp \ 170helicopter.o: helicopter.cpp \
171 helicopter.h \ 171 helicopter.h \
172 $(QPEDIR)/include/qpe/sound.h \ 172 $(OPIEDIR)/include/qpe/sound.h \
173 man.h \ 173 man.h \
174 codes.h \ 174 codes.h \
175 $(QPEDIR)/include/qpe/resource.h 175 $(OPIEDIR)/include/qpe/resource.h
176 176
177moc_interface.o: moc_interface.cpp \ 177moc_interface.o: moc_interface.cpp \
178 interface.h \ 178 interface.h \
179 cannon.h \ 179 cannon.h \
180 bullet.h \ 180 bullet.h \
181 $(QPEDIR)/include/qpe/sound.h \ 181 $(OPIEDIR)/include/qpe/sound.h \
182 base.h \ 182 base.h \
183 helicopter.h 183 helicopter.h
184 184
185moc_cannon.o: moc_cannon.cpp \ 185moc_cannon.o: moc_cannon.cpp \
186 cannon.h \ 186 cannon.h \
187 bullet.h \ 187 bullet.h \
188 $(QPEDIR)/include/qpe/sound.h 188 $(OPIEDIR)/include/qpe/sound.h
189 189
190moc_bullet.o: moc_bullet.cpp \ 190moc_bullet.o: moc_bullet.cpp \
191 bullet.h \ 191 bullet.h \
192 $(QPEDIR)/include/qpe/sound.h 192 $(OPIEDIR)/include/qpe/sound.h
193 193
194moc_interface.cpp: interface.h 194moc_interface.cpp: interface.h
195 $(MOC) interface.h -o moc_interface.cpp 195 $(MOC) interface.h -o moc_interface.cpp
196 196
197moc_cannon.cpp: cannon.h 197moc_cannon.cpp: cannon.h
198 $(MOC) cannon.h -o moc_cannon.cpp 198 $(MOC) cannon.h -o moc_cannon.cpp
199 199
200moc_bullet.cpp: bullet.h 200moc_bullet.cpp: bullet.h
201 $(MOC) bullet.h -o moc_bullet.cpp 201 $(MOC) bullet.h -o moc_bullet.cpp
202 202
203 203
diff --git a/noncore/games/parashoot/parashoot.pro b/noncore/games/parashoot/parashoot.pro
index 631560b..a7a01b2 100644
--- a/noncore/games/parashoot/parashoot.pro
+++ b/noncore/games/parashoot/parashoot.pro
@@ -1,11 +1,11 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = interface.h man.h cannon.h base.h bullet.h helicopter.h 4 HEADERS = interface.h man.h cannon.h base.h bullet.h helicopter.h
5 SOURCES = main.cpp interface.cpp man.cpp cannon.cpp base.cpp bullet.cpp helicopter.cpp 5 SOURCES = main.cpp interface.cpp man.cpp cannon.cpp base.cpp bullet.cpp helicopter.cpp
6 TARGET = parashoot 6 TARGET = parashoot
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(QPEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 10
11TRANSLATIONS = ../i18n/de/parashoot.ts 11TRANSLATIONS = ../i18n/de/parashoot.ts
diff --git a/noncore/games/qasteroids/Makefile.in b/noncore/games/qasteroids/Makefile.in
index 7312743..0dbd9bc 100644
--- a/noncore/games/qasteroids/Makefile.in
+++ b/noncore/games/qasteroids/Makefile.in
@@ -1,155 +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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= qasteroids 21 TARGET= qasteroids
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =ledmeter.h \ 26 HEADERS =ledmeter.h \
27 sprites.h \ 27 sprites.h \
28 toplevel.h \ 28 toplevel.h \
29 view.h 29 view.h
30 SOURCES =ledmeter.cpp \ 30 SOURCES =ledmeter.cpp \
31 toplevel.cpp \ 31 toplevel.cpp \
32 view.cpp \ 32 view.cpp \
33 main.cpp 33 main.cpp
34 OBJECTS =ledmeter.o \ 34 OBJECTS =ledmeter.o \
35 toplevel.o \ 35 toplevel.o \
36 view.o \ 36 view.o \
37 main.o 37 main.o
38INTERFACES = 38INTERFACES =
39UICDECLS = 39UICDECLS =
40UICIMPLS = 40UICIMPLS =
41 SRCMOC =moc_ledmeter.cpp \ 41 SRCMOC =moc_ledmeter.cpp \
42 moc_toplevel.cpp \ 42 moc_toplevel.cpp \
43 moc_view.cpp 43 moc_view.cpp
44 OBJMOC =moc_ledmeter.o \ 44 OBJMOC =moc_ledmeter.o \
45 moc_toplevel.o \ 45 moc_toplevel.o \
46 moc_view.o 46 moc_view.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:
79 tmake qasteroids.pro 79 tmake qasteroids.pro
80 80
81clean: 81clean:
82 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 82 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
83 -rm -f *~ core 83 -rm -f *~ core
84 -rm -f allmoc.cpp 84 -rm -f allmoc.cpp
85 85
86####### Extension Modules 86####### Extension Modules
87 87
88listpromodules: 88listpromodules:
89 @echo 89 @echo
90 90
91listallmodules: 91listallmodules:
92 @echo 92 @echo
93 93
94listaddonpromodules: 94listaddonpromodules:
95 @echo 95 @echo
96 96
97listaddonentmodules: 97listaddonentmodules:
98 @echo 98 @echo
99 99
100 100
101REQUIRES= 101REQUIRES=
102 102
103####### Sub-libraries 103####### Sub-libraries
104 104
105 105
106###### Combined headers 106###### Combined headers
107 107
108 108
109 109
110####### Compile 110####### Compile
111 111
112ledmeter.o: ledmeter.cpp \ 112ledmeter.o: ledmeter.cpp \
113 ledmeter.h 113 ledmeter.h
114 114
115toplevel.o: toplevel.cpp \ 115toplevel.o: toplevel.cpp \
116 toplevel.h \ 116 toplevel.h \
117 view.h \ 117 view.h \
118 sprites.h \ 118 sprites.h \
119 ledmeter.h \ 119 ledmeter.h \
120 $(QPEDIR)/include/qpe/qpeapplication.h \ 120 $(OPIEDIR)/include/qpe/qpeapplication.h \
121 $(QPEDIR)/include/qpe/resource.h 121 $(OPIEDIR)/include/qpe/resource.h
122 122
123view.o: view.cpp \ 123view.o: view.cpp \
124 view.h \ 124 view.h \
125 sprites.h \ 125 sprites.h \
126 $(QPEDIR)/include/qpe/resource.h 126 $(OPIEDIR)/include/qpe/resource.h
127 127
128main.o: main.cpp \ 128main.o: main.cpp \
129 toplevel.h \ 129 toplevel.h \
130 view.h \ 130 view.h \
131 sprites.h \ 131 sprites.h \
132 $(QPEDIR)/include/qpe/qpeapplication.h 132 $(OPIEDIR)/include/qpe/qpeapplication.h
133 133
134moc_ledmeter.o: moc_ledmeter.cpp \ 134moc_ledmeter.o: moc_ledmeter.cpp \
135 ledmeter.h 135 ledmeter.h
136 136
137moc_toplevel.o: moc_toplevel.cpp \ 137moc_toplevel.o: moc_toplevel.cpp \
138 toplevel.h \ 138 toplevel.h \
139 view.h \ 139 view.h \
140 sprites.h 140 sprites.h
141 141
142moc_view.o: moc_view.cpp \ 142moc_view.o: moc_view.cpp \
143 view.h \ 143 view.h \
144 sprites.h 144 sprites.h
145 145
146moc_ledmeter.cpp: ledmeter.h 146moc_ledmeter.cpp: ledmeter.h
147 $(MOC) ledmeter.h -o moc_ledmeter.cpp 147 $(MOC) ledmeter.h -o moc_ledmeter.cpp
148 148
149moc_toplevel.cpp: toplevel.h 149moc_toplevel.cpp: toplevel.h
150 $(MOC) toplevel.h -o moc_toplevel.cpp 150 $(MOC) toplevel.h -o moc_toplevel.cpp
151 151
152moc_view.cpp: view.h 152moc_view.cpp: view.h
153 $(MOC) view.h -o moc_view.cpp 153 $(MOC) view.h -o moc_view.cpp
154 154
155 155
diff --git a/noncore/games/qasteroids/qasteroids.pro b/noncore/games/qasteroids/qasteroids.pro
index 14a0901..2f5b2e4 100644
--- a/noncore/games/qasteroids/qasteroids.pro
+++ b/noncore/games/qasteroids/qasteroids.pro
@@ -1,11 +1,11 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = ledmeter.h sprites.h toplevel.h view.h 4 HEADERS = ledmeter.h sprites.h toplevel.h view.h
5 SOURCES = ledmeter.cpp toplevel.cpp view.cpp main.cpp 5 SOURCES = ledmeter.cpp toplevel.cpp view.cpp main.cpp
6 TARGET = qasteroids 6 TARGET = qasteroids
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(QPEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 10
11TRANSLATIONS = ../i18n/de/qasteroids.ts 11TRANSLATIONS = ../i18n/de/qasteroids.ts
diff --git a/noncore/games/snake/Makefile.in b/noncore/games/snake/Makefile.in
index 8179b6f..0801db3 100644
--- a/noncore/games/snake/Makefile.in
+++ b/noncore/games/snake/Makefile.in
@@ -1,159 +1,159 @@
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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= snake 21 TARGET= snake
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =snake.h \ 26 HEADERS =snake.h \
27 target.h \ 27 target.h \
28 obstacle.h \ 28 obstacle.h \
29 interface.h \ 29 interface.h \
30 codes.h 30 codes.h
31 SOURCES =snake.cpp \ 31 SOURCES =snake.cpp \
32 target.cpp \ 32 target.cpp \
33 obstacle.cpp \ 33 obstacle.cpp \
34 interface.cpp \ 34 interface.cpp \
35 main.cpp 35 main.cpp
36 OBJECTS =snake.o \ 36 OBJECTS =snake.o \
37 target.o \ 37 target.o \
38 obstacle.o \ 38 obstacle.o \
39 interface.o \ 39 interface.o \
40 main.o 40 main.o
41INTERFACES = 41INTERFACES =
42UICDECLS = 42UICDECLS =
43UICIMPLS = 43UICIMPLS =
44 SRCMOC =moc_snake.cpp \ 44 SRCMOC =moc_snake.cpp \
45 moc_interface.cpp 45 moc_interface.cpp
46 OBJMOC =moc_snake.o \ 46 OBJMOC =moc_snake.o \
47 moc_interface.o 47 moc_interface.o
48 48
49 49
50####### Implicit rules 50####### Implicit rules
51 51
52.SUFFIXES: .cpp .cxx .cc .C .c 52.SUFFIXES: .cpp .cxx .cc .C .c
53 53
54.cpp.o: 54.cpp.o:
55 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 55 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
56 56
57.cxx.o: 57.cxx.o:
58 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 58 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
59 59
60.cc.o: 60.cc.o:
61 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 61 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
62 62
63.C.o: 63.C.o:
64 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 64 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
65 65
66.c.o: 66.c.o:
67 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 67 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
68 68
69####### Build rules 69####### Build rules
70 70
71 71
72all: $(DESTDIR)$(TARGET) 72all: $(DESTDIR)$(TARGET)
73 73
74$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 74$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
75 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 75 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
76 76
77moc: $(SRCMOC) 77moc: $(SRCMOC)
78 78
79tmake: 79tmake:
80 tmake snake.pro 80 tmake snake.pro
81 81
82clean: 82clean:
83 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 83 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
84 -rm -f *~ core 84 -rm -f *~ core
85 -rm -f allmoc.cpp 85 -rm -f allmoc.cpp
86 86
87####### Extension Modules 87####### Extension Modules
88 88
89listpromodules: 89listpromodules:
90 @echo 90 @echo
91 91
92listallmodules: 92listallmodules:
93 @echo 93 @echo
94 94
95listaddonpromodules: 95listaddonpromodules:
96 @echo 96 @echo
97 97
98listaddonentmodules: 98listaddonentmodules:
99 @echo 99 @echo
100 100
101 101
102REQUIRES= 102REQUIRES=
103 103
104####### Sub-libraries 104####### Sub-libraries
105 105
106 106
107###### Combined headers 107###### Combined headers
108 108
109 109
110 110
111####### Compile 111####### Compile
112 112
113snake.o: snake.cpp \ 113snake.o: snake.cpp \
114 snake.h \ 114 snake.h \
115 target.h \ 115 target.h \
116 codes.h \ 116 codes.h \
117 $(QPEDIR)/include/qpe/resource.h 117 $(OPIEDIR)/include/qpe/resource.h
118 118
119target.o: target.cpp \ 119target.o: target.cpp \
120 target.h \ 120 target.h \
121 codes.h \ 121 codes.h \
122 $(QPEDIR)/include/qpe/resource.h 122 $(OPIEDIR)/include/qpe/resource.h
123 123
124obstacle.o: obstacle.cpp \ 124obstacle.o: obstacle.cpp \
125 obstacle.h \ 125 obstacle.h \
126 codes.h \ 126 codes.h \
127 $(QPEDIR)/include/qpe/resource.h 127 $(OPIEDIR)/include/qpe/resource.h
128 128
129interface.o: interface.cpp \ 129interface.o: interface.cpp \
130 interface.h \ 130 interface.h \
131 snake.h \ 131 snake.h \
132 target.h \ 132 target.h \
133 obstacle.h \ 133 obstacle.h \
134 $(QPEDIR)/include/qpe/resource.h \ 134 $(OPIEDIR)/include/qpe/resource.h \
135 $(QPEDIR)/include/qpe/qpetoolbar.h 135 $(OPIEDIR)/include/qpe/qpetoolbar.h
136 136
137main.o: main.cpp \ 137main.o: main.cpp \
138 interface.h \ 138 interface.h \
139 snake.h \ 139 snake.h \
140 target.h \ 140 target.h \
141 obstacle.h \ 141 obstacle.h \
142 $(QPEDIR)/include/qpe/qpeapplication.h 142 $(OPIEDIR)/include/qpe/qpeapplication.h
143 143
144moc_snake.o: moc_snake.cpp \ 144moc_snake.o: moc_snake.cpp \
145 snake.h 145 snake.h
146 146
147moc_interface.o: moc_interface.cpp \ 147moc_interface.o: moc_interface.cpp \
148 interface.h \ 148 interface.h \
149 snake.h \ 149 snake.h \
150 target.h \ 150 target.h \
151 obstacle.h 151 obstacle.h
152 152
153moc_snake.cpp: snake.h 153moc_snake.cpp: snake.h
154 $(MOC) snake.h -o moc_snake.cpp 154 $(MOC) snake.h -o moc_snake.cpp
155 155
156moc_interface.cpp: interface.h 156moc_interface.cpp: interface.h
157 $(MOC) interface.h -o moc_interface.cpp 157 $(MOC) interface.h -o moc_interface.cpp
158 158
159 159
diff --git a/noncore/games/snake/snake.pro b/noncore/games/snake/snake.pro
index 6dacdbd..38b4023 100644
--- a/noncore/games/snake/snake.pro
+++ b/noncore/games/snake/snake.pro
@@ -1,11 +1,11 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = snake.h target.h obstacle.h interface.h codes.h 4 HEADERS = snake.h target.h obstacle.h interface.h codes.h
5 SOURCES = snake.cpp target.cpp obstacle.cpp interface.cpp main.cpp 5 SOURCES = snake.cpp target.cpp obstacle.cpp interface.cpp main.cpp
6 TARGET = snake 6 TARGET = snake
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(QPEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 10
11TRANSLATIONS = ../i18n/de/snake.ts 11TRANSLATIONS = ../i18n/de/snake.ts
diff --git a/noncore/games/solitaire/Makefile.in b/noncore/games/solitaire/Makefile.in
index 3c50345..a0a64fb 100644
--- a/noncore/games/solitaire/Makefile.in
+++ b/noncore/games/solitaire/Makefile.in
@@ -1,235 +1,235 @@
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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= patience 21 TARGET= patience
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =canvascard.h \ 26 HEADERS =canvascard.h \
27 canvasshapes.h \ 27 canvasshapes.h \
28 cardgame.h \ 28 cardgame.h \
29 cardgamelayout.h \ 29 cardgamelayout.h \
30 cardpile.h \ 30 cardpile.h \
31 card.h \ 31 card.h \
32 carddeck.h \ 32 carddeck.h \
33 canvascardgame.h \ 33 canvascardgame.h \
34 freecellcardgame.h \ 34 freecellcardgame.h \
35 patiencecardgame.h \ 35 patiencecardgame.h \
36 canvascardwindow.h 36 canvascardwindow.h
37 SOURCES =canvascard.cpp \ 37 SOURCES =canvascard.cpp \
38 canvasshapes.cpp \ 38 canvasshapes.cpp \
39 cardgame.cpp \ 39 cardgame.cpp \
40 cardgamelayout.cpp \ 40 cardgamelayout.cpp \
41 cardpile.cpp \ 41 cardpile.cpp \
42 card.cpp \ 42 card.cpp \
43 carddeck.cpp \ 43 carddeck.cpp \
44 canvascardgame.cpp \ 44 canvascardgame.cpp \
45 freecellcardgame.cpp \ 45 freecellcardgame.cpp \
46 patiencecardgame.cpp \ 46 patiencecardgame.cpp \
47 canvascardwindow.cpp \ 47 canvascardwindow.cpp \
48 main.cpp 48 main.cpp
49 OBJECTS =canvascard.o \ 49 OBJECTS =canvascard.o \
50 canvasshapes.o \ 50 canvasshapes.o \
51 cardgame.o \ 51 cardgame.o \
52 cardgamelayout.o \ 52 cardgamelayout.o \
53 cardpile.o \ 53 cardpile.o \
54 card.o \ 54 card.o \
55 carddeck.o \ 55 carddeck.o \
56 canvascardgame.o \ 56 canvascardgame.o \
57 freecellcardgame.o \ 57 freecellcardgame.o \
58 patiencecardgame.o \ 58 patiencecardgame.o \
59 canvascardwindow.o \ 59 canvascardwindow.o \
60 main.o 60 main.o
61INTERFACES = 61INTERFACES =
62UICDECLS = 62UICDECLS =
63UICIMPLS = 63UICIMPLS =
64 SRCMOC =moc_canvascardwindow.cpp 64 SRCMOC =moc_canvascardwindow.cpp
65 OBJMOC =moc_canvascardwindow.o 65 OBJMOC =moc_canvascardwindow.o
66 66
67 67
68####### Implicit rules 68####### Implicit rules
69 69
70.SUFFIXES: .cpp .cxx .cc .C .c 70.SUFFIXES: .cpp .cxx .cc .C .c
71 71
72.cpp.o: 72.cpp.o:
73 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 73 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
74 74
75.cxx.o: 75.cxx.o:
76 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 76 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
77 77
78.cc.o: 78.cc.o:
79 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 79 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
80 80
81.C.o: 81.C.o:
82 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 82 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
83 83
84.c.o: 84.c.o:
85 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 85 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
86 86
87####### Build rules 87####### Build rules
88 88
89 89
90all: $(DESTDIR)$(TARGET) 90all: $(DESTDIR)$(TARGET)
91 91
92$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 92$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
93 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 93 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
94 94
95moc: $(SRCMOC) 95moc: $(SRCMOC)
96 96
97tmake: 97tmake:
98 tmake solitaire.pro 98 tmake solitaire.pro
99 99
100clean: 100clean:
101 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 101 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
102 -rm -f *~ core 102 -rm -f *~ core
103 -rm -f allmoc.cpp 103 -rm -f allmoc.cpp
104 104
105####### Extension Modules 105####### Extension Modules
106 106
107listpromodules: 107listpromodules:
108 @echo 108 @echo
109 109
110listallmodules: 110listallmodules:
111 @echo 111 @echo
112 112
113listaddonpromodules: 113listaddonpromodules:
114 @echo 114 @echo
115 115
116listaddonentmodules: 116listaddonentmodules:
117 @echo 117 @echo
118 118
119 119
120REQUIRES=patience 120REQUIRES=patience
121 121
122####### Sub-libraries 122####### Sub-libraries
123 123
124 124
125###### Combined headers 125###### Combined headers
126 126
127 127
128 128
129####### Compile 129####### Compile
130 130
131canvascard.o: canvascard.cpp \ 131canvascard.o: canvascard.cpp \
132 cardgame.h \ 132 cardgame.h \
133 card.h \ 133 card.h \
134 cardpile.h \ 134 cardpile.h \
135 carddeck.h \ 135 carddeck.h \
136 cardgamelayout.h \ 136 cardgamelayout.h \
137 canvascard.h \ 137 canvascard.h \
138 $(QPEDIR)/include/qpe/resource.h 138 $(OPIEDIR)/include/qpe/resource.h
139 139
140canvasshapes.o: canvasshapes.cpp \ 140canvasshapes.o: canvasshapes.cpp \
141 canvasshapes.h 141 canvasshapes.h
142 142
143cardgame.o: cardgame.cpp \ 143cardgame.o: cardgame.cpp \
144 cardgame.h \ 144 cardgame.h \
145 card.h \ 145 card.h \
146 cardpile.h \ 146 cardpile.h \
147 carddeck.h \ 147 carddeck.h \
148 cardgamelayout.h 148 cardgamelayout.h
149 149
150cardgamelayout.o: cardgamelayout.cpp \ 150cardgamelayout.o: cardgamelayout.cpp \
151 cardgamelayout.h \ 151 cardgamelayout.h \
152 cardpile.h 152 cardpile.h
153 153
154cardpile.o: cardpile.cpp \ 154cardpile.o: cardpile.cpp \
155 cardpile.h \ 155 cardpile.h \
156 card.h \ 156 card.h \
157 $(QPEDIR)/include/qpe/config.h 157 $(OPIEDIR)/include/qpe/config.h
158 158
159card.o: card.cpp \ 159card.o: card.cpp \
160 card.h \ 160 card.h \
161 $(QPEDIR)/include/qpe/config.h 161 $(OPIEDIR)/include/qpe/config.h
162 162
163carddeck.o: carddeck.cpp \ 163carddeck.o: carddeck.cpp \
164 card.h \ 164 card.h \
165 carddeck.h 165 carddeck.h
166 166
167canvascardgame.o: canvascardgame.cpp \ 167canvascardgame.o: canvascardgame.cpp \
168 cardgame.h \ 168 cardgame.h \
169 card.h \ 169 card.h \
170 cardpile.h \ 170 cardpile.h \
171 carddeck.h \ 171 carddeck.h \
172 cardgamelayout.h \ 172 cardgamelayout.h \
173 canvasshapes.h \ 173 canvasshapes.h \
174 canvascard.h \ 174 canvascard.h \
175 canvascardgame.h \ 175 canvascardgame.h \
176 $(QPEDIR)/include/qpe/resource.h \ 176 $(OPIEDIR)/include/qpe/resource.h \
177 $(QPEDIR)/include/qpe/config.h \ 177 $(OPIEDIR)/include/qpe/config.h \
178 $(QPEDIR)/include/qpe/qpemenubar.h 178 $(OPIEDIR)/include/qpe/qpemenubar.h
179 179
180freecellcardgame.o: freecellcardgame.cpp \ 180freecellcardgame.o: freecellcardgame.cpp \
181 freecellcardgame.h \ 181 freecellcardgame.h \
182 patiencecardgame.h \ 182 patiencecardgame.h \
183 canvascardgame.h \ 183 canvascardgame.h \
184 cardgame.h \ 184 cardgame.h \
185 card.h \ 185 card.h \
186 cardpile.h \ 186 cardpile.h \
187 carddeck.h \ 187 carddeck.h \
188 cardgamelayout.h \ 188 cardgamelayout.h \
189 canvasshapes.h \ 189 canvasshapes.h \
190 canvascard.h \ 190 canvascard.h \
191 $(QPEDIR)/include/qpe/resource.h \ 191 $(OPIEDIR)/include/qpe/resource.h \
192 $(QPEDIR)/include/qpe/config.h \ 192 $(OPIEDIR)/include/qpe/config.h \
193 $(QPEDIR)/include/qpe/qpemenubar.h 193 $(OPIEDIR)/include/qpe/qpemenubar.h
194 194
195patiencecardgame.o: patiencecardgame.cpp \ 195patiencecardgame.o: patiencecardgame.cpp \
196 patiencecardgame.h \ 196 patiencecardgame.h \
197 canvascardgame.h \ 197 canvascardgame.h \
198 cardgame.h \ 198 cardgame.h \
199 card.h \ 199 card.h \
200 cardpile.h \ 200 cardpile.h \
201 carddeck.h \ 201 carddeck.h \
202 cardgamelayout.h \ 202 cardgamelayout.h \
203 canvasshapes.h \ 203 canvasshapes.h \
204 canvascard.h \ 204 canvascard.h \
205 $(QPEDIR)/include/qpe/resource.h \ 205 $(OPIEDIR)/include/qpe/resource.h \
206 $(QPEDIR)/include/qpe/config.h \ 206 $(OPIEDIR)/include/qpe/config.h \
207 $(QPEDIR)/include/qpe/qpemenubar.h 207 $(OPIEDIR)/include/qpe/qpemenubar.h
208 208
209canvascardwindow.o: canvascardwindow.cpp \ 209canvascardwindow.o: canvascardwindow.cpp \
210 canvascardwindow.h \ 210 canvascardwindow.h \
211 patiencecardgame.h \ 211 patiencecardgame.h \
212 canvascardgame.h \ 212 canvascardgame.h \
213 cardgame.h \ 213 cardgame.h \
214 card.h \ 214 card.h \
215 cardpile.h \ 215 cardpile.h \
216 carddeck.h \ 216 carddeck.h \
217 cardgamelayout.h \ 217 cardgamelayout.h \
218 canvasshapes.h \ 218 canvasshapes.h \
219 canvascard.h \ 219 canvascard.h \
220 $(QPEDIR)/include/qpe/resource.h \ 220 $(OPIEDIR)/include/qpe/resource.h \
221 $(QPEDIR)/include/qpe/config.h \ 221 $(OPIEDIR)/include/qpe/config.h \
222 $(QPEDIR)/include/qpe/qpemenubar.h \ 222 $(OPIEDIR)/include/qpe/qpemenubar.h \
223 freecellcardgame.h 223 freecellcardgame.h
224 224
225main.o: main.cpp \ 225main.o: main.cpp \
226 canvascardwindow.h \ 226 canvascardwindow.h \
227 $(QPEDIR)/include/qpe/qpeapplication.h 227 $(OPIEDIR)/include/qpe/qpeapplication.h
228 228
229moc_canvascardwindow.o: moc_canvascardwindow.cpp \ 229moc_canvascardwindow.o: moc_canvascardwindow.cpp \
230 canvascardwindow.h 230 canvascardwindow.h
231 231
232moc_canvascardwindow.cpp: canvascardwindow.h 232moc_canvascardwindow.cpp: canvascardwindow.h
233 $(MOC) canvascardwindow.h -o moc_canvascardwindow.cpp 233 $(MOC) canvascardwindow.h -o moc_canvascardwindow.cpp
234 234
235 235
diff --git a/noncore/games/solitaire/solitaire.pro b/noncore/games/solitaire/solitaire.pro
index 8617cab..1c90c94 100755
--- a/noncore/games/solitaire/solitaire.pro
+++ b/noncore/games/solitaire/solitaire.pro
@@ -1,18 +1,18 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 2
3 CONFIG += qt warn_on release 3 CONFIG += qt warn_on release
4 DESTDIR = $(QPEDIR)/bin 4 DESTDIR = $(OPIEDIR)/bin
5 5
6 HEADERS = canvascard.h canvasshapes.h cardgame.h cardgamelayout.h cardpile.h card.h carddeck.h canvascardgame.h freecellcardgame.h patiencecardgame.h canvascardwindow.h 6 HEADERS = canvascard.h canvasshapes.h cardgame.h cardgamelayout.h cardpile.h card.h carddeck.h canvascardgame.h freecellcardgame.h patiencecardgame.h canvascardwindow.h
7 7
8 SOURCES = canvascard.cpp canvasshapes.cpp cardgame.cpp cardgamelayout.cpp cardpile.cpp card.cpp carddeck.cpp canvascardgame.cpp freecellcardgame.cpp patiencecardgame.cpp canvascardwindow.cpp main.cpp 8 SOURCES = canvascard.cpp canvasshapes.cpp cardgame.cpp cardgamelayout.cpp cardpile.cpp card.cpp carddeck.cpp canvascardgame.cpp freecellcardgame.cpp patiencecardgame.cpp canvascardwindow.cpp main.cpp
9 9
10 TARGET = patience 10 TARGET = patience
11 11
12INCLUDEPATH += $(QPEDIR)/include 12INCLUDEPATH += $(OPIEDIR)/include
13 DEPENDPATH+= $(QPEDIR)/include 13 DEPENDPATH+= $(OPIEDIR)/include
14LIBS += -lqpe 14LIBS += -lqpe
15 15
16 REQUIRES= patience 16 REQUIRES= patience
17 17
18TRANSLATIONS = ../i18n/de/patience.ts 18TRANSLATIONS = ../i18n/de/patience.ts
diff --git a/noncore/games/tetrix/Makefile.in b/noncore/games/tetrix/Makefile.in
index 3a74fdc..59e172c 100644
--- a/noncore/games/tetrix/Makefile.in
+++ b/noncore/games/tetrix/Makefile.in
@@ -1,157 +1,157 @@
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$(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= tetrix 21 TARGET= tetrix
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =minefield.h \ 26 HEADERS =minefield.h \
27 gtetrix.h \ 27 gtetrix.h \
28 qtetrix.h \ 28 qtetrix.h \
29 qtetrixb.h \ 29 qtetrixb.h \
30 tpiece.h 30 tpiece.h
31 SOURCES =main.cpp \ 31 SOURCES =main.cpp \
32 gtetrix.cpp \ 32 gtetrix.cpp \
33 qtetrix.cpp \ 33 qtetrix.cpp \
34 qtetrixb.cpp \ 34 qtetrixb.cpp \
35 tpiece.cpp 35 tpiece.cpp
36 OBJECTS =main.o \ 36 OBJECTS =main.o \
37 gtetrix.o \ 37 gtetrix.o \
38 qtetrix.o \ 38 qtetrix.o \
39 qtetrixb.o \ 39 qtetrixb.o \
40 tpiece.o 40 tpiece.o
41INTERFACES = 41INTERFACES =
42UICDECLS = 42UICDECLS =
43UICIMPLS = 43UICIMPLS =
44 SRCMOC =moc_qtetrix.cpp \ 44 SRCMOC =moc_qtetrix.cpp \
45 moc_qtetrixb.cpp 45 moc_qtetrixb.cpp
46 OBJMOC =moc_qtetrix.o \ 46 OBJMOC =moc_qtetrix.o \
47 moc_qtetrixb.o 47 moc_qtetrixb.o
48 48
49 49
50####### Implicit rules 50####### Implicit rules
51 51
52.SUFFIXES: .cpp .cxx .cc .C .c 52.SUFFIXES: .cpp .cxx .cc .C .c
53 53
54.cpp.o: 54.cpp.o:
55 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 55 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
56 56
57.cxx.o: 57.cxx.o:
58 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 58 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
59 59
60.cc.o: 60.cc.o:
61 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 61 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
62 62
63.C.o: 63.C.o:
64 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 64 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
65 65
66.c.o: 66.c.o:
67 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 67 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
68 68
69####### Build rules 69####### Build rules
70 70
71 71
72all: $(DESTDIR)$(TARGET) 72all: $(DESTDIR)$(TARGET)
73 73
74$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 74$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
75 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 75 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
76 76
77moc: $(SRCMOC) 77moc: $(SRCMOC)
78 78
79tmake: 79tmake:
80 tmake tetrix.pro 80 tmake tetrix.pro
81 81
82clean: 82clean:
83 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 83 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
84 -rm -f *~ core 84 -rm -f *~ core
85 -rm -f allmoc.cpp 85 -rm -f allmoc.cpp
86 86
87####### Extension Modules 87####### Extension Modules
88 88
89listpromodules: 89listpromodules:
90 @echo 90 @echo
91 91
92listallmodules: 92listallmodules:
93 @echo 93 @echo
94 94
95listaddonpromodules: 95listaddonpromodules:
96 @echo 96 @echo
97 97
98listaddonentmodules: 98listaddonentmodules:
99 @echo 99 @echo
100 100
101 101
102REQUIRES= 102REQUIRES=
103 103
104####### Sub-libraries 104####### Sub-libraries
105 105
106 106
107###### Combined headers 107###### Combined headers
108 108
109 109
110 110
111####### Compile 111####### Compile
112 112
113main.o: main.cpp \ 113main.o: main.cpp \
114 qtetrix.h \ 114 qtetrix.h \
115 qtetrixb.h \ 115 qtetrixb.h \
116 gtetrix.h \ 116 gtetrix.h \
117 tpiece.h \ 117 tpiece.h \
118 $(QPEDIR)/include/qpe/qpeapplication.h 118 $(OPIEDIR)/include/qpe/qpeapplication.h
119 119
120gtetrix.o: gtetrix.cpp \ 120gtetrix.o: gtetrix.cpp \
121 gtetrix.h \ 121 gtetrix.h \
122 tpiece.h 122 tpiece.h
123 123
124qtetrix.o: qtetrix.cpp \ 124qtetrix.o: qtetrix.cpp \
125 qtetrix.h \ 125 qtetrix.h \
126 qtetrixb.h \ 126 qtetrixb.h \
127 gtetrix.h \ 127 gtetrix.h \
128 tpiece.h \ 128 tpiece.h \
129 $(QPEDIR)/include/qpe/resource.h 129 $(OPIEDIR)/include/qpe/resource.h
130 130
131qtetrixb.o: qtetrixb.cpp \ 131qtetrixb.o: qtetrixb.cpp \
132 qtetrixb.h \ 132 qtetrixb.h \
133 gtetrix.h \ 133 gtetrix.h \
134 tpiece.h \ 134 tpiece.h \
135 qtetrix.h 135 qtetrix.h
136 136
137tpiece.o: tpiece.cpp \ 137tpiece.o: tpiece.cpp \
138 tpiece.h 138 tpiece.h
139 139
140moc_qtetrix.o: moc_qtetrix.cpp \ 140moc_qtetrix.o: moc_qtetrix.cpp \
141 qtetrix.h \ 141 qtetrix.h \
142 qtetrixb.h \ 142 qtetrixb.h \
143 gtetrix.h \ 143 gtetrix.h \
144 tpiece.h 144 tpiece.h
145 145
146moc_qtetrixb.o: moc_qtetrixb.cpp \ 146moc_qtetrixb.o: moc_qtetrixb.cpp \
147 qtetrixb.h \ 147 qtetrixb.h \
148 gtetrix.h \ 148 gtetrix.h \
149 tpiece.h 149 tpiece.h
150 150
151moc_qtetrix.cpp: qtetrix.h 151moc_qtetrix.cpp: qtetrix.h
152 $(MOC) qtetrix.h -o moc_qtetrix.cpp 152 $(MOC) qtetrix.h -o moc_qtetrix.cpp
153 153
154moc_qtetrixb.cpp: qtetrixb.h 154moc_qtetrixb.cpp: qtetrixb.h
155 $(MOC) qtetrixb.h -o moc_qtetrixb.cpp 155 $(MOC) qtetrixb.h -o moc_qtetrixb.cpp
156 156
157 157
diff --git a/noncore/games/tetrix/tetrix.pro b/noncore/games/tetrix/tetrix.pro
index 1160585..533fab0 100644
--- a/noncore/games/tetrix/tetrix.pro
+++ b/noncore/games/tetrix/tetrix.pro
@@ -1,17 +1,17 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = ../bin 3 DESTDIR = ../bin
4 HEADERS = minefield.h \ 4 HEADERS = minefield.h \
5 gtetrix.h \ 5 gtetrix.h \
6 qtetrix.h \ 6 qtetrix.h \
7 qtetrixb.h \ 7 qtetrixb.h \
8 tpiece.h 8 tpiece.h
9 SOURCES = main.cpp \ 9 SOURCES = main.cpp \
10 gtetrix.cpp \ 10 gtetrix.cpp \
11 qtetrix.cpp \ 11 qtetrix.cpp \
12 qtetrixb.cpp \ 12 qtetrixb.cpp \
13 tpiece.cpp 13 tpiece.cpp
14INCLUDEPATH += $(QPEDIR)/include 14INCLUDEPATH += $(OPIEDIR)/include
15 DEPENDPATH+= $(QPEDIR)/include 15 DEPENDPATH+= $(OPIEDIR)/include
16LIBS += -lqpe 16LIBS += -lqpe
17 INTERFACES= 17 INTERFACES=
diff --git a/noncore/games/wordgame/Makefile.in b/noncore/games/wordgame/Makefile.in
index 5627414..2e0a47c 100644
--- a/noncore/games/wordgame/Makefile.in
+++ b/noncore/games/wordgame/Makefile.in
@@ -1,168 +1,168 @@
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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= wordgame 21 TARGET= wordgame
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =wordgame.h 26 HEADERS =wordgame.h
27 SOURCES =main.cpp \ 27 SOURCES =main.cpp \
28 wordgame.cpp 28 wordgame.cpp
29 OBJECTS =main.o \ 29 OBJECTS =main.o \
30 wordgame.o \ 30 wordgame.o \
31 newgamebase.o \ 31 newgamebase.o \
32 rulesbase.o 32 rulesbase.o
33INTERFACES = newgamebase.ui \ 33INTERFACES = newgamebase.ui \
34 rulesbase.ui 34 rulesbase.ui
35UICDECLS = newgamebase.h \ 35UICDECLS = newgamebase.h \
36 rulesbase.h 36 rulesbase.h
37UICIMPLS = newgamebase.cpp \ 37UICIMPLS = newgamebase.cpp \
38 rulesbase.cpp 38 rulesbase.cpp
39 SRCMOC =moc_wordgame.cpp \ 39 SRCMOC =moc_wordgame.cpp \
40 moc_newgamebase.cpp \ 40 moc_newgamebase.cpp \
41 moc_rulesbase.cpp 41 moc_rulesbase.cpp
42 OBJMOC =moc_wordgame.o \ 42 OBJMOC =moc_wordgame.o \
43 moc_newgamebase.o \ 43 moc_newgamebase.o \
44 moc_rulesbase.o 44 moc_rulesbase.o
45 45
46 46
47####### Implicit rules 47####### Implicit rules
48 48
49.SUFFIXES: .cpp .cxx .cc .C .c 49.SUFFIXES: .cpp .cxx .cc .C .c
50 50
51.cpp.o: 51.cpp.o:
52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
53 53
54.cxx.o: 54.cxx.o:
55 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 55 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
56 56
57.cc.o: 57.cc.o:
58 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 58 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
59 59
60.C.o: 60.C.o:
61 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 61 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
62 62
63.c.o: 63.c.o:
64 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 64 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
65 65
66####### Build rules 66####### Build rules
67 67
68 68
69all: $(DESTDIR)$(TARGET) 69all: $(DESTDIR)$(TARGET)
70 70
71$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 71$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
72 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 72 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
73 73
74moc: $(SRCMOC) 74moc: $(SRCMOC)
75 75
76tmake: 76tmake:
77 tmake wordgame.pro 77 tmake wordgame.pro
78 78
79clean: 79clean:
80 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 80 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
81 -rm -f *~ core 81 -rm -f *~ core
82 -rm -f allmoc.cpp 82 -rm -f allmoc.cpp
83 83
84####### Extension Modules 84####### Extension Modules
85 85
86listpromodules: 86listpromodules:
87 @echo 87 @echo
88 88
89listallmodules: 89listallmodules:
90 @echo 90 @echo
91 91
92listaddonpromodules: 92listaddonpromodules:
93 @echo 93 @echo
94 94
95listaddonentmodules: 95listaddonentmodules:
96 @echo 96 @echo
97 97
98 98
99REQUIRES= 99REQUIRES=
100 100
101####### Sub-libraries 101####### Sub-libraries
102 102
103 103
104###### Combined headers 104###### Combined headers
105 105
106 106
107 107
108####### Compile 108####### Compile
109 109
110main.o: main.cpp \ 110main.o: main.cpp \
111 wordgame.h \ 111 wordgame.h \
112 newgamebase.h \ 112 newgamebase.h \
113 rulesbase.h \ 113 rulesbase.h \
114 $(QPEDIR)/include/qpe/qdawg.h \ 114 $(OPIEDIR)/include/qpe/qdawg.h \
115 $(QPEDIR)/include/qpe/applnk.h \ 115 $(OPIEDIR)/include/qpe/applnk.h \
116 $(QPEDIR)/include/qpe/qpeapplication.h 116 $(OPIEDIR)/include/qpe/qpeapplication.h
117 117
118wordgame.o: wordgame.cpp \ 118wordgame.o: wordgame.cpp \
119 wordgame.h \ 119 wordgame.h \
120 newgamebase.h \ 120 newgamebase.h \
121 rulesbase.h \ 121 rulesbase.h \
122 $(QPEDIR)/include/qpe/qdawg.h \ 122 $(OPIEDIR)/include/qpe/qdawg.h \
123 $(QPEDIR)/include/qpe/applnk.h \ 123 $(OPIEDIR)/include/qpe/applnk.h \
124 $(QPEDIR)/include/qpe/global.h \ 124 $(OPIEDIR)/include/qpe/global.h \
125 $(QPEDIR)/include/qpe/filemanager.h \ 125 $(OPIEDIR)/include/qpe/filemanager.h \
126 $(QPEDIR)/include/qpe/resource.h \ 126 $(OPIEDIR)/include/qpe/resource.h \
127 $(QPEDIR)/include/qpe/config.h \ 127 $(OPIEDIR)/include/qpe/config.h \
128 $(QPEDIR)/include/qpe/qpetoolbar.h 128 $(OPIEDIR)/include/qpe/qpetoolbar.h
129 129
130newgamebase.h: newgamebase.ui 130newgamebase.h: newgamebase.ui
131 $(UIC) newgamebase.ui -o $(INTERFACE_DECL_PATH)/newgamebase.h 131 $(UIC) newgamebase.ui -o $(INTERFACE_DECL_PATH)/newgamebase.h
132 132
133newgamebase.cpp: newgamebase.ui 133newgamebase.cpp: newgamebase.ui
134 $(UIC) newgamebase.ui -i newgamebase.h -o newgamebase.cpp 134 $(UIC) newgamebase.ui -i newgamebase.h -o newgamebase.cpp
135 135
136rulesbase.h: rulesbase.ui 136rulesbase.h: rulesbase.ui
137 $(UIC) rulesbase.ui -o $(INTERFACE_DECL_PATH)/rulesbase.h 137 $(UIC) rulesbase.ui -o $(INTERFACE_DECL_PATH)/rulesbase.h
138 138
139rulesbase.cpp: rulesbase.ui 139rulesbase.cpp: rulesbase.ui
140 $(UIC) rulesbase.ui -i rulesbase.h -o rulesbase.cpp 140 $(UIC) rulesbase.ui -i rulesbase.h -o rulesbase.cpp
141 141
142newgamebase.o: newgamebase.cpp 142newgamebase.o: newgamebase.cpp
143 143
144rulesbase.o: rulesbase.cpp 144rulesbase.o: rulesbase.cpp
145 145
146moc_wordgame.o: moc_wordgame.cpp \ 146moc_wordgame.o: moc_wordgame.cpp \
147 wordgame.h \ 147 wordgame.h \
148 newgamebase.h \ 148 newgamebase.h \
149 rulesbase.h \ 149 rulesbase.h \
150 $(QPEDIR)/include/qpe/qdawg.h \ 150 $(OPIEDIR)/include/qpe/qdawg.h \
151 $(QPEDIR)/include/qpe/applnk.h 151 $(OPIEDIR)/include/qpe/applnk.h
152 152
153moc_newgamebase.o: moc_newgamebase.cpp \ 153moc_newgamebase.o: moc_newgamebase.cpp \
154 newgamebase.h 154 newgamebase.h
155 155
156moc_rulesbase.o: moc_rulesbase.cpp \ 156moc_rulesbase.o: moc_rulesbase.cpp \
157 rulesbase.h 157 rulesbase.h
158 158
159moc_wordgame.cpp: wordgame.h 159moc_wordgame.cpp: wordgame.h
160 $(MOC) wordgame.h -o moc_wordgame.cpp 160 $(MOC) wordgame.h -o moc_wordgame.cpp
161 161
162moc_newgamebase.cpp: newgamebase.h 162moc_newgamebase.cpp: newgamebase.h
163 $(MOC) newgamebase.h -o moc_newgamebase.cpp 163 $(MOC) newgamebase.h -o moc_newgamebase.cpp
164 164
165moc_rulesbase.cpp: rulesbase.h 165moc_rulesbase.cpp: rulesbase.h
166 $(MOC) rulesbase.h -o moc_rulesbase.cpp 166 $(MOC) rulesbase.h -o moc_rulesbase.cpp
167 167
168 168
diff --git a/noncore/games/wordgame/wordgame.pro b/noncore/games/wordgame/wordgame.pro
index 7feacf9..64f4832 100644
--- a/noncore/games/wordgame/wordgame.pro
+++ b/noncore/games/wordgame/wordgame.pro
@@ -1,13 +1,13 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = wordgame.h 4 HEADERS = wordgame.h
5 SOURCES = main.cpp \ 5 SOURCES = main.cpp \
6 wordgame.cpp 6 wordgame.cpp
7 INTERFACES= newgamebase.ui rulesbase.ui 7 INTERFACES= newgamebase.ui rulesbase.ui
8 TARGET = wordgame 8 TARGET = wordgame
9INCLUDEPATH += $(QPEDIR)/include 9INCLUDEPATH += $(OPIEDIR)/include
10 DEPENDPATH+= $(QPEDIR)/include 10 DEPENDPATH+= $(OPIEDIR)/include
11LIBS += -lqpe 11LIBS += -lqpe
12 12
13TRANSLATIONS = ../i18n/de/wordgame.ts 13TRANSLATIONS = ../i18n/de/wordgame.ts
diff --git a/noncore/multimedia/showimg/Makefile.in b/noncore/multimedia/showimg/Makefile.in
index 9255b2d..7c58da1 100644
--- a/noncore/multimedia/showimg/Makefile.in
+++ b/noncore/multimedia/showimg/Makefile.in
@@ -1,119 +1,119 @@
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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= showimg 21 TARGET= showimg
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =showimg.h 26 HEADERS =showimg.h
27 SOURCES =main.cpp \ 27 SOURCES =main.cpp \
28 showimg.cpp 28 showimg.cpp
29 OBJECTS =main.o \ 29 OBJECTS =main.o \
30 showimg.o 30 showimg.o
31INTERFACES = 31INTERFACES =
32UICDECLS = 32UICDECLS =
33UICIMPLS = 33UICIMPLS =
34 SRCMOC =moc_showimg.cpp 34 SRCMOC =moc_showimg.cpp
35 OBJMOC =moc_showimg.o 35 OBJMOC =moc_showimg.o
36 36
37 37
38####### Implicit rules 38####### Implicit rules
39 39
40.SUFFIXES: .cpp .cxx .cc .C .c 40.SUFFIXES: .cpp .cxx .cc .C .c
41 41
42.cpp.o: 42.cpp.o:
43 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 43 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
44 44
45.cxx.o: 45.cxx.o:
46 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 46 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
47 47
48.cc.o: 48.cc.o:
49 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 49 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
50 50
51.C.o: 51.C.o:
52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
53 53
54.c.o: 54.c.o:
55 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 55 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
56 56
57####### Build rules 57####### Build rules
58 58
59 59
60all: $(DESTDIR)$(TARGET) 60all: $(DESTDIR)$(TARGET)
61 61
62$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 62$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
63 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 63 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
64 64
65moc: $(SRCMOC) 65moc: $(SRCMOC)
66 66
67tmake: 67tmake:
68 tmake showimg.pro 68 tmake showimg.pro
69 69
70clean: 70clean:
71 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 71 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
72 -rm -f *~ core 72 -rm -f *~ core
73 -rm -f allmoc.cpp 73 -rm -f allmoc.cpp
74 74
75####### Extension Modules 75####### Extension Modules
76 76
77listpromodules: 77listpromodules:
78 @echo 78 @echo
79 79
80listallmodules: 80listallmodules:
81 @echo 81 @echo
82 82
83listaddonpromodules: 83listaddonpromodules:
84 @echo 84 @echo
85 85
86listaddonentmodules: 86listaddonentmodules:
87 @echo 87 @echo
88 88
89 89
90REQUIRES=showimg 90REQUIRES=showimg
91 91
92####### Sub-libraries 92####### Sub-libraries
93 93
94 94
95###### Combined headers 95###### Combined headers
96 96
97 97
98 98
99####### Compile 99####### Compile
100 100
101main.o: main.cpp \ 101main.o: main.cpp \
102 showimg.h \ 102 showimg.h \
103 $(QPEDIR)/include/qpe/qpeapplication.h 103 $(OPIEDIR)/include/qpe/qpeapplication.h
104 104
105showimg.o: showimg.cpp \ 105showimg.o: showimg.cpp \
106 showimg.h \ 106 showimg.h \
107 $(QPEDIR)/include/qpe/resource.h \ 107 $(OPIEDIR)/include/qpe/resource.h \
108 $(QPEDIR)/include/qpe/fileselector.h \ 108 $(OPIEDIR)/include/qpe/fileselector.h \
109 $(QPEDIR)/include/qpe/applnk.h \ 109 $(OPIEDIR)/include/qpe/applnk.h \
110 $(QPEDIR)/include/qpe/qpemenubar.h \ 110 $(OPIEDIR)/include/qpe/qpemenubar.h \
111 $(QPEDIR)/include/qpe/qpetoolbar.h 111 $(OPIEDIR)/include/qpe/qpetoolbar.h
112 112
113moc_showimg.o: moc_showimg.cpp \ 113moc_showimg.o: moc_showimg.cpp \
114 showimg.h 114 showimg.h
115 115
116moc_showimg.cpp: showimg.h 116moc_showimg.cpp: showimg.h
117 $(MOC) showimg.h -o moc_showimg.cpp 117 $(MOC) showimg.h -o moc_showimg.cpp
118 118
119 119
diff --git a/noncore/multimedia/showimg/showimg.pro b/noncore/multimedia/showimg/showimg.pro
index a372f62..29da458 100644
--- a/noncore/multimedia/showimg/showimg.pro
+++ b/noncore/multimedia/showimg/showimg.pro
@@ -1,19 +1,19 @@
1TEMPLATE = app 1TEMPLATE = app
2 2
3CONFIG += qt warn_on release 3CONFIG += qt warn_on release
4DESTDIR = $(QPEDIR)/bin 4DESTDIR = $(OPIEDIR)/bin
5 5
6 HEADERS = showimg.h 6 HEADERS = showimg.h
7 7
8 SOURCES = main.cpp \ 8 SOURCES = main.cpp \
9 showimg.cpp 9 showimg.cpp
10 10
11TARGET = showimg 11TARGET = showimg
12 12
13INCLUDEPATH += $(QPEDIR)/include 13INCLUDEPATH += $(OPIEDIR)/include
14DEPENDPATH += $(QPEDIR)/include 14DEPENDPATH += $(OPIEDIR)/include
15LIBS += -lqpe 15LIBS += -lqpe
16 16
17REQUIRES = showimg 17REQUIRES = showimg
18 18
19TRANSLATIONS = ../i18n/de/showimg.ts 19TRANSLATIONS = ../i18n/de/showimg.ts
diff --git a/noncore/settings/language/Makefile.in b/noncore/settings/language/Makefile.in
index 2babf6e..d1a602d 100644
--- a/noncore/settings/language/Makefile.in
+++ b/noncore/settings/language/Makefile.in
@@ -1,135 +1,135 @@
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$(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= language 21 TARGET= language
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =settings.h 26 HEADERS =settings.h
27 SOURCES =language.cpp \ 27 SOURCES =language.cpp \
28 main.cpp 28 main.cpp
29 OBJECTS =language.o \ 29 OBJECTS =language.o \
30 main.o \ 30 main.o \
31 languagesettingsbase.o 31 languagesettingsbase.o
32INTERFACES = languagesettingsbase.ui 32INTERFACES = languagesettingsbase.ui
33UICDECLS = languagesettingsbase.h 33UICDECLS = languagesettingsbase.h
34UICIMPLS = languagesettingsbase.cpp 34UICIMPLS = languagesettingsbase.cpp
35 SRCMOC =moc_settings.cpp \ 35 SRCMOC =moc_settings.cpp \
36 moc_languagesettingsbase.cpp 36 moc_languagesettingsbase.cpp
37 OBJMOC =moc_settings.o \ 37 OBJMOC =moc_settings.o \
38 moc_languagesettingsbase.o 38 moc_languagesettingsbase.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:
71 tmake language.pro 71 tmake language.pro
72 72
73clean: 73clean:
74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
75 -rm -f *~ core 75 -rm -f *~ core
76 -rm -f allmoc.cpp 76 -rm -f allmoc.cpp
77 77
78####### Extension Modules 78####### Extension Modules
79 79
80listpromodules: 80listpromodules:
81 @echo 81 @echo
82 82
83listallmodules: 83listallmodules:
84 @echo 84 @echo
85 85
86listaddonpromodules: 86listaddonpromodules:
87 @echo 87 @echo
88 88
89listaddonentmodules: 89listaddonentmodules:
90 @echo 90 @echo
91 91
92 92
93REQUIRES= 93REQUIRES=
94 94
95####### Sub-libraries 95####### Sub-libraries
96 96
97 97
98###### Combined headers 98###### Combined headers
99 99
100 100
101 101
102####### Compile 102####### Compile
103 103
104language.o: language.cpp \ 104language.o: language.cpp \
105 settings.h \ 105 settings.h \
106 languagesettingsbase.h 106 languagesettingsbase.h
107 107
108main.o: main.cpp \ 108main.o: main.cpp \
109 settings.h \ 109 settings.h \
110 languagesettingsbase.h 110 languagesettingsbase.h
111 111
112languagesettingsbase.h: languagesettingsbase.ui 112languagesettingsbase.h: languagesettingsbase.ui
113 $(UIC) languagesettingsbase.ui -o $(INTERFACE_DECL_PATH)/languagesettingsbase.h 113 $(UIC) languagesettingsbase.ui -o $(INTERFACE_DECL_PATH)/languagesettingsbase.h
114 114
115languagesettingsbase.cpp: languagesettingsbase.ui 115languagesettingsbase.cpp: languagesettingsbase.ui
116 $(UIC) languagesettingsbase.ui -i languagesettingsbase.h -o languagesettingsbase.cpp 116 $(UIC) languagesettingsbase.ui -i languagesettingsbase.h -o languagesettingsbase.cpp
117 117
118languagesettingsbase.o: languagesettingsbase.cpp \ 118languagesettingsbase.o: languagesettingsbase.cpp \
119 languagesettingsbase.h \ 119 languagesettingsbase.h \
120 languagesettingsbase.ui 120 languagesettingsbase.ui
121 121
122moc_settings.o: moc_settings.cpp \ 122moc_settings.o: moc_settings.cpp \
123 settings.h \ 123 settings.h \
124 languagesettingsbase.h 124 languagesettingsbase.h
125 125
126moc_languagesettingsbase.o: moc_languagesettingsbase.cpp \ 126moc_languagesettingsbase.o: moc_languagesettingsbase.cpp \
127 languagesettingsbase.h 127 languagesettingsbase.h
128 128
129moc_settings.cpp: settings.h 129moc_settings.cpp: settings.h
130 $(MOC) settings.h -o moc_settings.cpp 130 $(MOC) settings.h -o moc_settings.cpp
131 131
132moc_languagesettingsbase.cpp: languagesettingsbase.h 132moc_languagesettingsbase.cpp: languagesettingsbase.h
133 $(MOC) languagesettingsbase.h -o moc_languagesettingsbase.cpp 133 $(MOC) languagesettingsbase.h -o moc_languagesettingsbase.cpp
134 134
135 135
diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro
index d1f1bf0..c01ffc8 100644
--- a/noncore/settings/language/language.pro
+++ b/noncore/settings/language/language.pro
@@ -1,12 +1,12 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = ../../bin 3 DESTDIR = ../../bin
4 HEADERS = settings.h 4 HEADERS = settings.h
5 SOURCES = language.cpp main.cpp 5 SOURCES = language.cpp main.cpp
6 INTERFACES= languagesettingsbase.ui 6 INTERFACES= languagesettingsbase.ui
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= ../$(QPEDIR)/include 8 DEPENDPATH+= ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 TARGET = language 10 TARGET = language
11 11
12TRANSLATIONS = ../../i18n/de/language.ts 12TRANSLATIONS = ../../i18n/de/language.ts
diff --git a/noncore/settings/sound/Makefile.in b/noncore/settings/sound/Makefile.in
index 1772e12..b42f2e9 100644
--- a/noncore/settings/sound/Makefile.in
+++ b/noncore/settings/sound/Makefile.in
@@ -1,135 +1,135 @@
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$(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= sound 21 TARGET= sound
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =soundsettings.h 26 HEADERS =soundsettings.h
27 SOURCES =soundsettings.cpp \ 27 SOURCES =soundsettings.cpp \
28 main.cpp 28 main.cpp
29 OBJECTS =soundsettings.o \ 29 OBJECTS =soundsettings.o \
30 main.o \ 30 main.o \
31 soundsettingsbase.o 31 soundsettingsbase.o
32INTERFACES = soundsettingsbase.ui 32INTERFACES = soundsettingsbase.ui
33UICDECLS = soundsettingsbase.h 33UICDECLS = soundsettingsbase.h
34UICIMPLS = soundsettingsbase.cpp 34UICIMPLS = soundsettingsbase.cpp
35 SRCMOC =moc_soundsettings.cpp \ 35 SRCMOC =moc_soundsettings.cpp \
36 moc_soundsettingsbase.cpp 36 moc_soundsettingsbase.cpp
37 OBJMOC =moc_soundsettings.o \ 37 OBJMOC =moc_soundsettings.o \
38 moc_soundsettingsbase.o 38 moc_soundsettingsbase.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:
71 tmake sound.pro 71 tmake sound.pro
72 72
73clean: 73clean:
74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
75 -rm -f *~ core 75 -rm -f *~ core
76 -rm -f allmoc.cpp 76 -rm -f allmoc.cpp
77 77
78####### Extension Modules 78####### Extension Modules
79 79
80listpromodules: 80listpromodules:
81 @echo 81 @echo
82 82
83listallmodules: 83listallmodules:
84 @echo 84 @echo
85 85
86listaddonpromodules: 86listaddonpromodules:
87 @echo 87 @echo
88 88
89listaddonentmodules: 89listaddonentmodules:
90 @echo 90 @echo
91 91
92 92
93REQUIRES= 93REQUIRES=
94 94
95####### Sub-libraries 95####### Sub-libraries
96 96
97 97
98###### Combined headers 98###### Combined headers
99 99
100 100
101 101
102####### Compile 102####### Compile
103 103
104soundsettings.o: soundsettings.cpp \ 104soundsettings.o: soundsettings.cpp \
105 soundsettings.h \ 105 soundsettings.h \
106 soundsettingsbase.h 106 soundsettingsbase.h
107 107
108main.o: main.cpp \ 108main.o: main.cpp \
109 soundsettings.h \ 109 soundsettings.h \
110 soundsettingsbase.h 110 soundsettingsbase.h
111 111
112soundsettingsbase.h: soundsettingsbase.ui 112soundsettingsbase.h: soundsettingsbase.ui
113 $(UIC) soundsettingsbase.ui -o $(INTERFACE_DECL_PATH)/soundsettingsbase.h 113 $(UIC) soundsettingsbase.ui -o $(INTERFACE_DECL_PATH)/soundsettingsbase.h
114 114
115soundsettingsbase.cpp: soundsettingsbase.ui 115soundsettingsbase.cpp: soundsettingsbase.ui
116 $(UIC) soundsettingsbase.ui -i soundsettingsbase.h -o soundsettingsbase.cpp 116 $(UIC) soundsettingsbase.ui -i soundsettingsbase.h -o soundsettingsbase.cpp
117 117
118soundsettingsbase.o: soundsettingsbase.cpp \ 118soundsettingsbase.o: soundsettingsbase.cpp \
119 soundsettingsbase.h \ 119 soundsettingsbase.h \
120 soundsettingsbase.ui 120 soundsettingsbase.ui
121 121
122moc_soundsettings.o: moc_soundsettings.cpp \ 122moc_soundsettings.o: moc_soundsettings.cpp \
123 soundsettings.h \ 123 soundsettings.h \
124 soundsettingsbase.h 124 soundsettingsbase.h
125 125
126moc_soundsettingsbase.o: moc_soundsettingsbase.cpp \ 126moc_soundsettingsbase.o: moc_soundsettingsbase.cpp \
127 soundsettingsbase.h 127 soundsettingsbase.h
128 128
129moc_soundsettings.cpp: soundsettings.h 129moc_soundsettings.cpp: soundsettings.h
130 $(MOC) soundsettings.h -o moc_soundsettings.cpp 130 $(MOC) soundsettings.h -o moc_soundsettings.cpp
131 131
132moc_soundsettingsbase.cpp: soundsettingsbase.h 132moc_soundsettingsbase.cpp: soundsettingsbase.h
133 $(MOC) soundsettingsbase.h -o moc_soundsettingsbase.cpp 133 $(MOC) soundsettingsbase.h -o moc_soundsettingsbase.cpp
134 134
135 135
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro
index 9028a44..44eff44 100644
--- a/noncore/settings/sound/sound.pro
+++ b/noncore/settings/sound/sound.pro
@@ -1,10 +1,10 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = ../../bin 3 DESTDIR = ../../bin
4 HEADERS = soundsettings.h 4 HEADERS = soundsettings.h
5 SOURCES = soundsettings.cpp main.cpp 5 SOURCES = soundsettings.cpp main.cpp
6 INTERFACES= soundsettingsbase.ui 6 INTERFACES= soundsettingsbase.ui
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= ../$(QPEDIR)/include 8 DEPENDPATH+= ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 TARGET = sound 10 TARGET = sound
diff --git a/noncore/settings/sysinfo/Makefile.in b/noncore/settings/sysinfo/Makefile.in
index 1149304..fb9d15e 100644
--- a/noncore/settings/sysinfo/Makefile.in
+++ b/noncore/settings/sysinfo/Makefile.in
@@ -1,193 +1,193 @@
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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= sysinfo 21 TARGET= sysinfo
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =memory.h \ 26 HEADERS =memory.h \
27 graph.h \ 27 graph.h \
28 load.h \ 28 load.h \
29 storage.h \ 29 storage.h \
30 versioninfo.h \ 30 versioninfo.h \
31 sysinfo.h 31 sysinfo.h
32 SOURCES =main.cpp \ 32 SOURCES =main.cpp \
33 memory.cpp \ 33 memory.cpp \
34 graph.cpp \ 34 graph.cpp \
35 load.cpp \ 35 load.cpp \
36 storage.cpp \ 36 storage.cpp \
37 versioninfo.cpp \ 37 versioninfo.cpp \
38 sysinfo.cpp 38 sysinfo.cpp
39 OBJECTS =main.o \ 39 OBJECTS =main.o \
40 memory.o \ 40 memory.o \
41 graph.o \ 41 graph.o \
42 load.o \ 42 load.o \
43 storage.o \ 43 storage.o \
44 versioninfo.o \ 44 versioninfo.o \
45 sysinfo.o 45 sysinfo.o
46INTERFACES = 46INTERFACES =
47UICDECLS = 47UICDECLS =
48UICIMPLS = 48UICIMPLS =
49 SRCMOC =moc_memory.cpp \ 49 SRCMOC =moc_memory.cpp \
50 moc_graph.cpp \ 50 moc_graph.cpp \
51 moc_load.cpp \ 51 moc_load.cpp \
52 moc_storage.cpp \ 52 moc_storage.cpp \
53 moc_versioninfo.cpp \ 53 moc_versioninfo.cpp \
54 moc_sysinfo.cpp 54 moc_sysinfo.cpp
55 OBJMOC =moc_memory.o \ 55 OBJMOC =moc_memory.o \
56 moc_graph.o \ 56 moc_graph.o \
57 moc_load.o \ 57 moc_load.o \
58 moc_storage.o \ 58 moc_storage.o \
59 moc_versioninfo.o \ 59 moc_versioninfo.o \
60 moc_sysinfo.o 60 moc_sysinfo.o
61 61
62 62
63####### Implicit rules 63####### Implicit rules
64 64
65.SUFFIXES: .cpp .cxx .cc .C .c 65.SUFFIXES: .cpp .cxx .cc .C .c
66 66
67.cpp.o: 67.cpp.o:
68 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 68 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
69 69
70.cxx.o: 70.cxx.o:
71 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 71 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
72 72
73.cc.o: 73.cc.o:
74 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 74 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
75 75
76.C.o: 76.C.o:
77 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 77 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
78 78
79.c.o: 79.c.o:
80 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 80 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
81 81
82####### Build rules 82####### Build rules
83 83
84 84
85all: $(DESTDIR)$(TARGET) 85all: $(DESTDIR)$(TARGET)
86 86
87$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 87$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
88 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 88 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
89 89
90moc: $(SRCMOC) 90moc: $(SRCMOC)
91 91
92tmake: 92tmake:
93 tmake sysinfo.pro 93 tmake sysinfo.pro
94 94
95clean: 95clean:
96 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 96 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
97 -rm -f *~ core 97 -rm -f *~ core
98 -rm -f allmoc.cpp 98 -rm -f allmoc.cpp
99 99
100####### Extension Modules 100####### Extension Modules
101 101
102listpromodules: 102listpromodules:
103 @echo 103 @echo
104 104
105listallmodules: 105listallmodules:
106 @echo 106 @echo
107 107
108listaddonpromodules: 108listaddonpromodules:
109 @echo 109 @echo
110 110
111listaddonentmodules: 111listaddonentmodules:
112 @echo 112 @echo
113 113
114 114
115REQUIRES= 115REQUIRES=
116 116
117####### Sub-libraries 117####### Sub-libraries
118 118
119 119
120###### Combined headers 120###### Combined headers
121 121
122 122
123 123
124####### Compile 124####### Compile
125 125
126main.o: main.cpp \ 126main.o: main.cpp \
127 sysinfo.h \ 127 sysinfo.h \
128 $(QPEDIR)/include/qpe/qpeapplication.h 128 $(OPIEDIR)/include/qpe/qpeapplication.h
129 129
130memory.o: memory.cpp \ 130memory.o: memory.cpp \
131 graph.h \ 131 graph.h \
132 memory.h 132 memory.h
133 133
134graph.o: graph.cpp \ 134graph.o: graph.cpp \
135 graph.h 135 graph.h
136 136
137load.o: load.cpp \ 137load.o: load.cpp \
138 load.h 138 load.h
139 139
140storage.o: storage.cpp \ 140storage.o: storage.cpp \
141 graph.h \ 141 graph.h \
142 storage.h 142 storage.h
143 143
144versioninfo.o: versioninfo.cpp \ 144versioninfo.o: versioninfo.cpp \
145 $(QPEDIR)/include/qpe/resource.h \ 145 $(OPIEDIR)/include/qpe/resource.h \
146 $(QPEDIR)/include/qpe/version.h \ 146 $(OPIEDIR)/include/qpe/version.h \
147 versioninfo.h 147 versioninfo.h
148 148
149sysinfo.o: sysinfo.cpp \ 149sysinfo.o: sysinfo.cpp \
150 memory.h \ 150 memory.h \
151 load.h \ 151 load.h \
152 storage.h \ 152 storage.h \
153 versioninfo.h \ 153 versioninfo.h \
154 sysinfo.h \ 154 sysinfo.h \
155 $(QPEDIR)/include/qpe/resource.h 155 $(OPIEDIR)/include/qpe/resource.h
156 156
157moc_memory.o: moc_memory.cpp \ 157moc_memory.o: moc_memory.cpp \
158 memory.h 158 memory.h
159 159
160moc_graph.o: moc_graph.cpp \ 160moc_graph.o: moc_graph.cpp \
161 graph.h 161 graph.h
162 162
163moc_load.o: moc_load.cpp \ 163moc_load.o: moc_load.cpp \
164 load.h 164 load.h
165 165
166moc_storage.o: moc_storage.cpp \ 166moc_storage.o: moc_storage.cpp \
167 storage.h 167 storage.h
168 168
169moc_versioninfo.o: moc_versioninfo.cpp \ 169moc_versioninfo.o: moc_versioninfo.cpp \
170 versioninfo.h 170 versioninfo.h
171 171
172moc_sysinfo.o: moc_sysinfo.cpp \ 172moc_sysinfo.o: moc_sysinfo.cpp \
173 sysinfo.h 173 sysinfo.h
174 174
175moc_memory.cpp: memory.h 175moc_memory.cpp: memory.h
176 $(MOC) memory.h -o moc_memory.cpp 176 $(MOC) memory.h -o moc_memory.cpp
177 177
178moc_graph.cpp: graph.h 178moc_graph.cpp: graph.h
179 $(MOC) graph.h -o moc_graph.cpp 179 $(MOC) graph.h -o moc_graph.cpp
180 180
181moc_load.cpp: load.h 181moc_load.cpp: load.h
182 $(MOC) load.h -o moc_load.cpp 182 $(MOC) load.h -o moc_load.cpp
183 183
184moc_storage.cpp: storage.h 184moc_storage.cpp: storage.h
185 $(MOC) storage.h -o moc_storage.cpp 185 $(MOC) storage.h -o moc_storage.cpp
186 186
187moc_versioninfo.cpp: versioninfo.h 187moc_versioninfo.cpp: versioninfo.h
188 $(MOC) versioninfo.h -o moc_versioninfo.cpp 188 $(MOC) versioninfo.h -o moc_versioninfo.cpp
189 189
190moc_sysinfo.cpp: sysinfo.h 190moc_sysinfo.cpp: sysinfo.h
191 $(MOC) sysinfo.h -o moc_sysinfo.cpp 191 $(MOC) sysinfo.h -o moc_sysinfo.cpp
192 192
193 193
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro
index 0c7d907..3393a12 100644
--- a/noncore/settings/sysinfo/sysinfo.pro
+++ b/noncore/settings/sysinfo/sysinfo.pro
@@ -1,25 +1,25 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = memory.h \ 4 HEADERS = memory.h \
5 graph.h \ 5 graph.h \
6 load.h \ 6 load.h \
7 storage.h \ 7 storage.h \
8 versioninfo.h \ 8 versioninfo.h \
9 sysinfo.h 9 sysinfo.h
10 SOURCES = main.cpp \ 10 SOURCES = main.cpp \
11 memory.cpp \ 11 memory.cpp \
12 graph.cpp \ 12 graph.cpp \
13 load.cpp \ 13 load.cpp \
14 storage.cpp \ 14 storage.cpp \
15 versioninfo.cpp \ 15 versioninfo.cpp \
16 sysinfo.cpp 16 sysinfo.cpp
17 INTERFACES= 17 INTERFACES=
18 18
19INCLUDEPATH += $(QPEDIR)/include 19INCLUDEPATH += $(OPIEDIR)/include
20 DEPENDPATH+= $(QPEDIR)/include 20 DEPENDPATH+= $(OPIEDIR)/include
21LIBS += -lqpe 21LIBS += -lqpe
22 22
23 TARGET = sysinfo 23 TARGET = sysinfo
24 24
25TRANSLATIONS = ../i18n/de/sysinfo.ts 25TRANSLATIONS = ../i18n/de/sysinfo.ts
diff --git a/noncore/tools/calc2/binary/binary.pro b/noncore/tools/calc2/binary/binary.pro
index 01ba6a4..2e9ed78 100644
--- a/noncore/tools/calc2/binary/binary.pro
+++ b/noncore/tools/calc2/binary/binary.pro
@@ -1,16 +1,16 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG -= moc 2CONFIG -= moc
3CONFIG += qt release 3CONFIG += qt release
4 4
5# Input 5# Input
6INTERFACES += binary.ui 6INTERFACES += binary.ui
7HEADERS = binaryimpl.h \ 7HEADERS = binaryimpl.h \
8 binaryfactory.h 8 binaryfactory.h
9SOURCES = binaryimpl.cpp \ 9SOURCES = binaryimpl.cpp \
10 binaryfactory.cpp 10 binaryfactory.cpp
11 11
12INCLUDEPATH += $(QPEDIR)/include \ 12INCLUDEPATH += $(OPIEDIR)/include \
13 $(QPEDIR)/calc2 13 $(OPIEDIR)/calc2
14DEPENDPATH += $(QPEDIR)/include 14DEPENDPATH += $(OPIEDIR)/include
15 15
16DESTDIR = $(QPEDIR)/plugins/calculator 16DESTDIR = $(OPIEDIR)/plugins/calculator
diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro
index c10232a..00e13b7 100644
--- a/noncore/tools/calc2/calc.pro
+++ b/noncore/tools/calc2/calc.pro
@@ -1,11 +1,11 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG += qt release 2CONFIG += qt release
3 3
4# Input 4# Input
5HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h 5HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h
6SOURCES += calc.cpp main.cpp engine.cpp 6SOURCES += calc.cpp main.cpp engine.cpp
7 7
8INCLUDEPATH += $(QPEDIR)/include 8INCLUDEPATH += $(OPIEDIR)/include
9DEPENDPATH += $(QPEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10LIBS += -lqpe -Wl,-export-dynamic 10LIBS += -lqpe -Wl,-export-dynamic
11 11
diff --git a/noncore/tools/calc2/simple/simple.pro b/noncore/tools/calc2/simple/simple.pro
index 92378a6..9e5d4e0 100644
--- a/noncore/tools/calc2/simple/simple.pro
+++ b/noncore/tools/calc2/simple/simple.pro
@@ -1,14 +1,14 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG -= moc 2CONFIG -= moc
3CONFIG += qt release 3CONFIG += qt release
4 4
5# Input 5# Input
6INTERFACES += simple.ui 6INTERFACES += simple.ui
7HEADERS = simpleimpl.h simplefactory.h stdinstructions.h 7HEADERS = simpleimpl.h simplefactory.h stdinstructions.h
8SOURCES = simpleimpl.cpp simplefactory.cpp 8SOURCES = simpleimpl.cpp simplefactory.cpp
9 9
10INCLUDEPATH += $(QPEDIR)/include \ 10INCLUDEPATH += $(OPIEDIR)/include \
11 $(QPEDIR)/calc2 11 $(OPIEDIR)/calc2
12DEPENDPATH += $(QPEDIR)/include 12DEPENDPATH += $(OPIEDIR)/include
13 13
14DESTDIR = $(QPEDIR)/plugins/calculator 14DESTDIR = $(OPIEDIR)/plugins/calculator
diff --git a/noncore/tools/calculator/Makefile.in b/noncore/tools/calculator/Makefile.in
index d62b046..ba78df5 100644
--- a/noncore/tools/calculator/Makefile.in
+++ b/noncore/tools/calculator/Makefile.in
@@ -1,139 +1,139 @@
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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= calculator 21 TARGET= calculator
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =calculatorimpl.h 26 HEADERS =calculatorimpl.h
27 SOURCES =calculatorimpl.cpp \ 27 SOURCES =calculatorimpl.cpp \
28 main.cpp 28 main.cpp
29 OBJECTS =calculatorimpl.o \ 29 OBJECTS =calculatorimpl.o \
30 main.o \ 30 main.o \
31 calculator.o 31 calculator.o
32INTERFACES = calculator.ui 32INTERFACES = calculator.ui
33UICDECLS = calculator.h 33UICDECLS = calculator.h
34UICIMPLS = calculator.cpp 34UICIMPLS = calculator.cpp
35 SRCMOC =moc_calculatorimpl.cpp \ 35 SRCMOC =moc_calculatorimpl.cpp \
36 moc_calculator.cpp 36 moc_calculator.cpp
37 OBJMOC =moc_calculatorimpl.o \ 37 OBJMOC =moc_calculatorimpl.o \
38 moc_calculator.o 38 moc_calculator.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:
71 tmake calculator.pro 71 tmake calculator.pro
72 72
73clean: 73clean:
74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
75 -rm -f *~ core 75 -rm -f *~ core
76 -rm -f allmoc.cpp 76 -rm -f allmoc.cpp
77 77
78####### Extension Modules 78####### Extension Modules
79 79
80listpromodules: 80listpromodules:
81 @echo 81 @echo
82 82
83listallmodules: 83listallmodules:
84 @echo 84 @echo
85 85
86listaddonpromodules: 86listaddonpromodules:
87 @echo 87 @echo
88 88
89listaddonentmodules: 89listaddonentmodules:
90 @echo 90 @echo
91 91
92 92
93REQUIRES= 93REQUIRES=
94 94
95####### Sub-libraries 95####### Sub-libraries
96 96
97 97
98###### Combined headers 98###### Combined headers
99 99
100 100
101 101
102####### Compile 102####### Compile
103 103
104calculatorimpl.o: calculatorimpl.cpp \ 104calculatorimpl.o: calculatorimpl.cpp \
105 calculatorimpl.h \ 105 calculatorimpl.h \
106 calculator.h \ 106 calculator.h \
107 $(QPEDIR)/include/qpe/resource.h \ 107 $(OPIEDIR)/include/qpe/resource.h \
108 $(QPEDIR)/include/qpe/qmath.h \ 108 $(OPIEDIR)/include/qpe/qmath.h \
109 $(QPEDIR)/include/qpe/qpeapplication.h 109 $(OPIEDIR)/include/qpe/qpeapplication.h
110 110
111main.o: main.cpp \ 111main.o: main.cpp \
112 calculatorimpl.h \ 112 calculatorimpl.h \
113 calculator.h \ 113 calculator.h \
114 $(QPEDIR)/include/qpe/qpeapplication.h 114 $(OPIEDIR)/include/qpe/qpeapplication.h
115 115
116calculator.h: calculator.ui 116calculator.h: calculator.ui
117 $(UIC) calculator.ui -o calculator.h 117 $(UIC) calculator.ui -o $(INTERFACE_DECL_PATH)/calculator.h
118 118
119calculator.cpp: calculator.ui 119calculator.cpp: calculator.ui
120 $(UIC) calculator.ui -i calculator.h -o calculator.cpp 120 $(UIC) calculator.ui -i calculator.h -o calculator.cpp
121 121
122calculator.o: calculator.cpp \ 122calculator.o: calculator.cpp \
123 calculator.h \ 123 calculator.h \
124 calculator.ui 124 calculator.ui
125 125
126moc_calculatorimpl.o: moc_calculatorimpl.cpp \ 126moc_calculatorimpl.o: moc_calculatorimpl.cpp \
127 calculatorimpl.h \ 127 calculatorimpl.h \
128 calculator.h 128 calculator.h
129 129
130moc_calculator.o: moc_calculator.cpp \ 130moc_calculator.o: moc_calculator.cpp \
131 calculator.h 131 calculator.h
132 132
133moc_calculatorimpl.cpp: calculatorimpl.h 133moc_calculatorimpl.cpp: calculatorimpl.h
134 $(MOC) calculatorimpl.h -o moc_calculatorimpl.cpp 134 $(MOC) calculatorimpl.h -o moc_calculatorimpl.cpp
135 135
136moc_calculator.cpp: calculator.h 136moc_calculator.cpp: calculator.h
137 $(MOC) calculator.h -o moc_calculator.cpp 137 $(MOC) calculator.h -o moc_calculator.cpp
138 138
139 139
diff --git a/noncore/tools/calculator/calculator.pro b/noncore/tools/calculator/calculator.pro
index 1281fd5..9554d2a 100644
--- a/noncore/tools/calculator/calculator.pro
+++ b/noncore/tools/calculator/calculator.pro
@@ -1,13 +1,13 @@
1 DESTDIR = $(QPEDIR)/bin 1 DESTDIR = $(OPIEDIR)/bin
2 TEMPLATE= app 2 TEMPLATE= app
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = calculatorimpl.h 4 HEADERS = calculatorimpl.h
5 SOURCES = calculatorimpl.cpp \ 5 SOURCES = calculatorimpl.cpp \
6 main.cpp 6 main.cpp
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(QPEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 INTERFACES= calculator.ui 10 INTERFACES= calculator.ui
11 TARGET = calculator 11 TARGET = calculator
12 12
13TRANSLATIONS = ../i18n/de/calculator.ts 13TRANSLATIONS = ../i18n/de/calculator.ts
diff --git a/noncore/tools/clock/Makefile.in b/noncore/tools/clock/Makefile.in
index adda9e6..efa7808 100644
--- a/noncore/tools/clock/Makefile.in
+++ b/noncore/tools/clock/Makefile.in
@@ -1,118 +1,118 @@
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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= clock 21 TARGET= clock
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =clock.h 26 HEADERS =clock.h
27 SOURCES =clock.cpp \ 27 SOURCES =clock.cpp \
28 main.cpp 28 main.cpp
29 OBJECTS =clock.o \ 29 OBJECTS =clock.o \
30 main.o 30 main.o
31INTERFACES = 31INTERFACES =
32UICDECLS = 32UICDECLS =
33UICIMPLS = 33UICIMPLS =
34 SRCMOC =moc_clock.cpp 34 SRCMOC =moc_clock.cpp
35 OBJMOC =moc_clock.o 35 OBJMOC =moc_clock.o
36 36
37 37
38####### Implicit rules 38####### Implicit rules
39 39
40.SUFFIXES: .cpp .cxx .cc .C .c 40.SUFFIXES: .cpp .cxx .cc .C .c
41 41
42.cpp.o: 42.cpp.o:
43 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 43 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
44 44
45.cxx.o: 45.cxx.o:
46 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 46 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
47 47
48.cc.o: 48.cc.o:
49 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 49 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
50 50
51.C.o: 51.C.o:
52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 52 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
53 53
54.c.o: 54.c.o:
55 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 55 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
56 56
57####### Build rules 57####### Build rules
58 58
59 59
60all: $(DESTDIR)$(TARGET) 60all: $(DESTDIR)$(TARGET)
61 61
62$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 62$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
63 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 63 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
64 64
65moc: $(SRCMOC) 65moc: $(SRCMOC)
66 66
67tmake: 67tmake:
68 tmake clock.pro 68 tmake clock.pro
69 69
70clean: 70clean:
71 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 71 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
72 -rm -f *~ core 72 -rm -f *~ core
73 -rm -f allmoc.cpp 73 -rm -f allmoc.cpp
74 74
75####### Extension Modules 75####### Extension Modules
76 76
77listpromodules: 77listpromodules:
78 @echo 78 @echo
79 79
80listallmodules: 80listallmodules:
81 @echo 81 @echo
82 82
83listaddonpromodules: 83listaddonpromodules:
84 @echo 84 @echo
85 85
86listaddonentmodules: 86listaddonentmodules:
87 @echo 87 @echo
88 88
89 89
90REQUIRES= 90REQUIRES=
91 91
92####### Sub-libraries 92####### Sub-libraries
93 93
94 94
95###### Combined headers 95###### Combined headers
96 96
97 97
98 98
99####### Compile 99####### Compile
100 100
101clock.o: clock.cpp \ 101clock.o: clock.cpp \
102 clock.h \ 102 clock.h \
103 $(QPEDIR)/include/qpe/qpeapplication.h \ 103 $(OPIEDIR)/include/qpe/qpeapplication.h \
104 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 104 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
105 $(QPEDIR)/include/qpe/config.h \ 105 $(OPIEDIR)/include/qpe/config.h \
106 $(QPEDIR)/include/qpe/timestring.h 106 $(OPIEDIR)/include/qpe/timestring.h
107 107
108main.o: main.cpp \ 108main.o: main.cpp \
109 clock.h \ 109 clock.h \
110 $(QPEDIR)/include/qpe/qpeapplication.h 110 $(OPIEDIR)/include/qpe/qpeapplication.h
111 111
112moc_clock.o: moc_clock.cpp \ 112moc_clock.o: moc_clock.cpp \
113 clock.h 113 clock.h
114 114
115moc_clock.cpp: clock.h 115moc_clock.cpp: clock.h
116 $(MOC) clock.h -o moc_clock.cpp 116 $(MOC) clock.h -o moc_clock.cpp
117 117
118 118
diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro
index 97f4d2c..ec27adc 100644
--- a/noncore/tools/clock/clock.pro
+++ b/noncore/tools/clock/clock.pro
@@ -1,13 +1,13 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = clock.h 4 HEADERS = clock.h
5 SOURCES = clock.cpp \ 5 SOURCES = clock.cpp \
6 main.cpp 6 main.cpp
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(QPEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 INTERFACES= 10 INTERFACES=
11 TARGET = clock 11 TARGET = clock
12 12
13TRANSLATIONS = ../i18n/de/clock.ts 13TRANSLATIONS = ../i18n/de/clock.ts
diff --git a/noncore/unsupported/filebrowser/Makefile.in b/noncore/unsupported/filebrowser/Makefile.in
index c7238ea..c00d0f5 100644
--- a/noncore/unsupported/filebrowser/Makefile.in
+++ b/noncore/unsupported/filebrowser/Makefile.in
@@ -1,136 +1,136 @@
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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= filebrowser 21 TARGET= filebrowser
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =inlineedit.h \ 26 HEADERS =inlineedit.h \
27 filebrowser.h 27 filebrowser.h
28 SOURCES =filebrowser.cpp \ 28 SOURCES =filebrowser.cpp \
29 inlineedit.cpp \ 29 inlineedit.cpp \
30 main.cpp 30 main.cpp
31 OBJECTS =filebrowser.o \ 31 OBJECTS =filebrowser.o \
32 inlineedit.o \ 32 inlineedit.o \
33 main.o 33 main.o
34INTERFACES = 34INTERFACES =
35UICDECLS = 35UICDECLS =
36UICIMPLS = 36UICIMPLS =
37 SRCMOC =moc_inlineedit.cpp \ 37 SRCMOC =moc_inlineedit.cpp \
38 moc_filebrowser.cpp 38 moc_filebrowser.cpp
39 OBJMOC =moc_inlineedit.o \ 39 OBJMOC =moc_inlineedit.o \
40 moc_filebrowser.o 40 moc_filebrowser.o
41 41
42 42
43####### Implicit rules 43####### Implicit rules
44 44
45.SUFFIXES: .cpp .cxx .cc .C .c 45.SUFFIXES: .cpp .cxx .cc .C .c
46 46
47.cpp.o: 47.cpp.o:
48 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 48 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
49 49
50.cxx.o: 50.cxx.o:
51 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 51 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
52 52
53.cc.o: 53.cc.o:
54 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 54 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
55 55
56.C.o: 56.C.o:
57 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 57 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
58 58
59.c.o: 59.c.o:
60 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 60 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
61 61
62####### Build rules 62####### Build rules
63 63
64 64
65all: $(DESTDIR)$(TARGET) 65all: $(DESTDIR)$(TARGET)
66 66
67$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 67$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
68 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 68 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
69 69
70moc: $(SRCMOC) 70moc: $(SRCMOC)
71 71
72tmake: 72tmake:
73 tmake filebrowser.pro 73 tmake filebrowser.pro
74 74
75clean: 75clean:
76 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 76 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
77 -rm -f *~ core 77 -rm -f *~ core
78 -rm -f allmoc.cpp 78 -rm -f allmoc.cpp
79 79
80####### Extension Modules 80####### Extension Modules
81 81
82listpromodules: 82listpromodules:
83 @echo 83 @echo
84 84
85listallmodules: 85listallmodules:
86 @echo 86 @echo
87 87
88listaddonpromodules: 88listaddonpromodules:
89 @echo 89 @echo
90 90
91listaddonentmodules: 91listaddonentmodules:
92 @echo 92 @echo
93 93
94 94
95REQUIRES= 95REQUIRES=
96 96
97####### Sub-libraries 97####### Sub-libraries
98 98
99 99
100###### Combined headers 100###### Combined headers
101 101
102 102
103 103
104####### Compile 104####### Compile
105 105
106filebrowser.o: filebrowser.cpp \ 106filebrowser.o: filebrowser.cpp \
107 inlineedit.h \ 107 inlineedit.h \
108 filebrowser.h \ 108 filebrowser.h \
109 $(QPEDIR)/include/qpe/resource.h \ 109 $(OPIEDIR)/include/qpe/resource.h \
110 $(QPEDIR)/include/qpe/global.h \ 110 $(OPIEDIR)/include/qpe/global.h \
111 $(QPEDIR)/include/qpe/mimetype.h \ 111 $(OPIEDIR)/include/qpe/mimetype.h \
112 $(QPEDIR)/include/qpe/applnk.h \ 112 $(OPIEDIR)/include/qpe/applnk.h \
113 $(QPEDIR)/include/qpe/qpetoolbar.h \ 113 $(OPIEDIR)/include/qpe/qpetoolbar.h \
114 $(QPEDIR)/include/qpe/qpemenubar.h 114 $(OPIEDIR)/include/qpe/qpemenubar.h
115 115
116inlineedit.o: inlineedit.cpp \ 116inlineedit.o: inlineedit.cpp \
117 inlineedit.h 117 inlineedit.h
118 118
119main.o: main.cpp \ 119main.o: main.cpp \
120 filebrowser.h \ 120 filebrowser.h \
121 $(QPEDIR)/include/qpe/qpeapplication.h \ 121 $(OPIEDIR)/include/qpe/qpeapplication.h \
122 $(QPEDIR)/include/qpe/mimetype.h 122 $(OPIEDIR)/include/qpe/mimetype.h
123 123
124moc_inlineedit.o: moc_inlineedit.cpp \ 124moc_inlineedit.o: moc_inlineedit.cpp \
125 inlineedit.h 125 inlineedit.h
126 126
127moc_filebrowser.o: moc_filebrowser.cpp \ 127moc_filebrowser.o: moc_filebrowser.cpp \
128 filebrowser.h 128 filebrowser.h
129 129
130moc_inlineedit.cpp: inlineedit.h 130moc_inlineedit.cpp: inlineedit.h
131 $(MOC) inlineedit.h -o moc_inlineedit.cpp 131 $(MOC) inlineedit.h -o moc_inlineedit.cpp
132 132
133moc_filebrowser.cpp: filebrowser.h 133moc_filebrowser.cpp: filebrowser.h
134 $(MOC) filebrowser.h -o moc_filebrowser.cpp 134 $(MOC) filebrowser.h -o moc_filebrowser.cpp
135 135
136 136
diff --git a/noncore/unsupported/filebrowser/filebrowser.pro b/noncore/unsupported/filebrowser/filebrowser.pro
index 34df79a..5d8f140 100644
--- a/noncore/unsupported/filebrowser/filebrowser.pro
+++ b/noncore/unsupported/filebrowser/filebrowser.pro
@@ -1,12 +1,12 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = inlineedit.h \ 4 HEADERS = inlineedit.h \
5 filebrowser.h 5 filebrowser.h
6 SOURCES = filebrowser.cpp \ 6 SOURCES = filebrowser.cpp \
7 inlineedit.cpp \ 7 inlineedit.cpp \
8 main.cpp 8 main.cpp
9INCLUDEPATH += $(QPEDIR)/include 9INCLUDEPATH += $(OPIEDIR)/include
10 DEPENDPATH+= $(QPEDIR)/include 10 DEPENDPATH+= $(OPIEDIR)/include
11LIBS += -lqpe 11LIBS += -lqpe
12 INTERFACES= 12 INTERFACES=
diff --git a/noncore/unsupported/oipkg/Makefile.in b/noncore/unsupported/oipkg/Makefile.in
index 8dd7edb..a7e22ef 100644
--- a/noncore/unsupported/oipkg/Makefile.in
+++ b/noncore/unsupported/oipkg/Makefile.in
@@ -1,203 +1,203 @@
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$(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 = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= qipkg 21 TARGET= qipkg
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =packagemanager.h 26 HEADERS =packagemanager.h
27 SOURCES =packagemanager.cpp \ 27 SOURCES =packagemanager.cpp \
28 main.cpp 28 main.cpp
29 OBJECTS =packagemanager.o \ 29 OBJECTS =packagemanager.o \
30 main.o \ 30 main.o \
31 packagemanagerbase.o \ 31 packagemanagerbase.o \
32 pkdesc.o \ 32 pkdesc.o \
33 pkfind.o \ 33 pkfind.o \
34 pksettings.o 34 pksettings.o
35INTERFACES = packagemanagerbase.ui \ 35INTERFACES = packagemanagerbase.ui \
36 pkdesc.ui \ 36 pkdesc.ui \
37 pkfind.ui \ 37 pkfind.ui \
38 pksettings.ui 38 pksettings.ui
39UICDECLS = packagemanagerbase.h \ 39UICDECLS = packagemanagerbase.h \
40 pkdesc.h \ 40 pkdesc.h \
41 pkfind.h \ 41 pkfind.h \
42 pksettings.h 42 pksettings.h
43UICIMPLS = packagemanagerbase.cpp \ 43UICIMPLS = packagemanagerbase.cpp \
44 pkdesc.cpp \ 44 pkdesc.cpp \
45 pkfind.cpp \ 45 pkfind.cpp \
46 pksettings.cpp 46 pksettings.cpp
47 SRCMOC =moc_packagemanager.cpp \ 47 SRCMOC =moc_packagemanager.cpp \
48 moc_packagemanagerbase.cpp \ 48 moc_packagemanagerbase.cpp \
49 moc_pkdesc.cpp \ 49 moc_pkdesc.cpp \
50 moc_pkfind.cpp \ 50 moc_pkfind.cpp \
51 moc_pksettings.cpp 51 moc_pksettings.cpp
52 OBJMOC =moc_packagemanager.o \ 52 OBJMOC =moc_packagemanager.o \
53 moc_packagemanagerbase.o \ 53 moc_packagemanagerbase.o \
54 moc_pkdesc.o \ 54 moc_pkdesc.o \
55 moc_pkfind.o \ 55 moc_pkfind.o \
56 moc_pksettings.o 56 moc_pksettings.o
57 57
58 58
59####### Implicit rules 59####### Implicit rules
60 60
61.SUFFIXES: .cpp .cxx .cc .C .c 61.SUFFIXES: .cpp .cxx .cc .C .c
62 62
63.cpp.o: 63.cpp.o:
64 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 64 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
65 65
66.cxx.o: 66.cxx.o:
67 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 67 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
68 68
69.cc.o: 69.cc.o:
70 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 70 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
71 71
72.C.o: 72.C.o:
73 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 73 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
74 74
75.c.o: 75.c.o:
76 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 76 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
77 77
78####### Build rules 78####### Build rules
79 79
80 80
81all: $(DESTDIR)$(TARGET) 81all: $(DESTDIR)$(TARGET)
82 82
83$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 83$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
84 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 84 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
85 85
86moc: $(SRCMOC) 86moc: $(SRCMOC)
87 87
88tmake: 88tmake:
89 tmake qipkg.pro 89 tmake qipkg.pro
90 90
91clean: 91clean:
92 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 92 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
93 -rm -f *~ core 93 -rm -f *~ core
94 -rm -f allmoc.cpp 94 -rm -f allmoc.cpp
95 95
96####### Extension Modules 96####### Extension Modules
97 97
98listpromodules: 98listpromodules:
99 @echo 99 @echo
100 100
101listallmodules: 101listallmodules:
102 @echo 102 @echo
103 103
104listaddonpromodules: 104listaddonpromodules:
105 @echo 105 @echo
106 106
107listaddonentmodules: 107listaddonentmodules:
108 @echo 108 @echo
109 109
110 110
111REQUIRES= 111REQUIRES=
112 112
113####### Sub-libraries 113####### Sub-libraries
114 114
115 115
116###### Combined headers 116###### Combined headers
117 117
118 118
119 119
120####### Compile 120####### Compile
121 121
122packagemanager.o: packagemanager.cpp \ 122packagemanager.o: packagemanager.cpp \
123 packagemanager.h \ 123 packagemanager.h \
124 packagemanagerbase.h \ 124 packagemanagerbase.h \
125 pkdesc.h \ 125 pkdesc.h \
126 pkfind.h \ 126 pkfind.h \
127 pksettings.h \ 127 pksettings.h \
128 $(QPEDIR)/include/qpe/process.h \ 128 $(OPIEDIR)/include/qpe/process.h \
129 $(QPEDIR)/include/qpe/resource.h \ 129 $(OPIEDIR)/include/qpe/resource.h \
130 $(QPEDIR)/include/qpe/stringutil.h \ 130 $(OPIEDIR)/include/qpe/stringutil.h \
131 $(QPEDIR)/include/qpe/qpeapplication.h \ 131 $(OPIEDIR)/include/qpe/qpeapplication.h \
132 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 132 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
133 $(QPEDIR)/include/qpe/applnk.h 133 $(OPIEDIR)/include/qpe/applnk.h
134 134
135main.o: main.cpp \ 135main.o: main.cpp \
136 packagemanager.h \ 136 packagemanager.h \
137 packagemanagerbase.h \ 137 packagemanagerbase.h \
138 $(QPEDIR)/include/qpe/qpeapplication.h 138 $(OPIEDIR)/include/qpe/qpeapplication.h
139 139
140packagemanagerbase.h: packagemanagerbase.ui 140packagemanagerbase.h: packagemanagerbase.ui
141 $(UIC) packagemanagerbase.ui -o $(INTERFACE_DECL_PATH)/packagemanagerbase.h 141 $(UIC) packagemanagerbase.ui -o $(INTERFACE_DECL_PATH)/packagemanagerbase.h
142 142
143packagemanagerbase.cpp: packagemanagerbase.ui 143packagemanagerbase.cpp: packagemanagerbase.ui
144 $(UIC) packagemanagerbase.ui -i packagemanagerbase.h -o packagemanagerbase.cpp 144 $(UIC) packagemanagerbase.ui -i packagemanagerbase.h -o packagemanagerbase.cpp
145 145
146pkdesc.h: pkdesc.ui 146pkdesc.h: pkdesc.ui
147 $(UIC) pkdesc.ui -o $(INTERFACE_DECL_PATH)/pkdesc.h 147 $(UIC) pkdesc.ui -o $(INTERFACE_DECL_PATH)/pkdesc.h
148 148
149pkdesc.cpp: pkdesc.ui 149pkdesc.cpp: pkdesc.ui
150 $(UIC) pkdesc.ui -i pkdesc.h -o pkdesc.cpp 150 $(UIC) pkdesc.ui -i pkdesc.h -o pkdesc.cpp
151 151
152pkfind.h: pkfind.ui 152pkfind.h: pkfind.ui
153 $(UIC) pkfind.ui -o $(INTERFACE_DECL_PATH)/pkfind.h 153 $(UIC) pkfind.ui -o $(INTERFACE_DECL_PATH)/pkfind.h
154 154
155pkfind.cpp: pkfind.ui 155pkfind.cpp: pkfind.ui
156 $(UIC) pkfind.ui -i pkfind.h -o pkfind.cpp 156 $(UIC) pkfind.ui -i pkfind.h -o pkfind.cpp
157 157
158pksettings.h: pksettings.ui 158pksettings.h: pksettings.ui
159 $(UIC) pksettings.ui -o $(INTERFACE_DECL_PATH)/pksettings.h 159 $(UIC) pksettings.ui -o $(INTERFACE_DECL_PATH)/pksettings.h
160 160
161pksettings.cpp: pksettings.ui 161pksettings.cpp: pksettings.ui
162 $(UIC) pksettings.ui -i pksettings.h -o pksettings.cpp 162 $(UIC) pksettings.ui -i pksettings.h -o pksettings.cpp
163 163
164packagemanagerbase.o: packagemanagerbase.cpp 164packagemanagerbase.o: packagemanagerbase.cpp
165 165
166pkdesc.o: pkdesc.cpp 166pkdesc.o: pkdesc.cpp
167 167
168pkfind.o: pkfind.cpp 168pkfind.o: pkfind.cpp
169 169
170pksettings.o: pksettings.cpp 170pksettings.o: pksettings.cpp
171 171
172moc_packagemanager.o: moc_packagemanager.cpp \ 172moc_packagemanager.o: moc_packagemanager.cpp \
173 packagemanager.h \ 173 packagemanager.h \
174 packagemanagerbase.h 174 packagemanagerbase.h
175 175
176moc_packagemanagerbase.o: moc_packagemanagerbase.cpp \ 176moc_packagemanagerbase.o: moc_packagemanagerbase.cpp \
177 packagemanagerbase.h 177 packagemanagerbase.h
178 178
179moc_pkdesc.o: moc_pkdesc.cpp \ 179moc_pkdesc.o: moc_pkdesc.cpp \
180 pkdesc.h 180 pkdesc.h
181 181
182moc_pkfind.o: moc_pkfind.cpp \ 182moc_pkfind.o: moc_pkfind.cpp \
183 pkfind.h 183 pkfind.h
184 184
185moc_pksettings.o: moc_pksettings.cpp \ 185moc_pksettings.o: moc_pksettings.cpp \
186 pksettings.h 186 pksettings.h
187 187
188moc_packagemanager.cpp: packagemanager.h 188moc_packagemanager.cpp: packagemanager.h
189 $(MOC) packagemanager.h -o moc_packagemanager.cpp 189 $(MOC) packagemanager.h -o moc_packagemanager.cpp
190 190
191moc_packagemanagerbase.cpp: packagemanagerbase.h 191moc_packagemanagerbase.cpp: packagemanagerbase.h
192 $(MOC) packagemanagerbase.h -o moc_packagemanagerbase.cpp 192 $(MOC) packagemanagerbase.h -o moc_packagemanagerbase.cpp
193 193
194moc_pkdesc.cpp: pkdesc.h 194moc_pkdesc.cpp: pkdesc.h
195 $(MOC) pkdesc.h -o moc_pkdesc.cpp 195 $(MOC) pkdesc.h -o moc_pkdesc.cpp
196 196
197moc_pkfind.cpp: pkfind.h 197moc_pkfind.cpp: pkfind.h
198 $(MOC) pkfind.h -o moc_pkfind.cpp 198 $(MOC) pkfind.h -o moc_pkfind.cpp
199 199
200moc_pksettings.cpp: pksettings.h 200moc_pksettings.cpp: pksettings.h
201 $(MOC) pksettings.h -o moc_pksettings.cpp 201 $(MOC) pksettings.h -o moc_pksettings.cpp
202 202
203 203
diff --git a/noncore/unsupported/oipkg/qipkg.pro b/noncore/unsupported/oipkg/qipkg.pro
index 90d8703..22a37ee 100644
--- a/noncore/unsupported/oipkg/qipkg.pro
+++ b/noncore/unsupported/oipkg/qipkg.pro
@@ -1,13 +1,13 @@
1 DESTDIR = $(QPEDIR)/bin 1 DESTDIR = $(OPIEDIR)/bin
2 TEMPLATE= app 2 TEMPLATE= app
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = packagemanager.h 4 HEADERS = packagemanager.h
5 SOURCES = packagemanager.cpp \ 5 SOURCES = packagemanager.cpp \
6 main.cpp 6 main.cpp
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(QPEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 INTERFACES= packagemanagerbase.ui pkdesc.ui pkfind.ui pksettings.ui 10 INTERFACES= packagemanagerbase.ui pkdesc.ui pkfind.ui pksettings.ui
11 TARGET = qipkg 11 TARGET = qipkg
12 12
13TRANSLATIONS = ../i18n/de/qipkg.ts 13TRANSLATIONS = ../i18n/de/qipkg.ts
diff --git a/scripts/q_functions b/scripts/q_functions
index cf2c2e1..0705cc2 100755
--- a/scripts/q_functions
+++ b/scripts/q_functions
@@ -1,232 +1,232 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# Common helper functions used by the other scripts 3# Common helper functions used by the other scripts
4# 4#
5# Copyright 1999-2000 Trolltech AS. All rights reserved. 5# Copyright 1999-2000 Trolltech AS. All rights reserved.
6# 6#
7 7
8 8
9function print_example_usage 9function print_example_usage
10{ 10{
11cat << END 11cat << END
12Example of what you do: 12Example of what you do:
13 ~/qpe$ q_add_application foo Foo MyFooBarApp "A FooBar Application" 13 ~/qpe$ q_add_application foo Foo MyFooBarApp "A FooBar Application"
14 ~/qpe$ cd foo 14 ~/qpe$ cd foo
15 ~/qpe/foo$ q_add_class foo Bar 15 ~/qpe/foo$ q_add_class foo Bar
16 ~/qpe/foo$ q_add_function public: void Bar::barFoo "( int a, int b )" 16 ~/qpe/foo$ q_add_function public: void Bar::barFoo "( int a, int b )"
17 ~/qpe/foo$ q_add_variable private: int Bar::fooBarInt 17 ~/qpe/foo$ q_add_variable private: int Bar::fooBarInt
18END 18END
19} 19}
20 20
21 21
22function print_copyright_header 22function print_copyright_header
23{ 23{
24cat << END 24cat << END
25/********************************************************************** 25/**********************************************************************
26** Copyright (C) 2000 Trolltech AS. All rights reserved. 26** Copyright (C) 2000 Trolltech AS. All rights reserved.
27** 27**
28** This file is part of Qtopia Environment. 28** This file is part of Qtopia Environment.
29** 29**
30** This file may be distributed and/or modified under the terms of the 30** This file may be distributed and/or modified under the terms of the
31** GNU General Public License version 2 as published by the Free Software 31** GNU General Public License version 2 as published by the Free Software
32** Foundation and appearing in the file LICENSE.GPL included in the 32** Foundation and appearing in the file LICENSE.GPL included in the
33** packaging of this file. 33** packaging of this file.
34** 34**
35** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 35** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
36** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 36** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
37** 37**
38** See http://www.trolltech.com/gpl/ for GPL licensing information. 38** See http://www.trolltech.com/gpl/ for GPL licensing information.
39** 39**
40** Contact info@trolltech.com if any conditions of this licensing are 40** Contact info@trolltech.com if any conditions of this licensing are
41** not clear to you. 41** not clear to you.
42** 42**
43**********************************************************************/ 43**********************************************************************/
44END 44END
45} 45}
46 46
47 47
48function print_main_file 48function print_main_file
49{ 49{
50print_copyright_header 50print_copyright_header
51cat << END 51cat << END
52#include <qpeapplication.h> 52#include <qpeapplication.h>
53#include <qmainwindow.h> 53#include <qmainwindow.h>
54#include "$NEW_CLASS_HEADER_FILE" 54#include "$NEW_CLASS_HEADER_FILE"
55 55
56 56
57int main( int argc, char ** argv ) 57int main( int argc, char ** argv )
58{ 58{
59 QPEApplication a( argc, argv ); 59 QPEApplication a( argc, argv );
60 60
61 $NEW_CLASS_NAME *m = new $NEW_CLASS_NAME(); 61 $NEW_CLASS_NAME *m = new $NEW_CLASS_NAME();
62 a.setMainWidget( m ); 62 a.setMainWidget( m );
63 m->show(); 63 m->show();
64 64
65 return a.exec(); 65 return a.exec();
66} 66}
67END 67END
68} 68}
69 69
70 70
71function print_source_file 71function print_source_file
72{ 72{
73print_copyright_header 73print_copyright_header
74cat << END 74cat << END
75#include <qwidget.h> 75#include <qwidget.h>
76#include <pixmaploader.h> 76#include <pixmaploader.h>
77#include "$NEW_CLASS_HEADER_FILE" 77#include "$NEW_CLASS_HEADER_FILE"
78 78
79 79
80$NEW_CLASS_NAME::$NEW_CLASS_NAME( QWidget *parent=0, const char *name=0, WFlags f = 0) : 80$NEW_CLASS_NAME::$NEW_CLASS_NAME( QWidget *parent=0, const char *name=0, WFlags f = 0) :
81 QWidget( parent, name, f ) 81 QWidget( parent, name, f )
82{ 82{
83} 83}
84 84
85 85
86void $NEW_CLASS_NAME::exampleFunction( ) 86void $NEW_CLASS_NAME::exampleFunction( )
87{ 87{
88} 88}
89END 89END
90} 90}
91 91
92 92
93function print_header_file 93function print_header_file
94{ 94{
95print_copyright_header 95print_copyright_header
96cat << END 96cat << END
97#ifndef $NEW_CLASS_HEADER_DEFINE 97#ifndef $NEW_CLASS_HEADER_DEFINE
98#define $NEW_CLASS_HEADER_DEFINE 98#define $NEW_CLASS_HEADER_DEFINE
99 99
100 100
101#include <qwidget.h> 101#include <qwidget.h>
102 102
103 103
104class $NEW_CLASS_NAME : public QWidget 104class $NEW_CLASS_NAME : public QWidget
105{ 105{
106Q_OBJECT 106Q_OBJECT
107public: 107public:
108 $NEW_CLASS_NAME( QWidget *parent=0, const char *name=0, WFlags f = 0); 108 $NEW_CLASS_NAME( QWidget *parent=0, const char *name=0, WFlags f = 0);
109protected: 109protected:
110 void exampleFunction( ); 110 void exampleFunction( );
111private: 111private:
112 int exampleVariable; 112 int exampleVariable;
113}; 113};
114 114
115 115
116#endif // $NEW_CLASS_HEADER_DEFINE 116#endif // $NEW_CLASS_HEADER_DEFINE
117END 117END
118} 118}
119 119
120 120
121function print_pro_file 121function print_pro_file
122{ 122{
123cat << END 123cat << END
124 TEMPLATE= app 124 TEMPLATE= app
125 CONFIG = qt warn_on release 125 CONFIG = qt warn_on release
126 DESTDIR = ../bin 126 DESTDIR = ../bin
127 HEADERS = $NEW_CLASS_HEADER_FILE 127 HEADERS = $NEW_CLASS_HEADER_FILE
128 SOURCES = $NEW_CLASS_SOURCE_FILE $NEW_APP_MAIN_FILE 128 SOURCES = $NEW_CLASS_SOURCE_FILE $NEW_APP_MAIN_FILE
129 INTERFACES= 129 INTERFACES=
130 INCLUDEPATH+= ../library 130 INCLUDEPATH+= ../library
131 DEPENDPATH+= ../library 131 DEPENDPATH+= ../library
132LIBS += -lqpe 132LIBS += -lqpe
133 TARGET = $NEW_APP_NAME 133 TARGET = $NEW_APP_NAME
134END 134END
135} 135}
136 136
137 137
138function print_install_file 138function print_install_file
139{ 139{
140cat << END 140cat << END
141#!/bin/sh 141#!/bin/sh
142if [ a\$QPEDIR = a ] 142if [ a\$OPIEDIR = a ]
143then 143then
144echo QPEDIR must be set 144echo OPIEDIR must be set
145exit 145exit
146fi 146fi
147[ -f \$QPEDIR/pics/$NEW_APP_ICON_FILE ] || cp $NEW_APP_ICON_FILE \$QPEDIR/pics/ 147[ -f \$OPIEDIR/pics/$NEW_APP_ICON_FILE ] || cp $NEW_APP_ICON_FILE \$OPIEDIR/pics/
148[ -f \$QPEDIR/apps/$NEW_APP_DESKTOP_FILE ] || cp $NEW_APP_DESKTOP_FILE \$QPEDIR/apps/ 148[ -f \$OPIEDIR/apps/$NEW_APP_DESKTOP_FILE ] || cp $NEW_APP_DESKTOP_FILE \$OPIEDIR/apps/
149mv \$QPEDIR/Makefile \$QPEDIR/Makefile.orig 149mv \$OPIEDIR/Makefile \$OPIEDIR/Makefile.orig
150sed "s/APPS=/&$NEW_APP_NAME \\\\\\\\ \\\\ 150sed "s/APPS=/&$NEW_APP_NAME \\\\\\\\ \\\\
151 /" \$QPEDIR/Makefile.orig >> \$QPEDIR/Makefile 151 /" \$OPIEDIR/Makefile.orig >> \$OPIEDIR/Makefile
152echo You may wish to move the desktop file in to 152echo You may wish to move the desktop file in to
153echo an appropriate subdirectory of the menus. 153echo an appropriate subdirectory of the menus.
154END 154END
155} 155}
156 156
157 157
158function print_desktop_file 158function print_desktop_file
159{ 159{
160cat << END 160cat << END
161[Desktop Entry] 161[Desktop Entry]
162Type=Application 162Type=Application
163Exec=$NEW_APP_NAME 163Exec=$NEW_APP_NAME
164Icon=$NEW_APP_ICON_FILE 164Icon=$NEW_APP_ICON_FILE
165Name=$NEW_APP_MENU_NAME 165Name=$NEW_APP_MENU_NAME
166Comment=$NEW_APP_DESCRIPTION 166Comment=$NEW_APP_DESCRIPTION
167END 167END
168} 168}
169 169
170 170
171function print_icon_file 171function print_icon_file
172{ 172{
173XPM_NAME="$NEW_APP_NAME"_xpm 173XPM_NAME="$NEW_APP_NAME"_xpm
174cat << END 174cat << END
175/* XPM */ 175/* XPM */
176static char *$XPM_NAME[] = { 176static char *$XPM_NAME[] = {
177"14 14 3 1", 177"14 14 3 1",
178 " c None", 178 " c None",
179 ".c #000000", 179 ".c #000000",
180 "ac #FFFFFF", 180 "ac #FFFFFF",
181" ", 181" ",
182" aaaaaaaaaaaa ", 182" aaaaaaaaaaaa ",
183" a..........a ", 183" a..........a ",
184" a..aaaaaa..a ", 184" a..aaaaaa..a ",
185" a.a.aaaa.a.a ", 185" a.a.aaaa.a.a ",
186" a.aa.aa.aa.a ", 186" a.aa.aa.aa.a ",
187" a.aaa..aaa.a ", 187" a.aaa..aaa.a ",
188" a.aaa..aaa.a ", 188" a.aaa..aaa.a ",
189" a.aa.aa.aa.a ", 189" a.aa.aa.aa.a ",
190" a.a.aaaa.a.a ", 190" a.a.aaaa.a.a ",
191" a..aaaaaa..a ", 191" a..aaaaaa..a ",
192" a..........a ", 192" a..........a ",
193" aaaaaaaaaaaa ", 193" aaaaaaaaaaaa ",
194" "}; 194" "};
195END 195END
196} 196}
197 197
198 198
199function add_class_to_pro_file 199function add_class_to_pro_file
200{ 200{
201cat << END 201cat << END
202 HEADERS += $NEW_CLASS_HEADER_FILE 202 HEADERS += $NEW_CLASS_HEADER_FILE
203 SOURCES += $NEW_CLASS_SOURCE_FILE 203 SOURCES += $NEW_CLASS_SOURCE_FILE
204END 204END
205} 205}
206 206
207 207
208function get_number_of_lines 208function get_number_of_lines
209{ 209{
210# Get the number of lines in the file 210# Get the number of lines in the file
211LINES=`wc -l $ORIGINAL_CLASS_HEADER_FILE | cut -d " " -f 6` 211LINES=`wc -l $ORIGINAL_CLASS_HEADER_FILE | cut -d " " -f 6`
212} 212}
213 213
214 214
215function get_first_line_of_class_definition 215function get_first_line_of_class_definition
216{ 216{
217# First look for class definition with Q_OBJECT a few lines below 217# First look for class definition with Q_OBJECT a few lines below
218LINE=`grep -n -A 3 "class $EXISTING_CLASS_NAME " $ORIGINAL_CLASS_HEADER_FILE | grep "Q_OBJECT" | cut -d "-" -f 1` 218LINE=`grep -n -A 3 "class $EXISTING_CLASS_NAME " $ORIGINAL_CLASS_HEADER_FILE | grep "Q_OBJECT" | cut -d "-" -f 1`
219if [ -z "$LINE" ] 219if [ -z "$LINE" ]
220then 220then
221# else look for class definition with open brace on same line 221# else look for class definition with open brace on same line
222LINE=`grep -n "class $EXISTING_CLASS_NAME.*[{]" $ORIGINAL_CLASS_HEADER_FILE | cut -d ":" -f 1` 222LINE=`grep -n "class $EXISTING_CLASS_NAME.*[{]" $ORIGINAL_CLASS_HEADER_FILE | cut -d ":" -f 1`
223#elif doesn't work here 223#elif doesn't work here
224fi;if [ -z "$LINE" ] 224fi;if [ -z "$LINE" ]
225then 225then
226# else look for class with open brace a few lines below 226# else look for class with open brace a few lines below
227LINE=`grep -n -A 3 "class $EXISTING_CLASS_NAME " $ORIGINAL_CLASS_HEADER_FILE | grep "\-.*[{]" | cut -d "-" -f 1` 227LINE=`grep -n -A 3 "class $EXISTING_CLASS_NAME " $ORIGINAL_CLASS_HEADER_FILE | grep "\-.*[{]" | cut -d "-" -f 1`
228#elif doesn't work here 228#elif doesn't work here
229fi 229fi
230} 230}
231 231
232 232