Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 81 insertions, 0 deletions

diff --git a/kompare/libdiff2/diffparser.cpp b/kompare/libdiff2/diffparser.cpp
new file mode 100644
index 00000000..f98fbde5
--- /dev/null
+++ b/kompare/libdiff2/diffparser.cpp
@@ -0,0 +1,81 @@
+/**************************************************************************
+**                              diffparser.cpp
+**                              --------------
+**      begin                   : Sun Aug  4 15:05:35 2002
+**      copyright               : (C) 2002-2004 Otto Bruggeman
+**      email                   : [email protected]
+**
+***************************************************************************/
+/***************************************************************************
+**
+**   This program is free software; you can redistribute it and/or modify
+**   it under the terms of the GNU General Public License as published by
+**   the Free Software Foundation; either version 2 of the License, or
+**   ( at your option ) any later version.
+**
+***************************************************************************/
+
+#include <qregexp.h>
+
+#include <kdebug.h>
+
+#include "diffparser.h"
+
+using namespace Diff2;
+
+DiffParser::DiffParser( const KompareModelList* list, const QStringList& 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" );
+	m_contextDiffHeader2.setPattern( "--- ([^\\t]+)\\t([^\\t]+)\\n" );
+}
+
+DiffParser::~DiffParser()
+{
+}
+
+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]" );
+
+	QStringList::ConstIterator it = m_diffLines.begin();
+
+	while( it != m_diffLines.end() )
+	{
+		kdDebug(8101) << (*it) << endl;
+		if( (*it).find( normalRE, 0 ) == 0 )
+		{
+			kdDebug(8101) << "Difflines are from a Normal diff..." << endl;
+			return Kompare::Normal;
+		}
+		else if( (*it).find( unifiedRE, 0 ) == 0 )
+		{
+			kdDebug(8101) << "Difflines are from a Unified diff..." << endl;
+			return Kompare::Unified;
+		}
+		else if( (*it).find( contextRE, 0 ) == 0 )
+		{
+			kdDebug(8101) << "Difflines are from a Context diff..." << endl;
+			return Kompare::Context;
+		}
+		else if( (*it).find( rcsRE, 0 ) == 0 )
+		{
+			kdDebug(8101) << "Difflines are from an RCS diff..." << endl;
+			return Kompare::RCS;
+		}
+		else if( (*it).find( edRE, 0 ) == 0 )
+		{
+			kdDebug(8101) << "Difflines are from an ED diff..." << endl;
+			return Kompare::Ed;
+		}
+		++it;
+	}
+	kdDebug(8101) << "Difflines are from an unknown diff..." << endl;
+	return Kompare::UnknownFormat;
+}