Diffstat (limited to 'qt/qt-2.3.7.patch/qte237-all.patch') (more/less context) (ignore whitespace changes)
-rw-r--r-- | qt/qt-2.3.7.patch/qte237-all.patch | 438 |
1 files changed, 388 insertions, 50 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-all.patch b/qt/qt-2.3.7.patch/qte237-all.patch index c71cf02..43d7a69 100644 --- a/qt/qt-2.3.7.patch/qte237-all.patch +++ b/qt/qt-2.3.7.patch/qte237-all.patch | |||
@@ -1,15 +1,15 @@ | |||
1 | 1 | ||
2 | # | 2 | # |
3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | 3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher |
4 | # | 4 | # |
5 | 5 | ||
6 | --- qt-2.3.7/src/kernel/qapplication.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 | 6 | --- qt-2.3.7/src/kernel/qapplication.cpp~qte237-all2004-04-27 18:16:31.000000000 +0200 |
7 | +++ qt-2.3.7/src/kernel/qapplication.cpp2004-04-24 17:12:59.000000000 +0200 | 7 | +++ qt-2.3.7/src/kernel/qapplication.cpp2004-04-27 18:16:54.000000000 +0200 |
8 | @@ -35,6 +35,8 @@ | 8 | @@ -35,6 +35,8 @@ |
9 | ** | 9 | ** |
10 | **********************************************************************/ | 10 | **********************************************************************/ |
11 | 11 | ||
12 | +#define QT_WEAK_SYMBOL__attribute__(( weak )) | 12 | +#define QT_WEAK_SYMBOL__attribute__(( weak )) |
13 | + | 13 | + |
14 | #include "qobjectlist.h" | 14 | #include "qobjectlist.h" |
15 | #include "qobjectdict.h" | 15 | #include "qobjectdict.h" |
@@ -82,18 +82,18 @@ | |||
82 | +} | 82 | +} |
83 | + | 83 | + |
84 | +void QApplication::setFont_NonWeak( const QFont &font, bool informWidgets, | 84 | +void QApplication::setFont_NonWeak( const QFont &font, bool informWidgets, |
85 | + const char* className ) | 85 | + const char* className ) |
86 | +{ | 86 | +{ |
87 | bool all = FALSE; | 87 | bool all = FALSE; |
88 | if ( !className ) { | 88 | if ( !className ) { |
89 | if ( !app_font ) { | 89 | if ( !app_font ) { |
90 | --- qt-2.3.7/src/kernel/qapplication.h~qte237-all2003-07-17 03:20:25.000000000 +0200 | 90 | --- qt-2.3.7/src/kernel/qapplication.h~qte237-all2004-04-27 18:16:31.000000000 +0200 |
91 | +++ qt-2.3.7/src/kernel/qapplication.h2004-04-24 17:12:59.000000000 +0200 | 91 | +++ qt-2.3.7/src/kernel/qapplication.h2004-04-27 18:16:54.000000000 +0200 |
92 | @@ -61,6 +61,10 @@ | 92 | @@ -61,6 +61,10 @@ |
93 | class QSemaphore; | 93 | class QSemaphore; |
94 | #endif | 94 | #endif |
95 | 95 | ||
96 | +#if !defined( QT_WEAK_SYMBOL ) | 96 | +#if !defined( QT_WEAK_SYMBOL ) |
97 | +#define QT_WEAK_SYMBOL | 97 | +#define QT_WEAK_SYMBOL |
98 | +#endif | 98 | +#endif |
99 | + | 99 | + |
@@ -139,32 +139,32 @@ | |||
139 | - static void qwsSetDecoration( QWSDecoration *); | 139 | - static void qwsSetDecoration( QWSDecoration *); |
140 | + static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; | 140 | + static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; |
141 | +private: | 141 | +private: |
142 | + static void qwsSetDecoration_NonWeak( QWSDecoration *); | 142 | + static void qwsSetDecoration_NonWeak( QWSDecoration *); |
143 | +public: | 143 | +public: |
144 | #endif | 144 | #endif |
145 | #endif | 145 | #endif |
146 | 146 | ||
147 | --- qt-2.3.7/src/kernel/qapplication_qws.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 | 147 | --- qt-2.3.7/src/kernel/qapplication_qws.cpp~qte237-all2004-04-27 18:16:31.000000000 +0200 |
148 | +++ qt-2.3.7/src/kernel/qapplication_qws.cpp2004-04-24 17:12:59.000000000 +0200 | 148 | +++ qt-2.3.7/src/kernel/qapplication_qws.cpp2004-04-27 18:16:54.000000000 +0200 |
149 | @@ -2804,6 +2804,11 @@ | 149 | @@ -2804,6 +2804,11 @@ |
150 | */ | 150 | */ |
151 | void QApplication::qwsSetDecoration( QWSDecoration *d ) | 151 | void QApplication::qwsSetDecoration( QWSDecoration *d ) |
152 | { | 152 | { |
153 | +qwsSetDecoration_NonWeak ( d ); | 153 | +qwsSetDecoration_NonWeak ( d ); |
154 | +} | 154 | +} |
155 | + | 155 | + |
156 | +void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d ) | 156 | +void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d ) |
157 | +{ | 157 | +{ |
158 | if ( d ) { | 158 | if ( d ) { |
159 | delete qws_decoration; | 159 | delete qws_decoration; |
160 | qws_decoration = d; | 160 | qws_decoration = d; |
161 | --- qt-2.3.7/src/kernel/qfontdatabase.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 | 161 | --- qt-2.3.7/src/kernel/qfontdatabase.cpp~qte237-all2004-04-27 18:16:31.000000000 +0200 |
162 | +++ qt-2.3.7/src/kernel/qfontdatabase.cpp2004-04-24 17:12:59.000000000 +0200 | 162 | +++ qt-2.3.7/src/kernel/qfontdatabase.cpp2004-04-27 18:16:54.000000000 +0200 |
163 | @@ -35,6 +35,8 @@ | 163 | @@ -35,6 +35,8 @@ |
164 | ** | 164 | ** |
165 | **********************************************************************/ | 165 | **********************************************************************/ |
166 | 166 | ||
167 | +#define QT_WEAK_SYMBOL __attribute__(( weak )) | 167 | +#define QT_WEAK_SYMBOL __attribute__(( weak )) |
168 | + | 168 | + |
169 | #include "qfontdatabase.h" | 169 | #include "qfontdatabase.h" |
170 | 170 | ||
@@ -178,18 +178,18 @@ | |||
178 | + | 178 | + |
179 | +QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family, | 179 | +QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family, |
180 | + const QString &style, | 180 | + const QString &style, |
181 | + const QString &charSet ) | 181 | + const QString &charSet ) |
182 | +{ | 182 | +{ |
183 | QString cs( charSet ); | 183 | QString cs( charSet ); |
184 | if ( charSet.isEmpty() ) { | 184 | if ( charSet.isEmpty() ) { |
185 | QStringList lst = charSets( family ); | 185 | QStringList lst = charSets( family ); |
186 | --- qt-2.3.7/src/kernel/qfontdatabase.h~qte237-all2003-07-17 03:20:25.000000000 +0200 | 186 | --- qt-2.3.7/src/kernel/qfontdatabase.h~qte237-all2004-04-27 18:16:31.000000000 +0200 |
187 | +++ qt-2.3.7/src/kernel/qfontdatabase.h2004-04-24 17:12:59.000000000 +0200 | 187 | +++ qt-2.3.7/src/kernel/qfontdatabase.h2004-04-27 18:16:54.000000000 +0200 |
188 | @@ -59,6 +59,10 @@ | 188 | @@ -59,6 +59,10 @@ |
189 | class QDiskFont; | 189 | class QDiskFont; |
190 | #endif | 190 | #endif |
191 | 191 | ||
192 | +#if !defined( QT_WEAK_SYMBOL ) | 192 | +#if !defined( QT_WEAK_SYMBOL ) |
193 | +#define QT_WEAK_SYMBOL | 193 | +#define QT_WEAK_SYMBOL |
194 | +#endif | 194 | +#endif |
195 | + | 195 | + |
@@ -209,29 +209,29 @@ | |||
209 | +private: | 209 | +private: |
210 | + QValueList<int> pointSizes_NonWeak( const QString &family, | 210 | + QValueList<int> pointSizes_NonWeak( const QString &family, |
211 | + const QString &style, | 211 | + const QString &style, |
212 | + const QString &charSet ); | 212 | + const QString &charSet ); |
213 | +public: | 213 | +public: |
214 | QStringList styles( const QString &family, | 214 | QStringList styles( const QString &family, |
215 | const QString &charSet = QString::null ) const; | 215 | const QString &charSet = QString::null ) const; |
216 | QStringList charSets( const QString &familyName, | 216 | QStringList charSets( const QString &familyName, |
217 | --- qt-2.3.7/src/kernel/qgfxraster_qws.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 | 217 | --- qt-2.3.7/src/kernel/qgfxraster_qws.cpp~qte237-all2004-04-27 18:16:31.000000000 +0200 |
218 | +++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp2004-04-24 17:12:59.000000000 +0200 | 218 | +++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp2004-04-27 18:16:54.000000000 +0200 |
219 | @@ -4237,7 +4237,7 @@ | 219 | @@ -4237,7 +4237,7 @@ |
220 | setAlphaType(IgnoreAlpha); | 220 | setAlphaType(IgnoreAlpha); |
221 | if ( w <= 0 || h <= 0 || !ncliprect ) return; | 221 | if ( w <= 0 || h <= 0 || !ncliprect ) return; |
222 | GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1)) | 222 | GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1)) |
223 | -#ifdef QWS_EXPERIMENTAL_FASTPATH | 223 | -#ifdef QWS_EXPERIMENTAL_FASTPATH |
224 | +#if 0 // def QWS_EXPERIMENTAL_FASTPATH !! this is crashing HancomWord on OZ !! | 224 | +#if 0 // def QWS_EXPERIMENTAL_FASTPATH !! this is crashing HancomWord on OZ !! |
225 | // ### fix for 8bpp | 225 | // ### fix for 8bpp |
226 | // This seems to be reliable now, at least for 16bpp | 226 | // This seems to be reliable now, at least for 16bpp |
227 | 227 | ||
228 | --- qt-2.3.7/src/kernel/qwindowsystem_qws.cpp~qte237-all2003-07-17 03:20:26.000000000 +0200 | 228 | --- qt-2.3.7/src/kernel/qwindowsystem_qws.cpp~qte237-all2004-04-27 18:16:31.000000000 +0200 |
229 | +++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp2004-04-24 17:12:59.000000000 +0200 | 229 | +++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp2004-04-27 18:16:54.000000000 +0200 |
230 | @@ -844,6 +844,18 @@ | 230 | @@ -844,6 +844,18 @@ |
231 | { | 231 | { |
232 | } | 232 | } |
233 | 233 | ||
234 | +static void catchSegvSignal( int ) | 234 | +static void catchSegvSignal( int ) |
235 | +{ | 235 | +{ |
236 | +#ifndef QT_NO_QWS_KEYBOARD | 236 | +#ifndef QT_NO_QWS_KEYBOARD |
237 | + if ( qwsServer ) | 237 | + if ( qwsServer ) |
@@ -249,44 +249,44 @@ | |||
249 | @@ -936,6 +948,7 @@ | 249 | @@ -936,6 +948,7 @@ |
250 | } | 250 | } |
251 | 251 | ||
252 | signal(SIGPIPE, ignoreSignal); //we get it when we read | 252 | signal(SIGPIPE, ignoreSignal); //we get it when we read |
253 | + signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash | 253 | + signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash |
254 | #endif | 254 | #endif |
255 | focusw = 0; | 255 | focusw = 0; |
256 | mouseGrabber = 0; | 256 | mouseGrabber = 0; |
257 | --- qt-2.3.7/src/widgets/qcommonstyle.cpp~qte237-all2003-07-17 03:20:26.000000000 +0200 | 257 | --- qt-2.3.7/src/widgets/qcommonstyle.cpp~qte237-all2004-04-27 18:16:31.000000000 +0200 |
258 | +++ qt-2.3.7/src/widgets/qcommonstyle.cpp2004-04-24 17:12:59.000000000 +0200 | 258 | +++ qt-2.3.7/src/widgets/qcommonstyle.cpp2004-04-27 18:16:54.000000000 +0200 |
259 | @@ -566,7 +566,7 @@ | 259 | @@ -566,7 +566,7 @@ |
260 | bool enabled, bool active ) | 260 | bool enabled, bool active ) |
261 | { | 261 | { |
262 | #ifndef QT_NO_MENUBAR | 262 | #ifndef QT_NO_MENUBAR |
263 | -#ifndef QT_NO_STYLE_SGI | 263 | -#ifndef QT_NO_STYLE_SGI |
264 | +#if 1 // #ifndef QT_NO_STYLE_SGI | 264 | +#if 1 // #ifndef QT_NO_STYLE_SGI |
265 | if (draw_menu_bar_impl != 0) { | 265 | if (draw_menu_bar_impl != 0) { |
266 | QDrawMenuBarItemImpl impl = draw_menu_bar_impl; | 266 | QDrawMenuBarItemImpl impl = draw_menu_bar_impl; |
267 | (this->*impl)(p, x, y, w, h, mi, g, enabled, active); | 267 | (this->*impl)(p, x, y, w, h, mi, g, enabled, active); |
268 | --- qt-2.3.7/src/widgets/qlistview.cpp~qte237-all2003-07-17 03:20:26.000000000 +0200 | 268 | --- qt-2.3.7/src/widgets/qlistview.cpp~qte237-all2004-04-27 18:16:31.000000000 +0200 |
269 | +++ qt-2.3.7/src/widgets/qlistview.cpp2004-04-24 17:12:59.000000000 +0200 | 269 | +++ qt-2.3.7/src/widgets/qlistview.cpp2004-04-27 18:16:54.000000000 +0200 |
270 | @@ -4968,9 +4968,9 @@ | 270 | @@ -4968,9 +4968,9 @@ |
271 | l = l->childItem ? l->childItem : l->siblingItem; | 271 | l = l->childItem ? l->childItem : l->siblingItem; |
272 | 272 | ||
273 | if ( l && l->height() ) | 273 | if ( l && l->height() ) |
274 | -s.setHeight( s.height() + 10 * l->height() ); | 274 | -s.setHeight( s.height() + 10 * l->height() ); |
275 | - else | 275 | - else |
276 | -s.setHeight( s.height() + 140 ); | 276 | -s.setHeight( s.height() + 140 ); |
277 | +s.setHeight( s.height() + 4 /*10*/ * l->height() ); | 277 | +s.setHeight( s.height() + 4 /*10*/ * l->height() ); |
278 | + else // ^v much too big for handhelds | 278 | + else // ^v much too big for handhelds |
279 | +s.setHeight( s.height() + 30 /*140*/ ); | 279 | +s.setHeight( s.height() + 30 /*140*/ ); |
280 | 280 | ||
281 | if ( s.width() > s.height() * 3 ) | 281 | if ( s.width() > s.height() * 3 ) |
282 | s.setHeight( s.width() / 3 ); | 282 | s.setHeight( s.width() / 3 ); |
283 | --- qt-2.3.7/src/widgets/qtoolbutton.cpp~qte237-all2003-07-17 03:20:27.000000000 +0200 | 283 | --- qt-2.3.7/src/widgets/qtoolbutton.cpp~qte237-all2004-04-27 18:16:31.000000000 +0200 |
284 | +++ qt-2.3.7/src/widgets/qtoolbutton.cpp2004-04-24 17:12:59.000000000 +0200 | 284 | +++ qt-2.3.7/src/widgets/qtoolbutton.cpp2004-04-27 18:16:54.000000000 +0200 |
285 | @@ -230,7 +230,7 @@ | 285 | @@ -230,7 +230,7 @@ |
286 | else | 286 | else |
287 | QToolTip::add( this, textLabel ); | 287 | QToolTip::add( this, textLabel ); |
288 | } | 288 | } |
289 | -#endif | 289 | -#endif |
290 | +#endif | 290 | +#endif |
291 | } | 291 | } |
292 | 292 | ||
@@ -304,173 +304,511 @@ | |||
304 | +if ( h < 24 ) | 304 | +if ( h < 24 ) |
305 | + h = 24; | 305 | + h = 24; |
306 | } else { | 306 | } else { |
307 | -w = h = 16; | 307 | -w = h = 16; |
308 | +w = h = 14; | 308 | +w = h = 14; |
309 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); | 309 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); |
310 | w = pm.width(); | 310 | w = pm.width(); |
311 | h = pm.height(); | 311 | h = pm.height(); |
312 | --- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 | 312 | --- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~qte237-all2004-04-27 18:16:31.000000000 +0200 |
313 | +++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp2004-04-24 17:12:59.000000000 +0200 | 313 | +++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp2004-04-27 18:16:54.000000000 +0200 |
314 | @@ -238,7 +238,7 @@ | 314 | @@ -238,7 +238,7 @@ |
315 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 63 | 315 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 63 |
316 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 64 | 316 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 64 |
317 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 65 | 317 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 65 |
318 | - { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 66 | 318 | - { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 66 |
319 | + { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 | 319 | + { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 |
320 | { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 | 320 | { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 |
321 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 68 | 321 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 68 |
322 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 69 | 322 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 69 |
323 | --- qt-2.3.7/configs/linux-generic-g++-shared~qte237-all2003-07-17 03:23:08.000000000 +0200 | 323 | --- qt-2.3.7/configs/linux-generic-g++-shared~qte237-all2004-04-27 18:16:31.000000000 +0200 |
324 | +++ qt-2.3.7/configs/linux-generic-g++-shared2004-04-24 17:12:59.000000000 +0200 | 324 | +++ qt-2.3.7/configs/linux-generic-g++-shared2004-04-27 18:16:54.000000000 +0200 |
325 | @@ -36,7 +36,7 @@ | 325 | @@ -36,7 +36,7 @@ |
326 | SYSCONF_LIBS_YACC= | 326 | SYSCONF_LIBS_YACC= |
327 | 327 | ||
328 | # Linking applications | 328 | # Linking applications |
329 | -SYSCONF_LINK = gcc | 329 | -SYSCONF_LINK = gcc |
330 | +SYSCONF_LINK = g++ | 330 | +SYSCONF_LINK = g++ |
331 | SYSCONF_LFLAGS = | 331 | SYSCONF_LFLAGS = |
332 | SYSCONF_LIBS = | 332 | SYSCONF_LIBS = |
333 | 333 | ||
334 | --- qt-2.3.7/configs/linux-generic-g++-shared-debug~qte237-all2003-07-17 03:23:08.000000000 +0200 | 334 | --- qt-2.3.7/configs/linux-generic-g++-shared-debug~qte237-all2004-04-27 18:16:31.000000000 +0200 |
335 | +++ qt-2.3.7/configs/linux-generic-g++-shared-debug2004-04-24 17:12:59.000000000 +0200 | 335 | +++ qt-2.3.7/configs/linux-generic-g++-shared-debug2004-04-27 18:16:54.000000000 +0200 |
336 | @@ -36,7 +36,7 @@ | 336 | @@ -36,7 +36,7 @@ |
337 | SYSCONF_LIBS_YACC= | 337 | SYSCONF_LIBS_YACC= |
338 | 338 | ||
339 | # Linking applications | 339 | # Linking applications |
340 | -SYSCONF_LINK = gcc | 340 | -SYSCONF_LINK = gcc |
341 | +SYSCONF_LINK = g++ | 341 | +SYSCONF_LINK = g++ |
342 | SYSCONF_LFLAGS = | 342 | SYSCONF_LFLAGS = |
343 | SYSCONF_LIBS = | 343 | SYSCONF_LIBS = |
344 | 344 | ||
345 | --- qt-2.3.7/configs/linux-generic-g++-static~qte237-all2003-07-17 03:23:08.000000000 +0200 | 345 | --- qt-2.3.7/configs/linux-generic-g++-static~qte237-all2004-04-27 18:16:31.000000000 +0200 |
346 | +++ qt-2.3.7/configs/linux-generic-g++-static2004-04-24 17:12:59.000000000 +0200 | 346 | +++ qt-2.3.7/configs/linux-generic-g++-static2004-04-27 18:16:54.000000000 +0200 |
347 | @@ -36,7 +36,7 @@ | 347 | @@ -36,7 +36,7 @@ |
348 | SYSCONF_LIBS_YACC= | 348 | SYSCONF_LIBS_YACC= |
349 | 349 | ||
350 | # Linking applications | 350 | # Linking applications |
351 | -SYSCONF_LINK = gcc | 351 | -SYSCONF_LINK = gcc |
352 | +SYSCONF_LINK = g++ | 352 | +SYSCONF_LINK = g++ |
353 | SYSCONF_LFLAGS = | 353 | SYSCONF_LFLAGS = |
354 | SYSCONF_LIBS = | 354 | SYSCONF_LIBS = |
355 | 355 | ||
356 | --- qt-2.3.7/configs/linux-generic-g++-static-debug~qte237-all2003-07-17 03:23:08.000000000 +0200 | 356 | --- qt-2.3.7/configs/linux-generic-g++-static-debug~qte237-all2004-04-27 18:16:31.000000000 +0200 |
357 | +++ qt-2.3.7/configs/linux-generic-g++-static-debug2004-04-24 17:12:59.000000000 +0200 | 357 | +++ qt-2.3.7/configs/linux-generic-g++-static-debug2004-04-27 18:16:54.000000000 +0200 |
358 | @@ -36,7 +36,7 @@ | 358 | @@ -36,7 +36,7 @@ |
359 | SYSCONF_LIBS_YACC= | 359 | SYSCONF_LIBS_YACC= |
360 | 360 | ||
361 | # Linking applications | 361 | # Linking applications |
362 | -SYSCONF_LINK = gcc | 362 | -SYSCONF_LINK = gcc |
363 | +SYSCONF_LINK = g++ | 363 | +SYSCONF_LINK = g++ |
364 | SYSCONF_LFLAGS = | 364 | SYSCONF_LFLAGS = |
365 | SYSCONF_LIBS = | 365 | SYSCONF_LIBS = |
366 | 366 | ||
367 | --- qt-2.3.7/configs/linux-generic_rtti-g++-shared~qte237-all2003-07-17 03:23:08.000000000 +0200 | 367 | --- qt-2.3.7/configs/linux-generic_rtti-g++-shared~qte237-all2004-04-27 18:16:31.000000000 +0200 |
368 | +++ qt-2.3.7/configs/linux-generic_rtti-g++-shared2004-04-24 17:12:59.000000000 +0200 | 368 | +++ qt-2.3.7/configs/linux-generic_rtti-g++-shared2004-04-27 18:16:54.000000000 +0200 |
369 | @@ -36,7 +36,7 @@ | 369 | @@ -36,7 +36,7 @@ |
370 | SYSCONF_LIBS_YACC= | 370 | SYSCONF_LIBS_YACC= |
371 | 371 | ||
372 | # Linking applications | 372 | # Linking applications |
373 | -SYSCONF_LINK = gcc | 373 | -SYSCONF_LINK = gcc |
374 | +SYSCONF_LINK = g++ | 374 | +SYSCONF_LINK = g++ |
375 | SYSCONF_LFLAGS = | 375 | SYSCONF_LFLAGS = |
376 | SYSCONF_LIBS = | 376 | SYSCONF_LIBS = |
377 | 377 | ||
378 | --- qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug~qte237-all2003-07-17 03:23:08.000000000 +0200 | 378 | --- qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug~qte237-all2004-04-27 18:16:31.000000000 +0200 |
379 | +++ qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug2004-04-24 17:12:59.000000000 +0200 | 379 | +++ qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug2004-04-27 18:16:54.000000000 +0200 |
380 | @@ -36,7 +36,7 @@ | 380 | @@ -36,7 +36,7 @@ |
381 | SYSCONF_LIBS_YACC= | 381 | SYSCONF_LIBS_YACC= |
382 | 382 | ||
383 | # Linking applications | 383 | # Linking applications |
384 | -SYSCONF_LINK = gcc | 384 | -SYSCONF_LINK = gcc |
385 | +SYSCONF_LINK = g++ | 385 | +SYSCONF_LINK = g++ |
386 | SYSCONF_LFLAGS = | 386 | SYSCONF_LFLAGS = |
387 | SYSCONF_LIBS = | 387 | SYSCONF_LIBS = |
388 | 388 | ||
389 | --- qt-2.3.7/configs/linux-generic_rtti-g++-static~qte237-all2003-07-17 03:23:08.000000000 +0200 | 389 | --- qt-2.3.7/configs/linux-generic_rtti-g++-static~qte237-all2004-04-27 18:16:31.000000000 +0200 |
390 | +++ qt-2.3.7/configs/linux-generic_rtti-g++-static2004-04-24 17:12:59.000000000 +0200 | 390 | +++ qt-2.3.7/configs/linux-generic_rtti-g++-static2004-04-27 18:16:54.000000000 +0200 |
391 | @@ -36,7 +36,7 @@ | 391 | @@ -36,7 +36,7 @@ |
392 | SYSCONF_LIBS_YACC= | 392 | SYSCONF_LIBS_YACC= |
393 | 393 | ||
394 | # Linking applications | 394 | # Linking applications |
395 | -SYSCONF_LINK = gcc | 395 | -SYSCONF_LINK = gcc |
396 | +SYSCONF_LINK = g++ | 396 | +SYSCONF_LINK = g++ |
397 | SYSCONF_LFLAGS = | 397 | SYSCONF_LFLAGS = |
398 | SYSCONF_LIBS = | 398 | SYSCONF_LIBS = |
399 | 399 | ||
400 | --- qt-2.3.7/configs/linux-generic_rtti-g++-static-debug~qte237-all2003-07-17 03:23:08.000000000 +0200 | 400 | --- qt-2.3.7/configs/linux-generic_rtti-g++-static-debug~qte237-all2004-04-27 18:16:31.000000000 +0200 |
401 | +++ qt-2.3.7/configs/linux-generic_rtti-g++-static-debug2004-04-24 17:12:59.000000000 +0200 | 401 | +++ qt-2.3.7/configs/linux-generic_rtti-g++-static-debug2004-04-27 18:16:54.000000000 +0200 |
402 | @@ -36,7 +36,7 @@ | 402 | @@ -36,7 +36,7 @@ |
403 | SYSCONF_LIBS_YACC= | 403 | SYSCONF_LIBS_YACC= |
404 | 404 | ||
405 | # Linking applications | 405 | # Linking applications |
406 | -SYSCONF_LINK = gcc | 406 | -SYSCONF_LINK = gcc |
407 | +SYSCONF_LINK = g++ | 407 | +SYSCONF_LINK = g++ |
408 | SYSCONF_LFLAGS = | 408 | SYSCONF_LFLAGS = |
409 | SYSCONF_LIBS = | 409 | SYSCONF_LIBS = |
410 | 410 | ||
411 | --- qt-2.3.7/configs/linux-x86rtti-g++-shared~qte237-all2003-07-17 03:23:10.000000000 +0200 | 411 | --- qt-2.3.7/configs/linux-x86rtti-g++-shared~qte237-all2004-04-27 18:16:31.000000000 +0200 |
412 | +++ qt-2.3.7/configs/linux-x86rtti-g++-shared2004-04-24 17:12:59.000000000 +0200 | 412 | +++ qt-2.3.7/configs/linux-x86rtti-g++-shared2004-04-27 18:16:54.000000000 +0200 |
413 | @@ -36,7 +36,7 @@ | 413 | @@ -36,7 +36,7 @@ |
414 | SYSCONF_LIBS_YACC= | 414 | SYSCONF_LIBS_YACC= |
415 | 415 | ||
416 | # Linking applications | 416 | # Linking applications |
417 | -SYSCONF_LINK = gcc | 417 | -SYSCONF_LINK = gcc |
418 | +SYSCONF_LINK = g++ | 418 | +SYSCONF_LINK = g++ |
419 | SYSCONF_LFLAGS = | 419 | SYSCONF_LFLAGS = |
420 | SYSCONF_LIBS = -lm | 420 | SYSCONF_LIBS = -lm |
421 | 421 | ||
422 | --- qt-2.3.7/configs/linux-x86rtti-g++-shared-debug~qte237-all2003-07-17 03:23:10.000000000 +0200 | 422 | --- qt-2.3.7/configs/linux-x86rtti-g++-shared-debug~qte237-all2004-04-27 18:16:31.000000000 +0200 |
423 | +++ qt-2.3.7/configs/linux-x86rtti-g++-shared-debug2004-04-24 17:12:59.000000000 +0200 | 423 | +++ qt-2.3.7/configs/linux-x86rtti-g++-shared-debug2004-04-27 18:16:54.000000000 +0200 |
424 | @@ -36,7 +36,7 @@ | 424 | @@ -36,7 +36,7 @@ |
425 | SYSCONF_LIBS_YACC= | 425 | SYSCONF_LIBS_YACC= |
426 | 426 | ||
427 | # Linking applications | 427 | # Linking applications |
428 | -SYSCONF_LINK = gcc | 428 | -SYSCONF_LINK = gcc |
429 | +SYSCONF_LINK = g++ | 429 | +SYSCONF_LINK = g++ |
430 | SYSCONF_LFLAGS = | 430 | SYSCONF_LFLAGS = |
431 | SYSCONF_LIBS = -lm | 431 | SYSCONF_LIBS = -lm |
432 | 432 | ||
433 | --- qt-2.3.7/configs/linux-x86rtti-g++-static~qte237-all2003-07-17 03:23:10.000000000 +0200 | 433 | --- qt-2.3.7/configs/linux-x86rtti-g++-static~qte237-all2004-04-27 18:16:31.000000000 +0200 |
434 | +++ qt-2.3.7/configs/linux-x86rtti-g++-static2004-04-24 17:12:59.000000000 +0200 | 434 | +++ qt-2.3.7/configs/linux-x86rtti-g++-static2004-04-27 18:16:54.000000000 +0200 |
435 | @@ -36,7 +36,7 @@ | 435 | @@ -36,7 +36,7 @@ |
436 | SYSCONF_LIBS_YACC= | 436 | SYSCONF_LIBS_YACC= |
437 | 437 | ||
438 | # Linking applications | 438 | # Linking applications |
439 | -SYSCONF_LINK = gcc | 439 | -SYSCONF_LINK = gcc |
440 | +SYSCONF_LINK = g++ | 440 | +SYSCONF_LINK = g++ |
441 | SYSCONF_LFLAGS = | 441 | SYSCONF_LFLAGS = |
442 | SYSCONF_LIBS = -lm | 442 | SYSCONF_LIBS = -lm |
443 | 443 | ||
444 | --- qt-2.3.7/configs/linux-x86rtti-g++-static-debug~qte237-all2003-07-17 03:23:10.000000000 +0200 | 444 | --- qt-2.3.7/configs/linux-x86rtti-g++-static-debug~qte237-all2004-04-27 18:16:31.000000000 +0200 |
445 | +++ qt-2.3.7/configs/linux-x86rtti-g++-static-debug2004-04-24 17:12:59.000000000 +0200 | 445 | +++ qt-2.3.7/configs/linux-x86rtti-g++-static-debug2004-04-27 18:16:54.000000000 +0200 |
446 | @@ -36,7 +36,7 @@ | 446 | @@ -36,7 +36,7 @@ |
447 | SYSCONF_LIBS_YACC= | 447 | SYSCONF_LIBS_YACC= |
448 | 448 | ||
449 | # Linking applications | 449 | # Linking applications |
450 | -SYSCONF_LINK = gcc | 450 | -SYSCONF_LINK = gcc |
451 | +SYSCONF_LINK = g++ | 451 | +SYSCONF_LINK = g++ |
452 | SYSCONF_LFLAGS = | 452 | SYSCONF_LFLAGS = |
453 | SYSCONF_LIBS = -lm | 453 | SYSCONF_LIBS = -lm |
454 | 454 | ||
455 | --- qt-2.3.7/src/kernel/qimage.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 | 455 | --- qt-2.3.7/src/kernel/qimage.cpp~qte237-all2004-04-27 18:16:31.000000000 +0200 |
456 | +++ qt-2.3.7/src/kernel/qimage.cpp2004-04-24 17:12:59.000000000 +0200 | 456 | +++ qt-2.3.7/src/kernel/qimage.cpp2004-04-27 18:16:54.000000000 +0200 |
457 | @@ -2201,7 +2201,7 @@ | 457 | @@ -2201,7 +2201,7 @@ |
458 | t2 = srcHeight * dstWidth; | 458 | t2 = srcHeight * dstWidth; |
459 | 459 | ||
460 | if (((sModeQStr == "ScaleMin") && (t1 > t2)) || | 460 | if (((sModeQStr == "ScaleMin") && (t1 > t2)) || |
461 | - ((sModeQStr == "ScaleMax") && (t2 < t2))) { | 461 | - ((sModeQStr == "ScaleMax") && (t2 < t2))) { |
462 | + ((sModeQStr == "ScaleMax") && (t1 < t2))) { | 462 | + ((sModeQStr == "ScaleMax") && (t1 < t2))) { |
463 | dstHeight = t2 / srcWidth; | 463 | dstHeight = t2 / srcWidth; |
464 | } else if (sModeQStr != "ScaleFree") { | 464 | } else if (sModeQStr != "ScaleFree") { |
465 | dstWidth = t1 / srcHeight; | 465 | dstWidth = t1 / srcHeight; |
466 | --- qt-2.3.7/src/tools/qsortedlist.h~qte237-all2003-07-17 03:20:26.000000000 +0200 | 466 | --- qt-2.3.7/src/tools/qsortedlist.h~qte237-all2004-04-27 18:16:31.000000000 +0200 |
467 | +++ qt-2.3.7/src/tools/qsortedlist.h2004-04-24 17:13:57.000000000 +0200 | 467 | +++ qt-2.3.7/src/tools/qsortedlist.h2004-04-27 18:16:54.000000000 +0200 |
468 | @@ -48,7 +48,7 @@ | 468 | @@ -48,7 +48,7 @@ |
469 | public: | 469 | public: |
470 | QSortedList() {} | 470 | QSortedList() {} |
471 | QSortedList( const QSortedList<type> &l ) : QList<type>(l) {} | 471 | QSortedList( const QSortedList<type> &l ) : QList<type>(l) {} |
472 | - ~QSortedList() { clear(); } | 472 | - ~QSortedList() { clear(); } |
473 | + ~QSortedList() { this->clear(); } | 473 | + ~QSortedList() { this->clear(); } |
474 | QSortedList<type> &operator=(const QSortedList<type> &l) | 474 | QSortedList<type> &operator=(const QSortedList<type> &l) |
475 | { return (QSortedList<type>&)QList<type>::operator=(l); } | 475 | { return (QSortedList<type>&)QList<type>::operator=(l); } |
476 | 476 | ||
477 | --- qt-2.3.7/src/kernel/qgfxvfb_qws.cpp~qte237-all2004-04-27 18:16:28.000000000 +0200 | ||
478 | +++ qt-2.3.7/src/kernel/qgfxvfb_qws.cpp2004-04-27 18:16:54.000000000 +0200 | ||
479 | @@ -31,7 +31,6 @@ | ||
480 | **********************************************************************/ | ||
481 | |||
482 | #include "qgfxraster_qws.h" | ||
483 | - | ||
484 | #ifndef QT_NO_QWS_VFB | ||
485 | |||
486 | #include <sys/ipc.h> | ||
487 | @@ -140,8 +139,8 @@ | ||
488 | void QGfxVFb<depth,type>::drawPoint( int x, int y ) | ||
489 | { | ||
490 | QWSDisplay::grab( TRUE ); | ||
491 | - if ( is_screen_gfx ) | ||
492 | -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) ); | ||
493 | + if ( this->is_screen_gfx ) | ||
494 | +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) ); | ||
495 | QGfxRaster<depth,type>::drawPoint( x, y ); | ||
496 | QWSDisplay::ungrab(); | ||
497 | } | ||
498 | @@ -150,8 +149,8 @@ | ||
499 | void QGfxVFb<depth,type>::drawPoints( const QPointArray &pa,int x,int y ) | ||
500 | { | ||
501 | QWSDisplay::grab( TRUE ); | ||
502 | - if ( is_screen_gfx ) | ||
503 | -qvfb_screen->setDirty( clipbounds ); | ||
504 | + if ( this->is_screen_gfx ) | ||
505 | +qvfb_screen->setDirty( this->clipbounds ); | ||
506 | QGfxRaster<depth,type>::drawPoints( pa, x, y ); | ||
507 | QWSDisplay::ungrab(); | ||
508 | } | ||
509 | @@ -160,9 +159,9 @@ | ||
510 | void QGfxVFb<depth,type>::drawLine( int x1,int y1,int x2,int y2 ) | ||
511 | { | ||
512 | QWSDisplay::grab( TRUE ); | ||
513 | - if ( is_screen_gfx ) { | ||
514 | + if ( this->is_screen_gfx ) { | ||
515 | QRect r; | ||
516 | -r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs ); | ||
517 | +r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs ); | ||
518 | qvfb_screen->setDirty( r.normalize() ); | ||
519 | } | ||
520 | QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 ); | ||
521 | @@ -173,8 +172,8 @@ | ||
522 | void QGfxVFb<depth,type>::fillRect( int x,int y,int w,int h ) | ||
523 | { | ||
524 | QWSDisplay::grab( TRUE ); | ||
525 | - if ( is_screen_gfx ) | ||
526 | -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) ); | ||
527 | + if ( this->is_screen_gfx ) | ||
528 | +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) ); | ||
529 | QGfxRaster<depth,type>::fillRect( x, y, w, h ); | ||
530 | QWSDisplay::ungrab(); | ||
531 | } | ||
532 | @@ -183,8 +182,8 @@ | ||
533 | void QGfxVFb<depth,type>::drawPolyline( const QPointArray &pa,int x,int y ) | ||
534 | { | ||
535 | QWSDisplay::grab( TRUE ); | ||
536 | - if ( is_screen_gfx ) | ||
537 | -qvfb_screen->setDirty( clipbounds ); | ||
538 | + if ( this->is_screen_gfx ) | ||
539 | +qvfb_screen->setDirty( this->clipbounds ); | ||
540 | QGfxRaster<depth,type>::drawPolyline( pa, x, y ); | ||
541 | QWSDisplay::ungrab(); | ||
542 | } | ||
543 | @@ -193,8 +192,8 @@ | ||
544 | void QGfxVFb<depth,type>::drawPolygon( const QPointArray &pa,bool w,int x,int y ) | ||
545 | { | ||
546 | QWSDisplay::grab( TRUE ); | ||
547 | - if ( is_screen_gfx ) | ||
548 | -qvfb_screen->setDirty( clipbounds ); | ||
549 | + if ( this->is_screen_gfx ) | ||
550 | +qvfb_screen->setDirty( this->clipbounds ); | ||
551 | QGfxRaster<depth,type>::drawPolygon( pa, w, x, y ); | ||
552 | QWSDisplay::ungrab(); | ||
553 | } | ||
554 | @@ -203,8 +202,8 @@ | ||
555 | void QGfxVFb<depth,type>::blt( int x,int y,int w,int h, int sx, int sy ) | ||
556 | { | ||
557 | QWSDisplay::grab( TRUE ); | ||
558 | - if ( is_screen_gfx ) | ||
559 | -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) ); | ||
560 | + if ( this->is_screen_gfx ) | ||
561 | +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) ); | ||
562 | QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy ); | ||
563 | QWSDisplay::ungrab(); | ||
564 | } | ||
565 | @@ -215,8 +214,8 @@ | ||
566 | QWSDisplay::grab( TRUE ); | ||
567 | int dy = sy - y; | ||
568 | int dx = sx - x; | ||
569 | - if ( is_screen_gfx ) | ||
570 | -qvfb_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs, | ||
571 | + if ( this->is_screen_gfx ) | ||
572 | +qvfb_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs, | ||
573 | w+abs(dx), h+abs(dy)) ); | ||
574 | QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy ); | ||
575 | QWSDisplay::ungrab(); | ||
576 | @@ -227,8 +226,8 @@ | ||
577 | void QGfxVFb<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy ) | ||
578 | { | ||
579 | QWSDisplay::grab( TRUE ); | ||
580 | - if ( is_screen_gfx ) | ||
581 | -qvfb_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) ); | ||
582 | + if ( this->is_screen_gfx ) | ||
583 | +qvfb_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) ); | ||
584 | QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy ); | ||
585 | QWSDisplay::ungrab(); | ||
586 | } | ||
587 | @@ -238,8 +237,8 @@ | ||
588 | void QGfxVFb<depth,type>::tiledBlt( int x,int y,int w,int h ) | ||
589 | { | ||
590 | QWSDisplay::grab( TRUE ); | ||
591 | - if ( is_screen_gfx ) | ||
592 | -qvfb_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) ); | ||
593 | + if ( this->is_screen_gfx ) | ||
594 | +qvfb_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) ); | ||
595 | QGfxRaster<depth,type>::tiledBlt( x, y, w, h ); | ||
596 | QWSDisplay::ungrab(); | ||
597 | } | ||
598 | --- qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp~qte237-all2004-04-27 18:16:28.000000000 +0200 | ||
599 | +++ qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp2004-04-27 18:16:54.000000000 +0200 | ||
600 | @@ -671,11 +671,11 @@ | ||
601 | inline int tx( int x, int y ) { | ||
602 | switch ( qt_trans_screen->transformation() ) { | ||
603 | case QTransformedScreen::Rot90: | ||
604 | - return y - xoffs + yoffs; | ||
605 | + return y - this->xoffs + this->yoffs; | ||
606 | case QTransformedScreen::Rot180: | ||
607 | - return (width - x - 1) - xoffs - xoffs; | ||
608 | + return (this->width - x - 1) - this->xoffs - this->xoffs; | ||
609 | case QTransformedScreen::Rot270: | ||
610 | - return (height - y - 1) - xoffs - yoffs; | ||
611 | + return (this->height - y - 1) - this->xoffs - this->yoffs; | ||
612 | default: | ||
613 | return x; | ||
614 | } | ||
615 | @@ -683,11 +683,11 @@ | ||
616 | inline int ty( int x, int y ) { | ||
617 | switch ( qt_trans_screen->transformation() ) { | ||
618 | case QTransformedScreen::Rot90: | ||
619 | - return (width - x - 1) - yoffs - xoffs; | ||
620 | + return (this->width - x - 1) - this->yoffs - this->xoffs; | ||
621 | case QTransformedScreen::Rot180: | ||
622 | - return (height - y - 1) - yoffs - yoffs; | ||
623 | + return (this->height - y - 1) - this->yoffs - this->yoffs; | ||
624 | case QTransformedScreen::Rot270: | ||
625 | - return x - yoffs + xoffs; | ||
626 | + return x - this->yoffs + this->xoffs; | ||
627 | default: | ||
628 | return y; | ||
629 | } | ||
630 | @@ -715,23 +715,23 @@ | ||
631 | template <const int depth, const int type> | ||
632 | void QGfxTransformedRaster<depth,type>::setSourceWidgetOffset(int x, int y) | ||
633 | { | ||
634 | - if ( srcbits == buffer ) { | ||
635 | + if ( this->srcbits == this->buffer ) { | ||
636 | switch ( qt_trans_screen->transformation() ) { | ||
637 | case QTransformedScreen::Rot90: | ||
638 | - srcwidgetoffs = QPoint( y, width - x - srcwidth ); | ||
639 | + this->srcwidgetoffs = QPoint( y, this->width - x - this->srcwidth ); | ||
640 | break; | ||
641 | case QTransformedScreen::Rot180: | ||
642 | - srcwidgetoffs = QPoint( width - x - srcwidth, height - y - srcheight ); | ||
643 | + this->srcwidgetoffs = QPoint( this->width - x - this->srcwidth, this->height - y - this->srcheight ); | ||
644 | break; | ||
645 | case QTransformedScreen::Rot270: | ||
646 | - srcwidgetoffs = QPoint( height - y - srcheight, x ); | ||
647 | + this->srcwidgetoffs = QPoint( this->height - y - this->srcheight, x ); | ||
648 | break; | ||
649 | default: | ||
650 | - srcwidgetoffs = QPoint( x, y ); | ||
651 | + this->srcwidgetoffs = QPoint( x, y ); | ||
652 | break; | ||
653 | } | ||
654 | } else | ||
655 | -srcwidgetoffs = QPoint( x, y ); | ||
656 | +this->srcwidgetoffs = QPoint( x, y ); | ||
657 | } | ||
658 | |||
659 | template <const int depth, const int type> | ||
660 | @@ -739,8 +739,8 @@ | ||
661 | { | ||
662 | QT_TRANS_GFX_BASE<depth,type>::setSource(i); | ||
663 | QSize s = qt_screen->mapToDevice( QSize(i->width(), i->height()) ); | ||
664 | - srcwidth = s.width(); | ||
665 | - srcheight = s.height(); | ||
666 | + this->srcwidth = s.width(); | ||
667 | + this->srcheight = s.height(); | ||
668 | } | ||
669 | |||
670 | template <const int depth, const int type> | ||
671 | @@ -782,7 +782,7 @@ | ||
672 | if ( w == 0 || h == 0 ) | ||
673 | return; | ||
674 | QRect r( x, y, w, h ); | ||
675 | - if ( cbrush.style() == SolidPattern ) { | ||
676 | + if ( this->cbrush.style() == Qt::SolidPattern ) { | ||
677 | r.setCoords( tx(x,y), ty(x,y), tx(x+w-1,y+h-1), ty(x+w-1,y+h-1) ); | ||
678 | r = r.normalize(); | ||
679 | } | ||
680 | @@ -797,7 +797,7 @@ | ||
681 | // solution. The brush offset logic is complicated enough, so we don't | ||
682 | // fastpath patternedbrush. | ||
683 | |||
684 | - if ( inDraw || cpen.style()==NoPen || patternedbrush ) { | ||
685 | + if ( inDraw || this->cpen.style()==Qt::NoPen || this->patternedbrush ) { | ||
686 | //slowpath | ||
687 | QT_TRANS_GFX_BASE<depth,type>::drawPolygon( a, w, idx, num ); | ||
688 | } else { | ||
689 | @@ -819,29 +819,29 @@ | ||
690 | template <const int depth, const int type> | ||
691 | void QGfxTransformedRaster<depth,type>::processSpans( int n, QPoint* point, int* width ) | ||
692 | { | ||
693 | - if ( inDraw || patternedbrush && srcwidth != 0 && srcheight != 0 ) { | ||
694 | + if ( inDraw || this->patternedbrush && this->srcwidth != 0 && this->srcheight != 0 ) { | ||
695 | //in the patternedbrush case, we let blt do the transformation | ||
696 | // so we leave inDraw false. | ||
697 | - QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width ); | ||
698 | +QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width ); | ||
699 | } else { | ||
700 | inDraw = TRUE; | ||
701 | while (n--) { | ||
702 | if ( *width > 0 ) { | ||
703 | - int x=tx(point->x(),point->y())+xoffs; | ||
704 | - int y=ty(point->x(),point->y())+yoffs; | ||
705 | + int x=tx(point->x(),point->y())+this->xoffs; | ||
706 | + int y=ty(point->x(),point->y())+this->yoffs; | ||
707 | |||
708 | switch( qt_trans_screen->transformation() ) { | ||
709 | case QTransformedScreen::Rot90: | ||
710 | - vline( x, y-(*width-1), y ); | ||
711 | + this->vline( x, y-(*width-1), y ); | ||
712 | break; | ||
713 | case QTransformedScreen::Rot180: | ||
714 | - hline( x - (*width-1), x, y ); | ||
715 | + this->hline( x - (*width-1), x, y ); | ||
716 | break; | ||
717 | case QTransformedScreen::Rot270: | ||
718 | - vline( x, y, y+*width-1 ); | ||
719 | + this->vline( x, y, y+*width-1 ); | ||
720 | break; | ||
721 | default: | ||
722 | - hline( x, x+*width-1, y ); | ||
723 | + this->hline( x, x+*width-1, y ); | ||
724 | break; | ||
725 | } | ||
726 | } | ||
727 | @@ -896,14 +896,14 @@ | ||
728 | switch ( qt_trans_screen->transformation() ) { | ||
729 | case QTransformedScreen::Rot90: | ||
730 | rsx = sy; | ||
731 | - rsy = srcwidth - sx - w; | ||
732 | + rsy = this->srcwidth - sx - w; | ||
733 | break; | ||
734 | case QTransformedScreen::Rot180: | ||
735 | - rsx = srcwidth - sx - w; | ||
736 | - rsy = srcheight - sy - h; | ||
737 | + rsx = this->srcwidth - sx - w; | ||
738 | + rsy = this->srcheight - sy - h; | ||
739 | break; | ||
740 | case QTransformedScreen::Rot270: | ||
741 | - rsx = srcheight - sy - h; | ||
742 | + rsx = this->srcheight - sy - h; | ||
743 | rsy = sx; | ||
744 | break; | ||
745 | default: | ||
746 | @@ -941,39 +941,39 @@ | ||
747 | r.setCoords( tx(rx,ry), ty(rx,ry), tx(rx+w-1,ry+h-1), ty(rx+w-1,ry+h-1) ); | ||
748 | r = r.normalize(); | ||
749 | |||
750 | - QPoint oldBrushOffs = brushoffs; | ||
751 | + QPoint oldBrushOffs = this->brushoffs; | ||
752 | int brx, bry; | ||
753 | switch ( qt_trans_screen->transformation() ) { | ||
754 | case QTransformedScreen::Rot90: | ||
755 | - brx = brushoffs.y(); | ||
756 | - bry = srcwidth - brushoffs.x() - w; | ||
757 | + brx = this->brushoffs.y(); | ||
758 | + bry = this->srcwidth - this->brushoffs.x() - w; | ||
759 | break; | ||
760 | case QTransformedScreen::Rot180: | ||
761 | - brx = srcwidth - brushoffs.x() - w; | ||
762 | - bry = srcheight - brushoffs.y() - h; | ||
763 | + brx = this->srcwidth - this->brushoffs.x() - w; | ||
764 | + bry = this->srcheight - this->brushoffs.y() - h; | ||
765 | break; | ||
766 | case QTransformedScreen::Rot270: | ||
767 | - brx = srcheight - brushoffs.y() - h; | ||
768 | - bry = brushoffs.x(); | ||
769 | + brx = this->srcheight - this->brushoffs.y() - h; | ||
770 | + bry = this->brushoffs.x(); | ||
771 | break; | ||
772 | default: | ||
773 | - brx = brushoffs.x(); | ||
774 | - bry = brushoffs.y(); | ||
775 | + brx = this->brushoffs.x(); | ||
776 | + bry = this->brushoffs.y(); | ||
777 | break; | ||
778 | } | ||
779 | - brushoffs = QPoint( brx, bry ); | ||
780 | + this->brushoffs = QPoint( brx, bry ); | ||
781 | |||
782 | - int oldsw = srcwidth; | ||
783 | - int oldsh = srcheight; | ||
784 | - QSize s = qt_screen->mapToDevice( QSize(srcwidth,srcheight) ); | ||
785 | - srcwidth = s.width(); | ||
786 | - srcheight = s.height(); | ||
787 | + int oldsw = this->srcwidth; | ||
788 | + int oldsh = this->srcheight; | ||
789 | + QSize s = qt_screen->mapToDevice( QSize(this->srcwidth,this->srcheight) ); | ||
790 | + this->srcwidth = s.width(); | ||
791 | + this->srcheight = s.height(); | ||
792 | |||
793 | QT_TRANS_GFX_BASE<depth,type>::tiledBlt( r.x(), r.y(), r.width(), r.height() ); | ||
794 | |||
795 | - srcwidth = oldsw; | ||
796 | - srcheight = oldsh; | ||
797 | - brushoffs = oldBrushOffs; | ||
798 | + this->srcwidth = oldsw; | ||
799 | + this->srcheight = oldsh; | ||
800 | + this->brushoffs = oldBrushOffs; | ||
801 | inDraw = FALSE; | ||
802 | } | ||
803 | |||
804 | --- qt-2.3.7/src/tools/qstring.h~qte237-all2003-07-17 03:20:26.000000000 +0200 | ||
805 | +++ qt-2.3.7/src/tools/qstring.h2004-04-27 18:18:37.000000000 +0200 | ||
806 | @@ -199,7 +199,7 @@ | ||
807 | #endif | ||
808 | enum { net_ordered = 0 }; | ||
809 | #endif | ||
810 | -} Q_PACKED; | ||
811 | +}; // was: Q_PACKED; (arm-linux-)g++ 3.4 no longer allows direct access to packed structures. ML. | ||
812 | |||
813 | inline QChar::QChar() | ||
814 | { | ||