diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:04:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:04:20 -0600 |
| commit | d654b1079f7801b0a65c8de8936d0d174656702b (patch) | |
| tree | f0b5c5099df85263a9d8f3ff42a685e952b392ae /src/mergeresultwindow.cpp | |
| parent | 9b57232f1beb774a8a4bab4ae1f85999e193d037 (diff) | |
| download | kdiff3-d654b1079f7801b0a65c8de8936d0d174656702b.tar.gz kdiff3-d654b1079f7801b0a65c8de8936d0d174656702b.zip | |
Rename obsolete tq methods to standard names
Diffstat (limited to 'src/mergeresultwindow.cpp')
| -rw-r--r-- | src/mergeresultwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); |