diff options
Diffstat (limited to 'klipper')
| -rw-r--r-- | klipper/clipboardpoll.cpp | 10 | ||||
| -rw-r--r-- | klipper/toplevel.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp index a4c4b46c5..ff6c50cef 100644 --- a/klipper/clipboardpoll.cpp +++ b/klipper/clipboardpoll.cpp @@ -114,7 +114,7 @@ void ClipboardPoll::initPolling() timer.start( 1000, false ); selection.atom = XA_PRIMARY; clipboard.atom = xa_clipboard; - selection.last_change = clipboard.last_change = GET_QT_X_TIME(); // don't trigger right after startup + selection.last_change = clipboard.last_change = get_tqt_x_time(); // don't trigger right after startup selection.last_owner = XGetSelectionOwner( tqt_xdisplay(), XA_PRIMARY ); #ifdef NOISY_KLIPPER_ kdDebug() << "(1) Setting last_owner for =" << "selection" << ":" << selection.last_owner << endl; @@ -151,7 +151,7 @@ bool ClipboardPoll::x11Event( XEvent* e ) #ifdef NOISY_KLIPPER_ kdDebug() << "SELECTION CHANGED (XFIXES)" << endl; #endif - SET_QT_X_TIME(ev->timestamp); + set_tqt_x_time(ev->timestamp); emit clipboardChanged( true ); } else if( ev->selection == xa_clipboard && !kapp->clipboard()->ownsClipboard()) @@ -159,7 +159,7 @@ bool ClipboardPoll::x11Event( XEvent* e ) #ifdef NOISY_KLIPPER_ kdDebug() << "CLIPBOARD CHANGED (XFIXES)" << endl; #endif - SET_QT_X_TIME(ev->timestamp); + set_tqt_x_time(ev->timestamp); emit clipboardChanged( false ); } } @@ -269,9 +269,9 @@ bool ClipboardPoll::checkTimestamp( SelectionData& data ) return false; } XDeleteProperty( tqt_xdisplay(), winId(), data.timestamp_atom ); - XConvertSelection( tqt_xdisplay(), data.atom, xa_timestamp, data.timestamp_atom, winId(), GET_QT_X_TIME() ); + XConvertSelection( tqt_xdisplay(), data.atom, xa_timestamp, data.timestamp_atom, winId(), get_tqt_x_time() ); data.waiting_for_timestamp = true; - data.waiting_x_time = GET_QT_X_TIME(); + data.waiting_x_time = get_tqt_x_time(); #ifdef REALLY_NOISY_KLIPPER_ kdDebug() << "WAITING TIMESTAMP:" << ( data.atom == XA_PRIMARY ) << endl; #endif diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index 64b80654b..d90846dfc 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -1114,7 +1114,7 @@ void KlipperWidget::updateTimestamp() { // Qt3.3.0 and 3.3.1 use tqt_x_user_time for clipboard operations Time time = ( strcmp( tqVersion(), "3.3.1" ) == 0 || strcmp( tqVersion(), "3.3.0" ) == 0 ) - ? GET_QT_X_USER_TIME() : GET_QT_X_TIME(); + ? get_tqt_x_user_time() : get_tqt_x_time(); static TQWidget* w = 0; if ( !w ) w = new TQWidget; |