From d654b1079f7801b0a65c8de8936d0d174656702b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 21 Dec 2011 14:04:20 -0600
Subject: Rename obsolete tq methods to standard names

---
 src/pdiff.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/pdiff.cpp')

diff --git a/src/pdiff.cpp b/src/pdiff.cpp
index 3986596..0a10b00 100644
--- a/src/pdiff.cpp
+++ b/src/pdiff.cpp
@@ -610,13 +610,13 @@ void KDiff3App::sourceMask( int srcMask, int enabledMask )
 
 
 // Function uses setMinSize( sizeHint ) before adding the widget.
-// void addWidget(TQBoxLayout* tqlayout, TQWidget* widget);
+// void addWidget(TQBoxLayout* layout, TQWidget* widget);
 template <class W, class L>
-void addWidget( L* tqlayout, W* widget)
+void addWidget( L* layout, W* widget)
 {
    TQSize s = widget->sizeHint();
    widget->setMinimumSize( TQSize(max2(s.width(),0),max2(s.height(),0) ) );
-   tqlayout->addWidget( widget );
+   layout->addWidget( widget );
 }
 
 void KDiff3App::initView()
@@ -1174,7 +1174,7 @@ void KDiff3App::slotEditCut()
 
    if ( !s.isNull() )
    {
-      TQApplication::tqclipboard()->setText( s, TQClipboard::Clipboard );
+      TQApplication::clipboard()->setText( s, TQClipboard::Clipboard );
    }
 
    slotStatusMsg(i18n("Ready."));
@@ -1190,7 +1190,7 @@ void KDiff3App::slotEditCopy()
    if ( s.isNull() && m_pMergeResultWindow!=0 ) s = m_pMergeResultWindow->getSelection();
    if ( !s.isNull() )
    {
-      TQApplication::tqclipboard()->setText( s, TQClipboard::Clipboard );
+      TQApplication::clipboard()->setText( s, TQClipboard::Clipboard );
    }
 
    slotStatusMsg(i18n("Ready."));
@@ -1208,17 +1208,17 @@ void KDiff3App::slotEditPaste()
    {
       if ( m_pDiffTextWindow1->hasFocus() )
       {
-         m_sd1.setData( TQApplication::tqclipboard()->text(TQClipboard::Clipboard) );
+         m_sd1.setData( TQApplication::clipboard()->text(TQClipboard::Clipboard) );
          init();
       }
       else if ( m_pDiffTextWindow2->hasFocus() )
       {
-         m_sd2.setData( TQApplication::tqclipboard()->text(TQClipboard::Clipboard) );
+         m_sd2.setData( TQApplication::clipboard()->text(TQClipboard::Clipboard) );
          init();
       }
       else if ( m_pDiffTextWindow3->hasFocus() )
       {
-         m_sd3.setData( TQApplication::tqclipboard()->text(TQClipboard::Clipboard) );
+         m_sd3.setData( TQApplication::clipboard()->text(TQClipboard::Clipboard) );
          init();
       }
    }
@@ -1465,7 +1465,7 @@ void KDiff3App::slotSelectionEnd()
    }
    else
    {
-       TQClipboard *clipBoard = TQApplication::tqclipboard();
+       TQClipboard *clipBoard = TQApplication::clipboard();
 
        if (clipBoard->supportsSelection ())
        {
@@ -1484,7 +1484,7 @@ void KDiff3App::slotSelectionEnd()
 
 void KDiff3App::slotClipboardChanged()
 {
-   TQString s = TQApplication::tqclipboard()->text();
+   TQString s = TQApplication::clipboard()->text();
    //editPaste->setEnabled(!s.isEmpty());
 }
 
-- 
cgit v1.2.3