diff options
Diffstat (limited to 'kompare/libdiff2/diffparser.cpp')
| -rw-r--r-- | kompare/libdiff2/diffparser.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kompare/libdiff2/diffparser.cpp b/kompare/libdiff2/diffparser.cpp index f98fbde5..d85256d2 100644 --- a/kompare/libdiff2/diffparser.cpp +++ b/kompare/libdiff2/diffparser.cpp @@ -15,7 +15,7 @@ ** ***************************************************************************/ -#include <qregexp.h> +#include <tqregexp.h> #include <kdebug.h> @@ -23,7 +23,7 @@ using namespace Diff2; -DiffParser::DiffParser( const KompareModelList* list, const QStringList& diff ) : ParserBase( list, diff ) +DiffParser::DiffParser( const KompareModelList* list, const TQStringList& diff ) : ParserBase( list, diff ) { // The regexps needed for context diff parsing, the rest is the same as in parserbase.cpp m_contextDiffHeader1.setPattern( "\\*\\*\\* ([^\\t]+)\\t([^\\t]+)\\n" ); @@ -38,13 +38,13 @@ enum Kompare::Format DiffParser::determineFormat() { kdDebug(8101) << "Determining the format of the diff Diff" << endl; - QRegExp normalRE ( "[0-9]+[0-9,]*[acd][0-9]+[0-9,]*" ); - QRegExp unifiedRE( "^--- " ); - QRegExp contextRE( "^\\*\\*\\* " ); - QRegExp rcsRE ( "^[acd][0-9]+ [0-9]+" ); - QRegExp edRE ( "^[0-9]+[0-9,]*[acd]" ); + TQRegExp normalRE ( "[0-9]+[0-9,]*[acd][0-9]+[0-9,]*" ); + TQRegExp unifiedRE( "^--- " ); + TQRegExp contextRE( "^\\*\\*\\* " ); + TQRegExp rcsRE ( "^[acd][0-9]+ [0-9]+" ); + TQRegExp edRE ( "^[0-9]+[0-9,]*[acd]" ); - QStringList::ConstIterator it = m_diffLines.begin(); + TQStringList::ConstIterator it = m_diffLines.begin(); while( it != m_diffLines.end() ) { |