Undo prior accidental commit

34 files changed, 74 insertions, 74 deletions

diff --git a/examples/canvas/canvas.cpp b/examples/canvas/canvas.cpp
index 748961b..1f33949 100644
--- a/examples/canvas/canvas.cpp
+++ b/examples/canvas/canvas.cpp
@@ -732,7 +732,7 @@ void Main::addMesh()
 #ifndef QT_NO_PROGRESSDIALOG
     progress.setProgress( rows );
 #endif
-    // tqDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() );
+    // qDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() );
 }
 
 void Main::addRectangle()
diff --git a/examples/canvas/makeimg.cpp b/examples/canvas/makeimg.cpp
index 335e7c0..c90ce8c 100644
--- a/examples/canvas/makeimg.cpp
+++ b/examples/canvas/makeimg.cpp
@@ -65,7 +65,7 @@ int main( int*, char**)
 #endif    
     *img = img->smoothScale( w/2, h/2 );
 
-    tqDebug( "saving out.png");
+    qDebug( "saving out.png");
     img->save( "out.png", "PNG" );
     
     w = img->width();
diff --git a/examples/demo/opengl/glinfo_x11.cpp b/examples/demo/opengl/glinfo_x11.cpp
index 58d5144..1137ef9 100644
--- a/examples/demo/opengl/glinfo_x11.cpp
+++ b/examples/demo/opengl/glinfo_x11.cpp
@@ -236,7 +236,7 @@ GLInfo::GLInfo()
 
     dpy = gl.x11Display();
     if ( !dpy ) {
-        tqWarning( "Error: unable to open display %s\n", displayName );
+        qWarning( "Error: unable to open display %s\n", displayName );
     }
 
     numScreens = ScreenCount( dpy );
diff --git a/examples/demo/opengl/gltexobj.cpp b/examples/demo/opengl/gltexobj.cpp
index 2844462..60627da 100644
--- a/examples/demo/opengl/gltexobj.cpp
+++ b/examples/demo/opengl/gltexobj.cpp
@@ -100,7 +100,7 @@ void GLTexobj::initializeGL()
     QImage tex1, tex2, buf;
 
     if ( !buf.load( "opengl/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;
@@ -108,7 +108,7 @@ void GLTexobj::initializeGL()
     tex1 = QGLWidget::convertToGLFormat( buf );  // flipped 32bit RGBA
 
     if ( !buf.load( "opengl/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/fileiconview/qfileiconview.cpp b/examples/fileiconview/qfileiconview.cpp
index 54d672a..cc590fb 100644
--- a/examples/fileiconview/qfileiconview.cpp
+++ b/examples/fileiconview/qfileiconview.cpp
@@ -471,7 +471,7 @@ QtFileIconView::QtFileIconView( const QString &dir, QWidget *parent, const char
     : QIconView( parent, name ), viewDir( dir ), newFolderNum( 0 )
 {
     if ( !iconFolderLockedLarge ) {
-	tqAddPostRoutine( cleanup );
+	qAddPostRoutine( cleanup );
 	QWMatrix m;
 	m.scale( 0.6, 0.6 );
 	QPixmap iconpix( folder_locked_icon );
diff --git a/examples/iconview/main.cpp b/examples/iconview/main.cpp
index d16604f..8784e93 100644
--- a/examples/iconview/main.cpp
+++ b/examples/iconview/main.cpp
@@ -27,18 +27,18 @@ public:
 
 public slots:
     void dropped( QDropEvent *mime ) {
-        tqDebug( "Dropped Mimesource %p into the view %p", mime, view );
-        tqDebug( "  Formats:" );
+        qDebug( "Dropped Mimesource %p into the view %p", mime, view );
+        qDebug( "  Formats:" );
         int i = 0;
         const char *str = mime->format( i );
-        tqDebug( "    %s", str );
+        qDebug( "    %s", str );
         while ( str ) {
-            tqDebug( "    %s", str );
+            qDebug( "    %s", str );
             str = mime->format( ++i );
         }
     };
     void moved() {
-        tqDebug( "All selected items were moved to another widget" );
+        qDebug( "All selected items were moved to another widget" );
     }
 
 protected:
diff --git a/examples/life/main.cpp b/examples/life/main.cpp
index 67b0faa..3ee785e 100644
--- a/examples/life/main.cpp
+++ b/examples/life/main.cpp
@@ -13,7 +13,7 @@
  
 void usage()
 {
-    tqWarning( "Usage: life [-scale scale]" );
+    qWarning( "Usage: life [-scale scale]" );
 }
 
 int main( int argc, char **argv )
diff --git a/examples/network/clientserver/server/server.cpp b/examples/network/clientserver/server/server.cpp
index 5a69ad8..440647c 100644
--- a/examples/network/clientserver/server/server.cpp
+++ b/examples/network/clientserver/server/server.cpp
@@ -79,7 +79,7 @@ public:
 	QServerSocket( 4242, 1, parent )
     {
 	if ( !ok() ) {
-	    tqWarning("Failed to bind to port 4242");
+	    qWarning("Failed to bind to port 4242");
 	    exit(1);
 	}
     }
diff --git a/examples/network/httpd/httpd.cpp b/examples/network/httpd/httpd.cpp
index df9df6b..4c40961 100644
--- a/examples/network/httpd/httpd.cpp
+++ b/examples/network/httpd/httpd.cpp
@@ -27,7 +27,7 @@ public:
 	QServerSocket(8080,1,parent)
     {
 	if ( !ok() ) {
-	    tqWarning("Failed to bind to port 8080");
+	    qWarning("Failed to bind to port 8080");
 	    exit( 1 );
 	}
     }
diff --git a/examples/network/networkprotocol/main.cpp b/examples/network/networkprotocol/main.cpp
index bb9bc1d..8d636e4 100644
--- a/examples/network/networkprotocol/main.cpp
+++ b/examples/network/networkprotocol/main.cpp
@@ -17,7 +17,7 @@ int main( int argc, char **argv )
 {
     QApplication a( argc, argv );
 
-    tqInitNetworkProtocols();
+    qInitNetworkProtocols();
     QNetworkProtocol::registerNetworkProtocol( "nntp", new QNetworkProtocolFactory<Nntp> );
     
     View v;
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;
     }
     
diff --git a/examples/progress/progress.cpp b/examples/progress/progress.cpp
index cf3c5f6..f7e7232 100644
--- a/examples/progress/progress.cpp
+++ b/examples/progress/progress.cpp
@@ -272,7 +272,7 @@ private:
     {
 	if ( timer_driven ) {
 	    if ( pb ) {
-		tqWarning("This cannot happen!");
+		qWarning("This cannot happen!");
 		return;
 	    }
 	    rects = n;
diff --git a/examples/qdir/qdir.cpp b/examples/qdir/qdir.cpp
index 370d07a..346c3ed 100644
--- a/examples/qdir/qdir.cpp
+++ b/examples/qdir/qdir.cpp
@@ -307,7 +307,7 @@ int main( int argc, char ** argv )
 	else if ( arg == "-custom" )
 	    custom = TRUE;
 	else if ( arg[0] == '-' ) {
-	    tqDebug("Usage: qdir [-any | -dir | -custom] [-preview] [-default f] {-filter f} [caption ...]\n"
+	    qDebug("Usage: qdir [-any | -dir | -custom] [-preview] [-default f] {-filter f} [caption ...]\n"
 		   "      -any         Get any filename, need not exist.\n"
 		   "      -dir         Return a directory rather than a file.\n"
 		   "      -custom      Opens a customized QFileDialog with \n"
diff --git a/examples/sql/blob/main.cpp b/examples/sql/blob/main.cpp
index c6ce4d9..054d857 100644
--- a/examples/sql/blob/main.cpp
+++ b/examples/sql/blob/main.cpp
@@ -29,52 +29,52 @@ int main( int argc, char ** argv )
     db->setPassword( PASSWORD );
     db->setHostName( HOST );
     if ( !db->open() ) {
-	tqWarning( db->lastError().databaseText() );
+	qWarning( db->lastError().databaseText() );
 	return 1;
     }
 
     if ( argc < 2 ) {
-	tqWarning( "Usage: %s <filename>", argv[0] );
+	qWarning( "Usage: %s <filename>", argv[0] );
 	return 1;
     }
     
     // read a file which we want to insert into the database
     QFile f( argv[1] );
     if ( !f.open( IO_ReadOnly ) ) {
-	tqWarning( "Unable to open data file '%s' - exiting", argv[1] );
+	qWarning( "Unable to open data file '%s' - exiting", argv[1] );
 	return 1;
     }
     QByteArray binaryData = f.readAll();
-    tqWarning( "Data size: %d", binaryData.size() );
+    qWarning( "Data size: %d", binaryData.size() );
     
     // create a table with a binary field
     QSqlQuery q;
     if ( !q.exec( "CREATE TABLE blobexample ( id INT PRIMARY KEY, binfield LONGBLOB )" ) ) {
-	tqWarning( "Unable to create table - exiting" );
+	qWarning( "Unable to create table - exiting" );
 	return 1;
     }
 
     // insert a BLOB into the table
     if ( !q.prepare( "INSERT INTO blobexample ( id, binfield ) VALUES ( ?, ? )" ) ) {
-	tqWarning( "Unable to prepare query - exiting" );
+	qWarning( "Unable to prepare query - exiting" );
 	return 1;
     }
     q.bindValue( 0, 1 );
     q.bindValue( 1, binaryData );
     if ( !q.exec() ) {
-	tqWarning( "Unable to execute prepared query - exiting" );
+	qWarning( "Unable to execute prepared query - exiting" );
 	return 1;
     }
 
     // read the BLOB back from the database
     if ( !q.exec( "SELECT id, binfield FROM blobexample" ) ) {
-	tqWarning( "Unable to execute query - exiting" );
+	qWarning( "Unable to execute query - exiting" );
 	return 1;
     }
-    tqWarning( "\nQSqlQuery:" );
+    qWarning( "\nQSqlQuery:" );
     while ( q.next() ) {
-	tqWarning( "BLOB id: %d", q.value( 0 ).toInt() );
-	tqWarning( "BLOB size: %d", q.value( 1 ).toByteArray().size() );
+	qWarning( "BLOB id: %d", q.value( 0 ).toInt() );
+	qWarning( "BLOB size: %d", q.value( 1 ).toByteArray().size() );
     }
 
     // write another BLOB using QSqlCursor
@@ -83,23 +83,23 @@ int main( int argc, char ** argv )
     r->setValue( "id", 2 );
     r->setValue( "binfield", binaryData );
     if ( !cur.insert() ) {
-	tqWarning( "Unable to insert BLOB using QSqlCursor - exiting" );
+	qWarning( "Unable to insert BLOB using QSqlCursor - exiting" );
 	return 1;
     }
 
     // read the BLOBs back using QSqlCursor
     if ( !cur.select() ) {
-	tqWarning( "Unable retrieve blobexample table using QSqlCursor - exiting" );
+	qWarning( "Unable retrieve blobexample table using QSqlCursor - exiting" );
 	return 1;
     }
-    tqWarning( "\nQSqlCursor:" );
+    qWarning( "\nQSqlCursor:" );
     while ( cur.next() ) {
-	tqWarning( "BLOB id: %d", cur.value( "id" ).toInt() );
-	tqWarning( "BLOB size: %d", cur.value( "binfield" ).toByteArray().size() );
+	qWarning( "BLOB id: %d", cur.value( "id" ).toInt() );
+	qWarning( "BLOB size: %d", cur.value( "binfield" ).toByteArray().size() );
     }
         
     if ( !q.exec( "DROP TABLE blobexample" ) ) {
-	tqWarning( "Unable to drop table - exiting" );
+	qWarning( "Unable to drop table - exiting" );
 	return 1;
     }
     return 0;
diff --git a/examples/sql/overview/connection.cpp b/examples/sql/overview/connection.cpp
index e096204..6afaa53 100644
--- a/examples/sql/overview/connection.cpp
+++ b/examples/sql/overview/connection.cpp
@@ -18,7 +18,7 @@ bool createConnections()
     defaultDB->setPassword( DB_SALES_PASSWD );
     defaultDB->setHostName( DB_SALES_HOST );
     if ( ! defaultDB->open() ) {
-	tqWarning( "Failed to open sales database: " + defaultDB->lastError().text() );
+	qWarning( "Failed to open sales database: " + defaultDB->lastError().text() );
 	return FALSE;
     }
 
@@ -28,7 +28,7 @@ bool createConnections()
     oracle->setPassword( DB_ORDERS_PASSWD );
     oracle->setHostName( DB_ORDERS_HOST );
     if ( ! oracle->open() ) {
-	tqWarning( "Failed to open orders database: " + oracle->lastError().text() );
+	qWarning( "Failed to open orders database: " + oracle->lastError().text() );
 	return FALSE;
     }
 
diff --git a/examples/sql/overview/extract/main.cpp b/examples/sql/overview/extract/main.cpp
index d3dd194..3714c1a 100644
--- a/examples/sql/overview/extract/main.cpp
+++ b/examples/sql/overview/extract/main.cpp
@@ -33,7 +33,7 @@ int main( int argc, char *argv[] )
 	    int id = cur.value( "id" ).toInt();
 	    QString name = cur.value( "forename" ).toString() + " " +
 			   cur.value( "surname" ).toString();
-	    tqDebug( QString::number( id ) + ": " + name );
+	    qDebug( QString::number( id ) + ": " + name );
 	}
     }
 
diff --git a/examples/sql/overview/order1/main.cpp b/examples/sql/overview/order1/main.cpp
index 3d9b129..3d64748 100644
--- a/examples/sql/overview/order1/main.cpp
+++ b/examples/sql/overview/order1/main.cpp
@@ -22,7 +22,7 @@ int main( int argc, char *argv[] )
         QSqlIndex order = cur.index( fields );
         cur.select( order ); 
         while ( cur.next() ) {
-	    tqDebug( cur.value( "id" ).toString() + ": " +
+	    qDebug( cur.value( "id" ).toString() + ": " +
 		    cur.value( "surname" ).toString() + " " +
 		    cur.value( "forename" ).toString() );
         }
diff --git a/examples/sql/overview/order2/main.cpp b/examples/sql/overview/order2/main.cpp
index 43ae7a2..762562e 100644
--- a/examples/sql/overview/order2/main.cpp
+++ b/examples/sql/overview/order2/main.cpp
@@ -24,7 +24,7 @@ int main( int argc, char *argv[] )
 	cur.setValue( "surname", "Bloggs" );
 	cur.select( filter, order ); 
 	while ( cur.next() ) {
-	    tqDebug( cur.value( "id" ).toString() + ": " +
+	    qDebug( cur.value( "id" ).toString() + ": " +
 		    cur.value( "surname" ).toString() + " " +
 		    cur.value( "forename" ).toString() );
         }
diff --git a/examples/sql/overview/retrieve1/main.cpp b/examples/sql/overview/retrieve1/main.cpp
index 6b9f303..b1cc06b 100644
--- a/examples/sql/overview/retrieve1/main.cpp
+++ b/examples/sql/overview/retrieve1/main.cpp
@@ -20,7 +20,7 @@ int main( int argc, char *argv[] )
 	QSqlQuery query( "SELECT id, surname FROM staff" );
 	if ( query.isActive() ) {
 	    while ( query.next() ) {
-		tqDebug( query.value(0).toString() + ": " +
+		qDebug( query.value(0).toString() + ": " +
 		        query.value(1).toString() );
 	    }
 	}
diff --git a/examples/sql/overview/retrieve2/main.cpp b/examples/sql/overview/retrieve2/main.cpp
index 0821265..69b172b 100644
--- a/examples/sql/overview/retrieve2/main.cpp
+++ b/examples/sql/overview/retrieve2/main.cpp
@@ -20,7 +20,7 @@ int main( int argc, char *argv[] )
 	QSqlCursor cur( "staff" ); // Specify the table/view name
 	cur.select(); // We'll retrieve every record
 	while ( cur.next() ) {
-	    tqDebug( cur.value( "id" ).toString() + ": " +
+	    qDebug( cur.value( "id" ).toString() + ": " +
 		    cur.value( "surname" ).toString() + " " +
 		    cur.value( "salary" ).toString() );
 	}
diff --git a/examples/tablet/tabletstats.cpp b/examples/tablet/tabletstats.cpp
index 8e6360b..a6e91fb 100644
--- a/examples/tablet/tabletstats.cpp
+++ b/examples/tablet/tabletstats.cpp
@@ -89,11 +89,11 @@ void StatsCanvas::tabletEvent( QTabletEvent *e )
     e->accept();
     switch( e->type() ) {
     case QEvent::TabletPress:
-	tqDebug( "Tablet Press" );
+	qDebug( "Tablet Press" );
 	mousePressed = TRUE;
 	break;
     case QEvent::TabletRelease:
-	tqDebug( "Tablet Release" );
+	qDebug( "Tablet Release" );
 	mousePressed = FALSE;
 	clearScreen();
 	break;
@@ -115,7 +115,7 @@ void StatsCanvas::tabletEvent( QTabletEvent *e )
 
 void StatsCanvas::mouseMoveEvent( QMouseEvent *e )
 {
-    tqDebug( "Mouse Move" );
+    qDebug( "Mouse Move" );
     // do nothing
     QWidget::mouseMoveEvent( e );
 }
@@ -123,13 +123,13 @@ void StatsCanvas::mouseMoveEvent( QMouseEvent *e )
 
 void StatsCanvas::mousePressEvent( QMouseEvent *e )
 {
-    tqDebug( "Mouse Press" );
+    qDebug( "Mouse Press" );
     QWidget::mousePressEvent( e );
 }
 
 void StatsCanvas::mouseReleaseEvent( QMouseEvent *e )
 {
-    tqDebug( "Mouse Release" );
+    qDebug( "Mouse Release" );
     QWidget::mouseReleaseEvent( e );
 }
 
diff --git a/examples/thread/semaphores/main.cpp b/examples/thread/semaphores/main.cpp
index 521f27a..d583c57 100644
--- a/examples/thread/semaphores/main.cpp
+++ b/examples/thread/semaphores/main.cpp
@@ -255,7 +255,7 @@ void SemaphoreExample::customEvent(QCustomEvent *event) {
 
     default:
 	{
-	    tqWarning("Unknown custom event type: %d", event->type());
+	    qWarning("Unknown custom event type: %d", event->type());
 	}
     }
 }
diff --git a/examples/tictac/main.cpp b/examples/tictac/main.cpp
index 65f2bc9..a64703f 100644
--- a/examples/tictac/main.cpp
+++ b/examples/tictac/main.cpp
@@ -19,7 +19,7 @@ int main( int argc, char **argv )
     if ( argc == 2 )				// get board size n
         n = atoi(argv[1]);
     if ( n < 3 || n > 10 ) {			// out of range
-        tqWarning( "%s: Board size must be from 3x3 to 10x10", argv[0] );
+        qWarning( "%s: Board size must be from 3x3 to 10x10", argv[0] );
         return 1;
     }
     TicTacToe ttt( n );				// create game
diff --git a/examples/widgets/widgets.cpp b/examples/widgets/widgets.cpp
index 9966825..4f61edd 100644
--- a/examples/widgets/widgets.cpp
+++ b/examples/widgets/widgets.cpp
@@ -714,21 +714,21 @@ void WidgetView::dummy()
 
 void WidgetView::selectionChanged()
 {
-    //tqDebug("selectionChanged");
+    //qDebug("selectionChanged");
 }
 void WidgetView::selectionChanged( QListViewItem* /*item*/)
 {
-    //tqDebug("selectionChanged %p", item );
+    //qDebug("selectionChanged %p", item );
 }
 
 void WidgetView::clicked( QListViewItem* /*item*/ )
 {
-    //tqDebug("clicked %p", item );
+    //qDebug("clicked %p", item );
 }
 
 void WidgetView::mySelectionChanged( QListViewItem* /*item*/ )
 {
-    //tqDebug("mySelectionChanged %p", item );
+    //qDebug("mySelectionChanged %p", item );
 }
 
 void WidgetView::showProperties()
@@ -747,5 +747,5 @@ void WidgetView::showProperties()
 		     p->writable() ? "write" : "only", p->type() );
 	output += tmp;
     }
-    tqDebug( output );
+    qDebug( output );
 }