Automated update from qt3

src/kernel/qapplication_x11.cpp

@@ -1571,7 +1571,7 @@ void qt_x11_create_wm_client_leader()
 static void qt_net_update_user_time(TQWidget *tlw)
 {
     XChangeProperty(TQPaintDevice::x11AppDisplay(), tlw->winId(), qt_net_wm_user_time, XA_CARDINAL,
-		    32, PropModeReplace, (unsigned char *) &qt_x_user_time, 1);
+		    32, PropModeReplace, (unsigned char *) &tqt_x_user_time, 1);
 }
 
 static void qt_check_focus_model()
@@ -1977,14 +1977,14 @@ void qt_init_internal( int *argcptr, char **argv,
 
 	// Support protocols
 
-	qt_x11_intern_atom( "WM_PROTOCOLS", &qt_wm_protocols );
-	qt_x11_intern_atom( "WM_DELETE_WINDOW", &qt_wm_delete_window );
-	qt_x11_intern_atom( "WM_STATE", &qt_wm_state );
+	qt_x11_intern_atom( "WM_PROTOCOLS", &tqt_wm_protocols );
+	qt_x11_intern_atom( "WM_DELETE_WINDOW", &tqt_wm_delete_window );
+	qt_x11_intern_atom( "WM_STATE", &tqt_wm_state );
 	qt_x11_intern_atom( "WM_CHANGE_STATE", &qt_wm_change_state );
-	qt_x11_intern_atom( "WM_TAKE_FOCUS", &qt_wm_take_focus );
+	qt_x11_intern_atom( "WM_TAKE_FOCUS", &tqt_wm_take_focus );
 	qt_x11_intern_atom( "WM_CLIENT_LEADER", &qt_wm_client_leader);
-	qt_x11_intern_atom( "WM_WINDOW_ROLE", &qt_window_role);
-	qt_x11_intern_atom( "SM_CLIENT_ID", &qt_sm_client_id);
+	qt_x11_intern_atom( "WM_WINDOW_ROLE", &tqt_window_role);
+	qt_x11_intern_atom( "SM_CLIENT_ID", &tqt_sm_client_id);
 	qt_x11_intern_atom( "CLIPBOARD", &qt_xa_clipboard );
 	qt_x11_intern_atom( "RESOURCE_MANAGER", &qt_resource_manager );
 	qt_x11_intern_atom( "INCR", &qt_x_incr );

src/kernel/qwidget_x11.cpp

@@ -1917,7 +1917,7 @@ void TQWidget::showWindow()
 
 	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);
+			    32, PropModeReplace, (unsigned char *) &tqt_x_user_time, 1);
 	}
 
 	if (!topData()->embedded &&