diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-29 00:07:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-29 00:07:37 -0600 |
| commit | fd3a3130ba3c445d3c0f2ef8052f78672008a565 (patch) | |
| tree | 6ce6c9f22b3e533eab6886f8e4f0219ff7a04ef8 /src | |
| parent | 41bb408dde90e755b07cd2ab8a9bdec7548c84b0 (diff) | |
| download | tqt3-fd3a3130ba3c445d3c0f2ef8052f78672008a565.tar.gz tqt3-fd3a3130ba3c445d3c0f2ef8052f78672008a565.zip | |
Automated update from qt3
Diffstat (limited to 'src')
| -rw-r--r-- | src/kernel/qapplication_x11.cpp | 14 | ||||
| -rw-r--r-- | src/kernel/qwidget_x11.cpp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index ccb02c735..44ff475c8 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/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 ); diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp index 52adb5397..d26313160 100644 --- a/src/kernel/qwidget_x11.cpp +++ b/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 && |