diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:51:49 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:51:49 +0000 |
| commit | 4ae0c208b66e0f7954e194384464fe2d0a2c56dd (patch) | |
| tree | b0a7cd1c184f0003c0292eb416ed27f674f9cc43 /kompare/libdiff2/perforceparser.cpp | |
| parent | 1964ea0fb4ab57493ca2ebb709c8d3b5395fd653 (diff) | |
| download | tdesdk-4ae0c208b66e0f7954e194384464fe2d0a2c56dd.tar.gz tdesdk-4ae0c208b66e0f7954e194384464fe2d0a2c56dd.zip | |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1157652 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kompare/libdiff2/perforceparser.cpp')
| -rw-r--r-- | kompare/libdiff2/perforceparser.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/kompare/libdiff2/perforceparser.cpp b/kompare/libdiff2/perforceparser.cpp index 907d88ff..0e0a2aef 100644 --- a/kompare/libdiff2/perforceparser.cpp +++ b/kompare/libdiff2/perforceparser.cpp @@ -15,7 +15,7 @@ ** ***************************************************************************/ -#include <qregexp.h> +#include <tqregexp.h> #include <kdebug.h> @@ -23,7 +23,7 @@ using namespace Diff2; -PerforceParser::PerforceParser( const KompareModelList* list, const QStringList& diff ) : ParserBase( list, diff ) +PerforceParser::PerforceParser( const KompareModelList* list, const TQStringList& diff ) : ParserBase( list, diff ) { m_contextDiffHeader1.setPattern( "==== (.*) - (.*) ====\\n" ); m_contextDiffHeader1.setMinimal( true ); @@ -43,13 +43,13 @@ enum Kompare::Format PerforceParser::determineFormat() { kdDebug(8101) << "Determining the format of the Perforce Diff" << endl; - QRegExp unifiedRE( "^@@" ); - QRegExp contextRE( "^\\*{15}" ); - QRegExp normalRE ( "^\\d+(|,\\d+)[acd]\\d+(|,\\d+)" ); - QRegExp rcsRE ( "^[acd]\\d+ \\d+" ); + TQRegExp unifiedRE( "^@@" ); + TQRegExp contextRE( "^\\*{15}" ); + TQRegExp normalRE ( "^\\d+(|,\\d+)[acd]\\d+(|,\\d+)" ); + TQRegExp rcsRE ( "^[acd]\\d+ \\d+" ); // Summary is not supported since it gives no useful parsable info - QStringList::ConstIterator it = m_diffLines.begin(); + TQStringList::ConstIterator it = m_diffLines.begin(); while( it != m_diffLines.end() ) { @@ -84,10 +84,10 @@ bool PerforceParser::parseContextDiffHeader() // kdDebug(8101) << "ParserBase::parseContextDiffHeader()" << endl; bool result = false; - QStringList::ConstIterator itEnd = m_diffLines.end(); + TQStringList::ConstIterator itEnd = m_diffLines.end(); - QRegExp sourceFileRE ( "([^\\#]+)#(\\d+)" ); - QRegExp destinationFileRE( "([^\\#]+)#(|\\d+)" ); + TQRegExp sourceFileRE ( "([^\\#]+)#(\\d+)" ); + TQRegExp destinationFileRE( "([^\\#]+)#(|\\d+)" ); while ( m_diffIterator != itEnd ) { @@ -128,10 +128,10 @@ bool PerforceParser::parseNormalDiffHeader() { bool result = false; - QStringList::ConstIterator itEnd = m_diffLines.end(); + TQStringList::ConstIterator itEnd = m_diffLines.end(); - QRegExp sourceFileRE ( "([^\\#]+)#(\\d+)" ); - QRegExp destinationFileRE( "([^\\#]+)#(|\\d+)" ); + TQRegExp sourceFileRE ( "([^\\#]+)#(\\d+)" ); + TQRegExp destinationFileRE( "([^\\#]+)#(|\\d+)" ); while ( m_diffIterator != itEnd ) { @@ -179,10 +179,10 @@ bool PerforceParser::parseUnifiedDiffHeader() { bool result = false; - QStringList::ConstIterator itEnd = m_diffLines.end(); + TQStringList::ConstIterator itEnd = m_diffLines.end(); - QRegExp sourceFileRE ( "([^\\#]+)#(\\d+)" ); - QRegExp destinationFileRE( "([^\\#]+)#(|\\d+)" ); + TQRegExp sourceFileRE ( "([^\\#]+)#(\\d+)" ); + TQRegExp destinationFileRE( "([^\\#]+)#(|\\d+)" ); while ( m_diffIterator != itEnd ) { |