summaryrefslogtreecommitdiffstats
path: root/kompare/libdiff2/diffparser.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:51:49 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:51:49 +0000
commit4ae0c208b66e0f7954e194384464fe2d0a2c56dd (patch)
treeb0a7cd1c184f0003c0292eb416ed27f674f9cc43 /kompare/libdiff2/diffparser.cpp
parent1964ea0fb4ab57493ca2ebb709c8d3b5395fd653 (diff)
downloadtdesdk-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/diffparser.cpp')
-rw-r--r--kompare/libdiff2/diffparser.cpp16
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() )
{