diff options
Diffstat (limited to 'src/kernel/qeventloop_x11.cpp')
| -rw-r--r-- | src/kernel/qeventloop_x11.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/qeventloop_x11.cpp index 1e446bace..bada85fdd 100644 --- a/src/kernel/qeventloop_x11.cpp +++ b/src/kernel/qeventloop_x11.cpp @@ -170,8 +170,8 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) case ClientMessage: { // from qapplication_x11.cpp - extern Atom qt_wm_protocols; - extern Atom qt_wm_take_focus; + extern Atom tqt_wm_protocols; + extern Atom tqt_wm_take_focus; extern Atom qt_qt_scrolldone; // only keep the wm_take_focus and @@ -180,8 +180,8 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) if ( event.xclient.format != 32 ) continue; - if ( event.xclient.message_type == qt_wm_protocols || - (Atom) event.xclient.data.l[0] == qt_wm_take_focus ) + if ( event.xclient.message_type == tqt_wm_protocols || + (Atom) event.xclient.data.l[0] == tqt_wm_take_focus ) break; if ( event.xclient.message_type == qt_qt_scrolldone ) break; @@ -337,7 +337,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) if (ret == -1 && errno == EBADF) { // disable the invalid socket notifier static const char *t[] = { "Read", "Write", "Exception" }; - qWarning("TQSocketNotifier: invalid socket %d and type '%s', disabling...", + tqWarning("TQSocketNotifier: invalid socket %d and type '%s', disabling...", sn->fd, t[type]); sn->obj->setEnabled(FALSE); } |