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

List:       kde-commits
Subject:    [kdesvn] src/kdesvnd: Make some getters from kdesvnd const
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2016-10-09 13:16:16
Message-ID: E1btDxg-0003lJ-KM () code ! kde ! org
[Download RAW message or body]

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

Make some getters from kdesvnd const

M  +8    -9    src/kdesvnd/kdesvnd.cpp
M  +6    -6    src/kdesvnd/kdesvnd.h

http://commits.kde.org/kdesvn/2314658a7fac4c1d7f2cca8166d6bad09c87a645

diff --git a/src/kdesvnd/kdesvnd.cpp b/src/kdesvnd/kdesvnd.cpp
index e21066a..9f9ea7d 100644
--- a/src/kdesvnd/kdesvnd.cpp
+++ b/src/kdesvnd/kdesvnd.cpp
@@ -71,7 +71,7 @@ kdesvnd::~kdesvnd()
     delete m_Listener;
 }
 
-QStringList kdesvnd::getTopLevelActionMenu(const QStringList &urlList)
+QStringList kdesvnd::getTopLevelActionMenu(const QStringList &urlList) const
 {
     // we get correct urls here
     QList<QUrl> urls;
@@ -83,7 +83,7 @@ QStringList kdesvnd::getTopLevelActionMenu(const QStringList \
&urlList)  return getActionMenu(urls, true);
 }
 
-QStringList kdesvnd::getActionMenu(const QStringList &urlList)
+QStringList kdesvnd::getActionMenu(const QStringList &urlList) const
 {
     // we get correct urls here
     QList<QUrl> urls;
@@ -94,7 +94,7 @@ QStringList kdesvnd::getActionMenu(const QStringList &urlList)
     return getActionMenu(urls, false);
 }
 
-QStringList kdesvnd::getActionMenu(const QList<QUrl> &list, bool toplevel)
+QStringList kdesvnd::getActionMenu(const QList<QUrl> &list, bool toplevel) const
 {
     QStringList result;
     Kdesvnsettings::self()->load();
@@ -167,7 +167,7 @@ QStringList kdesvnd::getActionMenu(const QList<QUrl> &list, bool \
toplevel)  return result;
 }
 
-QStringList kdesvnd::getSingleActionMenu(const QString &what)
+QStringList kdesvnd::getSingleActionMenu(const QString &what) const
 {
     QList<QUrl> l;
     l.append(QUrl(what));
@@ -252,20 +252,19 @@ QStringList kdesvnd::get_sslclientcertpw(const QString &realm)
     return resList;
 }
 
-QString kdesvnd::get_sslclientcertfile()
+QString kdesvnd::get_sslclientcertfile() const
 {
     return QFileDialog::getOpenFileName(nullptr, i18n("Open a file with a #PKCS12 \
certificate"));  }
 
-QStringList kdesvnd::get_logmsg()
+QStringList kdesvnd::get_logmsg() const
 {
     QStringList res;
     bool ok;
     QString logMessage = Commitmsg_impl::getLogmessage(&ok, 0, 0, 0);
-    if (!ok) {
-        return res;
+    if (ok) {
+        res.append(logMessage);
     }
-    res.append(logMessage);
     return res;
 }
 
diff --git a/src/kdesvnd/kdesvnd.h b/src/kdesvnd/kdesvnd.h
index b99436d..ed76b27 100644
--- a/src/kdesvnd/kdesvnd.h
+++ b/src/kdesvnd/kdesvnd.h
@@ -46,7 +46,7 @@ protected:
     bool isRepository(const QUrl &url) const;
     static QString cleanUrl(const QUrl &url);
     KdesvndListener *m_Listener;
-    QStringList getActionMenu(const QList<QUrl> &list, bool toplevel);
+    QStringList getActionMenu(const QList<QUrl> &list, bool toplevel) const;
 
     org::kde::JobViewServer m_uiserver;
 
@@ -73,17 +73,17 @@ public Q_SLOTS:
     int get_sslaccept(const QString &, const QString &, const QString &, const \
QString &, const QString &, const QString &);  
     // returns cert file or empty string
-    QString get_sslclientcertfile();
+    QString get_sslclientcertfile() const;
     // return a logmessage at pos 0, null-size list if cancel hit
-    QStringList get_logmsg();
+    QStringList get_logmsg() const;
 
     // return pw loaded from wallet if existent
     QString load_sslclientcertpw(const QString &realm);
     // return pw at pos 0, maysafe at pos 1, null-size if cancel hit.
     QStringList get_sslclientcertpw(const QString &);
-    QStringList getActionMenu(const QStringList &urlList);
-    QStringList getTopLevelActionMenu(const QStringList &urlList);
-    QStringList getSingleActionMenu(const QString &);
+    QStringList getActionMenu(const QStringList &urlList) const;
+    QStringList getTopLevelActionMenu(const QStringList &urlList) const;
+    QStringList getSingleActionMenu(const QString &) const;
 
     bool canceldKioOperation(qulonglong kioid);
     void maxTransferKioOperation(qulonglong kioid, qulonglong maxtransfer);


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