From ccfd699b854321d26be844e916cd26bb1a01ebca Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sat, 6 Aug 2016 15:06:53 +0300 Subject: QNetworkManagerEngine: fix const-correctness Change-Id: I058617315e7cf2c6fa49f1ed0d16cb5e2a78dd72 Reviewed-by: Lars Knoll --- src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp | 8 ++++---- src/plugins/bearer/networkmanager/qnetworkmanagerengine.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp index b0bc8a265e..8e6ab025cd 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp @@ -553,7 +553,7 @@ void QNetworkManagerEngine::newConnection(const QDBusObjectPath &path, emit configurationAdded(ptr); } -bool QNetworkManagerEngine::isConnectionActive(const QString &settingsPath) +bool QNetworkManagerEngine::isConnectionActive(const QString &settingsPath) const { QHashIterator i(activeConnectionsList); while (i.hasNext()) { @@ -863,7 +863,7 @@ QNetworkConfigurationPrivate *QNetworkManagerEngine::parseConnection(const QStri return cpPriv; } -bool QNetworkManagerEngine::isActiveContext(const QString &contextPath) +bool QNetworkManagerEngine::isActiveContext(const QString &contextPath) const { if (ofonoManager && ofonoManager->isValid()) { const QString contextPart = contextPath.section('/', -1); @@ -1024,7 +1024,7 @@ QNetworkConfigurationPrivatePointer QNetworkManagerEngine::defaultConfiguration( return QNetworkConfigurationPrivatePointer(); } -QNetworkConfiguration::BearerType QNetworkManagerEngine::currentBearerType(const QString &id) +QNetworkConfiguration::BearerType QNetworkManagerEngine::currentBearerType(const QString &id) const { QString contextPart = id.section('/', -1); QHashIterator i(ofonoContextManagers); @@ -1055,7 +1055,7 @@ QNetworkConfiguration::BearerType QNetworkManagerEngine::currentBearerType(const return QNetworkConfiguration::BearerUnknown; } -QString QNetworkManagerEngine::contextName(const QString &path) +QString QNetworkManagerEngine::contextName(const QString &path) const { QString contextPart = path.section('/', -1); QHashIterator i(ofonoContextManagers); diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h index e8c40a881d..2296d6b2b6 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h @@ -140,14 +140,14 @@ private: QOfonoManagerInterface *ofonoManager; QHash ofonoContextManagers; - QNetworkConfiguration::BearerType currentBearerType(const QString &id); - QString contextName(const QString &path); + QNetworkConfiguration::BearerType currentBearerType(const QString &id) const; + QString contextName(const QString &path) const; - bool isConnectionActive(const QString &settingsPath); + bool isConnectionActive(const QString &settingsPath) const; QDBusServiceWatcher *ofonoWatcher; QDBusServiceWatcher *nmWatcher; - bool isActiveContext(const QString &contextPath); + bool isActiveContext(const QString &contextPath) const; bool nmAvailable; void setupConfigurations(); }; -- cgit v1.2.3 From 3400e7ee7fc9f8747de28aa4eba9a28a8a79f819 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sat, 6 Aug 2016 15:08:34 +0300 Subject: QNetworkManagerEngine: add override keywords Change-Id: Ie926119ee58d330e415634f93eb334c6befeede1 Reviewed-by: Lars Knoll --- .../bearer/networkmanager/qnetworkmanagerengine.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h index 2296d6b2b6..2f425ddc02 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h @@ -74,26 +74,26 @@ public: bool networkManagerAvailable() const; - QString getInterfaceFromId(const QString &id); - bool hasIdentifier(const QString &id); + QString getInterfaceFromId(const QString &id) override; + bool hasIdentifier(const QString &id) override; - void connectToId(const QString &id); - void disconnectFromId(const QString &id); + void connectToId(const QString &id) override; + void disconnectFromId(const QString &id) override; Q_INVOKABLE void initialize(); Q_INVOKABLE void requestUpdate(); - QNetworkSession::State sessionStateForId(const QString &id); + QNetworkSession::State sessionStateForId(const QString &id) override; - quint64 bytesWritten(const QString &id); - quint64 bytesReceived(const QString &id); - quint64 startTime(const QString &id); + quint64 bytesWritten(const QString &id) override; + quint64 bytesReceived(const QString &id) override; + quint64 startTime(const QString &id) override; - QNetworkConfigurationManager::Capabilities capabilities() const; + QNetworkConfigurationManager::Capabilities capabilities() const override; - QNetworkSessionPrivate *createSessionBackend(); + QNetworkSessionPrivate *createSessionBackend() override; - QNetworkConfigurationPrivatePointer defaultConfiguration(); + QNetworkConfigurationPrivatePointer defaultConfiguration() override; private Q_SLOTS: void interfacePropertiesChanged(const QMap &properties); -- cgit v1.2.3 From 7305b3e82863f077c4f677d0a860e314ce6f806c Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sat, 6 Aug 2016 15:11:44 +0300 Subject: QNetworkManagerEngine: port away from Java-style iterators They are slower, more annoying, and not safer than their STL counterparts. Port to C++11 range-for, or to "auto it, end" for loops in cases where the key was also accessed. Change-Id: Ib27608ddbe9c0775092a1c6495731ad324727d3e Reviewed-by: Lars Knoll --- .../networkmanager/qnetworkmanagerengine.cpp | 36 ++++++++-------------- 1 file changed, 12 insertions(+), 24 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp index 8e6ab025cd..3cd9290420 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp @@ -555,12 +555,11 @@ void QNetworkManagerEngine::newConnection(const QDBusObjectPath &path, bool QNetworkManagerEngine::isConnectionActive(const QString &settingsPath) const { - QHashIterator i(activeConnectionsList); - while (i.hasNext()) { - i.next(); - if (i.value()->connection().path() == settingsPath) { - if (i.value()->state() == NM_ACTIVE_CONNECTION_STATE_ACTIVATING - || i.value()->state() == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) { + for (QNetworkManagerConnectionActive *activeConnection : activeConnectionsList) { + if (activeConnection->connection().path() == settingsPath) { + const auto state = activeConnection->state(); + if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING + || state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) { return true; } else { break; @@ -848,9 +847,7 @@ QNetworkConfigurationPrivate *QNetworkManagerEngine::parseConnection(const QStri if (ofonoManager && ofonoManager->isValid()) { const QString contextPart = connectionPath.section('/', -1); - QHashIterator i(ofonoContextManagers); - while (i.hasNext()) { - i.next(); + for (auto i = ofonoContextManagers.cbegin(), end = ofonoContextManagers.cend(); i != end; ++i) { const QString path = i.key() + QLatin1Char('/') +contextPart; if (isActiveContext(path)) { cpPriv->state |= QNetworkConfiguration::Active; @@ -867,10 +864,8 @@ bool QNetworkManagerEngine::isActiveContext(const QString &contextPath) const { if (ofonoManager && ofonoManager->isValid()) { const QString contextPart = contextPath.section('/', -1); - QHashIterator i(ofonoContextManagers); - while (i.hasNext()) { - i.next(); - PathPropertiesList list = i.value()->contextsWithProperties(); + for (QOfonoDataConnectionManagerInterface *iface : ofonoContextManagers) { + const PathPropertiesList list = iface->contextsWithProperties(); for (int i = 0; i < list.size(); ++i) { if (list.at(i).path.path().contains(contextPart)) { return list.at(i).properties.value(QStringLiteral("Active")).toBool(); @@ -1012,10 +1007,7 @@ QNetworkSessionPrivate *QNetworkManagerEngine::createSessionBackend() QNetworkConfigurationPrivatePointer QNetworkManagerEngine::defaultConfiguration() { - QHashIterator i(activeConnectionsList); - while (i.hasNext()) { - i.next(); - QNetworkManagerConnectionActive *activeConnection = i.value(); + for (QNetworkManagerConnectionActive *activeConnection : qAsConst(activeConnectionsList)) { if ((activeConnection->defaultRoute() || activeConnection->default6Route())) { return accessPointConfigurations.value(activeConnection->connection().path()); } @@ -1027,9 +1019,7 @@ QNetworkConfigurationPrivatePointer QNetworkManagerEngine::defaultConfiguration( QNetworkConfiguration::BearerType QNetworkManagerEngine::currentBearerType(const QString &id) const { QString contextPart = id.section('/', -1); - QHashIterator i(ofonoContextManagers); - while (i.hasNext()) { - i.next(); + for (auto i = ofonoContextManagers.begin(), end = ofonoContextManagers.end(); i != end; ++i) { QString contextPath = i.key() + QLatin1Char('/') +contextPart; if (i.value()->contexts().contains(contextPath)) { @@ -1058,10 +1048,8 @@ QNetworkConfiguration::BearerType QNetworkManagerEngine::currentBearerType(const QString QNetworkManagerEngine::contextName(const QString &path) const { QString contextPart = path.section('/', -1); - QHashIterator i(ofonoContextManagers); - while (i.hasNext()) { - i.next(); - PathPropertiesList list = i.value()->contextsWithProperties(); + for (QOfonoDataConnectionManagerInterface *iface : ofonoContextManagers) { + const PathPropertiesList list = iface->contextsWithProperties(); for (int i = 0; i < list.size(); ++i) { if (list.at(i).path.path().contains(contextPart)) { return list.at(i).properties.value(QStringLiteral("Name")).toString(); -- cgit v1.2.3 From d08db1100874fdc36ea169d34a8902133186b84b Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sat, 6 Aug 2016 17:26:37 +0300 Subject: Remove last uses of Java-style (non-mutable) iterators from QtBase Change-Id: I7531ffd4f2d5b2193bb6231c743ff0a074618b99 Reviewed-by: Lars Knoll --- .../networkmanager/qnetworkmanagerservice.cpp | 30 +++++----------------- 1 file changed, 7 insertions(+), 23 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp index 6c3c661db6..081cb1288d 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp @@ -215,9 +215,7 @@ QString QNetworkManagerInterface::version() const void QNetworkManagerInterface::propertiesSwap(QMap map) { - QMapIterator i(map); - while (i.hasNext()) { - i.next(); + for (auto i = map.cbegin(), end = map.cend(); i != end; ++i) { propertyMap.insert(i.key(),i.value()); if (i.key() == QLatin1String("State")) { @@ -334,11 +332,8 @@ quint32 QNetworkManagerInterfaceAccessPoint::strength() const void QNetworkManagerInterfaceAccessPoint::propertiesSwap(QMap map) { - QMapIterator i(map); - while (i.hasNext()) { - i.next(); + for (auto i = map.cbegin(), end = map.cend(); i != end; ++i) propertyMap.insert(i.key(),i.value()); - } } QNetworkManagerInterfaceDevice::QNetworkManagerInterfaceDevice(const QString &deviceObjectPath, QObject *parent) @@ -421,9 +416,7 @@ QDBusObjectPath QNetworkManagerInterfaceDevice::ip4config() const void QNetworkManagerInterfaceDevice::propertiesSwap(QMap map) { - QMapIterator i(map); - while (i.hasNext()) { - i.next(); + for (auto i = map.cbegin(), end = map.cend(); i != end; ++i) { if (i.key() == QLatin1String("AvailableConnections")) { //Device const QDBusArgument &dbusArgs = i.value().value(); QDBusObjectPath path; @@ -516,9 +509,7 @@ QStringList QNetworkManagerInterfaceDeviceWired::availableConnections() void QNetworkManagerInterfaceDeviceWired::propertiesSwap(QMap map) { - QMapIterator i(map); - while (i.hasNext()) { - i.next(); + for (auto i = map.cbegin(), end = map.cend(); i != end; ++i) { propertyMap.insert(i.key(),i.value()); if (i.key() == QLatin1String("Carrier")) Q_EMIT carrierChanged(i.value().toBool()); @@ -694,9 +685,7 @@ void QNetworkManagerInterfaceDeviceWireless::requestScan() void QNetworkManagerInterfaceDeviceWireless::propertiesSwap(QMap map) { - QMapIterator i(map); - while (i.hasNext()) { - i.next(); + for (auto i = map.cbegin(), end = map.cend(); i != end; ++i) { propertyMap.insert(i.key(),i.value()); if (i.key() == QLatin1String("ActiveAccessPoint")) //DeviceWireless Q_EMIT propertiesChanged(map); @@ -753,11 +742,8 @@ QNetworkManagerInterfaceDeviceModem::ModemCapabilities QNetworkManagerInterfaceD void QNetworkManagerInterfaceDeviceModem::propertiesSwap(QMap map) { - QMapIterator i(map); - while (i.hasNext()) { - i.next(); + for (auto i = map.cbegin(), end = map.cend(); i != end; ++i) propertyMap.insert(i.key(),i.value()); - } Q_EMIT propertiesChanged(map); } @@ -1051,9 +1037,7 @@ bool QNetworkManagerConnectionActive::default6Route() const void QNetworkManagerConnectionActive::propertiesSwap(QMap map) { - QMapIterator i(map); - while (i.hasNext()) { - i.next(); + for (auto i = map.cbegin(), end = map.cend(); i != end; ++i) { propertyMap.insert(i.key(),i.value()); if (i.key() == QLatin1String("State")) { quint32 state = i.value().toUInt(); -- cgit v1.2.3 From 60985aa42b37217fb4c01ed85bbf6f14410c3491 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 5 Aug 2016 13:35:39 +0200 Subject: Use qtConfig throughout in qtbase Use the new qtConfig macro in all pro/pri files. This required adding some feature entries, and adding {private,public}Feature to every referenced already existing entry. Change-Id: I164214dad1154df6ad84e86d99ed14994ef97cf4 Reviewed-by: Lars Knoll Reviewed-by: Oswald Buddenhagen --- src/plugins/bearer/bearer.pro | 2 +- src/plugins/bearer/corewlan/corewlan.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/bearer') diff --git a/src/plugins/bearer/bearer.pro b/src/plugins/bearer/bearer.pro index 8028e65147..8078a5708c 100644 --- a/src/plugins/bearer/bearer.pro +++ b/src/plugins/bearer/bearer.pro @@ -8,7 +8,7 @@ TEMPLATE = subdirs #win32:SUBDIRS += nla win32:SUBDIRS += generic win32:!winrt: SUBDIRS += nativewifi -mac:contains(QT_CONFIG, corewlan):SUBDIRS += corewlan +darwin:qtConfig(corewlan): SUBDIRS += corewlan mac:SUBDIRS += generic android:SUBDIRS += android diff --git a/src/plugins/bearer/corewlan/corewlan.pro b/src/plugins/bearer/corewlan/corewlan.pro index ab0257aecd..1dc09ebdd6 100644 --- a/src/plugins/bearer/corewlan/corewlan.pro +++ b/src/plugins/bearer/corewlan/corewlan.pro @@ -3,7 +3,7 @@ TARGET = qcorewlanbearer QT = core-private network-private LIBS += -framework Foundation -framework SystemConfiguration -contains(QT_CONFIG, corewlan) { +qtConfig(corewlan) { LIBS += -framework CoreWLAN -framework Security } -- cgit v1.2.3