From ee8b1156400791a077280138863336ea93a774a7 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Wed, 9 Dec 2009 16:49:06 +1000
Subject: Keep track of which QNetworkInterface is for each
 QNetworkConfiguration.

---
 src/plugins/bearer/generic/qgenericengine.cpp | 6 ++++--
 src/plugins/bearer/generic/qgenericengine.h   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/bearer/generic/qgenericengine.cpp b/src/plugins/bearer/generic/qgenericengine.cpp
index 11dfb3e..e70d23d 100644
--- a/src/plugins/bearer/generic/qgenericengine.cpp
+++ b/src/plugins/bearer/generic/qgenericengine.cpp
@@ -136,12 +136,12 @@ QGenericEngine::~QGenericEngine()
 
 QString QGenericEngine::getInterfaceFromId(const QString &id)
 {
-    return configurationInterface.value(id.toUInt());
+    return configurationInterface.value(id);
 }
 
 bool QGenericEngine::hasIdentifier(const QString &id)
 {
-    return configurationInterface.contains(id.toUInt());
+    return configurationInterface.contains(id);
 }
 
 QString QGenericEngine::bearerName(const QString &id)
@@ -258,6 +258,7 @@ void QGenericEngine::doRequestUpdate()
             ptr->type = QNetworkConfiguration::InternetAccessPoint;
 
             accessPointConfigurations.insert(id, ptr);
+            configurationInterface.insert(id, interface.name());
 
             emit configurationAdded(ptr);
         }
@@ -267,6 +268,7 @@ void QGenericEngine::doRequestUpdate()
         QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> ptr =
             accessPointConfigurations.take(previous.takeFirst());
 
+        configurationInterface.remove(ptr->id);
         emit configurationRemoved(ptr);
     }
 
diff --git a/src/plugins/bearer/generic/qgenericengine.h b/src/plugins/bearer/generic/qgenericengine.h
index 62f964a..32d762d 100644
--- a/src/plugins/bearer/generic/qgenericengine.h
+++ b/src/plugins/bearer/generic/qgenericengine.h
@@ -75,7 +75,7 @@ private Q_SLOTS:
     void doRequestUpdate();
 
 private:
-    QMap<uint, QString> configurationInterface;
+    QMap<QString, QString> configurationInterface;
     QTimer pollTimer;
 };
 
-- 
cgit v0.12