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, 133 insertions, 0 deletions

diff --git a/kompare/libdiff2/parserbase.h b/kompare/libdiff2/parserbase.h
new file mode 100644
index 00000000..5e08803e
--- /dev/null
+++ b/kompare/libdiff2/parserbase.h
@@ -0,0 +1,133 @@
+/**************************************************************************
+**                             parserbase.h
+**                              -------------------
+**      begin                   : Tue Jul 30 23:53:52 2002
+**      copyright               : (C) 2002-2004 Otto Bruggeman
+**      email                   : otto.bruggeman@home.nl
+**
+***************************************************************************/
+/***************************************************************************
+**
+**   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.
+**
+***************************************************************************/
+
+#ifndef _DIFF2_PARSERBASE_H
+#define _DIFF2_PARSERBASE_H
+
+#include <qregexp.h>
+
+#include "kompare.h"
+#include "difference.h"
+#include "diffmodellist.h"
+
+class QStringList;
+class QString;
+
+namespace Diff2
+{
+
+class KompareModelList;
+
+class ParserBase
+{
+public:
+	ParserBase( const KompareModelList* list, const QStringList& diff );
+	virtual ~ParserBase();
+
+public:
+	enum Kompare::Format format() { return determineFormat(); };
+	DiffModelList* parse();
+
+protected:
+	virtual bool parseContextDiffHeader();
+	virtual bool parseEdDiffHeader();
+	virtual bool parseNormalDiffHeader();
+	virtual bool parseRCSDiffHeader();
+	virtual bool parseUnifiedDiffHeader();
+
+	virtual bool parseContextHunkHeader();
+	virtual bool parseEdHunkHeader();
+	virtual bool parseNormalHunkHeader();
+	virtual bool parseRCSHunkHeader();
+	virtual bool parseUnifiedHunkHeader();
+
+	virtual bool parseContextHunkBody();
+	virtual bool parseEdHunkBody();
+	virtual bool parseNormalHunkBody();
+	virtual bool parseRCSHunkBody();
+	virtual bool parseUnifiedHunkBody();
+
+	virtual DiffModelList* parseContext();
+	virtual DiffModelList* parseEd();
+	virtual DiffModelList* parseNormal();
+	virtual DiffModelList* parseRCS();
+	virtual DiffModelList* parseUnified();
+
+protected: // Helper methods to speed things up
+	bool matchesUnifiedHunkLine( QString line ) const;
+
+protected:
+	/** What is format of the diff */
+	virtual enum Kompare::Format determineFormat();
+
+protected:
+	// Regexps for context parsing
+	QRegExp m_contextDiffHeader1;
+	QRegExp m_contextDiffHeader2;
+
+	QRegExp m_contextHunkHeader1;
+	QRegExp m_contextHunkHeader2;
+	QRegExp m_contextHunkHeader3;
+
+	QRegExp m_contextHunkBodyRemoved;
+	QRegExp m_contextHunkBodyAdded;
+	QRegExp m_contextHunkBodyChanged;
+	QRegExp m_contextHunkBodyContext;
+	QRegExp m_contextHunkBodyLine; // Added for convenience
+
+	// Regexps for normal parsing
+	QRegExp m_normalDiffHeader;
+
+	QRegExp m_normalHunkHeaderAdded;
+	QRegExp m_normalHunkHeaderRemoved;
+	QRegExp m_normalHunkHeaderChanged;
+
+	QRegExp m_normalHunkBodyRemoved;
+	QRegExp m_normalHunkBodyAdded;
+	QRegExp m_normalHunkBodyDivider;
+
+	enum Difference::Type m_normalDiffType;
+
+	// RegExps for rcs parsing
+	QRegExp m_rcsDiffHeader;
+
+	// Regexps for unified parsing
+	QRegExp m_unifiedDiffHeader1;
+	QRegExp m_unifiedDiffHeader2;
+
+	QRegExp m_unifiedHunkHeader;
+
+	QRegExp m_unifiedHunkBodyAdded;
+	QRegExp m_unifiedHunkBodyRemoved;
+	QRegExp m_unifiedHunkBodyContext;
+	QRegExp m_unifiedHunkBodyLine; // Added for convenience
+
+protected:
+	const QStringList&         m_diffLines;
+	DiffModel*                 m_currentModel;
+	DiffModelList*             m_models;
+	QStringList::ConstIterator m_diffIterator;
+
+	bool                       m_singleFileDiff;
+
+protected:
+	const KompareModelList* m_list;
+};
+
+} // End of namespace Diff2
+
+#endif