打个补丁吧!
diff -urN ../tmp-orig/qt-embedded-free-3.1.2/src/tools/qsortedlist.h ./src/tools/qsortedlist.h
--- ../tmp-orig/qt-embedded-free-3.1.2/src/tools/qsortedlist.h 2003-02-24 09:29:51.000000000 +0100
+++ ./src/tools/qsortedlist.h 2004-08-16 21:33:09.379370281 +0200
@@ -49,7 +49,7 @@
public:
QSortedList() {}
QSortedList( const QSortedList<type> &l ) : QPtrList<type>(l) {}
- ~QSortedList() { clear(); }
+ ~QSortedList() { this->clear(); }
QSortedList<type> &operator=(const QSortedList<type> &l)
{ return (QSortedList<type>&)QPtrList<type>::operator=(l); }
diff -urN ../tmp-orig/qt-embedded-free-3.1.2/src/embedded/qgfxtransformed_qws.cpp ./src/embedded/qgfxtransformed_qws.cpp
--- ../tmp-orig/qt-embedded-free-3.1.2/src/embedded/qgfxtransformed_qws.cpp 2003-02-24 09:29:57.000000000 +0100
+++ ./src/embedded/qgfxtransformed_qws.cpp 2004-08-16 21:32:22.081560641 +0200
@@ -584,11 +584,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;
}
@@ -596,11 +596,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;
}
@@ -628,23 +628,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>
@@ -652,8 +652,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>
@@ -695,7 +695,7 @@
if ( w == 0 || h == 0 )
return;
QRect r( x, y, w, h );
- if ( cbrush.style() == SolidPattern ) {
+ if ( this->cbrush.style() == this->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();
}
@@ -710,7 +710,7 @@
// solution. The brush offset logic is complicated enough, so we don't
// fastpath patternedbrush.
- if ( inDraw || cpen.style()==NoPen || patternedbrush ) {
+ if ( this->inDraw || this->cpen.style()==this->NoPen || this->patternedbrush ) {
//slowpath
QT_TRANS_GFX_BASE<depth,type>::drawPolygon( a, w, idx, num );
} else {
@@ -732,7 +732,7 @@
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 ( this->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 );
@@ -740,21 +740,21 @@
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;
}
}
@@ -809,14 +809,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:
@@ -854,39 +854,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;
}
diff -urN ../tmp-orig/qt-embedded-free-3.1.2/src/embedded/qgfxvfb_qws.cpp ./src/embedded/qgfxvfb_qws.cpp
--- ../tmp-orig/qt-embedded-free-3.1.2/src/embedded/qgfxvfb_qws.cpp 2003-02-24 09:29:59.000000000 +0100
+++ ./src/embedded/qgfxvfb_qws.cpp 2004-08-16 21:38:49.339688457 +0200
@@ -280,7 +280,7 @@
void QGfxVFb<depth,type>::drawPoint( int x, int y )
{
QWSDisplay::grab( TRUE );
- ((QVFbScreen *)gfx_screen)->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) );
+ ((QVFbScreen *)this->gfx_screen)->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) );
QGfxRaster<depth,type>::drawPoint( x, y );
QWSDisplay::ungrab();
}
@@ -289,7 +289,7 @@
void QGfxVFb<depth,type>::drawPoints( const QPointArray &pa,int x,int y )
{
QWSDisplay::grab( TRUE );
- ((QVFbScreen *)gfx_screen)->setDirty( clipbounds );
+ ((QVFbScreen *)this->gfx_screen)->setDirty( this->clipbounds );
QGfxRaster<depth,type>::drawPoints( pa, x, y );
QWSDisplay::ungrab();
}
@@ -299,8 +299,8 @@
{
QWSDisplay::grab( TRUE );
QRect r;
- r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs );
- ((QVFbScreen *)gfx_screen)->setDirty( r.normalize() );
+ r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs );
+ ((QVFbScreen *)this->gfx_screen)->setDirty( r.normalize() );
QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 );
QWSDisplay::ungrab();
}
@@ -309,7 +309,7 @@
void QGfxVFb<depth,type>::fillRect( int x,int y,int w,int h )
{
QWSDisplay::grab( TRUE );
- ((QVFbScreen *)gfx_screen)->setDirty( QRect( x+xoffs, y+yoffs, w, h ) );
+ ((QVFbScreen *)this->gfx_screen)->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) );
QGfxRaster<depth,type>::fillRect( x, y, w, h );
QWSDisplay::ungrab();
}
@@ -318,7 +318,7 @@
void QGfxVFb<depth,type>::drawPolyline( const QPointArray &pa,int x,int y )
{
QWSDisplay::grab( TRUE );
- ((QVFbScreen *)gfx_screen)->setDirty( clipbounds );
+ ((QVFbScreen *)this->gfx_screen)->setDirty( this->clipbounds );
QGfxRaster<depth,type>::drawPolyline( pa, x, y );
QWSDisplay::ungrab();
}
@@ -327,7 +327,7 @@
void QGfxVFb<depth,type>::drawPolygon( const QPointArray &pa,bool w,int x,int y )
{
QWSDisplay::grab( TRUE );
- ((QVFbScreen *)gfx_screen)->setDirty( clipbounds );
+ ((QVFbScreen *)this->gfx_screen)->setDirty( this->clipbounds );
QGfxRaster<depth,type>::drawPolygon( pa, w, x, y );
QWSDisplay::ungrab();
}
@@ -336,7 +336,7 @@
void QGfxVFb<depth,type>::blt( int x,int y,int w,int h, int sx, int sy )
{
QWSDisplay::grab( TRUE );
- ((QVFbScreen *)gfx_screen)->setDirty( QRect( x+xoffs, y+yoffs, w, h ) );
+ ((QVFbScreen *)this->gfx_screen)->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) );
QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy );
QWSDisplay::ungrab();
}
@@ -347,7 +347,7 @@
QWSDisplay::grab( TRUE );
int dy = sy - y;
int dx = sx - x;
- ((QVFbScreen *)gfx_screen)->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs,
+ ((QVFbScreen *)this->gfx_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();
@@ -358,7 +358,7 @@
void QGfxVFb<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy )
{
QWSDisplay::grab( TRUE );
- ((QVFbScreen *)gfx_screen)->setDirty( QRect( x + xoffs, y + yoffs, w, h) );
+ ((QVFbScreen *)this->gfx_screen)->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) );
QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy );
QWSDisplay::ungrab();
}
@@ -368,7 +368,7 @@
void QGfxVFb<depth,type>::tiledBlt( int x,int y,int w,int h )
{
QWSDisplay::grab( TRUE );
- ((QVFbScreen *)gfx_screen)->setDirty( QRect(x + xoffs, y + yoffs, w, h) );
+ ((QVFbScreen *)this->gfx_screen)->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) );
QGfxRaster<depth,type>::tiledBlt( x, y, w, h );
QWSDisplay::ungrab();
}
diff -urN ../tmp-orig/qt-embedded-free-3.1.2/src/embedded/qgfxvnc_qws.cpp ./src/embedded/qgfxvnc_qws.cpp
--- ../tmp-orig/qt-embedded-free-3.1.2/src/embedded/qgfxvnc_qws.cpp 2003-02-24 09:29:57.000000000 +0100
+++ ./src/embedded/qgfxvnc_qws.cpp 2004-08-16 21:33:09.377370585 +0200
@@ -1085,7 +1085,7 @@
void QGfxVNC<depth,type>::drawPoint( int x, int y )
{
QWSDisplay::grab( TRUE );
- qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) & clipbounds );
+ qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) & this->clipbounds );
QGfxRaster<depth,type>::drawPoint( x, y );
QWSDisplay::ungrab();
}
@@ -1095,8 +1095,8 @@
{
QWSDisplay::grab( TRUE );
QRect r = pa.boundingRect();
- r.moveBy( xoffs, yoffs );
- qvnc_screen->setDirty( r & clipbounds );
+ r.moveBy( this->xoffs, this->yoffs );
+ qvnc_screen->setDirty( r & this->clipbounds );
QGfxRaster<depth,type>::drawPoints( pa, x, y );
QWSDisplay::ungrab();
}
@@ -1116,7 +1116,7 @@
void QGfxVNC<depth,type>::fillRect( int x,int y,int w,int h )
{
QWSDisplay::grab( TRUE );
- qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds );
+ qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds );
QGfxRaster<depth,type>::fillRect( x, y, w, h );
QWSDisplay::ungrab();
}
@@ -1126,8 +1126,8 @@
{
QWSDisplay::grab( TRUE );
QRect r = pa.boundingRect();
- r.moveBy( xoffs, yoffs );
- qvnc_screen->setDirty( r & clipbounds );
+ r.moveBy( this->xoffs, this->yoffs );
+ qvnc_screen->setDirty( r & this->clipbounds );
QGfxRaster<depth,type>::drawPolyline( pa, x, y );
QWSDisplay::ungrab();
}
@@ -1137,8 +1137,8 @@
{
QWSDisplay::grab( TRUE );
QRect r = pa.boundingRect();
- r.moveBy( xoffs, yoffs );
- qvnc_screen->setDirty( r & clipbounds );
+ r.moveBy( this->xoffs, this->yoffs );
+ qvnc_screen->setDirty( r & this->clipbounds );
QGfxRaster<depth,type>::drawPolygon( pa, w, x, y );
QWSDisplay::ungrab();
}
@@ -1147,7 +1147,7 @@
void QGfxVNC<depth,type>::blt( int x,int y,int w,int h, int sx, int sy )
{
QWSDisplay::grab( TRUE );
- qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds );
+ qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds );
QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy );
QWSDisplay::ungrab();
}
@@ -1158,8 +1158,8 @@
QWSDisplay::grab( TRUE );
int dy = sy - y;
int dx = sx - x;
- qvnc_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs,
- w+abs(dx), h+abs(dy)) & clipbounds );
+ qvnc_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs,
+ w+abs(dx), h+abs(dy)) & this->clipbounds );
QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy );
QWSDisplay::ungrab();
}
@@ -1169,7 +1169,7 @@
void QGfxVNC<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy )
{
QWSDisplay::grab( TRUE );
- qvnc_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) & clipbounds );
+ qvnc_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds );
QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy );
QWSDisplay::ungrab();
}
@@ -1179,7 +1179,7 @@
void QGfxVNC<depth,type>::tiledBlt( int x,int y,int w,int h )
{
QWSDisplay::grab( TRUE );
- qvnc_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) & clipbounds );
+ qvnc_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds );
QGfxRaster<depth,type>::tiledBlt( x, y, w, h );
QWSDisplay::ungrab();
}