summaryrefslogtreecommitdiffstats
path: root/src/svnqt/conflictdescription.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/svnqt/conflictdescription.hpp')
-rw-r--r--src/svnqt/conflictdescription.hpp96
1 files changed, 96 insertions, 0 deletions
diff --git a/src/svnqt/conflictdescription.hpp b/src/svnqt/conflictdescription.hpp
new file mode 100644
index 0000000..3f72562
--- /dev/null
+++ b/src/svnqt/conflictdescription.hpp
@@ -0,0 +1,96 @@
+/***************************************************************************
+ * Copyright (C) 2008 by Rajko Albrecht [email protected] *
+ * http://kdesvn.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.hpp"
+#include "svnqt/svnqt_defines.hpp"
+#include <svn_types.h>
+
+#include <qstring.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 SVNQT_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 QString& baseFile() const;
+ const QString& theirFile() const;
+ const QString& propertyName() const;
+ const QString& Path() const;
+ const QString& myFile() const;
+ const QString& mimeType() const;
+ const QString& 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;
+ QString m_baseFile;
+ QString m_mergedFile;
+ QString m_mimeType;
+ QString m_myFile;
+ QString m_Path;
+ QString m_propertyName;
+ QString m_theirFile;
+ svn_node_kind_t m_nodeKind;
+};
+
+}
+
+#endif