[connman-qt] Clean up parameter and return types. Contributes to JB#3…

…8786 - const on non-pointer or non-reference return types don't make sense. Should be up to caller to decide how to handle the resulting variable. - separate methods for const/non-const getter don't make sense. - reference on bool/integer parameter doesn't make sense, just extra work.
sailfishos · Jun 28, 2017 · ec09ded · ec09ded
1 parent 92b1646
commit ec09ded
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 92 deletions.
diff --git a/libconnman-qt/networkmanager.cpp b/libconnman-qt/networkmanager.cpp
@@ -601,7 +601,7 @@ bool NetworkManager::isAvailable() const
 }
 
 
-const QString NetworkManager::state() const
+QString NetworkManager::state() const
 {
     return m_propertiesCache[State].toString();
 }
@@ -621,7 +621,7 @@ NetworkTechnology* NetworkManager::getTechnology(const QString &type) const
     return m_technologiesCache.value(type);
 }
 
-const QVector<NetworkTechnology *> NetworkManager::getTechnologies() const
+QVector<NetworkTechnology *> NetworkManager::getTechnologies() const
 {
     QVector<NetworkTechnology *> techs;
 
@@ -632,7 +632,7 @@ const QVector<NetworkTechnology *> NetworkManager::getTechnologies() const
     return techs;
 }
 
-const QVector<NetworkService*> NetworkManager::selectServices(const QString &tech,
+QVector<NetworkService*> NetworkManager::selectServices(const QString &tech,
     ServiceSelector selector) const
 {
     QVector<NetworkService *> services;
@@ -649,17 +649,17 @@ const QVector<NetworkService*> NetworkManager::selectServices(const QString &tec
     return services;
 }
 
-const QVector<NetworkService*> NetworkManager::getServices(const QString &tech) const
+QVector<NetworkService*> NetworkManager::getServices(const QString &tech) const
 {
     return selectServices(tech, Private::selectAll);
 }
 
-const QVector<NetworkService*> NetworkManager::getSavedServices(const QString &tech) const
+QVector<NetworkService*> NetworkManager::getSavedServices(const QString &tech) const
 {
     return selectServices(tech, Private::selectSaved);
 }
 
-const QVector<NetworkService*> NetworkManager::getAvailableServices(const QString &tech) const
+QVector<NetworkService*> NetworkManager::getAvailableServices(const QString &tech) const
 {
     return selectServices(tech, Private::selectAvailable);
 }
@@ -671,7 +671,7 @@ void NetworkManager::removeSavedService(const QString &) const
 
 // Setters
 
-void NetworkManager::setOfflineMode(const bool &offline)
+void NetworkManager::setOfflineMode(bool offline)
 {
     if (m_proxy) {
         m_proxy->SetProperty(OfflineMode, offline);
@@ -723,7 +723,7 @@ void NetworkManager::destroySession(const QString &path)
     }
 }
 
-void NetworkManager::setSessionMode(const bool &sessionMode)
+void NetworkManager::setSessionMode(bool sessionMode)
 {
     if (m_proxy) {
         m_proxy->SetProperty(SessionMode, sessionMode);

diff --git a/libconnman-qt/networkmanager.h b/libconnman-qt/networkmanager.h
@@ -57,10 +57,10 @@ class NetworkManager : public QObject
     bool isAvailable() const;
 
     Q_INVOKABLE NetworkTechnology* getTechnology(const QString &type) const;
-    const QVector<NetworkTechnology *> getTechnologies() const;
-    const QVector<NetworkService*> getServices(const QString &tech = QString()) const;
-    const QVector<NetworkService*> getSavedServices(const QString &tech = QString()) const;
-    const QVector<NetworkService*> getAvailableServices(const QString &tech = QString()) const;
+    QVector<NetworkTechnology *> getTechnologies() const;
+    QVector<NetworkService*> getServices(const QString &tech = QString()) const;
+    QVector<NetworkService*> getSavedServices(const QString &tech = QString()) const;
+    QVector<NetworkService*> getAvailableServices(const QString &tech = QString()) const;
     void removeSavedService(const QString &identifier) const;
 
     Q_INVOKABLE QStringList servicesList(const QString &tech);
@@ -70,7 +70,7 @@ class NetworkManager : public QObject
     Q_INVOKABLE QString technologyPathForService(const QString &path);
     Q_INVOKABLE QString technologyPathForType(const QString &type);
 
-    const QString state() const;
+    QString state() const;
     bool offlineMode() const;
     NetworkService* defaultRoute() const;
 
@@ -90,14 +90,14 @@ class NetworkManager : public QObject
     QString gpsTechnologyPath() const;
 
 public Q_SLOTS:
-    void setOfflineMode(const bool &offlineMode);
+    void setOfflineMode(bool offlineMode);
     void registerAgent(const QString &path);
     void unregisterAgent(const QString &path);
     void registerCounter(const QString &path, quint32 accuracy, quint32 period);
     void unregisterCounter(const QString &path);
     QDBusObjectPath createSession(const QVariantMap &settings, const QString &sessionNotifierPath);
     void destroySession(const QString &sessionAgentPath);
-    void setSessionMode(const bool &sessionMode);
+    void setSessionMode(bool sessionMode);
 
 Q_SIGNALS:
     void availabilityChanged(bool available);
@@ -125,7 +125,7 @@ public Q_SLOTS:
     void setConnmanAvailable(bool available);
     bool connectToConnman();
     void disconnectFromConnman();
-    const QVector<NetworkService*> selectServices(const QString &tech, ServiceSelector selector) const;
+    QVector<NetworkService*> selectServices(const QString &tech, ServiceSelector selector) const;
     QStringList selectServiceList(const QString &tech, ServiceSelector selector) const;
 
     InterfaceProxy *m_proxy;

diff --git a/libconnman-qt/networkservice.cpp b/libconnman-qt/networkservice.cpp
@@ -606,27 +606,27 @@ NetworkService::~NetworkService()
 {
 }
 
-const QString NetworkService::name() const
+QString NetworkService::name() const
 {
     return m_propertiesCache.value(Name).toString();
 }
 
-const QString NetworkService::state() const
+QString NetworkService::state() const
 {
     return m_propertiesCache.value(State).toString();
 }
 
-const QString NetworkService::error() const
+QString NetworkService::error() const
 {
     return m_propertiesCache.value(Error).toString();
 }
 
-const QString NetworkService::type() const
+QString NetworkService::type() const
 {
     return m_propertiesCache.value(Type).toString();
 }
 
-const QStringList NetworkService::security() const
+QStringList NetworkService::security() const
 {
     return m_propertiesCache.value(Security).toStringList();
 }
@@ -647,80 +647,80 @@ bool NetworkService::autoConnect() const
     return m_propertiesCache.value(AutoConnect).toBool();
 }
 
-const QString NetworkService::path() const
+QString NetworkService::path() const
 {
     return m_path;
 }
 
-const QVariantMap NetworkService::ipv4() const
+QVariantMap NetworkService::ipv4() const
 {
     if (m_propertiesCache.contains(IPv4)) {
         return qdbus_cast<QVariantMap>(m_propertiesCache.value(IPv4));
     }
     return QVariantMap();
 }
 
-const QVariantMap NetworkService::ipv4Config() const
+QVariantMap NetworkService::ipv4Config() const
 {
     if (m_propertiesCache.contains(IPv4Config)) {
         return qdbus_cast<QVariantMap>(m_propertiesCache.value(IPv4Config));
     }
     return QVariantMap();
 }
 
-const QVariantMap NetworkService::ipv6() const
+QVariantMap NetworkService::ipv6() const
 {
     if (m_propertiesCache.contains(IPv6)) {
         return qdbus_cast<QVariantMap>(m_propertiesCache.value(IPv6));
     }
     return QVariantMap();
 }
 
-const QVariantMap NetworkService::ipv6Config() const
+QVariantMap NetworkService::ipv6Config() const
 {
     if (m_propertiesCache.contains(IPv6Config)) {
         return qdbus_cast<QVariantMap>(m_propertiesCache.value(IPv6Config));
     }
     return QVariantMap();
 }
 
-const QStringList NetworkService::nameservers() const
+QStringList NetworkService::nameservers() const
 {
     return m_propertiesCache.value(Nameservers).toStringList();
 }
 
-const QStringList NetworkService::nameserversConfig() const
+QStringList NetworkService::nameserversConfig() const
 {
     return m_propertiesCache.value(NameserversConfig).toStringList();
 }
 
-const QStringList NetworkService::domains() const
+QStringList NetworkService::domains() const
 {
     return m_propertiesCache.value(Domains).toStringList();
 }
 
-const QStringList NetworkService::domainsConfig() const
+QStringList NetworkService::domainsConfig() const
 {
     return m_propertiesCache.value(DomainsConfig).toStringList();
 }
 
-const QVariantMap NetworkService::proxy() const
+QVariantMap NetworkService::proxy() const
 {
     if (m_propertiesCache.contains(Proxy)) {
         return qdbus_cast<QVariantMap>(m_propertiesCache.value(Proxy));
     }
     return QVariantMap();
 }
 
-const QVariantMap NetworkService::proxyConfig() const
+QVariantMap NetworkService::proxyConfig() const
 {
     if (m_propertiesCache.contains(ProxyConfig)) {
         return qdbus_cast<QVariantMap>(m_propertiesCache.value(ProxyConfig));
     }
     return QVariantMap();
 }
 
-const QVariantMap NetworkService::ethernet() const
+QVariantMap NetworkService::ethernet() const
 {
     if (m_propertiesCache.contains(Ethernet)) {
         return qdbus_cast<QVariantMap>(m_propertiesCache.value(Ethernet));
@@ -1158,26 +1158,6 @@ void NetworkService::setTimeserversConfig(const QStringList &servers)
     m_priv->setProperty(TimeserversConfig, servers);
 }
 
-const QString NetworkService::bssid()
-{
-    return m_propertiesCache.value(BSSID).toString();
-}
-
-quint32 NetworkService::maxRate()
-{
-    return m_propertiesCache.value(MaxRate).toUInt();
-}
-
-quint16 NetworkService::frequency()
-{
-    return m_propertiesCache.value(Frequency).toUInt();
-}
-
-const QString NetworkService::encryptionMode()
-{
-    return m_propertiesCache.value(EncryptionMode).toString();
-}
-
 QString NetworkService::bssid() const
 {
     return m_propertiesCache.value(BSSID).toString();

diff --git a/libconnman-qt/networkservice.h b/libconnman-qt/networkservice.h
@@ -88,27 +88,27 @@ class NetworkService : public QObject
 
     virtual ~NetworkService();
 
-    const QString name() const;
-    const QString type() const;
-    const QString state() const;
-    const QString error() const;
-    const QStringList security() const;
+    QString name() const;
+    QString type() const;
+    QString state() const;
+    QString error() const;
+    QStringList security() const;
     SecurityType securityType() const;
     bool autoConnect() const;
     uint strength() const;
     bool favorite() const;
-    const QString path() const;
-    const QVariantMap ipv4() const;
-    const QVariantMap ipv4Config() const;
-    const QVariantMap ipv6() const;
-    const QVariantMap ipv6Config() const;
-    const QStringList nameservers() const;
-    const QStringList nameserversConfig() const;
-    const QStringList domains() const;
-    const QStringList domainsConfig() const;
-    const QVariantMap proxy() const;
-    const QVariantMap proxyConfig() const;
-    const QVariantMap ethernet() const;
+    QString path() const;
+    QVariantMap ipv4() const;
+    QVariantMap ipv4Config() const;
+    QVariantMap ipv6() const;
+    QVariantMap ipv6Config() const;
+    QStringList nameservers() const;
+    QStringList nameserversConfig() const;
+    QStringList domains() const;
+    QStringList domainsConfig() const;
+    QVariantMap proxy() const;
+    QVariantMap proxyConfig() const;
+    QVariantMap ethernet() const;
     bool roaming() const;
 
     void setPath(const QString &path);
@@ -123,13 +123,7 @@ class NetworkService : public QObject
     QStringList timeserversConfig() const;
     void setTimeserversConfig(const QStringList &servers);
 
-    const QString bssid();
-    quint32 maxRate();
-    quint16 frequency();
-    const QString encryptionMode();
     bool hidden() const;
-
-    // Canonical variants of the above with const in the right place
     QString bssid() const;
     quint32 maxRate() const;
     quint16 frequency() const;
@@ -152,8 +146,8 @@ class NetworkService : public QObject
     void stateChanged(const QString &state);
     void errorChanged(const QString &error);
     void securityChanged(const QStringList &security);
-    void strengthChanged(const uint strength);
-    void favoriteChanged(const bool &favorite);
+    void strengthChanged(uint strength);
+    void favoriteChanged(bool favorite);
     void autoConnectChanged(bool autoconnect);
     void pathChanged(const QString &path);
     void ipv4Changed(const QVariantMap &ipv4);
@@ -201,7 +195,7 @@ public Q_SLOTS:
     void requestDisconnect();
     void remove();
 
-    void setAutoConnect(const bool autoconnect);
+    void setAutoConnect(bool autoconnect);
     void setIpv4Config(const QVariantMap &ipv4);
     void setIpv6Config(const QVariantMap &ipv6);
     void setNameserversConfig(const QStringList &nameservers);

diff --git a/libconnman-qt/networktechnology.cpp b/libconnman-qt/networktechnology.cpp
@@ -101,12 +101,12 @@ QString NetworkTechnology::path() const
     return m_path;
 }
 
-const QString NetworkTechnology::name() const
+QString NetworkTechnology::name() const
 {
     return m_propertiesCache.value(Name).toString();
 }
 
-const QString NetworkTechnology::type() const
+QString NetworkTechnology::type() const
 {
     return m_propertiesCache.value(Type).toString();
 }
@@ -121,7 +121,7 @@ bool NetworkTechnology::connected() const
     return m_propertiesCache.value(Connected).toBool();
 }
 
-const QString NetworkTechnology::objPath() const
+QString NetworkTechnology::objPath() const
 {
     if (m_technology)
         return m_technology->path();

diff --git a/libconnman-qt/networktechnology.h b/libconnman-qt/networktechnology.h
@@ -35,11 +35,11 @@ class NetworkTechnology : public QObject
 
     virtual ~NetworkTechnology();
 
-    const QString name() const;
-    const QString type() const;
+    QString name() const;
+    QString type() const;
     bool powered() const;
     bool connected() const;
-    const QString objPath() const;
+    QString objPath() const;
 
     QString path() const;
 

diff --git a/libconnman-qt/useragent.cpp b/libconnman-qt/useragent.cpp
@@ -150,7 +150,7 @@ QString UserAgent::path() const
     return agentPath;
 }
 
-void UserAgent::setAgentPath(QString &path)
+void UserAgent::setAgentPath(const QString &path)
 {
     if (path.isEmpty())
         return;