Convert generic engine plugin to be incremental.

4 files changed, 106 insertions, 59 deletions

diff --git a/src/plugins/bearer/generic/qgenericengine.cpp b/src/plugins/bearer/generic/qgenericengine.cpp
index 4be27ba..11dfb3e 100644
--- a/src/plugins/bearer/generic/qgenericengine.cpp
+++ b/src/plugins/bearer/generic/qgenericengine.cpp
@@ -125,21 +125,58 @@ static QString qGetInterfaceType(const QString &interface)
 QGenericEngine::QGenericEngine(QObject *parent)
 :   QNetworkSessionEngine(parent)
 {
-    connect(&pollTimer, SIGNAL(timeout()), this, SIGNAL(configurationsChanged()));
+    connect(&pollTimer, SIGNAL(timeout()), this, SLOT(doRequestUpdate()));
     pollTimer.setInterval(10000);
+    doRequestUpdate();
 }
 
 QGenericEngine::~QGenericEngine()
 {
 }
 
-QList<QNetworkConfigurationPrivate *> QGenericEngine::getConfigurations(bool *ok)
+QString QGenericEngine::getInterfaceFromId(const QString &id)
+{
+    return configurationInterface.value(id.toUInt());
+}
+
+bool QGenericEngine::hasIdentifier(const QString &id)
+{
+    return configurationInterface.contains(id.toUInt());
+}
+
+QString QGenericEngine::bearerName(const QString &id)
+{
+    QString interface = getInterfaceFromId(id);
+
+    if (interface.isEmpty())
+        return QString();
+
+    return qGetInterfaceType(interface);
+}
+
+void QGenericEngine::connectToId(const QString &id)
+{
+    emit connectionError(id, OperationNotSupported);
+}
+
+void QGenericEngine::disconnectFromId(const QString &id)
+{
+    emit connectionError(id, OperationNotSupported);
+}
+
+void QGenericEngine::requestUpdate()
 {
-    if (ok)
-        *ok = true;
+    pollTimer.stop();
+    QTimer::singleShot(0, this, SLOT(doRequestUpdate()));
+}
 
-    QList<QNetworkConfigurationPrivate *> foundConfigurations;
+QGenericEngine *QGenericEngine::instance()
+{
+    return genericEngine();
+}
 
+void QGenericEngine::doRequestUpdate()
+{
     // Immediately after connecting with a wireless access point
     // QNetworkInterface::allInterfaces() will sometimes return an empty list. Calling it again a
     // second time results in a non-empty list. If we loose interfaces we will end up removing
@@ -148,6 +185,8 @@ QList<QNetworkConfigurationPrivate *> QGenericEngine::getConfigurations(bool *ok
     if (interfaces.isEmpty())
         interfaces = QNetworkInterface::allInterfaces();
 
+    QStringList previous = accessPointConfigurations.keys();
+
     // create configuration for each interface
     while (!interfaces.isEmpty()) {
         QNetworkInterface interface = interfaces.takeFirst();
@@ -163,71 +202,77 @@ QList<QNetworkConfigurationPrivate *> QGenericEngine::getConfigurations(bool *ok
         if (qGetInterfaceType(interface.name()) == QLatin1String("WLAN"))
             continue;
 
-        QNetworkConfigurationPrivate *cpPriv = new QNetworkConfigurationPrivate;
-        const QString humanReadableName = interface.humanReadableName();
-        cpPriv->name = humanReadableName.isEmpty() ? interface.name() : humanReadableName;
-        cpPriv->isValid = true;
-
         uint identifier;
         if (interface.index())
-            identifier = qHash(QLatin1String("NLA:") + QString::number(interface.index()));
+            identifier = qHash(QLatin1String("generic:") + QString::number(interface.index()));
         else
-            identifier = qHash(QLatin1String("NLA:") + interface.hardwareAddress());
+            identifier = qHash(QLatin1String("generic:") + interface.hardwareAddress());
+
+        const QString id = QString::number(identifier);
 
-        cpPriv->id = QString::number(identifier);
-        cpPriv->state = QNetworkConfiguration::Discovered;
-        cpPriv->type = QNetworkConfiguration::InternetAccessPoint;
+        previous.removeAll(id);
+
+        QString name = interface.humanReadableName();
+        if (name.isEmpty())
+            name = interface.name();
+
+        QNetworkConfiguration::StateFlags state = QNetworkConfiguration::Discovered;
         if (interface.flags() & QNetworkInterface::IsUp)
-            cpPriv->state |= QNetworkConfiguration::Active;
+            state |= QNetworkConfiguration::Active;
 
-        configurationInterface[identifier] = interface.name();
+        if (accessPointConfigurations.contains(id)) {
+            QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> ptr =
+                accessPointConfigurations.value(id);
 
-        foundConfigurations.append(cpPriv);
-    }
+            bool changed = false;
 
-    pollTimer.start();
+            if (!ptr->isValid) {
+                ptr->isValid = true;
+                changed = true;
+            }
 
-    return foundConfigurations;
-}
+            if (ptr->name != name) {
+                ptr->name = name;
+                changed = true;
+            }
 
-QString QGenericEngine::getInterfaceFromId(const QString &id)
-{
-    return configurationInterface.value(id.toUInt());
-}
+            if (ptr->id != id) {
+                ptr->id = id;
+                changed = true;
+            }
 
-bool QGenericEngine::hasIdentifier(const QString &id)
-{
-    return configurationInterface.contains(id.toUInt());
-}
+            if (ptr->state != state) {
+                ptr->state = state;
+                changed = true;
+            }
 
-QString QGenericEngine::bearerName(const QString &id)
-{
-    QString interface = getInterfaceFromId(id);
+            if (changed)
+                emit configurationChanged(ptr);
+        } else {
+            QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> ptr(new QNetworkConfigurationPrivate);
 
-    if (interface.isEmpty())
-        return QString();
+            ptr->name = name;
+            ptr->isValid = true;
+            ptr->id = id;
+            ptr->state = state;
+            ptr->type = QNetworkConfiguration::InternetAccessPoint;
 
-    return qGetInterfaceType(interface);
-}
+            accessPointConfigurations.insert(id, ptr);
 
-void QGenericEngine::connectToId(const QString &id)
-{
-    emit connectionError(id, OperationNotSupported);
-}
+            emit configurationAdded(ptr);
+        }
+    }
 
-void QGenericEngine::disconnectFromId(const QString &id)
-{
-    emit connectionError(id, OperationNotSupported);
-}
+    while (!previous.isEmpty()) {
+        QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> ptr =
+            accessPointConfigurations.take(previous.takeFirst());
 
-void QGenericEngine::requestUpdate()
-{
-    emit configurationsChanged();
-}
+        emit configurationRemoved(ptr);
+    }
 
-QGenericEngine *QGenericEngine::instance()
-{
-    return genericEngine();
+    pollTimer.start();
+
+    emit updateCompleted();
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/bearer/generic/qgenericengine.h b/src/plugins/bearer/generic/qgenericengine.h
index 9923a9b..62f964a 100644
--- a/src/plugins/bearer/generic/qgenericengine.h
+++ b/src/plugins/bearer/generic/qgenericengine.h
@@ -59,7 +59,6 @@ public:
     QGenericEngine(QObject *parent = 0);
     ~QGenericEngine();
 
-    QList<QNetworkConfigurationPrivate *> getConfigurations(bool *ok = 0);
     QString getInterfaceFromId(const QString &id);
     bool hasIdentifier(const QString &id);
 
@@ -72,6 +71,9 @@ public:
 
     static QGenericEngine *instance();
 
+private Q_SLOTS:
+    void doRequestUpdate();
+
 private:
     QMap<uint, QString> configurationInterface;
     QTimer pollTimer;
diff --git a/src/plugins/bearer/networkmanager/qnmwifiengine.cpp b/src/plugins/bearer/networkmanager/qnmwifiengine.cpp
index 4a814ec..b215023 100644
--- a/src/plugins/bearer/networkmanager/qnmwifiengine.cpp
+++ b/src/plugins/bearer/networkmanager/qnmwifiengine.cpp
@@ -112,7 +112,7 @@ QString QNmWifiEngine::getNameForConfiguration(QNetworkManagerInterfaceDevice *d
 }
 
 
-QList<QNetworkConfigurationPrivate *> QNmWifiEngine::getConfigurations(bool *ok)
+QList<QNetworkConfigurationPrivatePointer> QNmWifiEngine::getConfigurations(bool *ok)
 {
 //    qWarning() << Q_FUNC_INFO << updated;
     if (ok)
@@ -133,7 +133,7 @@ QList<QNetworkConfigurationPrivate *> QNmWifiEngine::getConfigurations(bool *ok)
         //add access points
         updated = true;
     }
-    return foundConfigurations;
+    return QList<QNetworkConfigurationPrivatePointer>(); //foundConfigurations;
 }
 
 void QNmWifiEngine::findConnections()
@@ -411,7 +411,7 @@ bool QNmWifiEngine::hasIdentifier(const QString &id)
 {
     if (configurationInterface.contains(id))
         return true;
-    foreach (QNetworkConfigurationPrivate *cpPriv, getConfigurations()) {
+    foreach (QNetworkConfigurationPrivatePointer cpPriv, getConfigurations()) {
         if (cpPriv->id == id)
             return true;
     }
@@ -506,7 +506,7 @@ void QNmWifiEngine::requestUpdate()
     updated = false;
     knownSsids.clear();
     availableAccessPoints.clear();
-    emitConfigurationsChanged();
+    //emitConfigurationsChanged();
 }
 
 QNmWifiEngine *QNmWifiEngine::instance()
diff --git a/src/plugins/bearer/networkmanager/qnmwifiengine.h b/src/plugins/bearer/networkmanager/qnmwifiengine.h
index 4d514e7..d651ef4 100644
--- a/src/plugins/bearer/networkmanager/qnmwifiengine.h
+++ b/src/plugins/bearer/networkmanager/qnmwifiengine.h
@@ -80,7 +80,7 @@ public:
     QNmWifiEngine(QObject *parent = 0);
     ~QNmWifiEngine();
 
-    QList<QNetworkConfigurationPrivate *> getConfigurations(bool *ok = 0);
+    QList<QNetworkConfigurationPrivatePointer> getConfigurations(bool *ok = 0);
     QString getInterfaceFromId(const QString &id);
     bool hasIdentifier(const QString &id);
 
@@ -94,7 +94,7 @@ public:
     static QNmWifiEngine *instance();
 
     QStringList knownSsids;
-    inline void emitConfigurationsChanged() { emit configurationsChanged(); }
+    //inline void emitConfigurationsChanged() { emit configurationsChanged(); }
     QNetworkConfigurationPrivate * addAccessPoint(const QString &, QDBusObjectPath );
 
     QStringList getConnectionPathForId(const QString &uuid);