Rename obsolete tq methods to standard names

(cherry picked from commit b492b550f35c84160958775c14ea7037c5b12181)

3 files changed, 8 insertions, 8 deletions

diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp
index 38ef196e4..2f7ce4ddb 100644
--- a/klipper/clipboardpoll.cpp
+++ b/klipper/clipboardpoll.cpp
@@ -109,8 +109,8 @@ ClipboardPoll::ClipboardPoll( TQWidget* parent )
     
 void ClipboardPoll::initPolling()
 {
-    connect( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged() ), TQT_SLOT(qtSelectionChanged()));
-    connect( kapp->tqclipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( qtClipboardChanged() ));
+    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()));
     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->tqclipboard()->ownsSelection())
+        if( ev->selection == XA_PRIMARY && !kapp->clipboard()->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->tqclipboard()->ownsClipboard())
+        else if( ev->selection == xa_clipboard && !kapp->clipboard()->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->tqclipboard()->ownsSelection() && checkTimestamp( selection ) ) {
+    if( !kapp->clipboard()->ownsSelection() && checkTimestamp( selection ) ) {
 #ifdef NOISY_KLIPPER_
         kdDebug() << "SELECTION CHANGED" << endl;
 #endif
         emit clipboardChanged( true );
     }
-    if( !kapp->tqclipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) {
+    if( !kapp->clipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) {
 #ifdef NOISY_KLIPPER_
         kdDebug() << "CLIPBOARD CHANGED" << endl;
 #endif
diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp
index 838888bb9..bf4863607 100644
--- a/klipper/popupproxy.cpp
+++ b/klipper/popupproxy.cpp
@@ -109,7 +109,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item,
     Q_ASSERT( id != -1 ); // Be sure that the item was inserted.
     TQMenuItem* mi = proxy_for_menu->findItem( id );
     int fontheight = TQFontMetrics( proxy_for_menu->fontMetrics()  ).height();
-    int itemheight = proxy_for_menu->tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem,
+    int itemheight = proxy_for_menu->style().tqsizeFromContents(TQStyle::CT_PopupMenuItem,
                                                               proxy_for_menu,
                                                               TQSize( 0, fontheight ),
                                                               TQStyleOption(mi,10,0) ).height();
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index b64161304..12dc6ef96 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -142,7 +142,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config )
 
     updateTimestamp(); // read initial X user time
     setBackgroundMode( X11ParentRelative );
-    clip = kapp->tqclipboard();
+    clip = kapp->clipboard();
 
     connect( &m_overflowClearTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotClearOverflow()));
     m_overflowClearTimer.start( 1000 );