diff options
Diffstat (limited to 'kompare/libdiff2/perforceparser.cpp')
| -rw-r--r-- | kompare/libdiff2/perforceparser.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kompare/libdiff2/perforceparser.cpp b/kompare/libdiff2/perforceparser.cpp index 0e0a2aef..59a2dae2 100644 --- a/kompare/libdiff2/perforceparser.cpp +++ b/kompare/libdiff2/perforceparser.cpp @@ -53,22 +53,22 @@ enum Kompare::Format PerforceParser::determineFormat() while( it != m_diffLines.end() ) { - if( (*it).find( unifiedRE, 0 ) == 0 ) + if( (*it).tqfind( unifiedRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a Unified diff..." << endl; return Kompare::Unified; } - else if( (*it).find( contextRE, 0 ) == 0 ) + else if( (*it).tqfind( contextRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a Context diff..." << endl; return Kompare::Context; } - else if( (*it).find( normalRE, 0 ) == 0 ) + else if( (*it).tqfind( normalRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a Normal diff..." << endl; return Kompare::Normal; } - else if( (*it).find( rcsRE, 0 ) == 0 ) + else if( (*it).tqfind( rcsRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a RCS diff..." << endl; return Kompare::RCS; @@ -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.capturedTexts() << endl; - kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << 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.capturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << m_contextDiffHeader1.tqcapturedTexts() << 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.capturedTexts() << endl; - kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << 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.capturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << m_normalDiffHeader.tqcapturedTexts() << 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.capturedTexts() << endl; -// kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl; +// kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl; +// kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << 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.capturedTexts() << endl; +// kdDebug(8101) << "Captured texts = " << m_unifiedDiffHeader1.tqcapturedTexts() << endl; } } |