diff options
Diffstat (limited to 'klipper/clipboardpoll.cpp')
| -rw-r--r-- | klipper/clipboardpoll.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp index cc2f3877f..a2f5368a8 100644 --- a/klipper/clipboardpoll.cpp +++ b/klipper/clipboardpoll.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*- /* This file is part of the KDE project Copyright (C) 2003 by Lubos Lunak <l.lunak@kde.org> @@ -109,13 +108,13 @@ ClipboardPoll::ClipboardPoll( TQWidget* parent ) void ClipboardPoll::initPolling() { - connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged() ), TQT_SLOT(qtSelectionChanged())); - connect( kapp->clipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( qtClipboardChanged() )); - connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( timeout())); + connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged() ), TQ_SLOT(qtSelectionChanged())); + connect( kapp->clipboard(), TQ_SIGNAL( dataChanged() ), TQ_SLOT( qtClipboardChanged() )); + connect( &timer, TQ_SIGNAL( timeout()), TQ_SLOT( timeout())); 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; @@ -152,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()) @@ -160,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 ); } } @@ -270,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 |