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

diff --git a/kompare/libdiff2/cvsdiffparser.h b/kompare/libdiff2/cvsdiffparser.h
new file mode 100644
index 00000000..88fef485
--- /dev/null
+++ b/kompare/libdiff2/cvsdiffparser.h
@@ -0,0 +1,61 @@
+/**************************************************************************
+**                              cvsdiffparser.h
+**                              -----------------
+**      begin                   : Sun Aug  4 15:05:35 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 _CVSDIFF_PARSER_H
+#define _CVSDIFF_PARSER_H
+
+#include <qregexp.h>
+
+#include "parserbase.h"
+
+namespace Diff2
+{
+
+class KompareModelList;
+
+class CVSDiffParser : public ParserBase
+{
+public:
+	CVSDiffParser( const KompareModelList* list, const QStringList& diff );
+	virtual ~CVSDiffParser();
+
+protected:
+	virtual enum Kompare::Format determineFormat();
+
+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();
+};
+
+} // End of namespace Diff2
+
+#endif