[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdesvn] src/svnqt: Svn 1, 8 support: add svn_wc_conflict_reason_moved_away,
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2016-05-16 20:00:21
Message-ID: E1b2Ogf-00009t-CF () scm ! kde ! org
[Download RAW message or body]

Git commit 21a5b50e302f4c3122e408e5957265e786597e1a by Christian Ehrlicher.
Committed on 16/05/2016 at 19:56.
Pushed by chehrlic into branch 'master'.

Svn 1,8 support: add svn_wc_conflict_reason_moved_away, \
svn_wc_conflict_reason_moved_here, enum -> enum classes

M  +47   -32   src/svnqt/conflictdescription.cpp
M  +22   -19   src/svnqt/conflictdescription.h

http://commits.kde.org/kdesvn/21a5b50e302f4c3122e408e5957265e786597e1a

diff --git a/src/svnqt/conflictdescription.cpp b/src/svnqt/conflictdescription.cpp
index f7d5f31..5c7a0a0 100644
--- a/src/svnqt/conflictdescription.cpp
+++ b/src/svnqt/conflictdescription.cpp
@@ -50,54 +50,61 @@ ConflictDescription::ConflictDescription(const \
svn_wc_conflict_description2_t *c  m_theirFile = \
QString::fromUtf8(conflict->their_abspath);  switch (conflict->action) {
     case svn_wc_conflict_action_edit:
-        m_action = ConflictEdit;
+        m_action = ConflictAction::Edit;
         break;
     case svn_wc_conflict_action_add:
-        m_action = ConflictAdd;
+        m_action = ConflictAction::Add;
         break;
     case svn_wc_conflict_action_delete:
-        m_action = ConflictDelete;
+        m_action = ConflictAction::Delete;
         break;
     case svn_wc_conflict_action_replace:
-        m_action = ConflictReplace;
+        m_action = ConflictAction::Replace;
         break;
     }
     switch (conflict->kind) {
     case svn_wc_conflict_kind_text:
-        m_Type = ConflictText;
+        m_Type = ConflictType::Text;
         break;
     case svn_wc_conflict_kind_property:
-        m_Type = ConflictProperty;
+        m_Type = ConflictType::Property;
         break;
     case svn_wc_conflict_kind_tree:
-        m_Type = ConflictTree;
+        m_Type = ConflictType::Tree;
         break;
     }
     m_nodeKind = conflict->node_kind;
     m_binary = conflict->is_binary;
     switch (conflict->reason) {
     case svn_wc_conflict_reason_edited:
-        m_reason = ReasonEdited;
+        m_reason = ConflictReason::Edited;
         break;
     case svn_wc_conflict_reason_obstructed:
-        m_reason = ReasonObstructed;
+        m_reason = ConflictReason::Obstructed;
         break;
     case svn_wc_conflict_reason_deleted:
-        m_reason = ReasonDeleted;
+        m_reason = ConflictReason::Deleted;
         break;
     case svn_wc_conflict_reason_missing:
-        m_reason = ReasonMissing;
+        m_reason = ConflictReason::Missing;
         break;
     case svn_wc_conflict_reason_unversioned:
-        m_reason = ReasonUnversioned;
+        m_reason = ConflictReason::Unversioned;
         break;
     case svn_wc_conflict_reason_added:
-        m_reason = ReasonAdded;
+        m_reason = ConflictReason::Added;
         break;
     case svn_wc_conflict_reason_replaced:
-        m_reason = ReasonReplaced;
+        m_reason = ConflictReason::Replaced;
         break;
-    // todo svn 1.8: \
svn_wc_conflict_reason_moved_away/svn_wc_conflict_reason_moved_here +#if \
SVN_API_VERSION >= SVN_VERSION_CHECK(1,8,0) +    case \
svn_wc_conflict_reason_moved_away: +        m_reason = ConflictReason::MovedAway;
+        break;
+    case svn_wc_conflict_reason_moved_here:
+        m_reason = ConflictReason::MovedHere;
+        break;
+#endif
     }
 #else
     Q_UNUSED(conflict);
@@ -120,30 +127,30 @@ ConflictDescription::ConflictDescription(const \
svn_wc_conflict_description_t *co  m_theirFile = \
QString::fromUtf8(conflict->their_file);  switch (conflict->action) {
     case svn_wc_conflict_action_edit:
-        m_action = ConflictEdit;
+        m_action = ConflictAction::Edit;
         break;
     case svn_wc_conflict_action_add:
-        m_action = ConflictAdd;
+        m_action = ConflictAction::Add;
         break;
     case svn_wc_conflict_action_delete:
-        m_action = ConflictDelete;
+        m_action = ConflictAction::Delete;
         break;
 #if SVN_API_VERSION >= SVN_VERSION_CHECK(1,7,0)
     case svn_wc_conflict_action_replace:
-        m_action = ConflictReplace;
+        m_action = ConflictAction::Replace;
         break;
 #endif
     }
     switch (conflict->kind) {
     case svn_wc_conflict_kind_text:
-        m_Type = ConflictText;
+        m_Type = ConflictType::Text;
         break;
     case svn_wc_conflict_kind_property:
-        m_Type = ConflictProperty;
+        m_Type = ConflictType::Property;
         break;
 #if SVN_API_VERSION >= SVN_VERSION_CHECK(1,6,0)
     case svn_wc_conflict_kind_tree:
-        m_Type = ConflictTree;
+        m_Type = ConflictType::Tree;
         break;
 #endif
     }
@@ -151,28 +158,36 @@ ConflictDescription::ConflictDescription(const \
svn_wc_conflict_description_t *co  m_binary = conflict->is_binary;
     switch (conflict->reason) {
     case svn_wc_conflict_reason_edited:
-        m_reason = ReasonEdited;
+        m_reason = ConflictReason::Edited;
         break;
     case svn_wc_conflict_reason_obstructed:
-        m_reason = ReasonObstructed;
+        m_reason = ConflictReason::Obstructed;
         break;
     case svn_wc_conflict_reason_deleted:
-        m_reason = ReasonDeleted;
+        m_reason = ConflictReason::Deleted;
         break;
     case svn_wc_conflict_reason_missing:
-        m_reason = ReasonMissing;
+        m_reason = ConflictReason::Missing;
         break;
     case svn_wc_conflict_reason_unversioned:
-        m_reason = ReasonUnversioned;
+        m_reason = ConflictReason::Unversioned;
         break;
 #if SVN_API_VERSION >= SVN_VERSION_CHECK(1,6,0)
     case svn_wc_conflict_reason_added:
-        m_reason = ReasonAdded;
+        m_reason = ConflictReason::Added;
         break;
 #endif
 #if SVN_API_VERSION >= SVN_VERSION_CHECK(1,7,0)
     case svn_wc_conflict_reason_replaced:
-        m_reason = ReasonReplaced;
+        m_reason = ConflictReason::Replaced;
+        break;
+#endif
+#if SVN_API_VERSION >= SVN_VERSION_CHECK(1,8,0)
+    case svn_wc_conflict_reason_moved_away:
+        m_reason = ConflictReason::MovedAway;
+        break;
+    case svn_wc_conflict_reason_moved_here:
+        m_reason = ConflictReason::MovedHere;
         break;
 #endif
     }
@@ -196,9 +211,9 @@ const QString &svn::ConflictDescription::baseFile() const
  */
 void svn::ConflictDescription::init()
 {
-    m_action = ConflictEdit;
-    m_Type = ConflictText;
-    m_reason = ReasonEdited;
+    m_action = ConflictAction::Edit;
+    m_Type = ConflictType::Text;
+    m_reason = ConflictReason::Edited;
     m_binary = false;
     m_nodeKind = svn_node_unknown;
 }
diff --git a/src/svnqt/conflictdescription.h b/src/svnqt/conflictdescription.h
index baf7277..9999098 100644
--- a/src/svnqt/conflictdescription.h
+++ b/src/svnqt/conflictdescription.h
@@ -46,25 +46,27 @@ namespace svn
 class SVNQT_EXPORT ConflictDescription
 {
 public:
-    enum ConflictType {
-        ConflictText,
-        ConflictProperty,
-        ConflictTree
+    enum class ConflictType {
+        Text,
+        Property,
+        Tree
     };
-    enum ConflictReason {
-        ReasonEdited,
-        ReasonObstructed,
-        ReasonDeleted,
-        ReasonMissing,
-        ReasonUnversioned,
-        ReasonAdded,
-        ReasonReplaced
+    enum class ConflictReason {
+        Edited,
+        Obstructed,
+        Deleted,
+        Missing,
+        Unversioned,
+        Added,
+        Replaced,
+        MovedAway,
+        MovedHere
     };
-    enum ConflictAction {
-        ConflictEdit,
-        ConflictAdd,
-        ConflictDelete,
-        ConflictReplace
+    enum class ConflictAction {
+        Edit,
+        Add,
+        Delete,
+        Replace
     };
     explicit ConflictDescription(const svn_wc_conflict_description_t *);
     explicit ConflictDescription(const svn_wc_conflict_description2_t *);
@@ -83,9 +85,10 @@ public:
     const QString &mimeType() const;
     const QString &mergedFile() const;
 
-protected:
     //! don't use it.
-    ConflictDescription(const ConflictDescription &);
+    ConflictDescription(const ConflictDescription &) = delete;
+    ConflictDescription &operator=(const ConflictDescription &) = delete;
+protected:
     void init();
 protected:
     Pool m_pool;


[prev in list] [next in list] [prev in thread] [next in thread]