From 34450eb48e56677395601bf155a6a05752b326ad Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Thu, 11 Feb 2010 16:27:44 +1000
Subject: Use provided typedef for QNetworkConfigurationPrivatePointer.

---
 src/network/bearer/qnetworkconfigmanager.cpp   |  6 ++----
 src/network/bearer/qnetworkconfigmanager_p.cpp | 10 +++++-----
 src/network/bearer/qnetworkconfiguration.cpp   |  5 ++---
 src/plugins/bearer/generic/qgenericengine.cpp  |  5 ++---
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp
index 8673f52..8ca2537 100644
--- a/src/network/bearer/qnetworkconfigmanager.cpp
+++ b/src/network/bearer/qnetworkconfigmanager.cpp
@@ -239,8 +239,7 @@ QList<QNetworkConfiguration> QNetworkConfigurationManager::allConfigurations(QNe
 
         //find all InternetAccessPoints
         foreach (const QString &ii, cpsIdents) {
-            QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> p =
-                    engine->accessPointConfigurations.value(ii);
+            QNetworkConfigurationPrivatePointer p = engine->accessPointConfigurations.value(ii);
             if ((p->state & filter) == filter) {
                 QNetworkConfiguration pt;
                 pt.d = engine->accessPointConfigurations.value(ii);
@@ -251,8 +250,7 @@ QList<QNetworkConfiguration> QNetworkConfigurationManager::allConfigurations(QNe
         //find all service networks
         cpsIdents = engine->snapConfigurations.keys();
         foreach (const QString &ii, cpsIdents) {
-            QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> p =
-                    engine->snapConfigurations.value(ii);
+            QNetworkConfigurationPrivatePointer p = engine->snapConfigurations.value(ii);
             if ((p->state & filter) == filter) {
                 QNetworkConfiguration pt;
                 pt.d = engine->snapConfigurations.value(ii);
diff --git a/src/network/bearer/qnetworkconfigmanager_p.cpp b/src/network/bearer/qnetworkconfigmanager_p.cpp
index 66d5982..01a85a5 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.cpp
+++ b/src/network/bearer/qnetworkconfigmanager_p.cpp
@@ -121,7 +121,7 @@ void QNetworkConfigurationManagerPrivate::updateInternetServiceConfiguration()
         serviceNetwork->state = QNetworkConfiguration::Defined;
         serviceNetwork->type = QNetworkConfiguration::ServiceNetwork;
 
-        QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> ptr(serviceNetwork);
+        QNetworkConfigurationPrivatePointer ptr(serviceNetwork);
 
         generic->snapConfigurations.insert(serviceNetwork->id, ptr);
 
@@ -132,17 +132,17 @@ void QNetworkConfigurationManagerPrivate::updateInternetServiceConfiguration()
         }
     }
 
-    QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> ptr =
+    QNetworkConfigurationPrivatePointer ptr =
         generic->snapConfigurations.value(QLatin1String("Internet Service Network"));
 
-    QList<QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> > serviceNetworkMembers;
+    QList<QNetworkConfigurationPrivatePointer> serviceNetworkMembers;
 
-    QHash<QString, QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> >::const_iterator i =
+    QHash<QString, QNetworkConfigurationPrivatePointer>::const_iterator i =
         generic->accessPointConfigurations.constBegin();
 
     QNetworkConfiguration::StateFlags state = QNetworkConfiguration::Defined;
     while (i != generic->accessPointConfigurations.constEnd()) {
-        QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> child = i.value();
+        QNetworkConfigurationPrivatePointer child = i.value();
 
         if (child.data()->internet && ((child.data()->state & QNetworkConfiguration::Defined)
                     == QNetworkConfiguration::Defined)) {
diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp
index 9246645..8c11d9c 100644
--- a/src/network/bearer/qnetworkconfiguration.cpp
+++ b/src/network/bearer/qnetworkconfiguration.cpp
@@ -326,10 +326,9 @@ QList<QNetworkConfiguration> QNetworkConfiguration::children() const
     if (type() != QNetworkConfiguration::ServiceNetwork || !isValid() )
         return results;
 
-    QMutableListIterator<QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> > iter(d->serviceNetworkMembers);
-    QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> p(0);
+    QMutableListIterator<QNetworkConfigurationPrivatePointer> iter(d->serviceNetworkMembers);
     while(iter.hasNext()) {
-        p = iter.next();
+        QNetworkConfigurationPrivatePointer p = iter.next();
         //if we have an invalid member get rid of it -> was deleted earlier on
         if (!p->isValid)
             iter.remove();
diff --git a/src/plugins/bearer/generic/qgenericengine.cpp b/src/plugins/bearer/generic/qgenericengine.cpp
index c6ab4df..dba2c08 100644
--- a/src/plugins/bearer/generic/qgenericengine.cpp
+++ b/src/plugins/bearer/generic/qgenericengine.cpp
@@ -224,8 +224,7 @@ void QGenericEngine::doRequestUpdate()
             state |= QNetworkConfiguration::Active;
 
         if (accessPointConfigurations.contains(id)) {
-            QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> ptr =
-                accessPointConfigurations.value(id);
+            QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(id);
 
             bool changed = false;
 
@@ -269,7 +268,7 @@ void QGenericEngine::doRequestUpdate()
     }
 
     while (!previous.isEmpty()) {
-        QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> ptr =
+        QNetworkConfigurationPrivatePointer ptr =
             accessPointConfigurations.take(previous.takeFirst());
 
         configurationInterface.remove(ptr->id);
-- 
cgit v0.12