diff options
Diffstat (limited to 'kompare/libdiff2')
| -rw-r--r-- | kompare/libdiff2/diffhunk.cpp | 4 | ||||
| -rw-r--r-- | kompare/libdiff2/diffmodel.cpp | 8 | ||||
| -rw-r--r-- | kompare/libdiff2/perforceparser.cpp | 18 |
3 files changed, 15 insertions, 15 deletions
diff --git a/kompare/libdiff2/diffhunk.cpp b/kompare/libdiff2/diffhunk.cpp index efa7e12d..3fbd082e 100644 --- a/kompare/libdiff2/diffhunk.cpp +++ b/kompare/libdiff2/diffhunk.cpp @@ -97,7 +97,7 @@ TQString DiffHunk::recreateHunk() const } // recreate header - hunk += TQString::tqfromLatin1( "@@ -%1,%3 +%2,%4 @@" ) + hunk += TQString::fromLatin1( "@@ -%1,%3 +%2,%4 @@" ) .tqarg( m_sourceLine ) .tqarg( m_destinationLine ) .tqarg( slc ) @@ -106,7 +106,7 @@ TQString DiffHunk::recreateHunk() const if ( !m_function.isEmpty() ) hunk += " " + m_function; - hunk += TQString::tqfromLatin1( "\n" ); + hunk += TQString::fromLatin1( "\n" ); hunk += differences; diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp index cd348dfc..c300755b 100644 --- a/kompare/libdiff2/diffmodel.cpp +++ b/kompare/libdiff2/diffmodel.cpp @@ -152,13 +152,13 @@ TQString DiffModel::recreateDiff() const TQString diff; // recreate header - TQString tab = TQString::tqfromLatin1( "\t" ); - TQString nl = TQString::tqfromLatin1( "\n" ); - diff += TQString::tqfromLatin1( "--- %1\t%2" ).tqarg( m_source ).tqarg( m_sourceTimestamp ); + TQString tab = TQString::fromLatin1( "\t" ); + TQString nl = TQString::fromLatin1( "\n" ); + diff += TQString::fromLatin1( "--- %1\t%2" ).tqarg( m_source ).tqarg( m_sourceTimestamp ); if ( !m_sourceRevision.isEmpty() ) diff += tab + m_sourceRevision; diff += nl; - diff += TQString::tqfromLatin1( "+++ %1\t%2" ).tqarg( m_destination ).tqarg( m_destinationTimestamp ); + diff += TQString::fromLatin1( "+++ %1\t%2" ).tqarg( m_destination ).tqarg( m_destinationTimestamp ); if ( !m_destinationRevision.isEmpty() ) diff += tab + m_destinationRevision; diff += nl; diff --git a/kompare/libdiff2/perforceparser.cpp b/kompare/libdiff2/perforceparser.cpp index b0d54157..0e0a2aef 100644 --- a/kompare/libdiff2/perforceparser.cpp +++ b/kompare/libdiff2/perforceparser.cpp @@ -103,8 +103,8 @@ bool PerforceParser::parseContextDiffHeader() destinationFileRE.exactMatch( m_contextDiffHeader1.cap( 2 ) ); kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl; kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl; - kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl; - kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl; kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl; kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl; m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) ); @@ -117,7 +117,7 @@ bool PerforceParser::parseContextDiffHeader() else { kdDebug(8101) << "Matched length = " << m_contextDiffHeader1.matchedLength() << endl; - kdDebug(8101) << "Captured texts = " << m_contextDiffHeader1.tqcapturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << m_contextDiffHeader1.capturedTexts() << endl; } } @@ -149,8 +149,8 @@ bool PerforceParser::parseNormalDiffHeader() destinationFileRE.exactMatch( m_normalDiffHeader.cap( 2 ) ); kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl; kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl; - kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl; - kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl; kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl; kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl; m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) ); @@ -163,7 +163,7 @@ bool PerforceParser::parseNormalDiffHeader() else { kdDebug(8101) << "Matched length = " << m_normalDiffHeader.matchedLength() << endl; - kdDebug(8101) << "Captured texts = " << m_normalDiffHeader.tqcapturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << m_normalDiffHeader.capturedTexts() << endl; } } @@ -200,8 +200,8 @@ bool PerforceParser::parseUnifiedDiffHeader() destinationFileRE.exactMatch( m_unifiedDiffHeader1.cap( 2 ) ); // kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl; // kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl; -// kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl; -// kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl; +// kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl; +// kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl; // kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl; // kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl; m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) ); @@ -214,7 +214,7 @@ bool PerforceParser::parseUnifiedDiffHeader() else { // kdDebug(8101) << "Matched length = " << m_unifiedDiffHeader1.matchedLength() << endl; -// kdDebug(8101) << "Captured texts = " << m_unifiedDiffHeader1.tqcapturedTexts() << endl; +// kdDebug(8101) << "Captured texts = " << m_unifiedDiffHeader1.capturedTexts() << endl; } } |