summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer/networkmanager
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2009-12-07 06:11:11 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-01-04 01:00:58 (GMT)
commit63d59200884a68e569cce9d0ee470447b8239f6b (patch)
tree80c4f5086a4c0ba6300c8a7588a55a7d9f8e5b19 /src/plugins/bearer/networkmanager
parent19e64169b8f3b0b0c12d99327e8c68c5c8a26498 (diff)
downloadQt-63d59200884a68e569cce9d0ee470447b8239f6b.zip
Qt-63d59200884a68e569cce9d0ee470447b8239f6b.tar.gz
Qt-63d59200884a68e569cce9d0ee470447b8239f6b.tar.bz2
Convert generic engine plugin to be incremental.
Diffstat (limited to 'src/plugins/bearer/networkmanager')
-rw-r--r--src/plugins/bearer/networkmanager/qnmwifiengine.cpp8
-rw-r--r--src/plugins/bearer/networkmanager/qnmwifiengine.h4
2 files changed, 6 insertions, 6 deletions
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);