1 files changed, 28 insertions, 28 deletions

diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index d0d069702..64a11c0bb 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -713,12 +713,12 @@ void TQPainter::save()
     TQPStateStack *pss = (TQPStateStack *)ps_stack;
     if ( pss == 0 ) {
 	pss = new TQPtrStack<TQPState>;
-	Q_CHECK_PTR( pss );
+	TQ_CHECK_PTR( pss );
 	pss->setAutoDelete( TRUE );
 	ps_stack = pss;
     }
     TQPState *ps = new TQPState;
-    Q_CHECK_PTR( ps );
+    TQ_CHECK_PTR( ps );
     ps->font  = cfont;
     ps->pen   = cpen;
     ps->curPt = pos();
@@ -838,7 +838,7 @@ void TQPainter::redirect( TQPaintDevice *pdev, TQPaintDevice *replacement )
         if ( replacement == 0 )
             return;
         pdev_dict = new TQPaintDeviceDict;
-        Q_CHECK_PTR( pdev_dict );
+        TQ_CHECK_PTR( pdev_dict );
     }
 #if defined(QT_CHECK_NULL)
     if ( pdev == 0 )
@@ -1475,7 +1475,7 @@ void TQPainter::saveWorldMatrix()
     TQWMatrixStack *stack = (TQWMatrixStack *)wm_stack;
     if ( stack == 0 ) {
 	stack  = new TQPtrStack<TQWMatrix>;
-	Q_CHECK_PTR( stack );
+	TQ_CHECK_PTR( stack );
 	stack->setAutoDelete( TRUE );
 	wm_stack = stack;
     }
@@ -1721,16 +1721,16 @@ void TQPainter::map( int x, int y, int *rx, int *ry ) const
 		*ry = y;
 		break;
 	    case TxTranslate:
-		*rx = qRound( x + dx() );
-		*ry = qRound( y + dy() );
+		*rx = tqRound( x + dx() );
+		*ry = tqRound( y + dy() );
 		break;
 	    case TxScale:
-		*rx = qRound( m11()*x + dx() );
-		*ry = qRound( m22()*y + dy() );
+		*rx = tqRound( m11()*x + dx() );
+		*ry = tqRound( m22()*y + dy() );
 		break;
 	    default:
-		*rx = qRound( m11()*x + m21()*y+dx() );
-		*ry = qRound( m12()*x + m22()*y+dy() );
+		*rx = tqRound( m11()*x + m21()*y+dx() );
+		*ry = tqRound( m12()*x + m22()*y+dy() );
 		break;
 	}
     }
@@ -1767,10 +1767,10 @@ void TQPainter::map( int x, int y, int w, int h,
 		double ty1 = m22()*y + dy();
 		double tx2 = m11()*(x + w - 1) + dx();
 		double ty2 = m22()*(y + h - 1) + dy();
-		*rx = qRound( tx1 );
-		*ry = qRound( ty1 );
-		*rw = qRound( tx2 ) - *rx + 1;
-		*rh = qRound( ty2 ) - *ry + 1;
+		*rx = tqRound( tx1 );
+		*ry = tqRound( ty1 );
+		*rw = tqRound( tx2 ) - *rx + 1;
+		*rh = tqRound( ty2 ) - *ry + 1;
 	    } break;
 	    default:
 #if defined(QT_CHECK_STATE)
@@ -1785,15 +1785,15 @@ void TQPainter::map( int x, int y, int w, int h,
 		*rw = w;  *rh = h;
 		break;
 	    case TxTranslate:
-		*rx = qRound(x + dx() );
-		*ry = qRound(y + dy() );
+		*rx = tqRound(x + dx() );
+		*ry = tqRound(y + dy() );
 		*rw = w;  *rh = h;
 		break;
 	    case TxScale:
-		*rx = qRound( m11()*x + dx() );
-		*ry = qRound( m22()*y + dy() );
-		*rw = qRound( m11()*w );
-		*rh = qRound( m22()*h );
+		*rx = tqRound( m11()*x + dx() );
+		*ry = tqRound( m22()*y + dy() );
+		*rw = tqRound( m11()*w );
+		*rh = tqRound( m22()*h );
 		break;
 	    default:
 #if defined(QT_CHECK_STATE)
@@ -1827,8 +1827,8 @@ void TQPainter::mapInv( int x, int y, int *rx, int *ry ) const
 	*rx = tx >= 0 ? int(tx + 0.5) : int(tx - 0.5);
 	*ry = ty >= 0 ? int(ty + 0.5) : int(ty - 0.5);
     } else {
-	*rx = qRound( im11()*x + im21()*y + idx() );
-	*ry = qRound( im12()*x + im22()*y + idy() );
+	*rx = tqRound( im11()*x + im21()*y + idx() );
+	*ry = tqRound( im12()*x + im22()*y + idy() );
     }
 #else
     *rx = x - xlatex;
@@ -1860,10 +1860,10 @@ void TQPainter::mapInv( int x, int y, int w, int h,
 	*rw = tw >= 0 ? int(tw + 0.5) : int(tw - 0.5);
 	*rh = th >= 0 ? int(th + 0.5) : int(th - 0.5);
     } else {
-	*rx = qRound( im11()*x + idx() );
-	*ry = qRound( im22()*y + idy() );
-	*rw = qRound( im11()*w );
-	*rh = qRound( im22()*h );
+	*rx = tqRound( im11()*x + idx() );
+	*ry = tqRound( im22()*y + idy() );
+	*rw = tqRound( im11()*w );
+	*rh = tqRound( im22()*h );
     }
 #else
     *rx = x - xlatex;
@@ -3216,7 +3216,7 @@ TQRect TQPainter::boundingRect( const TQRect &r, int flags,
 void TQPen::init( const TQColor &color, uint width, uint linestyle )
 {
     data = new TQPenData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->style = (PenStyle)(linestyle & MPenStyle);
     data->width = width;
     data->color = color;
@@ -3619,7 +3619,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPen &p )
 void TQBrush::init( const TQColor &color, BrushStyle style )
 {
     data = new TQBrushData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->style	 = style;
     data->color	 = color;
     data->pixmap = 0;