summaryrefslogtreecommitdiff
path: root/qt
authormickeyl <mickeyl>2004-04-27 16:28:05 (UTC)
committer mickeyl <mickeyl>2004-04-27 16:28:05 (UTC)
commitb645511e7fba8e3c27fda69b3939c0e5dbca1609 (patch) (side-by-side diff)
tree527944d06b232f636c0a8dba8147f73c71127e31 /qt
parentb777fe895d5edc58ec6026cc7a66a157958f4411 (diff)
downloadopie-b645511e7fba8e3c27fda69b3939c0e5dbca1609.zip
opie-b645511e7fba8e3c27fda69b3939c0e5dbca1609.tar.gz
opie-b645511e7fba8e3c27fda69b3939c0e5dbca1609.tar.bz2
fix Qt-Embedded 2.3.7 to compile with the shiny new gcc 3.4
Diffstat (limited to 'qt') (more/less context) (show whitespace changes)
-rw-r--r--qt/qt-2.3.7.patch/qte237-all.patch438
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
@@ -3,8 +3,8 @@
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
---- qt-2.3.7/src/kernel/qapplication.cpp~qte237-all 2003-07-17 03:20:25.000000000 +0200
-+++ qt-2.3.7/src/kernel/qapplication.cpp 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/src/kernel/qapplication.cpp~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/src/kernel/qapplication.cpp 2004-04-27 18:16:54.000000000 +0200
@@ -35,6 +35,8 @@
**
**********************************************************************/
@@ -87,8 +87,8 @@
bool all = FALSE;
if ( !className ) {
if ( !app_font ) {
---- qt-2.3.7/src/kernel/qapplication.h~qte237-all 2003-07-17 03:20:25.000000000 +0200
-+++ qt-2.3.7/src/kernel/qapplication.h 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/src/kernel/qapplication.h~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/src/kernel/qapplication.h 2004-04-27 18:16:54.000000000 +0200
@@ -61,6 +61,10 @@
class QSemaphore;
#endif
@@ -144,8 +144,8 @@
#endif
#endif
---- qt-2.3.7/src/kernel/qapplication_qws.cpp~qte237-all 2003-07-17 03:20:25.000000000 +0200
-+++ qt-2.3.7/src/kernel/qapplication_qws.cpp 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/src/kernel/qapplication_qws.cpp~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/src/kernel/qapplication_qws.cpp 2004-04-27 18:16:54.000000000 +0200
@@ -2804,6 +2804,11 @@
*/
void QApplication::qwsSetDecoration( QWSDecoration *d )
@@ -158,8 +158,8 @@
if ( d ) {
delete qws_decoration;
qws_decoration = d;
---- qt-2.3.7/src/kernel/qfontdatabase.cpp~qte237-all 2003-07-17 03:20:25.000000000 +0200
-+++ qt-2.3.7/src/kernel/qfontdatabase.cpp 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/src/kernel/qfontdatabase.cpp~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/src/kernel/qfontdatabase.cpp 2004-04-27 18:16:54.000000000 +0200
@@ -35,6 +35,8 @@
**
**********************************************************************/
@@ -183,8 +183,8 @@
QString cs( charSet );
if ( charSet.isEmpty() ) {
QStringList lst = charSets( family );
---- qt-2.3.7/src/kernel/qfontdatabase.h~qte237-all 2003-07-17 03:20:25.000000000 +0200
-+++ qt-2.3.7/src/kernel/qfontdatabase.h 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/src/kernel/qfontdatabase.h~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/src/kernel/qfontdatabase.h 2004-04-27 18:16:54.000000000 +0200
@@ -59,6 +59,10 @@
class QDiskFont;
#endif
@@ -214,8 +214,8 @@
QStringList styles( const QString &family,
const QString &charSet = QString::null ) const;
QStringList charSets( const QString &familyName,
---- qt-2.3.7/src/kernel/qgfxraster_qws.cpp~qte237-all 2003-07-17 03:20:25.000000000 +0200
-+++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/src/kernel/qgfxraster_qws.cpp~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp 2004-04-27 18:16:54.000000000 +0200
@@ -4237,7 +4237,7 @@
setAlphaType(IgnoreAlpha);
if ( w <= 0 || h <= 0 || !ncliprect ) return;
@@ -225,8 +225,8 @@
// ### fix for 8bpp
// This seems to be reliable now, at least for 16bpp
---- qt-2.3.7/src/kernel/qwindowsystem_qws.cpp~qte237-all 2003-07-17 03:20:26.000000000 +0200
-+++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/src/kernel/qwindowsystem_qws.cpp~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp 2004-04-27 18:16:54.000000000 +0200
@@ -844,6 +844,18 @@
{
}
@@ -254,8 +254,8 @@
#endif
focusw = 0;
mouseGrabber = 0;
---- qt-2.3.7/src/widgets/qcommonstyle.cpp~qte237-all 2003-07-17 03:20:26.000000000 +0200
-+++ qt-2.3.7/src/widgets/qcommonstyle.cpp 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/src/widgets/qcommonstyle.cpp~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/src/widgets/qcommonstyle.cpp 2004-04-27 18:16:54.000000000 +0200
@@ -566,7 +566,7 @@
bool enabled, bool active )
{
@@ -265,8 +265,8 @@
if (draw_menu_bar_impl != 0) {
QDrawMenuBarItemImpl impl = draw_menu_bar_impl;
(this->*impl)(p, x, y, w, h, mi, g, enabled, active);
---- qt-2.3.7/src/widgets/qlistview.cpp~qte237-all 2003-07-17 03:20:26.000000000 +0200
-+++ qt-2.3.7/src/widgets/qlistview.cpp 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/src/widgets/qlistview.cpp~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/src/widgets/qlistview.cpp 2004-04-27 18:16:54.000000000 +0200
@@ -4968,9 +4968,9 @@
l = l->childItem ? l->childItem : l->siblingItem;
@@ -280,8 +280,8 @@
if ( s.width() > s.height() * 3 )
s.setHeight( s.width() / 3 );
---- qt-2.3.7/src/widgets/qtoolbutton.cpp~qte237-all 2003-07-17 03:20:27.000000000 +0200
-+++ qt-2.3.7/src/widgets/qtoolbutton.cpp 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/src/widgets/qtoolbutton.cpp~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/src/widgets/qtoolbutton.cpp 2004-04-27 18:16:54.000000000 +0200
@@ -230,7 +230,7 @@
else
QToolTip::add( this, textLabel );
@@ -309,8 +309,8 @@
QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal);
w = pm.width();
h = pm.height();
---- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~qte237-all 2003-07-17 03:20:25.000000000 +0200
-+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp 2004-04-27 18:16:54.000000000 +0200
@@ -238,7 +238,7 @@
{ Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 63
{ Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 64
@@ -320,8 +320,8 @@
{ Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67
{ Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 68
{ Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 69
---- qt-2.3.7/configs/linux-generic-g++-shared~qte237-all 2003-07-17 03:23:08.000000000 +0200
-+++ qt-2.3.7/configs/linux-generic-g++-shared 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/configs/linux-generic-g++-shared~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/configs/linux-generic-g++-shared 2004-04-27 18:16:54.000000000 +0200
@@ -36,7 +36,7 @@
SYSCONF_LIBS_YACC =
@@ -331,8 +331,8 @@
SYSCONF_LFLAGS =
SYSCONF_LIBS =
---- qt-2.3.7/configs/linux-generic-g++-shared-debug~qte237-all 2003-07-17 03:23:08.000000000 +0200
-+++ qt-2.3.7/configs/linux-generic-g++-shared-debug 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/configs/linux-generic-g++-shared-debug~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/configs/linux-generic-g++-shared-debug 2004-04-27 18:16:54.000000000 +0200
@@ -36,7 +36,7 @@
SYSCONF_LIBS_YACC =
@@ -342,8 +342,8 @@
SYSCONF_LFLAGS =
SYSCONF_LIBS =
---- qt-2.3.7/configs/linux-generic-g++-static~qte237-all 2003-07-17 03:23:08.000000000 +0200
-+++ qt-2.3.7/configs/linux-generic-g++-static 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/configs/linux-generic-g++-static~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/configs/linux-generic-g++-static 2004-04-27 18:16:54.000000000 +0200
@@ -36,7 +36,7 @@
SYSCONF_LIBS_YACC =
@@ -353,8 +353,8 @@
SYSCONF_LFLAGS =
SYSCONF_LIBS =
---- qt-2.3.7/configs/linux-generic-g++-static-debug~qte237-all 2003-07-17 03:23:08.000000000 +0200
-+++ qt-2.3.7/configs/linux-generic-g++-static-debug 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/configs/linux-generic-g++-static-debug~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/configs/linux-generic-g++-static-debug 2004-04-27 18:16:54.000000000 +0200
@@ -36,7 +36,7 @@
SYSCONF_LIBS_YACC =
@@ -364,8 +364,8 @@
SYSCONF_LFLAGS =
SYSCONF_LIBS =
---- qt-2.3.7/configs/linux-generic_rtti-g++-shared~qte237-all 2003-07-17 03:23:08.000000000 +0200
-+++ qt-2.3.7/configs/linux-generic_rtti-g++-shared 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/configs/linux-generic_rtti-g++-shared~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/configs/linux-generic_rtti-g++-shared 2004-04-27 18:16:54.000000000 +0200
@@ -36,7 +36,7 @@
SYSCONF_LIBS_YACC =
@@ -375,8 +375,8 @@
SYSCONF_LFLAGS =
SYSCONF_LIBS =
---- qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug~qte237-all 2003-07-17 03:23:08.000000000 +0200
-+++ qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug 2004-04-27 18:16:54.000000000 +0200
@@ -36,7 +36,7 @@
SYSCONF_LIBS_YACC =
@@ -386,8 +386,8 @@
SYSCONF_LFLAGS =
SYSCONF_LIBS =
---- qt-2.3.7/configs/linux-generic_rtti-g++-static~qte237-all 2003-07-17 03:23:08.000000000 +0200
-+++ qt-2.3.7/configs/linux-generic_rtti-g++-static 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/configs/linux-generic_rtti-g++-static~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/configs/linux-generic_rtti-g++-static 2004-04-27 18:16:54.000000000 +0200
@@ -36,7 +36,7 @@
SYSCONF_LIBS_YACC =
@@ -397,8 +397,8 @@
SYSCONF_LFLAGS =
SYSCONF_LIBS =
---- qt-2.3.7/configs/linux-generic_rtti-g++-static-debug~qte237-all 2003-07-17 03:23:08.000000000 +0200
-+++ qt-2.3.7/configs/linux-generic_rtti-g++-static-debug 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/configs/linux-generic_rtti-g++-static-debug~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/configs/linux-generic_rtti-g++-static-debug 2004-04-27 18:16:54.000000000 +0200
@@ -36,7 +36,7 @@
SYSCONF_LIBS_YACC =
@@ -408,8 +408,8 @@
SYSCONF_LFLAGS =
SYSCONF_LIBS =
---- qt-2.3.7/configs/linux-x86rtti-g++-shared~qte237-all 2003-07-17 03:23:10.000000000 +0200
-+++ qt-2.3.7/configs/linux-x86rtti-g++-shared 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/configs/linux-x86rtti-g++-shared~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/configs/linux-x86rtti-g++-shared 2004-04-27 18:16:54.000000000 +0200
@@ -36,7 +36,7 @@
SYSCONF_LIBS_YACC =
@@ -419,8 +419,8 @@
SYSCONF_LFLAGS =
SYSCONF_LIBS = -lm
---- qt-2.3.7/configs/linux-x86rtti-g++-shared-debug~qte237-all 2003-07-17 03:23:10.000000000 +0200
-+++ qt-2.3.7/configs/linux-x86rtti-g++-shared-debug 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/configs/linux-x86rtti-g++-shared-debug~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/configs/linux-x86rtti-g++-shared-debug 2004-04-27 18:16:54.000000000 +0200
@@ -36,7 +36,7 @@
SYSCONF_LIBS_YACC =
@@ -430,8 +430,8 @@
SYSCONF_LFLAGS =
SYSCONF_LIBS = -lm
---- qt-2.3.7/configs/linux-x86rtti-g++-static~qte237-all 2003-07-17 03:23:10.000000000 +0200
-+++ qt-2.3.7/configs/linux-x86rtti-g++-static 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/configs/linux-x86rtti-g++-static~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/configs/linux-x86rtti-g++-static 2004-04-27 18:16:54.000000000 +0200
@@ -36,7 +36,7 @@
SYSCONF_LIBS_YACC =
@@ -441,8 +441,8 @@
SYSCONF_LFLAGS =
SYSCONF_LIBS = -lm
---- qt-2.3.7/configs/linux-x86rtti-g++-static-debug~qte237-all 2003-07-17 03:23:10.000000000 +0200
-+++ qt-2.3.7/configs/linux-x86rtti-g++-static-debug 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/configs/linux-x86rtti-g++-static-debug~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/configs/linux-x86rtti-g++-static-debug 2004-04-27 18:16:54.000000000 +0200
@@ -36,7 +36,7 @@
SYSCONF_LIBS_YACC =
@@ -452,8 +452,8 @@
SYSCONF_LFLAGS =
SYSCONF_LIBS = -lm
---- qt-2.3.7/src/kernel/qimage.cpp~qte237-all 2003-07-17 03:20:25.000000000 +0200
-+++ qt-2.3.7/src/kernel/qimage.cpp 2004-04-24 17:12:59.000000000 +0200
+--- qt-2.3.7/src/kernel/qimage.cpp~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/src/kernel/qimage.cpp 2004-04-27 18:16:54.000000000 +0200
@@ -2201,7 +2201,7 @@
t2 = srcHeight * dstWidth;
@@ -463,8 +463,8 @@
dstHeight = t2 / srcWidth;
} else if (sModeQStr != "ScaleFree") {
dstWidth = t1 / srcHeight;
---- qt-2.3.7/src/tools/qsortedlist.h~qte237-all 2003-07-17 03:20:26.000000000 +0200
-+++ qt-2.3.7/src/tools/qsortedlist.h 2004-04-24 17:13:57.000000000 +0200
+--- qt-2.3.7/src/tools/qsortedlist.h~qte237-all 2004-04-27 18:16:31.000000000 +0200
++++ qt-2.3.7/src/tools/qsortedlist.h 2004-04-27 18:16:54.000000000 +0200
@@ -48,7 +48,7 @@
public:
QSortedList() {}
@@ -474,3 +474,341 @@
QSortedList<type> &operator=(const QSortedList<type> &l)
{ return (QSortedList<type>&)QList<type>::operator=(l); }
+--- qt-2.3.7/src/kernel/qgfxvfb_qws.cpp~qte237-all 2004-04-27 18:16:28.000000000 +0200
++++ qt-2.3.7/src/kernel/qgfxvfb_qws.cpp 2004-04-27 18:16:54.000000000 +0200
+@@ -31,7 +31,6 @@
+ **********************************************************************/
+
+ #include "qgfxraster_qws.h"
+-
+ #ifndef QT_NO_QWS_VFB
+
+ #include <sys/ipc.h>
+@@ -140,8 +139,8 @@
+ void QGfxVFb<depth,type>::drawPoint( int x, int y )
+ {
+ QWSDisplay::grab( TRUE );
+- if ( is_screen_gfx )
+- qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) );
++ if ( this->is_screen_gfx )
++ qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) );
+ QGfxRaster<depth,type>::drawPoint( x, y );
+ QWSDisplay::ungrab();
+ }
+@@ -150,8 +149,8 @@
+ void QGfxVFb<depth,type>::drawPoints( const QPointArray &pa,int x,int y )
+ {
+ QWSDisplay::grab( TRUE );
+- if ( is_screen_gfx )
+- qvfb_screen->setDirty( clipbounds );
++ if ( this->is_screen_gfx )
++ qvfb_screen->setDirty( this->clipbounds );
+ QGfxRaster<depth,type>::drawPoints( pa, x, y );
+ QWSDisplay::ungrab();
+ }
+@@ -160,9 +159,9 @@
+ void QGfxVFb<depth,type>::drawLine( int x1,int y1,int x2,int y2 )
+ {
+ QWSDisplay::grab( TRUE );
+- if ( is_screen_gfx ) {
++ if ( this->is_screen_gfx ) {
+ QRect r;
+- r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs );
++ r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs );
+ qvfb_screen->setDirty( r.normalize() );
+ }
+ QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 );
+@@ -173,8 +172,8 @@
+ void QGfxVFb<depth,type>::fillRect( int x,int y,int w,int h )
+ {
+ QWSDisplay::grab( TRUE );
+- if ( is_screen_gfx )
+- qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) );
++ if ( this->is_screen_gfx )
++ qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) );
+ QGfxRaster<depth,type>::fillRect( x, y, w, h );
+ QWSDisplay::ungrab();
+ }
+@@ -183,8 +182,8 @@
+ void QGfxVFb<depth,type>::drawPolyline( const QPointArray &pa,int x,int y )
+ {
+ QWSDisplay::grab( TRUE );
+- if ( is_screen_gfx )
+- qvfb_screen->setDirty( clipbounds );
++ if ( this->is_screen_gfx )
++ qvfb_screen->setDirty( this->clipbounds );
+ QGfxRaster<depth,type>::drawPolyline( pa, x, y );
+ QWSDisplay::ungrab();
+ }
+@@ -193,8 +192,8 @@
+ void QGfxVFb<depth,type>::drawPolygon( const QPointArray &pa,bool w,int x,int y )
+ {
+ QWSDisplay::grab( TRUE );
+- if ( is_screen_gfx )
+- qvfb_screen->setDirty( clipbounds );
++ if ( this->is_screen_gfx )
++ qvfb_screen->setDirty( this->clipbounds );
+ QGfxRaster<depth,type>::drawPolygon( pa, w, x, y );
+ QWSDisplay::ungrab();
+ }
+@@ -203,8 +202,8 @@
+ void QGfxVFb<depth,type>::blt( int x,int y,int w,int h, int sx, int sy )
+ {
+ QWSDisplay::grab( TRUE );
+- if ( is_screen_gfx )
+- qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) );
++ if ( this->is_screen_gfx )
++ qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) );
+ QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy );
+ QWSDisplay::ungrab();
+ }
+@@ -215,8 +214,8 @@
+ QWSDisplay::grab( TRUE );
+ int dy = sy - y;
+ int dx = sx - x;
+- if ( is_screen_gfx )
+- qvfb_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs,
++ if ( this->is_screen_gfx )
++ qvfb_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs,
+ w+abs(dx), h+abs(dy)) );
+ QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy );
+ QWSDisplay::ungrab();
+@@ -227,8 +226,8 @@
+ void QGfxVFb<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy )
+ {
+ QWSDisplay::grab( TRUE );
+- if ( is_screen_gfx )
+- qvfb_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) );
++ if ( this->is_screen_gfx )
++ qvfb_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) );
+ QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy );
+ QWSDisplay::ungrab();
+ }
+@@ -238,8 +237,8 @@
+ void QGfxVFb<depth,type>::tiledBlt( int x,int y,int w,int h )
+ {
+ QWSDisplay::grab( TRUE );
+- if ( is_screen_gfx )
+- qvfb_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) );
++ if ( this->is_screen_gfx )
++ qvfb_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) );
+ QGfxRaster<depth,type>::tiledBlt( x, y, w, h );
+ QWSDisplay::ungrab();
+ }
+--- qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp~qte237-all 2004-04-27 18:16:28.000000000 +0200
++++ qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp 2004-04-27 18:16:54.000000000 +0200
+@@ -671,11 +671,11 @@
+ inline int tx( int x, int y ) {
+ switch ( qt_trans_screen->transformation() ) {
+ case QTransformedScreen::Rot90:
+- return y - xoffs + yoffs;
++ return y - this->xoffs + this->yoffs;
+ case QTransformedScreen::Rot180:
+- return (width - x - 1) - xoffs - xoffs;
++ return (this->width - x - 1) - this->xoffs - this->xoffs;
+ case QTransformedScreen::Rot270:
+- return (height - y - 1) - xoffs - yoffs;
++ return (this->height - y - 1) - this->xoffs - this->yoffs;
+ default:
+ return x;
+ }
+@@ -683,11 +683,11 @@
+ inline int ty( int x, int y ) {
+ switch ( qt_trans_screen->transformation() ) {
+ case QTransformedScreen::Rot90:
+- return (width - x - 1) - yoffs - xoffs;
++ return (this->width - x - 1) - this->yoffs - this->xoffs;
+ case QTransformedScreen::Rot180:
+- return (height - y - 1) - yoffs - yoffs;
++ return (this->height - y - 1) - this->yoffs - this->yoffs;
+ case QTransformedScreen::Rot270:
+- return x - yoffs + xoffs;
++ return x - this->yoffs + this->xoffs;
+ default:
+ return y;
+ }
+@@ -715,23 +715,23 @@
+ template <const int depth, const int type>
+ void QGfxTransformedRaster<depth,type>::setSourceWidgetOffset(int x, int y)
+ {
+- if ( srcbits == buffer ) {
++ if ( this->srcbits == this->buffer ) {
+ switch ( qt_trans_screen->transformation() ) {
+ case QTransformedScreen::Rot90:
+- srcwidgetoffs = QPoint( y, width - x - srcwidth );
++ this->srcwidgetoffs = QPoint( y, this->width - x - this->srcwidth );
+ break;
+ case QTransformedScreen::Rot180:
+- srcwidgetoffs = QPoint( width - x - srcwidth, height - y - srcheight );
++ this->srcwidgetoffs = QPoint( this->width - x - this->srcwidth, this->height - y - this->srcheight );
+ break;
+ case QTransformedScreen::Rot270:
+- srcwidgetoffs = QPoint( height - y - srcheight, x );
++ this->srcwidgetoffs = QPoint( this->height - y - this->srcheight, x );
+ break;
+ default:
+- srcwidgetoffs = QPoint( x, y );
++ this->srcwidgetoffs = QPoint( x, y );
+ break;
+ }
+ } else
+- srcwidgetoffs = QPoint( x, y );
++ this->srcwidgetoffs = QPoint( x, y );
+ }
+
+ template <const int depth, const int type>
+@@ -739,8 +739,8 @@
+ {
+ QT_TRANS_GFX_BASE<depth,type>::setSource(i);
+ QSize s = qt_screen->mapToDevice( QSize(i->width(), i->height()) );
+- srcwidth = s.width();
+- srcheight = s.height();
++ this->srcwidth = s.width();
++ this->srcheight = s.height();
+ }
+
+ template <const int depth, const int type>
+@@ -782,7 +782,7 @@
+ if ( w == 0 || h == 0 )
+ return;
+ QRect r( x, y, w, h );
+- if ( cbrush.style() == SolidPattern ) {
++ if ( this->cbrush.style() == Qt::SolidPattern ) {
+ r.setCoords( tx(x,y), ty(x,y), tx(x+w-1,y+h-1), ty(x+w-1,y+h-1) );
+ r = r.normalize();
+ }
+@@ -797,7 +797,7 @@
+ // solution. The brush offset logic is complicated enough, so we don't
+ // fastpath patternedbrush.
+
+- if ( inDraw || cpen.style()==NoPen || patternedbrush ) {
++ if ( inDraw || this->cpen.style()==Qt::NoPen || this->patternedbrush ) {
+ //slowpath
+ QT_TRANS_GFX_BASE<depth,type>::drawPolygon( a, w, idx, num );
+ } else {
+@@ -819,29 +819,29 @@
+ template <const int depth, const int type>
+ void QGfxTransformedRaster<depth,type>::processSpans( int n, QPoint* point, int* width )
+ {
+- if ( inDraw || patternedbrush && srcwidth != 0 && srcheight != 0 ) {
++ if ( inDraw || this->patternedbrush && this->srcwidth != 0 && this->srcheight != 0 ) {
+ //in the patternedbrush case, we let blt do the transformation
+ // so we leave inDraw false.
+- QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width );
++ QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width );
+ } else {
+ inDraw = TRUE;
+ while (n--) {
+ if ( *width > 0 ) {
+- int x=tx(point->x(),point->y())+xoffs;
+- int y=ty(point->x(),point->y())+yoffs;
++ int x=tx(point->x(),point->y())+this->xoffs;
++ int y=ty(point->x(),point->y())+this->yoffs;
+
+ switch( qt_trans_screen->transformation() ) {
+ case QTransformedScreen::Rot90:
+- vline( x, y-(*width-1), y );
++ this->vline( x, y-(*width-1), y );
+ break;
+ case QTransformedScreen::Rot180:
+- hline( x - (*width-1), x, y );
++ this->hline( x - (*width-1), x, y );
+ break;
+ case QTransformedScreen::Rot270:
+- vline( x, y, y+*width-1 );
++ this->vline( x, y, y+*width-1 );
+ break;
+ default:
+- hline( x, x+*width-1, y );
++ this->hline( x, x+*width-1, y );
+ break;
+ }
+ }
+@@ -896,14 +896,14 @@
+ switch ( qt_trans_screen->transformation() ) {
+ case QTransformedScreen::Rot90:
+ rsx = sy;
+- rsy = srcwidth - sx - w;
++ rsy = this->srcwidth - sx - w;
+ break;
+ case QTransformedScreen::Rot180:
+- rsx = srcwidth - sx - w;
+- rsy = srcheight - sy - h;
++ rsx = this->srcwidth - sx - w;
++ rsy = this->srcheight - sy - h;
+ break;
+ case QTransformedScreen::Rot270:
+- rsx = srcheight - sy - h;
++ rsx = this->srcheight - sy - h;
+ rsy = sx;
+ break;
+ default:
+@@ -941,39 +941,39 @@
+ r.setCoords( tx(rx,ry), ty(rx,ry), tx(rx+w-1,ry+h-1), ty(rx+w-1,ry+h-1) );
+ r = r.normalize();
+
+- QPoint oldBrushOffs = brushoffs;
++ QPoint oldBrushOffs = this->brushoffs;
+ int brx, bry;
+ switch ( qt_trans_screen->transformation() ) {
+ case QTransformedScreen::Rot90:
+- brx = brushoffs.y();
+- bry = srcwidth - brushoffs.x() - w;
++ brx = this->brushoffs.y();
++ bry = this->srcwidth - this->brushoffs.x() - w;
+ break;
+ case QTransformedScreen::Rot180:
+- brx = srcwidth - brushoffs.x() - w;
+- bry = srcheight - brushoffs.y() - h;
++ brx = this->srcwidth - this->brushoffs.x() - w;
++ bry = this->srcheight - this->brushoffs.y() - h;
+ break;
+ case QTransformedScreen::Rot270:
+- brx = srcheight - brushoffs.y() - h;
+- bry = brushoffs.x();
++ brx = this->srcheight - this->brushoffs.y() - h;
++ bry = this->brushoffs.x();
+ break;
+ default:
+- brx = brushoffs.x();
+- bry = brushoffs.y();
++ brx = this->brushoffs.x();
++ bry = this->brushoffs.y();
+ break;
+ }
+- brushoffs = QPoint( brx, bry );
++ this->brushoffs = QPoint( brx, bry );
+
+- int oldsw = srcwidth;
+- int oldsh = srcheight;
+- QSize s = qt_screen->mapToDevice( QSize(srcwidth,srcheight) );
+- srcwidth = s.width();
+- srcheight = s.height();
++ int oldsw = this->srcwidth;
++ int oldsh = this->srcheight;
++ QSize s = qt_screen->mapToDevice( QSize(this->srcwidth,this->srcheight) );
++ this->srcwidth = s.width();
++ this->srcheight = s.height();
+
+ QT_TRANS_GFX_BASE<depth,type>::tiledBlt( r.x(), r.y(), r.width(), r.height() );
+
+- srcwidth = oldsw;
+- srcheight = oldsh;
+- brushoffs = oldBrushOffs;
++ this->srcwidth = oldsw;
++ this->srcheight = oldsh;
++ this->brushoffs = oldBrushOffs;
+ inDraw = FALSE;
+ }
+
+--- qt-2.3.7/src/tools/qstring.h~qte237-all 2003-07-17 03:20:26.000000000 +0200
++++ qt-2.3.7/src/tools/qstring.h 2004-04-27 18:18:37.000000000 +0200
+@@ -199,7 +199,7 @@
+ #endif
+ enum { net_ordered = 0 };
+ #endif
+-} Q_PACKED;
++}; // was: Q_PACKED; (arm-linux-)g++ 3.4 no longer allows direct access to packed structures. ML.
+
+ inline QChar::QChar()
+ {