diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-15 05:30:39 (GMT) |
---|---|---|
committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-15 05:30:51 (GMT) |
commit | af9843fe530d4c09226cc45b223bbf357e6bfb41 (patch) | |
tree | 9636231a561e3249789a603c77dc3dd263ecd791 /src/network | |
parent | 868d5fc208acbe9579b2c70637cccdd355263c11 (diff) | |
download | Qt-af9843fe530d4c09226cc45b223bbf357e6bfb41.zip Qt-af9843fe530d4c09226cc45b223bbf357e6bfb41.tar.gz Qt-af9843fe530d4c09226cc45b223bbf357e6bfb41.tar.bz2 |
Remove unused code.
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/bearer/qnetworkconfigmanager_p.cpp | 56 | ||||
-rw-r--r-- | src/network/bearer/qnetworkconfigmanager_p.h | 3 |
2 files changed, 0 insertions, 59 deletions
diff --git a/src/network/bearer/qnetworkconfigmanager_p.cpp b/src/network/bearer/qnetworkconfigmanager_p.cpp index 4367654..bc354c1 100644 --- a/src/network/bearer/qnetworkconfigmanager_p.cpp +++ b/src/network/bearer/qnetworkconfigmanager_p.cpp @@ -109,62 +109,6 @@ void QNetworkConfigurationManagerPrivate::configurationChanged(QNetworkConfigura emit onlineStateChanged(online); } -void QNetworkConfigurationManagerPrivate::updateInternetServiceConfiguration() -{ -#if 0 - if (!generic->snapConfigurations.contains(QLatin1String("Internet Service Network"))) { - QNetworkConfigurationPrivate *serviceNetwork = new QNetworkConfigurationPrivate; - serviceNetwork->name = tr("Internet"); - serviceNetwork->isValid = true; - serviceNetwork->id = QLatin1String("Internet Service Network"); - serviceNetwork->state = QNetworkConfiguration::Defined; - serviceNetwork->type = QNetworkConfiguration::ServiceNetwork; - - QNetworkConfigurationPrivatePointer ptr(serviceNetwork); - - generic->snapConfigurations.insert(serviceNetwork->id, ptr); - - if (!firstUpdate) { - QNetworkConfiguration item; - item.d = ptr; - emit configurationAdded(item); - } - } - - QNetworkConfigurationPrivatePointer ptr = - generic->snapConfigurations.value(QLatin1String("Internet Service Network")); - - QList<QNetworkConfigurationPrivatePointer> serviceNetworkMembers; - - QHash<QString, QNetworkConfigurationPrivatePointer>::const_iterator i = - generic->accessPointConfigurations.constBegin(); - - QNetworkConfiguration::StateFlags state = QNetworkConfiguration::Defined; - while (i != generic->accessPointConfigurations.constEnd()) { - QNetworkConfigurationPrivatePointer child = i.value(); - - if (child.data()->internet && ((child.data()->state & QNetworkConfiguration::Defined) - == QNetworkConfiguration::Defined)) { - serviceNetworkMembers.append(child); - - state |= child.data()->state; - } - - ++i; - } - - - if (ptr.data()->state != state || ptr.data()->serviceNetworkMembers != serviceNetworkMembers) { - ptr.data()->state = state; - ptr.data()->serviceNetworkMembers = serviceNetworkMembers; - - QNetworkConfiguration item; - item.d = ptr; - emit configurationChanged(item); - } -#endif -} - void QNetworkConfigurationManagerPrivate::updateConfigurations() { if (firstUpdate) { diff --git a/src/network/bearer/qnetworkconfigmanager_p.h b/src/network/bearer/qnetworkconfigmanager_p.h index f6603ce..e178c2d 100644 --- a/src/network/bearer/qnetworkconfigmanager_p.h +++ b/src/network/bearer/qnetworkconfigmanager_p.h @@ -90,9 +90,6 @@ Q_SIGNALS: void configurationChanged(const QNetworkConfiguration& config); void onlineStateChanged(bool isOnline); -private: - void updateInternetServiceConfiguration(); - void abort(); public: |