diff options
Diffstat (limited to 'src/plugins/bearer/networkmanager')
3 files changed, 38 insertions, 66 deletions
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp index b0bc8a265e..3cd9290420 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp @@ -553,14 +553,13 @@ void QNetworkManagerEngine::newConnection(const QDBusObjectPath &path, emit configurationAdded(ptr); } -bool QNetworkManagerEngine::isConnectionActive(const QString &settingsPath) +bool QNetworkManagerEngine::isConnectionActive(const QString &settingsPath) const { - QHashIterator<QString, QNetworkManagerConnectionActive*> 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<QString, QOfonoDataConnectionManagerInterface*> 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; @@ -863,14 +860,12 @@ 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); - QHashIterator<QString, QOfonoDataConnectionManagerInterface*> 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<QString, QNetworkManagerConnectionActive*> 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()); } @@ -1024,12 +1016,10 @@ 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<QString, QOfonoDataConnectionManagerInterface*> 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)) { @@ -1055,13 +1045,11 @@ 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<QString, QOfonoDataConnectionManagerInterface*> 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(); diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h index bfe2d746ec..ac70881f63 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<QString, QVariant> &properties); @@ -140,14 +140,14 @@ private: QOfonoManagerInterface *ofonoManager; QHash <QString, QOfonoDataConnectionManagerInterface *> 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(); }; 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<QString,QVariant> map) { - QMapIterator<QString, QVariant> 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<QString,QVariant> map) { - QMapIterator<QString, QVariant> 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<QString,QVariant> map) { - QMapIterator<QString, QVariant> 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<QDBusArgument>(); QDBusObjectPath path; @@ -516,9 +509,7 @@ QStringList QNetworkManagerInterfaceDeviceWired::availableConnections() void QNetworkManagerInterfaceDeviceWired::propertiesSwap(QMap<QString,QVariant> map) { - QMapIterator<QString, QVariant> 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<QString,QVariant> map) { - QMapIterator<QString, QVariant> 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<QString,QVariant> map) { - QMapIterator<QString, QVariant> 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<QString,QVariant> map) { - QMapIterator<QString, QVariant> 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(); |