diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-13 17:43:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-13 17:43:39 -0600 |
| commit | 359640943bcf155faa9a067dde9e00a123276290 (patch) | |
| tree | fb3d55ea5e18949042fb0064123fb73d2b1eb932 /src/kernel/qpainter_x11.cpp | |
| parent | a829bcdc533e154000803d517200d32fe762e85c (diff) | |
| download | tqt3-359640943bcf155faa9a067dde9e00a123276290.tar.gz tqt3-359640943bcf155faa9a067dde9e00a123276290.zip | |
Automated update from Qt3
Diffstat (limited to 'src/kernel/qpainter_x11.cpp')
| -rw-r--r-- | src/kernel/qpainter_x11.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp index 6214dc3b..f88f0380 100644 --- a/src/kernel/qpainter_x11.cpp +++ b/src/kernel/qpainter_x11.cpp @@ -205,11 +205,11 @@ const double Q_PI2 = 1.57079632679489661923; // pi/2 #if defined(Q_CC_GNU) && defined(Q_OS_AIX) // AIX 4.2 gcc 2.7.2.3 gets internal error. -static int qRoundAIX( double d ) +static int tqRoundAIX( double d ) { - return qRound(d); + return tqRound(d); } -#define qRound qRoundAIX +#define tqRound tqRoundAIX #endif @@ -959,7 +959,7 @@ void TQPainter::updateBrush() bool del = FALSE; if ( !pm ) { // not already in pm dict pm = new TQBitmap( d, d, pat, TRUE ); - Q_CHECK_PTR( pm ); + TQ_CHECK_PTR( pm ); del = !TQPixmapCache::insert( key, pm ); } if ( cbrush.data->pixmap ) @@ -2187,12 +2187,12 @@ void TQPainter::drawPie( int x, int y, int w, int h, int a, int alen ) double yc = (double)y+h2; double ra1 = Q_PI/2880.0*a; // convert a, alen to radians double ra2 = ra1 + Q_PI/2880.0*alen; - int xic = qRound(xc); - int yic = qRound(yc); + int xic = tqRound(xc); + int yic = tqRound(yc); XDrawLine( dpy, hd, g, xic, yic, - qRound(xc + qcos(ra1)*w2), qRound(yc - qsin(ra1)*h2)); + tqRound(xc + qcos(ra1)*w2), tqRound(yc - qsin(ra1)*h2)); XDrawLine( dpy, hd, g, xic, yic, - qRound(xc + qcos(ra2)*w2), qRound(yc - qsin(ra2)*h2)); + tqRound(xc + qcos(ra2)*w2), tqRound(yc - qsin(ra2)*h2)); XDrawArc( dpy, hd, g, x, y, w, h, a*4, alen*4 ); } } @@ -2264,8 +2264,8 @@ void TQPainter::drawChord( int x, int y, int w, int h, int a, int alen ) double ra1 = Q_PI/2880.0*a; // convert a, alen to radians double ra2 = ra1 + Q_PI/2880.0*alen; XDrawLine( dpy, hd, g, - qRound(xc + qcos(ra1)*w2), qRound(yc - qsin(ra1)*h2), - qRound(xc + qcos(ra2)*w2), qRound(yc - qsin(ra2)*h2)); + tqRound(xc + qcos(ra1)*w2), tqRound(yc - qsin(ra1)*h2), + tqRound(xc + qcos(ra2)*w2), tqRound(yc - qsin(ra2)*h2)); XDrawArc( dpy, hd, g, x, y, w, h, a*4, alen*4 ); } XSetArcMode( dpy, gc_brush, ArcPieSlice ); @@ -3138,7 +3138,7 @@ void TQPainter::drawTextItem( int x, int y, const TQTextItem &ti, int textFlags fe->draw( this, x, y, engine, si, textFlags ); } -#if QT_VERSION >= 0x040000 +#if TQT_VERSION >= 0x040000 #error "remove current position and associated methods" #endif /*! |