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

diff --git a/kompare/libdiff2/parser.h b/kompare/libdiff2/parser.h
new file mode 100644
index 00000000..0ffae23a
--- /dev/null
+++ b/kompare/libdiff2/parser.h
@@ -0,0 +1,58 @@
+/**************************************************************************
+**                              parser.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_PARSER_H
+#define _DIFF2_PARSER_H
+
+#include "diffmodellist.h"
+#include "kompare.h"
+
+namespace Diff2
+{
+
+class DiffModel;
+class KompareModelList;
+
+class Parser
+{
+public:
+	Parser( const KompareModelList* list );
+	~Parser();
+
+public:
+	DiffModelList* parse( QStringList& diffLines );
+
+	enum Kompare::Generator generator() const { return m_generator; };
+	enum Kompare::Format    format() const    { return m_format; };
+
+private:
+	/** Which program was used to generate the output */
+	enum Kompare::Generator determineGenerator( const QStringList& diffLines );
+
+	int cleanUpCrap( QStringList& diffLines );
+
+private:
+	enum Kompare::Generator m_generator;
+	enum Kompare::Format    m_format;
+
+	const KompareModelList* m_list;
+};
+
+} // End of namespace Diff2
+
+#endif
+