1 files changed, 96 insertions, 0 deletions
diff --git a/src/svnqt/conflictdescription.h b/src/svnqt/conflictdescription.h
new file mode 100644
index 0000000..1944827
--- /dev/null
+++ b/src/svnqt/conflictdescription.h
@@ -0,0 +1,96 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Rajko Albrecht  [email protected]             *
+ *   http://tdesvn.alwins-world.de/                                        *
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
+#ifndef SVNCONFLICTDESCRIPTION_H
+#define SVNCONFLICTDESCRIPTION_H
+
+struct svn_wc_conflict_description_t;
+
+#include "svnqt/pool.h"
+#include "svnqt/svnqt_defines.h"
+#include <svn_types.h>
+
+#include <tqstring.h>
+
+namespace svn {
+
+/** Wrapper for svn_wc_conflict_description_t
+ * does nothing when build against subversion prior 1.5
+ * @since subversion 1.5
+ * @author Rajko Albrecht
+*/
+class SVNTQT_EXPORT ConflictDescription
+{
+public:
+    enum ConflictType {
+        ConflictText,
+        ConflictProperty
+    };
+    enum ConflictReason {
+        ReasonEdited,
+        ReasonObstructed,
+        ReasonDeleted,
+        ReasonMissing,
+        ReasonUnversioned
+    };
+    enum ConflictAction {
+        ConflictEdit,
+        ConflictAdd,
+        ConflictDelete
+    };
+    ConflictDescription();
+    ConflictDescription(const svn_wc_conflict_description_t*);
+    ~ConflictDescription();
+
+    ConflictAction action() const;
+    ConflictType Type() const;
+    ConflictReason reason() const;
+    svn_node_kind_t nodeKind() const;
+    bool binary() const;
+    const TQString& baseFile() const;
+    const TQString& theirFile() const;
+    const TQString& propertyName() const;
+    const TQString& Path() const;
+    const TQString& myFile() const;
+    const TQString& mimeType() const;
+    const TQString& mergedFile() const;
+
+protected:
+    //! don't use it.
+    ConflictDescription(const ConflictDescription&);
+    void init();
+protected:
+    Pool m_pool;
+    bool m_binary;
+    ConflictAction m_action;
+    ConflictType m_Type;
+    ConflictReason m_reason;
+    TQString m_baseFile;
+    TQString m_mergedFile;
+    TQString m_mimeType;
+    TQString m_myFile;
+    TQString m_Path;
+    TQString m_propertyName;
+    TQString m_theirFile;
+    svn_node_kind_t m_nodeKind;
+};
+
+}
+
+#endif