author | zecke <zecke> | 2004-09-12 15:44:52 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-12 15:44:52 (UTC) |
commit | 8f22819ca6e53edaa1b80c25d34e7df5e60981a4 (patch) (unidiff) | |
tree | 896a016609668a10c650f9f0139b46822c4454a9 /qt/qt-2.3.7.patch/qte237-all.patch | |
parent | 1ecaa166126baf48c1ed280963b421d70e1afcda (diff) | |
download | opie-8f22819ca6e53edaa1b80c25d34e7df5e60981a4.zip opie-8f22819ca6e53edaa1b80c25d34e7df5e60981a4.tar.gz opie-8f22819ca6e53edaa1b80c25d34e7df5e60981a4.tar.bz2 |
Apply patch from "Tony" for #1395 to fix building of QVNC for gcc3.4
Also remove the diffs for 'include/' files because they're only symlinks
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 | 104 |
1 files changed, 104 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 6f94211..ea03446 100644 --- a/qt/qt-2.3.7.patch/qte237-all.patch +++ b/qt/qt-2.3.7.patch/qte237-all.patch | |||
@@ -1346,2 +1346,106 @@ diff -ur qt-2.3.7-old/src/widgets/qtoolbutton.cpp qt-2.3.7/src/widgets/qtoolbutt | |||
1346 | w = pm.width(); | 1346 | w = pm.width(); |
1347 | h = pm.height(); | 1347 | h = pm.height(); |
1348 | diff -ur qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp qt-2.3.7/src/kernel/qgfxvnc_qws.cpp | ||
1349 | --- qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp2004-09-10 21:08:04.000000000 +0200 | ||
1350 | +++ qt-2.3.7/src/kernel/qgfxvnc_qws.cpp2004-09-10 21:10:54.000000000 +0200 | ||
1351 | @@ -971,7 +971,7 @@ | ||
1352 | void QGfxVNC<depth,type>::drawPoint( int x, int y ) | ||
1353 | { | ||
1354 | QWSDisplay::grab( TRUE ); | ||
1355 | - qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) & clipbounds ); | ||
1356 | + qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) & this->clipbounds ); | ||
1357 | QGfxRaster<depth,type>::drawPoint( x, y ); | ||
1358 | QWSDisplay::ungrab(); | ||
1359 | } | ||
1360 | @@ -981,8 +981,8 @@ | ||
1361 | { | ||
1362 | QWSDisplay::grab( TRUE ); | ||
1363 | QRect r = pa.boundingRect(); | ||
1364 | - r.moveBy( xoffs, yoffs ); | ||
1365 | - qvnc_screen->setDirty( r & clipbounds ); | ||
1366 | + r.moveBy( this->xoffs, this->yoffs ); | ||
1367 | + qvnc_screen->setDirty( r & this->clipbounds ); | ||
1368 | QGfxRaster<depth,type>::drawPoints( pa, x, y ); | ||
1369 | QWSDisplay::ungrab(); | ||
1370 | } | ||
1371 | @@ -992,9 +992,9 @@ | ||
1372 | { | ||
1373 | QWSDisplay::grab( TRUE ); | ||
1374 | QRect r; | ||
1375 | - r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs ); | ||
1376 | + r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs ); | ||
1377 | r = r.normalize(); | ||
1378 | - qvnc_screen->setDirty( r & clipbounds ); | ||
1379 | + qvnc_screen->setDirty( r & this->clipbounds ); | ||
1380 | QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 ); | ||
1381 | QWSDisplay::ungrab(); | ||
1382 | } | ||
1383 | @@ -1003,7 +1003,7 @@ | ||
1384 | void QGfxVNC<depth,type>::fillRect( int x,int y,int w,int h ) | ||
1385 | { | ||
1386 | QWSDisplay::grab( TRUE ); | ||
1387 | - qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds ); | ||
1388 | + qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds ); | ||
1389 | QGfxRaster<depth,type>::fillRect( x, y, w, h ); | ||
1390 | QWSDisplay::ungrab(); | ||
1391 | } | ||
1392 | @@ -1013,8 +1013,8 @@ | ||
1393 | { | ||
1394 | QWSDisplay::grab( TRUE ); | ||
1395 | QRect r = pa.boundingRect(); | ||
1396 | - r.moveBy( xoffs, yoffs ); | ||
1397 | - qvnc_screen->setDirty( r & clipbounds ); | ||
1398 | + r.moveBy( this->xoffs, this->yoffs ); | ||
1399 | + qvnc_screen->setDirty( r & this->clipbounds ); | ||
1400 | QGfxRaster<depth,type>::drawPolyline( pa, x, y ); | ||
1401 | QWSDisplay::ungrab(); | ||
1402 | } | ||
1403 | @@ -1024,8 +1024,8 @@ | ||
1404 | { | ||
1405 | QWSDisplay::grab( TRUE ); | ||
1406 | QRect r = pa.boundingRect(); | ||
1407 | - r.moveBy( xoffs, yoffs ); | ||
1408 | - qvnc_screen->setDirty( r & clipbounds ); | ||
1409 | + r.moveBy( this->xoffs, this->yoffs ); | ||
1410 | + qvnc_screen->setDirty( r & this->clipbounds ); | ||
1411 | QGfxRaster<depth,type>::drawPolygon( pa, w, x, y ); | ||
1412 | QWSDisplay::ungrab(); | ||
1413 | } | ||
1414 | @@ -1034,7 +1034,7 @@ | ||
1415 | void QGfxVNC<depth,type>::blt( int x,int y,int w,int h, int sx, int sy ) | ||
1416 | { | ||
1417 | QWSDisplay::grab( TRUE ); | ||
1418 | - qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds ); | ||
1419 | + qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds ); | ||
1420 | QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy ); | ||
1421 | QWSDisplay::ungrab(); | ||
1422 | } | ||
1423 | @@ -1045,8 +1045,8 @@ | ||
1424 | QWSDisplay::grab( TRUE ); | ||
1425 | int dy = sy - y; | ||
1426 | int dx = sx - x; | ||
1427 | - qvnc_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs, | ||
1428 | - w+abs(dx), h+abs(dy)) & clipbounds ); | ||
1429 | + qvnc_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs, | ||
1430 | + w+abs(dx), h+abs(dy)) & this->clipbounds ); | ||
1431 | QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy ); | ||
1432 | QWSDisplay::ungrab(); | ||
1433 | } | ||
1434 | @@ -1056,7 +1056,7 @@ | ||
1435 | void QGfxVNC<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy ) | ||
1436 | { | ||
1437 | QWSDisplay::grab( TRUE ); | ||
1438 | - qvnc_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) & clipbounds ); | ||
1439 | + qvnc_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds ); | ||
1440 | QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy ); | ||
1441 | QWSDisplay::ungrab(); | ||
1442 | } | ||
1443 | @@ -1066,7 +1066,7 @@ | ||
1444 | void QGfxVNC<depth,type>::tiledBlt( int x,int y,int w,int h ) | ||
1445 | { | ||
1446 | QWSDisplay::grab( TRUE ); | ||
1447 | - qvnc_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) & clipbounds ); | ||
1448 | + qvnc_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds ); | ||
1449 | QGfxRaster<depth,type>::tiledBlt( x, y, w, h ); | ||
1450 | QWSDisplay::ungrab(); | ||
1451 | } | ||