Undo prior accidental commit

1 files changed, 20 insertions, 20 deletions

diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index 59a598b..206bffc 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -347,7 +347,7 @@ static GC alloc_gc( Display *dpy, int scrn, Drawable hd, bool monochrome=FALSE,
         p++;
     }
 #if defined(QT_CHECK_NULL)
-    tqWarning( "QPainter: Internal error; no available GC" );
+    qWarning( "QPainter: Internal error; no available GC" );
 #endif
     GC gc = XCreateGC( dpy, hd, 0, 0 );
     XSetGraphicsExposures( dpy, gc, False );
@@ -449,9 +449,9 @@ static void cleanup_gc_cache()
     if ( !gc_cache_init )
         return;
 #if defined(GC_CACHE_STAT)
-    tqDebug( "Number of cache hits = %d", g_numhits );
-    tqDebug( "Number of cache creates = %d", g_numcreates );
-    tqDebug( "Number of cache faults = %d", g_numfaults );
+    qDebug( "Number of cache hits = %d", g_numhits );
+    qDebug( "Number of cache creates = %d", g_numcreates );
+    qDebug( "Number of cache faults = %d", g_numfaults );
     for ( int i=0; i<gc_cache_size; i++ ) {
         QCString    str;
         QBuffer     buf( str );
@@ -464,7 +464,7 @@ static void cleanup_gc_cache()
               << g->count << '\t';
         }
         s << '\0';
-        tqDebug( str );
+        qDebug( str );
         buf.close();
     }
 #endif
@@ -640,7 +640,7 @@ void QPainter::setFont( const QFont &font )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isActive() )
-        tqWarning( "QPainter::setFont: Will be reset by begin()" );
+        qWarning( "QPainter::setFont: Will be reset by begin()" );
 #endif
     if ( cfont.d != font.d ) {
         cfont = font;
@@ -1013,14 +1013,14 @@ bool QPainter::begin( const QPaintDevice *pd, bool unclipped )
 {
     if ( isActive() ) {                         // already active painting
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPainter::begin: Painter is already active."
+        qWarning( "QPainter::begin: Painter is already active."
                   "\n\tYou must end() the painter before a second begin()" );
 #endif
         return FALSE;
     }
     if ( pd == 0 ) {
 #if defined(QT_CHECK_NULL)
-        tqWarning( "QPainter::begin: Paint device cannot be null" );
+        qWarning( "QPainter::begin: Paint device cannot be null" );
 #endif
         return FALSE;
     }
@@ -1039,7 +1039,7 @@ bool QPainter::begin( const QPaintDevice *pd, bool unclipped )
     if ( pdev->isExtDev() && pdev->paintingActive() ) {
         // somebody else is already painting
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPainter::begin: Another QPainter is already painting "
+        qWarning( "QPainter::begin: Another QPainter is already painting "
                   "this device;\n\tAn extended paint device can only be "
                   "painted by one QPainter at a time." );
 #endif
@@ -1129,7 +1129,7 @@ bool QPainter::begin( const QPaintDevice *pd, bool unclipped )
         QPixmap *pm = (QPixmap*)pdev;
         if ( pm->isNull() ) {
 #if defined(QT_CHECK_NULL)
-            tqWarning( "QPainter::begin: Cannot paint null pixmap" );
+            qWarning( "QPainter::begin: Cannot paint null pixmap" );
 #endif
             end();
             return FALSE;
@@ -1189,7 +1189,7 @@ bool QPainter::end()                            // end painting
 {
     if ( !isActive() ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPainter::end: Missing begin() or begin() failed" );
+        qWarning( "QPainter::end: Missing begin() or begin() failed" );
 #endif
         return FALSE;
     }
@@ -1290,7 +1290,7 @@ void QPainter::setBackgroundColor( const QColor &c )
 {
     if ( !isActive() ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPainter::setBackgroundColor: Call begin() first" );
+        qWarning( "QPainter::setBackgroundColor: Call begin() first" );
 #endif
         return;
     }
@@ -1325,13 +1325,13 @@ void QPainter::setBackgroundMode( BGMode m )
 {
     if ( !isActive() ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPainter::setBackgroundMode: Call begin() first" );
+        qWarning( "QPainter::setBackgroundMode: Call begin() first" );
 #endif
         return;
     }
     if ( m != TransparentMode && m != OpaqueMode ) {
 #if defined(QT_CHECK_RANGE)
-        tqWarning( "QPainter::setBackgroundMode: Invalid mode" );
+        qWarning( "QPainter::setBackgroundMode: Invalid mode" );
 #endif
         return;
     }
@@ -1379,13 +1379,13 @@ void QPainter::setRasterOp( RasterOp r )
 {
     if ( !isActive() ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPainter::setRasterOp: Call begin() first" );
+        qWarning( "QPainter::setRasterOp: Call begin() first" );
 #endif
         return;
     }
     if ( (uint)r > LastROP ) {
 #if defined(QT_CHECK_RANGE)
-        tqWarning( "QPainter::setRasterOp: Invalid ROP code" );
+        qWarning( "QPainter::setRasterOp: Invalid ROP code" );
 #endif
         return;
     }
@@ -1420,7 +1420,7 @@ void QPainter::setBrushOrigin( int x, int y )
 {
     if ( !isActive() ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPainter::setBrushOrigin: Call begin() first" );
+        qWarning( "QPainter::setBrushOrigin: Call begin() first" );
 #endif
         return;
     }
@@ -1449,7 +1449,7 @@ void QPainter::setClipping( bool enable )
 {
     if ( !isActive() ) {
 #if defined(QT_CHECK_STATE)
-        tqWarning( "QPainter::setClipping: Will be reset by begin()" );
+        qWarning( "QPainter::setClipping: Will be reset by begin()" );
 #endif
         return;
     }
@@ -1514,7 +1514,7 @@ void QPainter::setClipRegion( const QRegion &rgn, CoordinateMode m )
 {
 #if defined(QT_CHECK_STATE)
     if ( !isActive() )
-        tqWarning( "QPainter::setClipRegion: Will be reset by begin()" );
+        qWarning( "QPainter::setClipRegion: Will be reset by begin()" );
 #endif
     if ( m == CoordDevice )
 	crgn = rgn;
@@ -2501,7 +2501,7 @@ void QPainter::drawCubicBezier( const QPointArray &a, int index )
         return;
     if ( a.size() - index < 4 ) {
 #if defined(QT_CHECK_RANGE)
-        tqWarning( "QPainter::drawCubicBezier: Cubic Bezier needs 4 control "
+        qWarning( "QPainter::drawCubicBezier: Cubic Bezier needs 4 control "
                   "points" );
 #endif
         return;