author | mickeyl <mickeyl> | 2005-02-19 16:07:58 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-02-19 16:07:58 (UTC) |
commit | b7bf9c7acdc010eb30bc246372efb0d1b394166a (patch) (unidiff) | |
tree | 8dde116603cd8ddf439a881fc4a1d8f413af617b /qt/qt-2.3.7.patch/qte237-gcc34.patch | |
parent | 298d0d244ca724405ca0651775ed61a22ce7a5ae (diff) | |
download | opie-b7bf9c7acdc010eb30bc246372efb0d1b394166a.zip opie-b7bf9c7acdc010eb30bc246372efb0d1b394166a.tar.gz opie-b7bf9c7acdc010eb30bc246372efb0d1b394166a.tar.bz2 |
hello qte2.3.10 patches
bye bye old patches
Diffstat (limited to 'qt/qt-2.3.7.patch/qte237-gcc34.patch') (more/less context) (ignore whitespace changes)
-rw-r--r-- | qt/qt-2.3.7.patch/qte237-gcc34.patch | 510 |
1 files changed, 0 insertions, 510 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-gcc34.patch b/qt/qt-2.3.7.patch/qte237-gcc34.patch deleted file mode 100644 index a7f1681..0000000 --- a/qt/qt-2.3.7.patch/qte237-gcc34.patch +++ b/dev/null | |||
@@ -1,510 +0,0 @@ | |||
1 | diff -ur qt-2.3.7_old/src/kernel/qgfxtransformed_qws.cpp qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp | ||
2 | --- qt-2.3.7_old/src/kernel/qgfxtransformed_qws.cpp2004-09-10 21:08:04.000000000 +0200 | ||
3 | +++ qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp2004-09-10 21:08:42.000000000 +0200 | ||
4 | @@ -671,11 +671,11 @@ | ||
5 | inline int tx( int x, int y ) { | ||
6 | switch ( qt_trans_screen->transformation() ) { | ||
7 | case QTransformedScreen::Rot90: | ||
8 | - return y - xoffs + yoffs; | ||
9 | + return y - this->xoffs + this->yoffs; | ||
10 | case QTransformedScreen::Rot180: | ||
11 | - return (width - x - 1) - xoffs - xoffs; | ||
12 | + return (this->width - x - 1) - this->xoffs - this->xoffs; | ||
13 | case QTransformedScreen::Rot270: | ||
14 | - return (height - y - 1) - xoffs - yoffs; | ||
15 | + return (this->height - y - 1) - this->xoffs - this->yoffs; | ||
16 | default: | ||
17 | return x; | ||
18 | } | ||
19 | @@ -683,11 +683,11 @@ | ||
20 | inline int ty( int x, int y ) { | ||
21 | switch ( qt_trans_screen->transformation() ) { | ||
22 | case QTransformedScreen::Rot90: | ||
23 | - return (width - x - 1) - yoffs - xoffs; | ||
24 | + return (this->width - x - 1) - this->yoffs - this->xoffs; | ||
25 | case QTransformedScreen::Rot180: | ||
26 | - return (height - y - 1) - yoffs - yoffs; | ||
27 | + return (this->height - y - 1) - this->yoffs - this->yoffs; | ||
28 | case QTransformedScreen::Rot270: | ||
29 | - return x - yoffs + xoffs; | ||
30 | + return x - this->yoffs + this->xoffs; | ||
31 | default: | ||
32 | return y; | ||
33 | } | ||
34 | @@ -715,23 +715,23 @@ | ||
35 | template <const int depth, const int type> | ||
36 | void QGfxTransformedRaster<depth,type>::setSourceWidgetOffset(int x, int y) | ||
37 | { | ||
38 | - if ( srcbits == buffer ) { | ||
39 | + if ( this->srcbits == this->buffer ) { | ||
40 | switch ( qt_trans_screen->transformation() ) { | ||
41 | case QTransformedScreen::Rot90: | ||
42 | - srcwidgetoffs = QPoint( y, width - x - srcwidth ); | ||
43 | + this->srcwidgetoffs = QPoint( y, this->width - x - this->srcwidth ); | ||
44 | break; | ||
45 | case QTransformedScreen::Rot180: | ||
46 | - srcwidgetoffs = QPoint( width - x - srcwidth, height - y - srcheight ); | ||
47 | + this->srcwidgetoffs = QPoint( this->width - x - this->srcwidth, this->height - y - this->srcheight ); | ||
48 | break; | ||
49 | case QTransformedScreen::Rot270: | ||
50 | - srcwidgetoffs = QPoint( height - y - srcheight, x ); | ||
51 | + this->srcwidgetoffs = QPoint( this->height - y - this->srcheight, x ); | ||
52 | break; | ||
53 | default: | ||
54 | - srcwidgetoffs = QPoint( x, y ); | ||
55 | + this->srcwidgetoffs = QPoint( x, y ); | ||
56 | break; | ||
57 | } | ||
58 | } else | ||
59 | -srcwidgetoffs = QPoint( x, y ); | ||
60 | +this->srcwidgetoffs = QPoint( x, y ); | ||
61 | } | ||
62 | |||
63 | template <const int depth, const int type> | ||
64 | @@ -739,8 +739,8 @@ | ||
65 | { | ||
66 | QT_TRANS_GFX_BASE<depth,type>::setSource(i); | ||
67 | QSize s = qt_screen->mapToDevice( QSize(i->width(), i->height()) ); | ||
68 | - srcwidth = s.width(); | ||
69 | - srcheight = s.height(); | ||
70 | + this->srcwidth = s.width(); | ||
71 | + this->srcheight = s.height(); | ||
72 | } | ||
73 | |||
74 | template <const int depth, const int type> | ||
75 | @@ -782,7 +782,7 @@ | ||
76 | if ( w == 0 || h == 0 ) | ||
77 | return; | ||
78 | QRect r( x, y, w, h ); | ||
79 | - if ( cbrush.style() == SolidPattern ) { | ||
80 | + if ( this->cbrush.style() == Qt::SolidPattern ) { | ||
81 | r.setCoords( tx(x,y), ty(x,y), tx(x+w-1,y+h-1), ty(x+w-1,y+h-1) ); | ||
82 | r = r.normalize(); | ||
83 | } | ||
84 | @@ -797,7 +797,7 @@ | ||
85 | // solution. The brush offset logic is complicated enough, so we don't | ||
86 | // fastpath patternedbrush. | ||
87 | |||
88 | - if ( inDraw || cpen.style()==NoPen || patternedbrush ) { | ||
89 | + if ( inDraw || this->cpen.style()==Qt::NoPen || this->patternedbrush ) { | ||
90 | //slowpath | ||
91 | QT_TRANS_GFX_BASE<depth,type>::drawPolygon( a, w, idx, num ); | ||
92 | } else { | ||
93 | @@ -819,29 +819,29 @@ | ||
94 | template <const int depth, const int type> | ||
95 | void QGfxTransformedRaster<depth,type>::processSpans( int n, QPoint* point, int* width ) | ||
96 | { | ||
97 | - if ( inDraw || patternedbrush && srcwidth != 0 && srcheight != 0 ) { | ||
98 | + if ( inDraw || this->patternedbrush && this->srcwidth != 0 && this->srcheight != 0 ) { | ||
99 | //in the patternedbrush case, we let blt do the transformation | ||
100 | // so we leave inDraw false. | ||
101 | - QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width ); | ||
102 | +QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width ); | ||
103 | } else { | ||
104 | inDraw = TRUE; | ||
105 | while (n--) { | ||
106 | if ( *width > 0 ) { | ||
107 | - int x=tx(point->x(),point->y())+xoffs; | ||
108 | - int y=ty(point->x(),point->y())+yoffs; | ||
109 | + int x=tx(point->x(),point->y())+this->xoffs; | ||
110 | + int y=ty(point->x(),point->y())+this->yoffs; | ||
111 | |||
112 | switch( qt_trans_screen->transformation() ) { | ||
113 | case QTransformedScreen::Rot90: | ||
114 | - vline( x, y-(*width-1), y ); | ||
115 | + this->vline( x, y-(*width-1), y ); | ||
116 | break; | ||
117 | case QTransformedScreen::Rot180: | ||
118 | - hline( x - (*width-1), x, y ); | ||
119 | + this->hline( x - (*width-1), x, y ); | ||
120 | break; | ||
121 | case QTransformedScreen::Rot270: | ||
122 | - vline( x, y, y+*width-1 ); | ||
123 | + this->vline( x, y, y+*width-1 ); | ||
124 | break; | ||
125 | default: | ||
126 | - hline( x, x+*width-1, y ); | ||
127 | + this->hline( x, x+*width-1, y ); | ||
128 | break; | ||
129 | } | ||
130 | } | ||
131 | @@ -896,14 +896,14 @@ | ||
132 | switch ( qt_trans_screen->transformation() ) { | ||
133 | case QTransformedScreen::Rot90: | ||
134 | rsx = sy; | ||
135 | - rsy = srcwidth - sx - w; | ||
136 | + rsy = this->srcwidth - sx - w; | ||
137 | break; | ||
138 | case QTransformedScreen::Rot180: | ||
139 | - rsx = srcwidth - sx - w; | ||
140 | - rsy = srcheight - sy - h; | ||
141 | + rsx = this->srcwidth - sx - w; | ||
142 | + rsy = this->srcheight - sy - h; | ||
143 | break; | ||
144 | case QTransformedScreen::Rot270: | ||
145 | - rsx = srcheight - sy - h; | ||
146 | + rsx = this->srcheight - sy - h; | ||
147 | rsy = sx; | ||
148 | break; | ||
149 | default: | ||
150 | @@ -941,39 +941,39 @@ | ||
151 | r.setCoords( tx(rx,ry), ty(rx,ry), tx(rx+w-1,ry+h-1), ty(rx+w-1,ry+h-1) ); | ||
152 | r = r.normalize(); | ||
153 | |||
154 | - QPoint oldBrushOffs = brushoffs; | ||
155 | + QPoint oldBrushOffs = this->brushoffs; | ||
156 | int brx, bry; | ||
157 | switch ( qt_trans_screen->transformation() ) { | ||
158 | case QTransformedScreen::Rot90: | ||
159 | - brx = brushoffs.y(); | ||
160 | - bry = srcwidth - brushoffs.x() - w; | ||
161 | + brx = this->brushoffs.y(); | ||
162 | + bry = this->srcwidth - this->brushoffs.x() - w; | ||
163 | break; | ||
164 | case QTransformedScreen::Rot180: | ||
165 | - brx = srcwidth - brushoffs.x() - w; | ||
166 | - bry = srcheight - brushoffs.y() - h; | ||
167 | + brx = this->srcwidth - this->brushoffs.x() - w; | ||
168 | + bry = this->srcheight - this->brushoffs.y() - h; | ||
169 | break; | ||
170 | case QTransformedScreen::Rot270: | ||
171 | - brx = srcheight - brushoffs.y() - h; | ||
172 | - bry = brushoffs.x(); | ||
173 | + brx = this->srcheight - this->brushoffs.y() - h; | ||
174 | + bry = this->brushoffs.x(); | ||
175 | break; | ||
176 | default: | ||
177 | - brx = brushoffs.x(); | ||
178 | - bry = brushoffs.y(); | ||
179 | + brx = this->brushoffs.x(); | ||
180 | + bry = this->brushoffs.y(); | ||
181 | break; | ||
182 | } | ||
183 | - brushoffs = QPoint( brx, bry ); | ||
184 | + this->brushoffs = QPoint( brx, bry ); | ||
185 | |||
186 | - int oldsw = srcwidth; | ||
187 | - int oldsh = srcheight; | ||
188 | - QSize s = qt_screen->mapToDevice( QSize(srcwidth,srcheight) ); | ||
189 | - srcwidth = s.width(); | ||
190 | - srcheight = s.height(); | ||
191 | + int oldsw = this->srcwidth; | ||
192 | + int oldsh = this->srcheight; | ||
193 | + QSize s = qt_screen->mapToDevice( QSize(this->srcwidth,this->srcheight) ); | ||
194 | + this->srcwidth = s.width(); | ||
195 | + this->srcheight = s.height(); | ||
196 | |||
197 | QT_TRANS_GFX_BASE<depth,type>::tiledBlt( r.x(), r.y(), r.width(), r.height() ); | ||
198 | |||
199 | - srcwidth = oldsw; | ||
200 | - srcheight = oldsh; | ||
201 | - brushoffs = oldBrushOffs; | ||
202 | + this->srcwidth = oldsw; | ||
203 | + this->srcheight = oldsh; | ||
204 | + this->brushoffs = oldBrushOffs; | ||
205 | inDraw = FALSE; | ||
206 | } | ||
207 | |||
208 | diff -ur qt-2.3.7_old/src/kernel/qgfxvfb_qws.cpp qt-2.3.7/src/kernel/qgfxvfb_qws.cpp | ||
209 | --- qt-2.3.7_old/src/kernel/qgfxvfb_qws.cpp2004-09-10 21:08:04.000000000 +0200 | ||
210 | +++ qt-2.3.7/src/kernel/qgfxvfb_qws.cpp2004-09-10 21:08:42.000000000 +0200 | ||
211 | @@ -31,7 +31,6 @@ | ||
212 | **********************************************************************/ | ||
213 | |||
214 | #include "qgfxraster_qws.h" | ||
215 | - | ||
216 | #ifndef QT_NO_QWS_VFB | ||
217 | |||
218 | #include <sys/ipc.h> | ||
219 | @@ -140,8 +139,8 @@ | ||
220 | void QGfxVFb<depth,type>::drawPoint( int x, int y ) | ||
221 | { | ||
222 | QWSDisplay::grab( TRUE ); | ||
223 | - if ( is_screen_gfx ) | ||
224 | -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) ); | ||
225 | + if ( this->is_screen_gfx ) | ||
226 | +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) ); | ||
227 | QGfxRaster<depth,type>::drawPoint( x, y ); | ||
228 | QWSDisplay::ungrab(); | ||
229 | } | ||
230 | @@ -150,8 +149,8 @@ | ||
231 | void QGfxVFb<depth,type>::drawPoints( const QPointArray &pa,int x,int y ) | ||
232 | { | ||
233 | QWSDisplay::grab( TRUE ); | ||
234 | - if ( is_screen_gfx ) | ||
235 | -qvfb_screen->setDirty( clipbounds ); | ||
236 | + if ( this->is_screen_gfx ) | ||
237 | +qvfb_screen->setDirty( this->clipbounds ); | ||
238 | QGfxRaster<depth,type>::drawPoints( pa, x, y ); | ||
239 | QWSDisplay::ungrab(); | ||
240 | } | ||
241 | @@ -160,9 +159,9 @@ | ||
242 | void QGfxVFb<depth,type>::drawLine( int x1,int y1,int x2,int y2 ) | ||
243 | { | ||
244 | QWSDisplay::grab( TRUE ); | ||
245 | - if ( is_screen_gfx ) { | ||
246 | + if ( this->is_screen_gfx ) { | ||
247 | QRect r; | ||
248 | -r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs ); | ||
249 | +r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs ); | ||
250 | qvfb_screen->setDirty( r.normalize() ); | ||
251 | } | ||
252 | QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 ); | ||
253 | @@ -173,8 +172,8 @@ | ||
254 | void QGfxVFb<depth,type>::fillRect( int x,int y,int w,int h ) | ||
255 | { | ||
256 | QWSDisplay::grab( TRUE ); | ||
257 | - if ( is_screen_gfx ) | ||
258 | -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) ); | ||
259 | + if ( this->is_screen_gfx ) | ||
260 | +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) ); | ||
261 | QGfxRaster<depth,type>::fillRect( x, y, w, h ); | ||
262 | QWSDisplay::ungrab(); | ||
263 | } | ||
264 | @@ -183,8 +182,8 @@ | ||
265 | void QGfxVFb<depth,type>::drawPolyline( const QPointArray &pa,int x,int y ) | ||
266 | { | ||
267 | QWSDisplay::grab( TRUE ); | ||
268 | - if ( is_screen_gfx ) | ||
269 | -qvfb_screen->setDirty( clipbounds ); | ||
270 | + if ( this->is_screen_gfx ) | ||
271 | +qvfb_screen->setDirty( this->clipbounds ); | ||
272 | QGfxRaster<depth,type>::drawPolyline( pa, x, y ); | ||
273 | QWSDisplay::ungrab(); | ||
274 | } | ||
275 | @@ -193,8 +192,8 @@ | ||
276 | void QGfxVFb<depth,type>::drawPolygon( const QPointArray &pa,bool w,int x,int y ) | ||
277 | { | ||
278 | QWSDisplay::grab( TRUE ); | ||
279 | - if ( is_screen_gfx ) | ||
280 | -qvfb_screen->setDirty( clipbounds ); | ||
281 | + if ( this->is_screen_gfx ) | ||
282 | +qvfb_screen->setDirty( this->clipbounds ); | ||
283 | QGfxRaster<depth,type>::drawPolygon( pa, w, x, y ); | ||
284 | QWSDisplay::ungrab(); | ||
285 | } | ||
286 | @@ -203,8 +202,8 @@ | ||
287 | void QGfxVFb<depth,type>::blt( int x,int y,int w,int h, int sx, int sy ) | ||
288 | { | ||
289 | QWSDisplay::grab( TRUE ); | ||
290 | - if ( is_screen_gfx ) | ||
291 | -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) ); | ||
292 | + if ( this->is_screen_gfx ) | ||
293 | +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) ); | ||
294 | QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy ); | ||
295 | QWSDisplay::ungrab(); | ||
296 | } | ||
297 | @@ -215,8 +214,8 @@ | ||
298 | QWSDisplay::grab( TRUE ); | ||
299 | int dy = sy - y; | ||
300 | int dx = sx - x; | ||
301 | - if ( is_screen_gfx ) | ||
302 | -qvfb_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs, | ||
303 | + if ( this->is_screen_gfx ) | ||
304 | +qvfb_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs, | ||
305 | w+abs(dx), h+abs(dy)) ); | ||
306 | QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy ); | ||
307 | QWSDisplay::ungrab(); | ||
308 | @@ -227,8 +226,8 @@ | ||
309 | void QGfxVFb<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy ) | ||
310 | { | ||
311 | QWSDisplay::grab( TRUE ); | ||
312 | - if ( is_screen_gfx ) | ||
313 | -qvfb_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) ); | ||
314 | + if ( this->is_screen_gfx ) | ||
315 | +qvfb_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) ); | ||
316 | QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy ); | ||
317 | QWSDisplay::ungrab(); | ||
318 | } | ||
319 | @@ -238,8 +237,8 @@ | ||
320 | void QGfxVFb<depth,type>::tiledBlt( int x,int y,int w,int h ) | ||
321 | { | ||
322 | QWSDisplay::grab( TRUE ); | ||
323 | - if ( is_screen_gfx ) | ||
324 | -qvfb_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) ); | ||
325 | + if ( this->is_screen_gfx ) | ||
326 | +qvfb_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) ); | ||
327 | QGfxRaster<depth,type>::tiledBlt( x, y, w, h ); | ||
328 | QWSDisplay::ungrab(); | ||
329 | } | ||
330 | diff -ur qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp qt-2.3.7/src/kernel/qgfxvnc_qws.cpp | ||
331 | --- qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp2004-09-10 21:08:04.000000000 +0200 | ||
332 | +++ qt-2.3.7/src/kernel/qgfxvnc_qws.cpp2004-09-10 21:10:54.000000000 +0200 | ||
333 | @@ -971,7 +971,7 @@ | ||
334 | void QGfxVNC<depth,type>::drawPoint( int x, int y ) | ||
335 | { | ||
336 | QWSDisplay::grab( TRUE ); | ||
337 | - qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) & clipbounds ); | ||
338 | + qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) & this->clipbounds ); | ||
339 | QGfxRaster<depth,type>::drawPoint( x, y ); | ||
340 | QWSDisplay::ungrab(); | ||
341 | } | ||
342 | @@ -981,8 +981,8 @@ | ||
343 | { | ||
344 | QWSDisplay::grab( TRUE ); | ||
345 | QRect r = pa.boundingRect(); | ||
346 | - r.moveBy( xoffs, yoffs ); | ||
347 | - qvnc_screen->setDirty( r & clipbounds ); | ||
348 | + r.moveBy( this->xoffs, this->yoffs ); | ||
349 | + qvnc_screen->setDirty( r & this->clipbounds ); | ||
350 | QGfxRaster<depth,type>::drawPoints( pa, x, y ); | ||
351 | QWSDisplay::ungrab(); | ||
352 | } | ||
353 | @@ -992,9 +992,9 @@ | ||
354 | { | ||
355 | QWSDisplay::grab( TRUE ); | ||
356 | QRect r; | ||
357 | - r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs ); | ||
358 | + r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs ); | ||
359 | r = r.normalize(); | ||
360 | - qvnc_screen->setDirty( r & clipbounds ); | ||
361 | + qvnc_screen->setDirty( r & this->clipbounds ); | ||
362 | QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 ); | ||
363 | QWSDisplay::ungrab(); | ||
364 | } | ||
365 | @@ -1003,7 +1003,7 @@ | ||
366 | void QGfxVNC<depth,type>::fillRect( int x,int y,int w,int h ) | ||
367 | { | ||
368 | QWSDisplay::grab( TRUE ); | ||
369 | - qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds ); | ||
370 | + qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds ); | ||
371 | QGfxRaster<depth,type>::fillRect( x, y, w, h ); | ||
372 | QWSDisplay::ungrab(); | ||
373 | } | ||
374 | @@ -1013,8 +1013,8 @@ | ||
375 | { | ||
376 | QWSDisplay::grab( TRUE ); | ||
377 | QRect r = pa.boundingRect(); | ||
378 | - r.moveBy( xoffs, yoffs ); | ||
379 | - qvnc_screen->setDirty( r & clipbounds ); | ||
380 | + r.moveBy( this->xoffs, this->yoffs ); | ||
381 | + qvnc_screen->setDirty( r & this->clipbounds ); | ||
382 | QGfxRaster<depth,type>::drawPolyline( pa, x, y ); | ||
383 | QWSDisplay::ungrab(); | ||
384 | } | ||
385 | @@ -1024,8 +1024,8 @@ | ||
386 | { | ||
387 | QWSDisplay::grab( TRUE ); | ||
388 | QRect r = pa.boundingRect(); | ||
389 | - r.moveBy( xoffs, yoffs ); | ||
390 | - qvnc_screen->setDirty( r & clipbounds ); | ||
391 | + r.moveBy( this->xoffs, this->yoffs ); | ||
392 | + qvnc_screen->setDirty( r & this->clipbounds ); | ||
393 | QGfxRaster<depth,type>::drawPolygon( pa, w, x, y ); | ||
394 | QWSDisplay::ungrab(); | ||
395 | } | ||
396 | @@ -1034,7 +1034,7 @@ | ||
397 | void QGfxVNC<depth,type>::blt( int x,int y,int w,int h, int sx, int sy ) | ||
398 | { | ||
399 | QWSDisplay::grab( TRUE ); | ||
400 | - qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds ); | ||
401 | + qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds ); | ||
402 | QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy ); | ||
403 | QWSDisplay::ungrab(); | ||
404 | } | ||
405 | @@ -1045,8 +1045,8 @@ | ||
406 | QWSDisplay::grab( TRUE ); | ||
407 | int dy = sy - y; | ||
408 | int dx = sx - x; | ||
409 | - qvnc_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs, | ||
410 | - w+abs(dx), h+abs(dy)) & clipbounds ); | ||
411 | + qvnc_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs, | ||
412 | + w+abs(dx), h+abs(dy)) & this->clipbounds ); | ||
413 | QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy ); | ||
414 | QWSDisplay::ungrab(); | ||
415 | } | ||
416 | @@ -1056,7 +1056,7 @@ | ||
417 | void QGfxVNC<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy ) | ||
418 | { | ||
419 | QWSDisplay::grab( TRUE ); | ||
420 | - qvnc_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) & clipbounds ); | ||
421 | + qvnc_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds ); | ||
422 | QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy ); | ||
423 | QWSDisplay::ungrab(); | ||
424 | } | ||
425 | @@ -1066,7 +1066,7 @@ | ||
426 | void QGfxVNC<depth,type>::tiledBlt( int x,int y,int w,int h ) | ||
427 | { | ||
428 | QWSDisplay::grab( TRUE ); | ||
429 | - qvnc_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) & clipbounds ); | ||
430 | + qvnc_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds ); | ||
431 | QGfxRaster<depth,type>::tiledBlt( x, y, w, h ); | ||
432 | QWSDisplay::ungrab(); | ||
433 | } | ||
434 | diff -ur qt-2.3.7_old/src/tools/qcstring.h qt-2.3.7/src/tools/qcstring.h | ||
435 | --- qt-2.3.7_old/src/tools/qcstring.h2004-09-10 21:08:04.000000000 +0200 | ||
436 | +++ qt-2.3.7/src/tools/qcstring.h2004-09-10 21:08:42.000000000 +0200 | ||
437 | @@ -119,7 +119,7 @@ | ||
438 | // We want to keep source compatibility for 2.x | ||
439 | // ### TODO for 4.0: completely remove these and the cstr* functions | ||
440 | |||
441 | -#if !defined(QT_GENUINE_STR) | ||
442 | +#if 0 | ||
443 | |||
444 | #undefstrlen | ||
445 | #define strlen qstrlen | ||
446 | diff -ur qt-2.3.7_old/src/tools/qglobal.h qt-2.3.7/src/tools/qglobal.h | ||
447 | --- qt-2.3.7_old/src/tools/qglobal.h2004-09-10 21:08:04.000000000 +0200 | ||
448 | +++ qt-2.3.7/src/tools/qglobal.h2004-09-10 21:08:42.000000000 +0200 | ||
449 | @@ -207,8 +207,16 @@ | ||
450 | #if __GNUC__ == 2 && __GNUC_MINOR__ == 96 | ||
451 | #define Q_FP_CCAST_BROKEN | ||
452 | #endif | ||
453 | +/* ARM gcc pads structs to 32 bits, even when they contain a single | ||
454 | + char, or short. We tell gcc to pack QChars to 16 bits, to avoid | ||
455 | + QString bloat. However, gcc 3.4 doesn't allow us to create references to | ||
456 | + members of a packed struct. (Pointers are OK, because then you | ||
457 | + supposedly know what you are doing.) */ | ||
458 | #if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) | ||
459 | #define Q_PACKED __attribute__ ((packed)) | ||
460 | +# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 | ||
461 | +# define Q_NO_PACKED_REFERENCE | ||
462 | +# endif | ||
463 | #endif | ||
464 | #elif defined(__xlC__) | ||
465 | #define _CC_XLC_ | ||
466 | diff -ur qt-2.3.7_old/src/tools/qsortedlist.h qt-2.3.7/src/tools/qsortedlist.h | ||
467 | --- qt-2.3.7_old/src/tools/qsortedlist.h2004-09-10 21:08:04.000000000 +0200 | ||
468 | +++ qt-2.3.7/src/tools/qsortedlist.h2004-09-10 21:08:42.000000000 +0200 | ||
469 | @@ -48,7 +48,7 @@ | ||
470 | public: | ||
471 | QSortedList() {} | ||
472 | QSortedList( const QSortedList<type> &l ) : QList<type>(l) {} | ||
473 | - ~QSortedList() { clear(); } | ||
474 | + ~QSortedList() { this->clear(); } | ||
475 | QSortedList<type> &operator=(const QSortedList<type> &l) | ||
476 | { return (QSortedList<type>&)QList<type>::operator=(l); } | ||
477 | |||
478 | diff -ur qt-2.3.7_old/src/tools/qstring.h qt-2.3.7/src/tools/qstring.h | ||
479 | --- qt-2.3.7_old/src/tools/qstring.h2004-09-10 21:08:04.000000000 +0200 | ||
480 | +++ qt-2.3.7/src/tools/qstring.h2004-09-10 21:08:42.000000000 +0200 | ||
481 | @@ -163,8 +163,16 @@ | ||
482 | bool isLetterOrNumber() const; | ||
483 | bool isDigit() const; | ||
484 | |||
485 | + | ||
486 | +#ifdef Q_NO_PACKED_REFERENCE | ||
487 | + uchar& cell() { return *(&cl); } | ||
488 | + uchar& row() { return *(&rw); } | ||
489 | +#else | ||
490 | uchar& cell() { return cl; } | ||
491 | - uchar& row() { return rw; } | ||
492 | + uchar& row() { return rw; } | ||
493 | +#endif | ||
494 | + | ||
495 | + | ||
496 | uchar cell() const { return cl; } | ||
497 | uchar row() const { return rw; } | ||
498 | |||
499 | diff -ur qt-2.3.7_old/src/kernel/qwsdecoration_qws.h qt-2.3.7/src/kernel/qwsdecoration_qws.h | ||
500 | --- qt-2.3.7_old/src/kernel/qwsdecoration_qws.h2003-07-17 03:20:26.000000000 +0200 | ||
501 | +++ qt-2.3.7/src/kernel/qwsdecoration_qws.h2004-09-13 15:44:13.000000000 +0200 | ||
502 | @@ -50,7 +50,7 @@ | ||
503 | enum Region { None=0, All=1, Title=2, Top=3, Bottom=4, Left=5, Right=6, | ||
504 | TopLeft=7, TopRight=8, BottomLeft=9, BottomRight=10, | ||
505 | Close=11, Minimize=12, Maximize=13, Normalize=14, | ||
506 | - Menu=15, LastRegion=Menu }; | ||
507 | + Menu=15, LastRegion=Menu, UserDefined = 100 }; | ||
508 | |||
509 | virtual QRegion region(const QWidget *, const QRect &rect, Region r=All) = 0; | ||
510 | virtual void close( QWidget * ); | ||