diff options
| author | Timothy Pearson <[email protected]> | 2011-12-16 09:58:25 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-16 09:58:25 -0600 |
| commit | 2c01fd64ddde84a6d78b632f7f3b7c3560dc288c (patch) | |
| tree | 65f4f4370cf4269757d7fa4d0f4d15996a1bf68f /klipper/clipboardpoll.cpp | |
| parent | 73c08b592db45af554b9f21029bc549d70f683ab (diff) | |
| download | tdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.tar.gz tdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.
Diffstat (limited to 'klipper/clipboardpoll.cpp')
| -rw-r--r-- | klipper/clipboardpoll.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp index 7c575ddb0..38ef196e4 100644 --- a/klipper/clipboardpoll.cpp +++ b/klipper/clipboardpoll.cpp @@ -23,7 +23,7 @@ #include "clipboardpoll.h" #include <kapplication.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <kdebug.h> #include <X11/Xatom.h> #include <time.h> @@ -109,8 +109,8 @@ 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( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged() ), TQT_SLOT(qtSelectionChanged())); + connect( kapp->tqclipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( qtClipboardChanged() )); connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( timeout())); timer.start( 1000, false ); selection.atom = XA_PRIMARY; @@ -147,7 +147,7 @@ bool ClipboardPoll::x11Event( XEvent* e ) if( xfixes_event_base != -1 && e->type == xfixes_event_base + XFixesSelectionNotify ) { XFixesSelectionNotifyEvent* ev = reinterpret_cast< XFixesSelectionNotifyEvent* >( e ); - if( ev->selection == XA_PRIMARY && !kapp->clipboard()->ownsSelection()) + if( ev->selection == XA_PRIMARY && !kapp->tqclipboard()->ownsSelection()) { #ifdef NOISY_KLIPPER_ kdDebug() << "SELECTION CHANGED (XFIXES)" << endl; @@ -155,7 +155,7 @@ bool ClipboardPoll::x11Event( XEvent* e ) SET_QT_X_TIME(ev->timestamp); emit clipboardChanged( true ); } - else if( ev->selection == xa_clipboard && !kapp->clipboard()->ownsClipboard()) + else if( ev->selection == xa_clipboard && !kapp->tqclipboard()->ownsClipboard()) { #ifdef NOISY_KLIPPER_ kdDebug() << "CLIPBOARD CHANGED (XFIXES)" << endl; @@ -218,13 +218,13 @@ void ClipboardPoll::updateQtOwnership( SelectionData& data ) void ClipboardPoll::timeout() { KlipperWidget::updateTimestamp(); - if( !kapp->clipboard()->ownsSelection() && checkTimestamp( selection ) ) { + if( !kapp->tqclipboard()->ownsSelection() && checkTimestamp( selection ) ) { #ifdef NOISY_KLIPPER_ kdDebug() << "SELECTION CHANGED" << endl; #endif emit clipboardChanged( true ); } - if( !kapp->clipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) { + if( !kapp->tqclipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) { #ifdef NOISY_KLIPPER_ kdDebug() << "CLIPBOARD CHANGED" << endl; #endif |