diff options
Diffstat (limited to 'src/diff.cpp')
| -rw-r--r-- | src/diff.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/diff.cpp b/src/diff.cpp index 136275c..722950f 100644 --- a/src/diff.cpp +++ b/src/diff.cpp @@ -492,7 +492,7 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic KMessageBox::error(m_pOptionDialog, i18n("Preprocessing possibly failed. Check this command:\n\n %1" "\n\nThe preprocessing command will be disabled now." - ).tqarg(cmd) ); + ).arg(cmd) ); m_pOptionDialog->m_PreProcessorCmd = ""; m_normalData.readFile( fileNameIn1 ); pEncoding1 = m_pEncoding; @@ -527,7 +527,7 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic KMessageBox::error(m_pOptionDialog, i18n("The line-matching-preprocessing possibly failed. Check this command:\n\n %1" "\n\nThe line-matching-preprocessing command will be disabled now." - ).tqarg(cmd) ); + ).arg(cmd) ); m_pOptionDialog->m_LineMatchingPreProcessorCmd = ""; m_lmppData.readFile( fileNameIn2 ); } @@ -1190,7 +1190,7 @@ void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManua if ( pManualDiffHelpList->empty() ) return; - // If a line appears unaligned in comparison to the manual tqalignment, correct this. + // If a line appears unaligned in comparison to the manual alignment, correct this. ManualDiffHelpList::iterator iMDHL; for( iMDHL = pManualDiffHelpList->begin(); iMDHL != pManualDiffHelpList->end(); ++iMDHL ) @@ -1228,7 +1228,7 @@ void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManua if (wi>=1 && wi <= 3) { - // Found manual tqalignment for one source + // Found manual alignment for one source Diff3LineList::iterator iDest = i3; // Move lines up until the next firstLine is found. Omit wi from move and search. |