diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2010-12-10 03:47:29 (GMT) |
---|---|---|
committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-12-10 03:47:29 (GMT) |
commit | 8c79236781cc2dea904f36d6e8c751e6635b9bb9 (patch) | |
tree | 2a93ff417cf070573548d7282232cd7ce524cde4 /src | |
parent | 36f88ca5bdace12bb713085a11351d06318534d7 (diff) | |
download | Qt-8c79236781cc2dea904f36d6e8c751e6635b9bb9.zip Qt-8c79236781cc2dea904f36d6e8c751e6635b9bb9.tar.gz Qt-8c79236781cc2dea904f36d6e8c751e6635b9bb9.tar.bz2 |
fix CV-qualifiers for some members
this change is BC-safe since QNetworkConfigurationManagerPrivate
is not a part of a public API
Merge-request: 899
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/network/bearer/qnetworkconfigmanager_p.cpp | 12 | ||||
-rw-r--r-- | src/network/bearer/qnetworkconfigmanager_p.h | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/network/bearer/qnetworkconfigmanager_p.cpp b/src/network/bearer/qnetworkconfigmanager_p.cpp index d33cda1..022365e 100644 --- a/src/network/bearer/qnetworkconfigmanager_p.cpp +++ b/src/network/bearer/qnetworkconfigmanager_p.cpp @@ -73,7 +73,7 @@ QNetworkConfigurationManagerPrivate::~QNetworkConfigurationManagerPrivate() qDeleteAll(sessionEngines); } -QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration() +QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration() const { QMutexLocker locker(&mutex); @@ -190,7 +190,7 @@ QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration( return QNetworkConfiguration(); } -QList<QNetworkConfiguration> QNetworkConfigurationManagerPrivate::allConfigurations(QNetworkConfiguration::StateFlags filter) +QList<QNetworkConfiguration> QNetworkConfigurationManagerPrivate::allConfigurations(QNetworkConfiguration::StateFlags filter) const { QList<QNetworkConfiguration> result; @@ -234,7 +234,7 @@ QList<QNetworkConfiguration> QNetworkConfigurationManagerPrivate::allConfigurati return result; } -QNetworkConfiguration QNetworkConfigurationManagerPrivate::configurationFromIdentifier(const QString &identifier) +QNetworkConfiguration QNetworkConfigurationManagerPrivate::configurationFromIdentifier(const QString &identifier) const { QNetworkConfiguration item; @@ -258,14 +258,14 @@ QNetworkConfiguration QNetworkConfigurationManagerPrivate::configurationFromIden return item; } -bool QNetworkConfigurationManagerPrivate::isOnline() +bool QNetworkConfigurationManagerPrivate::isOnline() const { QMutexLocker locker(&mutex); return !onlineConfigurations.isEmpty(); } -QNetworkConfigurationManager::Capabilities QNetworkConfigurationManagerPrivate::capabilities() +QNetworkConfigurationManager::Capabilities QNetworkConfigurationManagerPrivate::capabilities() const { QMutexLocker locker(&mutex); @@ -431,7 +431,7 @@ void QNetworkConfigurationManagerPrivate::performAsyncConfigurationUpdate() } } -QList<QBearerEngine *> QNetworkConfigurationManagerPrivate::engines() +QList<QBearerEngine *> QNetworkConfigurationManagerPrivate::engines() const { QMutexLocker locker(&mutex); diff --git a/src/network/bearer/qnetworkconfigmanager_p.h b/src/network/bearer/qnetworkconfigmanager_p.h index 45c1fb4..9b946d8 100644 --- a/src/network/bearer/qnetworkconfigmanager_p.h +++ b/src/network/bearer/qnetworkconfigmanager_p.h @@ -74,17 +74,17 @@ public: QNetworkConfigurationManagerPrivate(); virtual ~QNetworkConfigurationManagerPrivate(); - QNetworkConfiguration defaultConfiguration(); - QList<QNetworkConfiguration> allConfigurations(QNetworkConfiguration::StateFlags filter); - QNetworkConfiguration configurationFromIdentifier(const QString &identifier); + QNetworkConfiguration defaultConfiguration() const; + QList<QNetworkConfiguration> allConfigurations(QNetworkConfiguration::StateFlags filter) const; + QNetworkConfiguration configurationFromIdentifier(const QString &identifier) const; - bool isOnline(); + bool isOnline() const; - QNetworkConfigurationManager::Capabilities capabilities(); + QNetworkConfigurationManager::Capabilities capabilities() const; void performAsyncConfigurationUpdate(); - QList<QBearerEngine *> engines(); + QList<QBearerEngine *> engines() const; Q_INVOKABLE void startPolling(); @@ -111,7 +111,7 @@ private Q_SLOTS: private: QTimer *pollTimer; - QMutex mutex; + mutable QMutex mutex; QList<QBearerEngine *> sessionEngines; |