Undo prior accidental commit

11 files changed, 21 insertions, 21 deletions

diff --git a/examples/opengl/box/main.cpp b/examples/opengl/box/main.cpp
index 44c485b..897cd3f 100644
--- a/examples/opengl/box/main.cpp
+++ b/examples/opengl/box/main.cpp
@@ -30,7 +30,7 @@ int main( int argc, char **argv )
     QApplication a(argc,argv);
 
     if ( !QGLFormat::hasOpenGL() ) {
-	tqWarning( "This system has no OpenGL support. Exiting." );
+	qWarning( "This system has no OpenGL support. Exiting." );
 	return -1;
     }
 
diff --git a/examples/opengl/gear/gear.cpp b/examples/opengl/gear/gear.cpp
index 3109ec8..8f138e9 100644
--- a/examples/opengl/gear/gear.cpp
+++ b/examples/opengl/gear/gear.cpp
@@ -278,7 +278,7 @@ int main( int argc, char **argv )
     QApplication a( argc, argv );
 
     if ( !QGLFormat::hasOpenGL() ) {
-	tqWarning( "This system has no OpenGL support. Exiting." );
+	qWarning( "This system has no OpenGL support. Exiting." );
 	return -1;
     }
 
diff --git a/examples/opengl/glpixmap/globjwin.cpp b/examples/opengl/glpixmap/globjwin.cpp
index 7a50153..1b3269b 100644
--- a/examples/opengl/glpixmap/globjwin.cpp
+++ b/examples/opengl/glpixmap/globjwin.cpp
@@ -180,7 +180,7 @@ void GLObjectWindow::drawOnPixmap( QPixmap* pm )
     // Draw some text on the pixmap to differentiate it from the GL window
 
     if ( pm->isNull() ) {
-	tqWarning("Cannot draw on null pixmap");
+	qWarning("Cannot draw on null pixmap");
 	return;
     }
     else {
diff --git a/examples/opengl/glpixmap/main.cpp b/examples/opengl/glpixmap/main.cpp
index b4af120..25ee5b4 100644
--- a/examples/opengl/glpixmap/main.cpp
+++ b/examples/opengl/glpixmap/main.cpp
@@ -30,7 +30,7 @@ int main( int argc, char **argv )
     QApplication a(argc,argv);			
 
     if ( !QGLFormat::hasOpenGL() ) {
-	tqWarning( "This system has no OpenGL support. Exiting." );
+	qWarning( "This system has no OpenGL support. Exiting." );
 	return -1;
     }
 
diff --git a/examples/opengl/overlay/main.cpp b/examples/opengl/overlay/main.cpp
index 5b6cf86..2939ecb 100644
--- a/examples/opengl/overlay/main.cpp
+++ b/examples/opengl/overlay/main.cpp
@@ -31,7 +31,7 @@ int main( int argc, char **argv )
     QApplication a(argc,argv);
 
     if ( !QGLFormat::hasOpenGL() ) {
-	tqWarning( "This system has no OpenGL support. Exiting." );
+	qWarning( "This system has no OpenGL support. Exiting." );
 	return -1;
     }
 
diff --git a/examples/opengl/overlay_x11/gearwidget.cpp b/examples/opengl/overlay_x11/gearwidget.cpp
index 98fe110..e98938d 100644
--- a/examples/opengl/overlay_x11/gearwidget.cpp
+++ b/examples/opengl/overlay_x11/gearwidget.cpp
@@ -250,7 +250,7 @@ void GearWidget::resizeGL( int width, int height )
 
 void GearWidget::paintGL()
 {
-    tqDebug( "GearWidget: Doing GL rendering." );
+    qDebug( "GearWidget: Doing GL rendering." );
 #if defined (Q_GLX)
     static bool doneIt = FALSE;
     if ( !doneIt ) {
@@ -259,7 +259,7 @@ void GearWidget::paintGL()
 	// simpler in future versions of Qt!
 	XWindowAttributes a;
 	XGetWindowAttributes( x11Display(), winId(), &a );
-	tqDebug( "QGLWidget: using Visual ID: 0x%x.",
+	qDebug( "QGLWidget: using Visual ID: 0x%x.",
 	       (int)XVisualIDFromVisual( a.visual ) );
     }
 #endif
diff --git a/examples/opengl/overlay_x11/main.cpp b/examples/opengl/overlay_x11/main.cpp
index bb1dfe1..10ff6fc 100644
--- a/examples/opengl/overlay_x11/main.cpp
+++ b/examples/opengl/overlay_x11/main.cpp
@@ -36,7 +36,7 @@ QColor findOverlayTransparentColor()
     appVisual = (Visual*)QPaintDevice::x11AppVisual();
 #endif
 
-    tqDebug( "Default Visual ID: 0x%x", (int)XVisualIDFromVisual(appVisual) );
+    qDebug( "Default Visual ID: 0x%x", (int)XVisualIDFromVisual(appVisual) );
 
     typedef struct OverlayProp {
 	long  visual;
@@ -80,11 +80,11 @@ QColor findOverlayTransparentColor()
 	    return QColor( qRgb( 1, 2, 3 ), overlayProp[i].value );
     }
 
-    tqWarning( "Default visual is not in overlay plane" );
+    qWarning( "Default visual is not in overlay plane" );
     return invalidColor;
 
 #else // defined(Q_WS_X11)
-    tqWarning( "Wrong window system - Only X11 has overlay support." );
+    qWarning( "Wrong window system - Only X11 has overlay support." );
     return invalidColor;
 #endif
 }
@@ -96,13 +96,13 @@ int main( int argc, char **argv )
     QApplication a( argc, argv );
 
     if ( !QGLFormat::hasOpenGL() ) {
-	tqWarning( "This system has no OpenGL support. Exiting." );
+	qWarning( "This system has no OpenGL support. Exiting." );
 	return -1;
     }
 
     QColor transparentColor = findOverlayTransparentColor();
     if ( !transparentColor.isValid() ) {
-	tqWarning( "Failed to get transparent color for overlay. Exiting." );
+	qWarning( "Failed to get transparent color for overlay. Exiting." );
 	return -1;
     }
 
diff --git a/examples/opengl/sharedbox/glbox.cpp b/examples/opengl/sharedbox/glbox.cpp
index 755e6e1..4d52ca5 100644
--- a/examples/opengl/sharedbox/glbox.cpp
+++ b/examples/opengl/sharedbox/glbox.cpp
@@ -57,18 +57,18 @@ void GLBox::initializeGL()
 	sharedDisplayList = makeObject();	// Make one
 	object = sharedDisplayList;		// Use it
 	sharedListUsers++;				// Keep reference count
-	tqDebug( "GLBox %s created shared display list.", name() );
+	qDebug( "GLBox %s created shared display list.", name() );
     }
     else {				// There is a shared diplay list
 	if ( isSharing() ) {		// Can we access it?
 	    object = sharedDisplayList;		// Yes, use it
 	    sharedListUsers++;			// Keep reference count
-	    tqDebug( "GLBox %s uses shared display list.", name() );
+	    qDebug( "GLBox %s uses shared display list.", name() );
 	}
 	else {				
 	    localDisplayList = makeObject();	// No, roll our own
 	    object = localDisplayList;		// and use that
-	    tqDebug( "GLBox %s uses private display list.", name() );
+	    qDebug( "GLBox %s uses private display list.", name() );
 	}
     }
 }
@@ -84,14 +84,14 @@ GLBox::~GLBox()
     makeCurrent();				// We're going to do gl calls
     if ( localDisplayList != 0 ) {		// Did we make our own?
 	glDeleteLists( localDisplayList, 1 );	// Yes, delete it
-	tqDebug( "GLBox %s deleted private display list.", name() );
+	qDebug( "GLBox %s deleted private display list.", name() );
     }
     else {
 	sharedListUsers--;	// No, we used the shared one; keep refcount
 	if ( sharedListUsers == 0 ) { 			// Any sharers left?
 	    glDeleteLists( sharedDisplayList, 1 );	// No, delete it
 	    sharedDisplayList = 0;
-	    tqDebug( "GLBox %s deleted shared display list.", name() );
+	    qDebug( "GLBox %s deleted shared display list.", name() );
 	}
     }
 }
diff --git a/examples/opengl/sharedbox/main.cpp b/examples/opengl/sharedbox/main.cpp
index b4af120..25ee5b4 100644
--- a/examples/opengl/sharedbox/main.cpp
+++ b/examples/opengl/sharedbox/main.cpp
@@ -30,7 +30,7 @@ int main( int argc, char **argv )
     QApplication a(argc,argv);			
 
     if ( !QGLFormat::hasOpenGL() ) {
-	tqWarning( "This system has no OpenGL support. Exiting." );
+	qWarning( "This system has no OpenGL support. Exiting." );
 	return -1;
     }
 
diff --git a/examples/opengl/texture/gltexobj.cpp b/examples/opengl/texture/gltexobj.cpp
index 10a1f0f..2fc05d6 100644
--- a/examples/opengl/texture/gltexobj.cpp
+++ b/examples/opengl/texture/gltexobj.cpp
@@ -109,7 +109,7 @@ void GLTexobj::initializeGL()
     QImage tex1, tex2, buf;
 
     if ( !buf.load( "gllogo.bmp" ) ) {	// Load first image from file
-	tqWarning( "Could not read image file, using single-color instead." );
+	qWarning( "Could not read image file, using single-color instead." );
 	QImage dummy( 128, 128, 32 );
 	dummy.fill( Qt::green.rgb() );
 	buf = dummy;
@@ -117,7 +117,7 @@ void GLTexobj::initializeGL()
     tex1 = QGLWidget::convertToGLFormat( buf );  // flipped 32bit RGBA
 
     if ( !buf.load( "qtlogo.bmp" ) ) {	// Load first image from file
-	tqWarning( "Could not read image file, using single-color instead." );
+	qWarning( "Could not read image file, using single-color instead." );
 	QImage dummy( 128, 128, 32 );
 	dummy.fill( Qt::red.rgb() );
 	buf = dummy;
diff --git a/examples/opengl/texture/main.cpp b/examples/opengl/texture/main.cpp
index 043a057..0470d00 100644
--- a/examples/opengl/texture/main.cpp
+++ b/examples/opengl/texture/main.cpp
@@ -28,7 +28,7 @@ int main( int argc, char **argv )
     QApplication a(argc,argv);
 
     if ( !QGLFormat::hasOpenGL() ) {
-	tqWarning( "This system has no OpenGL support. Exiting." );
+	qWarning( "This system has no OpenGL support. Exiting." );
 	return -1;
     }