From d654b1079f7801b0a65c8de8936d0d174656702b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:04:20 -0600 Subject: Rename obsolete tq methods to standard names --- src/mergeresultwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mergeresultwindow.cpp') diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp index dea1407..760d794 100644 --- a/src/mergeresultwindow.cpp +++ b/src/mergeresultwindow.cpp @@ -2613,10 +2613,10 @@ void MergeResultWindow::pasteClipboard( bool bFromSelection ) TQString str = melIt->getString( this ); int x = convertToPosInText( str, m_cursorXPos, m_pOptionDialog->m_tabSize ); - if ( !TQApplication::tqclipboard()->supportsSelection() ) + if ( !TQApplication::clipboard()->supportsSelection() ) bFromSelection = false; - TQString clipBoard = TQApplication::tqclipboard()->text( bFromSelection ? TQClipboard::Selection : TQClipboard::Clipboard ); + TQString clipBoard = TQApplication::clipboard()->text( bFromSelection ? TQClipboard::Selection : TQClipboard::Clipboard ); TQString currentLine = str.left(x); TQString endOfLine = str.mid(x); -- cgit v1.2.3