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

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

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

Make svn::StringArray ctors explicit

M  +1    -1    src/svnfrontend/graphtree/revisiontree.cpp
M  +2    -2    src/svnfrontend/svnactions.cpp
M  +1    -1    src/svnqt/cache/ReposLog.cpp
M  +1    -1    src/svnqt/cache/ReposLog.h
M  +0    -1    src/svnqt/client_annotate_parameter.cpp
M  +0    -1    src/svnqt/client_merge.cpp
M  +2    -2    src/svnqt/stringarray.h

http://commits.kde.org/kdesvn/d092ab587ead66d7edde61dbda46b62cd8330ad3

diff --git a/src/svnfrontend/graphtree/revisiontree.cpp \
b/src/svnfrontend/graphtree/revisiontree.cpp index 0523e59..699b263 100644
--- a/src/svnfrontend/graphtree/revisiontree.cpp
+++ b/src/svnfrontend/graphtree/revisiontree.cpp
@@ -85,7 +85,7 @@ bool RtreeData::getLogs(const QString &reposRoot, const \
svn::Revision &startr, c  }
     svn::LogParameter params;
     params.targets(reposRoot).revisionRange(endr, \
                startr).peg(startr).limit(0).discoverChangedPathes(true).strictNodeHistory(false);
                
-    QStringList ex = svn::cache::ReposConfig::self()->readEntry(reposRoot, \
"tree_exclude_list", QStringList()); +    const svn::StringArray \
ex(svn::cache::ReposConfig::self()->readEntry(reposRoot, "tree_exclude_list", \
QStringList()));  try {
         CursorStack a(Qt::BusyCursor);
         StopDlg sdlg(m_Listener, dlgParent,
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index 32c4c49..392dfa6 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -1277,7 +1277,7 @@ void SvnActions::makeDiffinternal(const QString &p1, const \
svn::Revision &r1, co  svn::DiffParameter _opts;
     _opts.path1(p1).path2(p2).tmpPath(tn).
         peg(peg).rev1(r1).rev2(r2).
-        ignoreContentType(ignore_content).extra(extraOptions).depth(svn::DepthInfinity).ignoreAncestry(false).noDiffDeleted(false).changeList(svn::StringArray()).
 +        ignoreContentType(ignore_content).extra(svn::StringArray(extraOptions)).dept \
h(svn::DepthInfinity).ignoreAncestry(false).noDiffDeleted(false).changeList(svn::StringArray()).
  git_diff_format(gitformat).copies_as_adds(copy_as_add);
 
     try {
@@ -1331,7 +1331,7 @@ void SvnActions::makeNorecDiff(const QString &p1, const \
svn::Revision &r1, const  // no peg revision required
     _opts.path1(p1).path2(p2).tmpPath(tn).
     rev1(r1).rev2(r2).
-    ignoreContentType(ignore_content).extra(extraOptions).depth(svn::DepthEmpty).ignoreAncestry(false).noDiffDeleted(false).changeList(svn::StringArray());
 +    ignoreContentType(ignore_content).extra(svn::StringArray(extraOptions)).depth(sv \
n::DepthEmpty).ignoreAncestry(false).noDiffDeleted(false).changeList(svn::StringArray());
  
     try {
         StopDlg sdlg(m_Data->m_SvnContextListener, _p ? _p : \
                m_Data->m_ParentList->realWidget(),
diff --git a/src/svnqt/cache/ReposLog.cpp b/src/svnqt/cache/ReposLog.cpp
index c7e5b9c..e2bb27e 100644
--- a/src/svnqt/cache/ReposLog.cpp
+++ b/src/svnqt/cache/ReposLog.cpp
@@ -292,7 +292,7 @@ bool svn::cache::ReposLog::fillCache(const svn::Revision &_end)
 /*!
     \fn svn::cache::ReposLog::simpleLog(const svn::Revision&start,const \
                svn::Revision&end,LogEntriesMap&target)
  */
-bool svn::cache::ReposLog::simpleLog(LogEntriesMap &target, const svn::Revision \
&_start, const svn::Revision &_end, bool noNetwork, const QStringList &exclude) +bool \
svn::cache::ReposLog::simpleLog(LogEntriesMap &target, const svn::Revision &_start, \
const svn::Revision &_end, bool noNetwork, const StringArray &exclude)  {
     if (!m_Client || m_ReposRoot.isEmpty()) {
         return false;
diff --git a/src/svnqt/cache/ReposLog.h b/src/svnqt/cache/ReposLog.h
index f4321ea..a9b9406 100644
--- a/src/svnqt/cache/ReposLog.h
+++ b/src/svnqt/cache/ReposLog.h
@@ -77,7 +77,7 @@ public:
      * @return true if entries found and no error, if no entries found false
      * @exception svn::DatabaseException in case of errors
      */
-    bool simpleLog(LogEntriesMap &target, const svn::Revision &start, const \
svn::Revision &end, bool noNetwork = false, const QStringList &exclude = \
QStringList()); +    bool simpleLog(LogEntriesMap &target, const svn::Revision \
&start, const svn::Revision &end, bool noNetwork = false, const StringArray &exclude \
                = StringArray());
     svn::Revision date2numberRev(const svn::Revision &, bool noNetwork = false);
     bool fillCache(const svn::Revision &end);
     bool insertLogEntry(const svn::LogEntry &);
diff --git a/src/svnqt/client_annotate_parameter.cpp \
b/src/svnqt/client_annotate_parameter.cpp index 2f8a9c4..89af04a 100644
--- a/src/svnqt/client_annotate_parameter.cpp
+++ b/src/svnqt/client_annotate_parameter.cpp
@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "client_annotate_parameter.h"
 #include "svnqttypes.h"
-#include "stringarray.h"
 #include "client_parameter_macros.h"
 #include "diffoptions.h"
 
diff --git a/src/svnqt/client_merge.cpp b/src/svnqt/client_merge.cpp
index 47f6590..70b9ea1 100644
--- a/src/svnqt/client_merge.cpp
+++ b/src/svnqt/client_merge.cpp
@@ -30,7 +30,6 @@
 #include "pool.h"
 #include "targets.h"
 #include "svnqt_defines.h"
-#include "stringarray.h"
 #include "helper.h"
 #include "client_parameter.h"
 
diff --git a/src/svnqt/stringarray.h b/src/svnqt/stringarray.h
index 3d97d8a..4dc55eb 100644
--- a/src/svnqt/stringarray.h
+++ b/src/svnqt/stringarray.h
@@ -47,8 +47,8 @@ protected:
 
 public:
     StringArray();
-    StringArray(const QStringList &);    //krazy:exclude=explicit
-    StringArray(const apr_array_header_t *apr_targets);    //krazy:exclude=explicit
+    explicit StringArray(const QStringList &);
+    explicit StringArray(const apr_array_header_t *apr_targets);
     QStringList::size_type size()const;
     const QString &operator[](QStringList::size_type which)const;
     QString &operator[](QStringList::size_type which);


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