Undo prior accidental commit

1 files changed, 20 insertions, 20 deletions

diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp
index b3aadaa..73cdad4 100644
--- a/src/kernel/qclipboard_x11.cpp
+++ b/src/kernel/qclipboard_x11.cpp
@@ -42,15 +42,15 @@
 // #define QCLIPBOARD_DEBUG_VERBOSE
 
 #ifdef QCLIPBOARD_DEBUG
-#  define QDEBUG tqDebug
+#  define QDEBUG qDebug
 #else
-#  define QDEBUG if (FALSE) tqDebug
+#  define QDEBUG if (FALSE) qDebug
 #endif
 
 #ifdef QCLIPBOARD_DEBUG_VERBOSE
-#  define VQDEBUG tqDebug
+#  define VQDEBUG qDebug
 #else
-#  define VQDEBUG if (FALSE) tqDebug
+#  define VQDEBUG if (FALSE) qDebug
 #endif
 
 #include "qplatformdefs.h"
@@ -140,7 +140,7 @@ void setupOwner()
 	return;
     owner = new QWidget( 0, "internal clipboard owner" );
     requestor = new QWidget(0, "internal clipboard requestor");
-    tqAddPostRoutine( cleanup );
+    qAddPostRoutine( cleanup );
 }
 
 static
@@ -239,7 +239,7 @@ static QClipboardData *clipboardData()
     if ( internalCbData == 0 ) {
 	internalCbData = new QClipboardData;
 	Q_CHECK_PTR( internalCbData );
-	tqAddPostRoutine( cleanupClipboardData );
+	qAddPostRoutine( cleanupClipboardData );
     }
     return internalCbData;
 }
@@ -261,7 +261,7 @@ static QClipboardData *selectionData()
     if (internalSelData == 0) {
 	internalSelData = new QClipboardData;
 	Q_CHECK_PTR(internalSelData);
-	tqAddPostRoutine(cleanupSelectionData);
+	qAddPostRoutine(cleanupSelectionData);
     }
     return internalSelData;
 }
@@ -306,7 +306,7 @@ static int qt_xclb_transation_event_handler(XEvent *event)
 */
 static void qt_xclb_incr_timeout(void)
 {
-    tqWarning("QClipboard: timed out while sending data");
+    qWarning("QClipboard: timed out while sending data");
 
     while (transactions)
         delete *transactions->begin();
@@ -482,7 +482,7 @@ bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event,
 
     if (qApp->eventLoop()->inherits("QMotif")) { // yes yes, evil hack, we know
         if ( waiting_for_data )
-            tqFatal( "QClipboard: internal error, qt_xclb_wait_for_event recursed" );
+            qFatal( "QClipboard: internal error, qt_xclb_wait_for_event recursed" );
 
         waiting_for_data = TRUE;
         has_captured_event = FALSE;
@@ -1061,7 +1061,7 @@ bool QClipboard::event( QEvent *e )
 	    }
 	} else {
 #ifdef QT_CHECK_STATE
-	    tqWarning("QClipboard: Unknown SelectionClear event received.");
+	    qWarning("QClipboard: Unknown SelectionClear event received.");
 #endif
 	    return FALSE;
 	}
@@ -1110,7 +1110,7 @@ bool QClipboard::event( QEvent *e )
 		d = clipboardData();
 	    } else {
 #ifdef QT_CHECK_RANGE
-		tqWarning("QClipboard: unknown selection '%lx'", req->selection);
+		qWarning("QClipboard: unknown selection '%lx'", req->selection);
 #endif // QT_CHECK_RANGE
 
 		XSendEvent(dpy, req->requestor, False, NoEventMask, &event);
@@ -1119,7 +1119,7 @@ bool QClipboard::event( QEvent *e )
 
 	    if (! d->source()) {
 #ifdef QT_CHECK_STATE
-		tqWarning("QClipboard: cannot transfer data, no data available");
+		qWarning("QClipboard: cannot transfer data, no data available");
 #endif // QT_CHECK_STATE
 
 		XSendEvent(dpy, req->requestor, False, NoEventMask, &event);
@@ -1190,7 +1190,7 @@ bool QClipboard::event( QEvent *e )
 		    } else {
 
 #ifdef QT_CHECK_STATE
-			tqWarning("QClipboard: invalid data timestamp");
+			qWarning("QClipboard: invalid data timestamp");
 #endif // QT_CHECK_STATE
 		    }
 		} else if (target == xa_targets) {
@@ -1262,7 +1262,7 @@ QClipboardWatcher::QClipboardWatcher( QClipboard::Mode mode )
 
 #ifdef QT_CHECK_RANGE
     default:
-	tqWarning( "QClipboardWatcher: internal error, unknown clipboard mode" );
+	qWarning( "QClipboardWatcher: internal error, unknown clipboard mode" );
 	break;
 #endif // QT_CHECK_RANGE
     }
@@ -1285,7 +1285,7 @@ bool QClipboardWatcher::empty() const
 
 #ifdef QT_CHECK_STATE
     if( win == requestor->winId()) {
-        tqWarning( "QClipboardWatcher::empty: internal error, app owns the selection" );
+        qWarning( "QClipboardWatcher::empty: internal error, app owns the selection" );
         return TRUE;
     }
 #endif // QT_CHECK_STATE
@@ -1371,10 +1371,10 @@ QByteArray QClipboardWatcher::encodedData( const char* fmt ) const
 
     Atom fmtatom = 0;
 
-    if ( 0==tqstricmp(fmt,"text/plain;charset=iso-8859-1") ) {
+    if ( 0==qstricmp(fmt,"text/plain;charset=iso-8859-1") ) {
 	// ICCCM section 2.6.2 says STRING is latin1 text
 	fmtatom = XA_STRING;
-    } else if ( 0==tqstricmp(fmt,"text/plain;charset=utf-8") ) {
+    } else if ( 0==qstricmp(fmt,"text/plain;charset=utf-8") ) {
 	// proprosed UTF8_STRING conversion type
 	fmtatom = *qt_xdnd_str_to_atom( "UTF8_STRING" );
     } else if ( 0==qstrcmp(fmt,"text/plain") ) {
@@ -1476,7 +1476,7 @@ QMimeSource* QClipboard::data( Mode mode ) const
 
     default:
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QClipboard::data: invalid mode '%d'", mode );
+	qWarning( "QClipboard::data: invalid mode '%d'", mode );
 #endif // QT_CHECK_RANGE
 	return 0;
     }
@@ -1526,7 +1526,7 @@ void QClipboard::setData( QMimeSource* src, Mode mode )
 
     default:
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QClipboard::data: invalid mode '%d'", mode );
+	qWarning( "QClipboard::data: invalid mode '%d'", mode );
 #endif // QT_CHECK_RANGE
 	return;
     }
@@ -1557,7 +1557,7 @@ void QClipboard::setData( QMimeSource* src, Mode mode )
 
     if (XGetSelectionOwner(dpy, atom) != newOwner) {
 #ifdef QT_CHECK_STATE
-	tqWarning("QClipboard::setData: Cannot set X11 selection owner for %s",
+	qWarning("QClipboard::setData: Cannot set X11 selection owner for %s",
 		 qt_xdnd_atom_to_str(atom));
 #endif // QT_CHECK_STATE