1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNetworkManagerEngine: fix const-correctness

Browse Source 
Change-Id: I058617315e7cf2c6fa49f1ed0d16cb5e2a78dd72
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Marc Mutz 2016-08-06 15:06:53 +03:00
parent 4101ecdb0e
commit ccfd699b85
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
View File

@ -553,7 +553,7 @@ void QNetworkManagerEngine::newConnection(const QDBusObjectPath &path,
emit configurationAdded(ptr); emit configurationAdded(ptr);
} }
bool QNetworkManagerEngine::isConnectionActive(const QString &settingsPath) bool QNetworkManagerEngine::isConnectionActive(const QString &settingsPath) const
{ {
QHashIterator<QString, QNetworkManagerConnectionActive*> i(activeConnectionsList); QHashIterator<QString, QNetworkManagerConnectionActive*> i(activeConnectionsList);
while (i.hasNext()) { while (i.hasNext()) {
@ -863,7 +863,7 @@ QNetworkConfigurationPrivate *QNetworkManagerEngine::parseConnection(const QStri
return cpPriv; return cpPriv;
} }
bool QNetworkManagerEngine::isActiveContext(const QString &contextPath) bool QNetworkManagerEngine::isActiveContext(const QString &contextPath) const
{ {
if (ofonoManager && ofonoManager->isValid()) { if (ofonoManager && ofonoManager->isValid()) {
const QString contextPart = contextPath.section('/', -1); const QString contextPart = contextPath.section('/', -1);
@ -1024,7 +1024,7 @@ QNetworkConfigurationPrivatePointer QNetworkManagerEngine::defaultConfiguration(
return QNetworkConfigurationPrivatePointer(); return QNetworkConfigurationPrivatePointer();
} }
QNetworkConfiguration::BearerType QNetworkManagerEngine::currentBearerType(const QString &id) QNetworkConfiguration::BearerType QNetworkManagerEngine::currentBearerType(const QString &id) const
{ {
QString contextPart = id.section('/', -1); QString contextPart = id.section('/', -1);
QHashIterator<QString, QOfonoDataConnectionManagerInterface*> i(ofonoContextManagers); QHashIterator<QString, QOfonoDataConnectionManagerInterface*> i(ofonoContextManagers);
@ -1055,7 +1055,7 @@ QNetworkConfiguration::BearerType QNetworkManagerEngine::currentBearerType(const
return QNetworkConfiguration::BearerUnknown; return QNetworkConfiguration::BearerUnknown;
} }
QString QNetworkManagerEngine::contextName(const QString &path) QString QNetworkManagerEngine::contextName(const QString &path) const
{ {
QString contextPart = path.section('/', -1); QString contextPart = path.section('/', -1);
QHashIterator<QString, QOfonoDataConnectionManagerInterface*> i(ofonoContextManagers); QHashIterator<QString, QOfonoDataConnectionManagerInterface*> i(ofonoContextManagers);

8
src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
View File

@ -140,14 +140,14 @@ private:
QOfonoManagerInterface *ofonoManager; QOfonoManagerInterface *ofonoManager;
QHash <QString, QOfonoDataConnectionManagerInterface *> ofonoContextManagers; QHash <QString, QOfonoDataConnectionManagerInterface *> ofonoContextManagers;
QNetworkConfiguration::BearerType currentBearerType(const QString &id); QNetworkConfiguration::BearerType currentBearerType(const QString &id) const;
QString contextName(const QString &path); QString contextName(const QString &path) const;
bool isConnectionActive(const QString &settingsPath); bool isConnectionActive(const QString &settingsPath) const;
QDBusServiceWatcher *ofonoWatcher; QDBusServiceWatcher *ofonoWatcher;
QDBusServiceWatcher *nmWatcher; QDBusServiceWatcher *nmWatcher;
bool isActiveContext(const QString &contextPath); bool isActiveContext(const QString &contextPath) const;
bool nmAvailable; bool nmAvailable;
void setupConfigurations(); void setupConfigurations();
}; };