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