API tools faq
paste
Advertisement
Guest User

Ariya

a guest
Jan 31st, 2008
672
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 12.74 KB | None | 0 0
raw download clone embed print report
  1. diff -Naur qt-2.3.8-orig/src/kernel/qgfxtransformed_qws.cpp qt-2.3.8/src/kernel/qgfxtransformed_qws.cpp
  2. --- qt-2.3.8-orig/src/kernel/qgfxtransformed_qws.cpp 2004-08-05 07:56:10.000000000 +0200
  3. +++ qt-2.3.8/src/kernel/qgfxtransformed_qws.cpp 2008-01-31 20:01:14.000000000 +0100
  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() == this->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()==this->NoPen || this->patternedbrush ) {
  90. //slowpath
  91. QT_TRANS_GFX_BASE<depth,type>::drawPolygon( a, w, idx, num );
  92. } else {
  93. @@ -819,7 +819,7 @@
  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. @@ -827,21 +827,21 @@
  103. inDraw = TRUE;
  104. while (n--) {
  105. if ( *width > 0 ) {
  106. - int x=tx(point->x(),point->y())+xoffs;
  107. - int y=ty(point->x(),point->y())+yoffs;
  108. + int x=tx(point->x(),point->y())+this->xoffs;
  109. + int y=ty(point->x(),point->y())+this->yoffs;
  110.  
  111. switch( qt_trans_screen->transformation() ) {
  112. case QTransformedScreen::Rot90:
  113. - vline( x, y-(*width-1), y );
  114. + this->vline( x, y-(*width-1), y );
  115. break;
  116. case QTransformedScreen::Rot180:
  117. - hline( x - (*width-1), x, y );
  118. + this->hline( x - (*width-1), x, y );
  119. break;
  120. case QTransformedScreen::Rot270:
  121. - vline( x, y, y+*width-1 );
  122. + this->vline( x, y, y+*width-1 );
  123. break;
  124. default:
  125. - hline( x, x+*width-1, y );
  126. + this->hline( x, x+*width-1, y );
  127. break;
  128. }
  129. }
  130. @@ -896,14 +896,14 @@
  131. switch ( qt_trans_screen->transformation() ) {
  132. case QTransformedScreen::Rot90:
  133. rsx = sy;
  134. - rsy = srcwidth - sx - w;
  135. + rsy = this->srcwidth - sx - w;
  136. break;
  137. case QTransformedScreen::Rot180:
  138. - rsx = srcwidth - sx - w;
  139. - rsy = srcheight - sy - h;
  140. + rsx = this->srcwidth - sx - w;
  141. + rsy = this->srcheight - sy - h;
  142. break;
  143. case QTransformedScreen::Rot270:
  144. - rsx = srcheight - sy - h;
  145. + rsx = this->srcheight - sy - h;
  146. rsy = sx;
  147. break;
  148. default:
  149. @@ -941,39 +941,39 @@
  150. r.setCoords( tx(rx,ry), ty(rx,ry), tx(rx+w-1,ry+h-1), ty(rx+w-1,ry+h-1) );
  151. r = r.normalize();
  152.  
  153. - QPoint oldBrushOffs = brushoffs;
  154. + QPoint oldBrushOffs = this->brushoffs;
  155. int brx, bry;
  156. switch ( qt_trans_screen->transformation() ) {
  157. case QTransformedScreen::Rot90:
  158. - brx = brushoffs.y();
  159. - bry = srcwidth - brushoffs.x() - w;
  160. + brx = this->brushoffs.y();
  161. + bry = this->srcwidth - this->brushoffs.x() - w;
  162. break;
  163. case QTransformedScreen::Rot180:
  164. - brx = srcwidth - brushoffs.x() - w;
  165. - bry = srcheight - brushoffs.y() - h;
  166. + brx = this->srcwidth - this->brushoffs.x() - w;
  167. + bry = this->srcheight - this->brushoffs.y() - h;
  168. break;
  169. case QTransformedScreen::Rot270:
  170. - brx = srcheight - brushoffs.y() - h;
  171. - bry = brushoffs.x();
  172. + brx = this->srcheight - this->brushoffs.y() - h;
  173. + bry = this->brushoffs.x();
  174. break;
  175. default:
  176. - brx = brushoffs.x();
  177. - bry = brushoffs.y();
  178. + brx = this->brushoffs.x();
  179. + bry = this->brushoffs.y();
  180. break;
  181. }
  182. - brushoffs = QPoint( brx, bry );
  183. + this->brushoffs = QPoint( brx, bry );
  184.  
  185. - int oldsw = srcwidth;
  186. - int oldsh = srcheight;
  187. - QSize s = qt_screen->mapToDevice( QSize(srcwidth,srcheight) );
  188. - srcwidth = s.width();
  189. - srcheight = s.height();
  190. + int oldsw = this->srcwidth;
  191. + int oldsh = this->srcheight;
  192. + QSize s = qt_screen->mapToDevice( QSize(this->srcwidth,this->srcheight) );
  193. + this->srcwidth = s.width();
  194. + this->srcheight = s.height();
  195.  
  196. QT_TRANS_GFX_BASE<depth,type>::tiledBlt( r.x(), r.y(), r.width(), r.height() );
  197.  
  198. - srcwidth = oldsw;
  199. - srcheight = oldsh;
  200. - brushoffs = oldBrushOffs;
  201. + this->srcwidth = oldsw;
  202. + this->srcheight = oldsh;
  203. + this->brushoffs = oldBrushOffs;
  204. inDraw = FALSE;
  205. }
  206.  
  207. diff -Naur qt-2.3.8-orig/src/kernel/qgfxvfb_qws.cpp qt-2.3.8/src/kernel/qgfxvfb_qws.cpp
  208. --- qt-2.3.8-orig/src/kernel/qgfxvfb_qws.cpp 2004-08-05 07:56:10.000000000 +0200
  209. +++ qt-2.3.8/src/kernel/qgfxvfb_qws.cpp 2008-01-31 20:01:14.000000000 +0100
  210. @@ -140,8 +140,8 @@
  211. void QGfxVFb<depth,type>::drawPoint( int x, int y )
  212. {
  213. QWSDisplay::grab( TRUE );
  214. - if ( is_screen_gfx )
  215. - qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) );
  216. + if ( this->is_screen_gfx )
  217. + qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) );
  218. QGfxRaster<depth,type>::drawPoint( x, y );
  219. QWSDisplay::ungrab();
  220. }
  221. @@ -150,8 +150,8 @@
  222. void QGfxVFb<depth,type>::drawPoints( const QPointArray &pa,int x,int y )
  223. {
  224. QWSDisplay::grab( TRUE );
  225. - if ( is_screen_gfx )
  226. - qvfb_screen->setDirty( clipbounds );
  227. + if ( this->is_screen_gfx )
  228. + qvfb_screen->setDirty( this->clipbounds );
  229. QGfxRaster<depth,type>::drawPoints( pa, x, y );
  230. QWSDisplay::ungrab();
  231. }
  232. @@ -160,9 +160,9 @@
  233. void QGfxVFb<depth,type>::drawLine( int x1,int y1,int x2,int y2 )
  234. {
  235. QWSDisplay::grab( TRUE );
  236. - if ( is_screen_gfx ) {
  237. + if ( this->is_screen_gfx ) {
  238. QRect r;
  239. - r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs );
  240. + r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs );
  241. qvfb_screen->setDirty( r.normalize() );
  242. }
  243. QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 );
  244. @@ -173,8 +173,8 @@
  245. void QGfxVFb<depth,type>::fillRect( int x,int y,int w,int h )
  246. {
  247. QWSDisplay::grab( TRUE );
  248. - if ( is_screen_gfx )
  249. - qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) );
  250. + if ( this->is_screen_gfx )
  251. + qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) );
  252. QGfxRaster<depth,type>::fillRect( x, y, w, h );
  253. QWSDisplay::ungrab();
  254. }
  255. @@ -183,8 +183,8 @@
  256. void QGfxVFb<depth,type>::drawPolyline( const QPointArray &pa,int x,int y )
  257. {
  258. QWSDisplay::grab( TRUE );
  259. - if ( is_screen_gfx )
  260. - qvfb_screen->setDirty( clipbounds );
  261. + if ( this->is_screen_gfx )
  262. + qvfb_screen->setDirty( this->clipbounds );
  263. QGfxRaster<depth,type>::drawPolyline( pa, x, y );
  264. QWSDisplay::ungrab();
  265. }
  266. @@ -193,8 +193,8 @@
  267. void QGfxVFb<depth,type>::drawPolygon( const QPointArray &pa,bool w,int x,int y )
  268. {
  269. QWSDisplay::grab( TRUE );
  270. - if ( is_screen_gfx )
  271. - qvfb_screen->setDirty( clipbounds );
  272. + if ( this->is_screen_gfx )
  273. + qvfb_screen->setDirty( this->clipbounds );
  274. QGfxRaster<depth,type>::drawPolygon( pa, w, x, y );
  275. QWSDisplay::ungrab();
  276. }
  277. @@ -203,8 +203,8 @@
  278. void QGfxVFb<depth,type>::blt( int x,int y,int w,int h, int sx, int sy )
  279. {
  280. QWSDisplay::grab( TRUE );
  281. - if ( is_screen_gfx )
  282. - qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) );
  283. + if ( this->is_screen_gfx )
  284. + qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) );
  285. QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy );
  286. QWSDisplay::ungrab();
  287. }
  288. @@ -215,8 +215,8 @@
  289. QWSDisplay::grab( TRUE );
  290. int dy = sy - y;
  291. int dx = sx - x;
  292. - if ( is_screen_gfx )
  293. - qvfb_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs,
  294. + if ( this->is_screen_gfx )
  295. + qvfb_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs,
  296. w+abs(dx), h+abs(dy)) );
  297. QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy );
  298. QWSDisplay::ungrab();
  299. @@ -227,8 +227,8 @@
  300. void QGfxVFb<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy )
  301. {
  302. QWSDisplay::grab( TRUE );
  303. - if ( is_screen_gfx )
  304. - qvfb_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) );
  305. + if ( this->is_screen_gfx )
  306. + qvfb_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) );
  307. QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy );
  308. QWSDisplay::ungrab();
  309. }
  310. @@ -238,8 +238,8 @@
  311. void QGfxVFb<depth,type>::tiledBlt( int x,int y,int w,int h )
  312. {
  313. QWSDisplay::grab( TRUE );
  314. - if ( is_screen_gfx )
  315. - qvfb_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) );
  316. + if ( this->is_screen_gfx )
  317. + qvfb_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) );
  318. QGfxRaster<depth,type>::tiledBlt( x, y, w, h );
  319. QWSDisplay::ungrab();
  320. }
  321. diff -Naur qt-2.3.8-orig/src/kernel/qwindowsystem_qws.h qt-2.3.8/src/kernel/qwindowsystem_qws.h
  322. --- qt-2.3.8-orig/src/kernel/qwindowsystem_qws.h 2004-08-05 07:56:10.000000000 +0200
  323. +++ qt-2.3.8/src/kernel/qwindowsystem_qws.h 2008-01-31 20:01:14.000000000 +0100
  324. @@ -167,6 +167,7 @@
  325.  
  326. class QWSMouseHandler;
  327. struct QWSCommandStruct;
  328. +class QWSInputMethod;
  329.  
  330. #ifndef QT_NO_QWS_MULTIPROCESS
  331. class QWSServer : public QWSServerSocket
  332. diff -Naur qt-2.3.8-orig/src/tools/qsortedlist.h qt-2.3.8/src/tools/qsortedlist.h
  333. --- qt-2.3.8-orig/src/tools/qsortedlist.h 2004-08-05 07:56:10.000000000 +0200
  334. +++ qt-2.3.8/src/tools/qsortedlist.h 2008-01-31 20:01:14.000000000 +0100
  335. @@ -48,7 +48,7 @@
  336. public:
  337. QSortedList() {}
  338. QSortedList( const QSortedList<type> &l ) : QList<type>(l) {}
  339. - ~QSortedList() { clear(); }
  340. + ~QSortedList() { this->clear(); }
  341. QSortedList<type> &operator=(const QSortedList<type> &l)
  342. { return (QSortedList<type>&)QList<type>::operator=(l); }
  343.  
  344. diff -Naur qt-2.3.8-orig/src/tools/qvaluestack.h qt-2.3.8/src/tools/qvaluestack.h
  345. --- qt-2.3.8-orig/src/tools/qvaluestack.h 2004-08-05 07:56:10.000000000 +0200
  346. +++ qt-2.3.8/src/tools/qvaluestack.h 2008-01-31 20:01:14.000000000 +0100
  347. @@ -54,7 +54,7 @@
  348. {
  349. T elem( this->last() );
  350. if ( !this->isEmpty() )
  351. - remove( this->fromLast() );
  352. + this->remove( this->fromLast() );
  353. return elem;
  354. }
  355. T& top() { return this->last(); }
  356.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!