Automated conversion from qt3

1 files changed, 29 insertions, 29 deletions

diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp
index 41b048b67..52adb5397 100644
--- a/src/kernel/qwidget_x11.cpp
+++ b/src/kernel/qwidget_x11.cpp
@@ -85,8 +85,8 @@ static TQWidget *mouseGrb    = 0;
 static TQWidget *keyboardGrb = 0;
 
 // defined in qapplication_x11.cpp
-extern Time qt_x_time;
-extern Time qt_x_user_time;
+extern Time tqt_x_time;
+extern Time tqt_x_user_time;
 
 #ifndef QT_NO_XSYNC
 extern Atom qt_net_wm_sync_request_counter;
@@ -95,7 +95,7 @@ extern bool qt_use_xsync;
 #endif
 
 // defined in qfont_x11.cpp
-extern bool qt_has_xft;
+extern bool tqt_has_xft;
 
 int qt_x11_create_desktop_on_screen = -1;
 
@@ -104,13 +104,13 @@ int qt_x11_create_desktop_on_screen = -1;
  *****************************************************************************/
 
 // defined in qapplication_x11.cpp
-extern Atom qt_wm_state;
+extern Atom tqt_wm_state;
 extern Atom qt_wm_change_state;
-extern Atom qt_wm_delete_window;
-extern Atom qt_wm_take_focus;
+extern Atom tqt_wm_delete_window;
+extern Atom tqt_wm_take_focus;
 extern Atom qt_wm_client_leader;
-extern Atom qt_window_role;
-extern Atom qt_sm_client_id;
+extern Atom tqt_window_role;
+extern Atom tqt_sm_client_id;
 extern Atom qt_utf8_string;
 extern Atom qt_net_wm_context_help;
 extern Atom qt_net_wm_ping;
@@ -468,7 +468,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
 	rendhd = 0;
     }
 
-    if ( qt_has_xft )
+    if ( tqt_has_xft )
 	rendhd = (HANDLE) XftDrawCreate( dpy, id, (Visual *) x11Visual(),
 					 x11Colormap() );
 #endif // QT_NO_XFTFREETYPE
@@ -676,8 +676,8 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
 	XStoreName( dpy, id, tqAppName() );
 	Atom protocols[5];
 	int n = 0;
-	protocols[n++] = qt_wm_delete_window;	// support del window protocol
-	protocols[n++] = qt_wm_take_focus;	// support take focus window protocol
+	protocols[n++] = tqt_wm_delete_window;	// support del window protocol
+	protocols[n++] = tqt_wm_take_focus;	// support take focus window protocol
 	protocols[n++] = qt_net_wm_ping;	// support _NET_WM_PING protocol
 #ifndef QT_NO_XSYNC
 	protocols[n++] = qt_net_wm_sync_request;// support the _NET_WM_SYNC_RETQUEST protocol
@@ -727,7 +727,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
 
 	// declare the widget's object name as window role
 	XChangeProperty( dpy, id,
-			 qt_window_role, XA_STRING, 8, PropModeReplace,
+			 tqt_window_role, XA_STRING, 8, PropModeReplace,
 			 (unsigned char *)name(), tqstrlen( name() ) );
 
 	// set client leader property
@@ -1250,7 +1250,7 @@ qstring_to_xtp( const TQString& s )
 					     tl, 1, XStdICCTextStyle, &tp );
 #if defined(QT_DEBUG)
 	if ( errCode < 0 )
-	    qDebug( "qstring_to_xtp result code %d", errCode );
+	    tqDebug( "qstring_to_xtp result code %d", errCode );
 #endif
     }
     if ( !mapper || errCode < 0 ) {
@@ -1413,7 +1413,7 @@ void TQWidget::grabMouse()
 				  PointerMotionMask | EnterWindowMask |
 				  LeaveWindowMask ),
 			  GrabModeAsync, GrabModeAsync,
-			  None, None, qt_x_time );
+			  None, None, tqt_x_time );
 #if defined(QT_CHECK_STATE)
 	if ( status ) {
 	    const char *s =
@@ -1422,7 +1422,7 @@ void TQWidget::grabMouse()
 		status == GrabFrozen      ? "\"GrabFrozen\"" :
 		status == GrabInvalidTime ? "\"GrabInvalidTime\"" :
 		"<?>";
-	    qWarning( "Grabbing the mouse failed with %s", s );
+	    tqWarning( "Grabbing the mouse failed with %s", s );
 	}
 #endif
 	mouseGrb = this;
@@ -1455,7 +1455,7 @@ void TQWidget::grabMouse( const TQCursor &cursor )
 		      (uint)(ButtonPressMask | ButtonReleaseMask |
 			     PointerMotionMask | EnterWindowMask | LeaveWindowMask),
 		      GrabModeAsync, GrabModeAsync,
-		      None, cursor.handle(), qt_x_time );
+		      None, cursor.handle(), tqt_x_time );
 #if defined(QT_CHECK_STATE)
 	if ( status ) {
 	    const char *s =
@@ -1464,7 +1464,7 @@ void TQWidget::grabMouse( const TQCursor &cursor )
 		status == GrabFrozen      ? "\"GrabFrozen\"" :
 		status == GrabInvalidTime ? "\"GrabInvalidTime\"" :
 					    "<?>";
-	    qWarning( "Grabbing the mouse failed with %s", s );
+	    tqWarning( "Grabbing the mouse failed with %s", s );
 	}
 #endif
 	mouseGrb = this;
@@ -1480,7 +1480,7 @@ void TQWidget::grabMouse( const TQCursor &cursor )
 void TQWidget::releaseMouse()
 {
     if ( !qt_nograb() && mouseGrb == this ) {
-	XUngrabPointer( x11Display(),  qt_x_time );
+	XUngrabPointer( x11Display(),  tqt_x_time );
 	XFlush( x11Display() );
 	mouseGrb = 0;
     }
@@ -1510,7 +1510,7 @@ void TQWidget::grabKeyboard()
 	if ( keyboardGrb )
 	    keyboardGrb->releaseKeyboard();
 	XGrabKeyboard( x11Display(), winid, False, GrabModeAsync, GrabModeAsync,
-		       qt_x_time );
+		       tqt_x_time );
 	keyboardGrb = this;
     }
 }
@@ -1524,7 +1524,7 @@ void TQWidget::grabKeyboard()
 void TQWidget::releaseKeyboard()
 {
     if ( !qt_nograb() && keyboardGrb == this ) {
-	XUngrabKeyboard( x11Display(), qt_x_time );
+	XUngrabKeyboard( x11Display(), tqt_x_time );
 	keyboardGrb = 0;
     }
 }
@@ -1585,7 +1585,7 @@ void TQWidget::setActiveWindow()
 {
     TQWidget *tlw = topLevelWidget();
     if ( tlw->isVisible() && !tlw->topData()->embedded && !qt_deferred_map_contains(tlw) ) {
-	XSetInputFocus( x11Display(), tlw->winId(), RevertToNone, qt_x_time);
+	XSetInputFocus( x11Display(), tlw->winId(), RevertToNone, tqt_x_time);
 	focusInputContext();
     }
 }
@@ -1915,7 +1915,7 @@ void TQWidget::showWindow()
 	if ( got_hints )
 	    XFree( (char *)h );
 
-	if (qt_x_user_time != CurrentTime) {
+	if (tqt_x_user_time != CurrentTime) {
 	    XChangeProperty(x11Display(), winId(), qt_net_wm_user_time, XA_CARDINAL,
 			    32, PropModeReplace, (unsigned char *) &qt_x_user_time, 1);
 	}
@@ -2215,7 +2215,7 @@ void TQWidget::setMinimumSize( int minw, int minh )
 {
 #if defined(QT_CHECK_RANGE)
     if ( minw < 0 || minh < 0 )
-	qWarning("TQWidget::setMinimumSize: The smallest allowed size is (0,0)");
+	tqWarning("TQWidget::setMinimumSize: The smallest allowed size is (0,0)");
 #endif
     createExtra();
     if ( extra->minw == minw && extra->minh == minh )
@@ -2244,7 +2244,7 @@ void TQWidget::setMaximumSize( int maxw, int maxh )
 {
 #if defined(QT_CHECK_RANGE)
     if ( maxw > TQWIDGETSIZE_MAX || maxh > TQWIDGETSIZE_MAX ) {
-	qWarning("TQWidget::setMaximumSize: (%s/%s) "
+	tqWarning("TQWidget::setMaximumSize: (%s/%s) "
 		"The largest allowed size is (%d,%d)",
 		 name( "unnamed" ), className(), TQWIDGETSIZE_MAX,
 		TQWIDGETSIZE_MAX );
@@ -2252,7 +2252,7 @@ void TQWidget::setMaximumSize( int maxw, int maxh )
 	maxh = TQMIN( maxh, TQWIDGETSIZE_MAX );
     }
     if ( maxw < 0 || maxh < 0 ) {
-	qWarning("TQWidget::setMaximumSize: (%s/%s) Negative sizes (%d,%d) "
+	tqWarning("TQWidget::setMaximumSize: (%s/%s) Negative sizes (%d,%d) "
 		"are not possible",
 		name( "unnamed" ), className(), maxw, maxh );
 	maxw = TQMAX( maxw, 0 );
@@ -2424,7 +2424,7 @@ void TQWidget::scroll( int dx, int dy, const TQRect& r )
 	return;
 
     Display *dpy = x11Display();
-    GC gc = qt_xget_readonly_gc( x11Screen(), FALSE );
+    GC gc = tqt_xget_readonly_gc( x11Screen(), FALSE );
     // Want expose events
     if ( w > 0 && h > 0 && !just_update ) {
 	XSetGraphicsExposures( dpy, gc, True );
@@ -2546,7 +2546,7 @@ int TQWidget::metric( int m ) const
 	    default:
 		val = 0;
 #if defined(QT_CHECK_RANGE)
-		qWarning( "TQWidget::metric: Invalid metric command" );
+		tqWarning( "TQWidget::metric: Invalid metric command" );
 #endif
 	}
     }
@@ -2765,7 +2765,7 @@ void TQWidget::setName( const char *name )
     TQObject::setName( name );
     if ( isTopLevel() ) {
 	XChangeProperty( x11Display(), winId(),
-			 qt_window_role, XA_STRING, 8, PropModeReplace,
+			 tqt_window_role, XA_STRING, 8, PropModeReplace,
 			 (unsigned char *)name, tqstrlen( name ) );
     }
 }
@@ -2800,7 +2800,7 @@ void TQWidget::updateFrameStrut() const
 	    XFree(c);
 
 	if (! p) {
-	    qWarning("TQWidget::updateFrameStrut(): ERROR - no parent");
+	    tqWarning("TQWidget::updateFrameStrut(): ERROR - no parent");
 	    return;
 	}