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

List:       kde-commits
Subject:    [kdesvn] src/svnqt: Make svn::Pool ctors explicit
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2016-10-09 13:16:16
Message-ID: E1btDxg-0003lJ-SY () code ! kde ! org
[Download RAW message or body]

Git commit 84da96033c9f6d1cd783a698e39f04b8e77b4ce1 by Christian Ehrlicher.
Committed on 09/10/2016 at 13:14.
Pushed by chehrlic into branch 'master'.

Make svn::Pool ctors explicit

M  +2    -2    src/svnqt/conflictresult.cpp
M  +2    -2    src/svnqt/conflictresult.h
M  +1    -1    src/svnqt/helper.h
M  +1    -1    src/svnqt/pool.h

http://commits.kde.org/kdesvn/84da96033c9f6d1cd783a698e39f04b8e77b4ce1

diff --git a/src/svnqt/conflictresult.cpp b/src/svnqt/conflictresult.cpp
index 41e9ab7..b4b038e 100644
--- a/src/svnqt/conflictresult.cpp
+++ b/src/svnqt/conflictresult.cpp
@@ -84,7 +84,7 @@ void ConflictResult::setChoice(ConflictChoice aValue)
     m_choice = aValue;
 }
 
-void ConflictResult::assignResult(svn_wc_conflict_result_t **aResult, const Pool &pool)const
+void ConflictResult::assignResult(svn_wc_conflict_result_t **aResult, apr_pool_t *pool)const
 {
     svn_wc_conflict_choice_t _choice;
     switch (choice()) {
@@ -121,7 +121,7 @@ void ConflictResult::assignResult(svn_wc_conflict_result_t **aResult, const Pool
     }
 }
 
-const svn_wc_conflict_result_t *ConflictResult::result(const Pool &pool)const
+const svn_wc_conflict_result_t *ConflictResult::result(apr_pool_t *pool)const
 {
     svn_wc_conflict_result_t *result = 0;
     assignResult(&result, pool);
diff --git a/src/svnqt/conflictresult.h b/src/svnqt/conflictresult.h
index de3ff59..50be7c0 100644
--- a/src/svnqt/conflictresult.h
+++ b/src/svnqt/conflictresult.h
@@ -67,8 +67,8 @@ public:
     }
     void setChoice(ConflictChoice aValue);
 
-    const svn_wc_conflict_result_t *result(const Pool &pool)const;
-    void assignResult(svn_wc_conflict_result_t **aResult, const Pool &pool)const;
+    const svn_wc_conflict_result_t *result(apr_pool_t *pool)const;
+    void assignResult(svn_wc_conflict_result_t **aResult, apr_pool_t *pool)const;
 
 protected:
     ConflictChoice m_choice;
diff --git a/src/svnqt/helper.h b/src/svnqt/helper.h
index e6ce419..64e5b37 100644
--- a/src/svnqt/helper.h
+++ b/src/svnqt/helper.h
@@ -134,7 +134,7 @@ class Hash2Map
 {
     PropertiesMap _map;
 public:
-    Hash2Map(apr_hash_t *hash, const svn::Pool &pool)
+    Hash2Map(apr_hash_t *hash, apr_pool_t *pool)
         : _map()
     {
         if (hash != 0L) {
diff --git a/src/svnqt/pool.h b/src/svnqt/pool.h
index a7bb9e1..9f2c25a 100644
--- a/src/svnqt/pool.h
+++ b/src/svnqt/pool.h
@@ -48,7 +48,7 @@ public:
      *
      * @param parent NULL -> global pool
      */
-    Pool(apr_pool_t *parent = nullptr);    //krazy:exclude=explicit
+    explicit Pool(apr_pool_t *parent = nullptr);
     Pool &operator=(const Pool &) = delete;
     Pool(const Pool &) = delete;
 

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