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 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-all.patch b/qt/qt-2.3.7.patch/qte237-all.patch index 43d7a69..daf0e9c 100644 --- a/qt/qt-2.3.7.patch/qte237-all.patch +++ b/qt/qt-2.3.7.patch/qte237-all.patch @@ -687,128 +687,139 @@ 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() { +--- 2.3.7/src/tools/qcstring.h~gcc34-compliance 2004-04-27 20:21:48.000000000 +0200 ++++ 2.3.7/src/tools/qcstring.h 2004-04-27 20:22:52.000000000 +0200 +@@ -119,7 +119,7 @@ + // We want to keep source compatibility for 2.x + // ### TODO for 4.0: completely remove these and the cstr* functions + +-#if !defined(QT_GENUINE_STR) ++#if 0 + + #undef strlen + #define strlen qstrlen |