diff options
author | Lorn Potter <lorn.potter@jollamobile.com> | 2014-10-20 11:31:00 +1000 |
---|---|---|
committer | Lorn Potter <lorn.potter@gmail.com> | 2014-10-27 05:32:58 +0100 |
commit | 0ca0ecdb32b3d7df76fe9782d04493ebe0da0a9e (patch) | |
tree | 2df1907b38e1c7c5bd81108835155ba8d73673d5 /src/plugins/bearer/networkmanager/qnetworkmanagerengine.h | |
parent | 6c308e6f1de8f6dfe1938dfbfec55a6881de898a (diff) |
Make networkmanager bearer backend work better
This fixes QNetworkConfigurations when user:
- configures new AP
- deletes connection configuration
- switches wifi AP
Change-Id: I38c543c6de7b61f49d7ac96fa05f7a6fc4fba70f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/plugins/bearer/networkmanager/qnetworkmanagerengine.h')
-rw-r--r-- | src/plugins/bearer/networkmanager/qnetworkmanagerengine.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h index c8bdfe3400..ab1cfea71e 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h @@ -93,35 +93,35 @@ private Q_SLOTS: const QMap<QString, QVariant> &properties); void activeConnectionPropertiesChanged(const QString &path, const QMap<QString, QVariant> &properties); - void devicePropertiesChanged(const QString &path, - const QMap<QString, QVariant> &properties); + void devicePropertiesChanged(const QString &path, quint32); void deviceAdded(const QDBusObjectPath &path); void deviceRemoved(const QDBusObjectPath &path); void newConnection(const QDBusObjectPath &path, QNetworkManagerSettings *settings = 0); void removeConnection(const QString &path); - void updateConnection(const QNmSettingsMap &settings); + void updateConnection(); void activationFinished(QDBusPendingCallWatcher *watcher); + void deviceConnectionsChanged(const QStringList &activeConnectionsList); - void newAccessPoint(const QString &path, const QDBusObjectPath &objectPath); - void removeAccessPoint(const QString &path, const QDBusObjectPath &objectPath); + void newAccessPoint(const QString &path); + void removeAccessPoint(const QString &path); void updateAccessPoint(const QMap<QString, QVariant> &map); + void scanFinished(); private: - QNetworkConfigurationPrivate *parseConnection(const QString &service, - const QString &settingsPath, + QNetworkConfigurationPrivate *parseConnection(const QString &settingsPath, const QNmSettingsMap &map); QNetworkManagerSettingsConnection *connectionFromId(const QString &id) const; -private: - QNetworkManagerInterface *interface; + QNetworkManagerInterface *managerInterface; QNetworkManagerSettings *systemSettings; QNetworkManagerSettings *userSettings; QHash<QString, QNetworkManagerInterfaceDeviceWireless *> wirelessDevices; QHash<QString, QNetworkManagerConnectionActive *> activeConnections; QList<QNetworkManagerSettingsConnection *> connections; QList<QNetworkManagerInterfaceAccessPoint *> accessPoints; + QHash<QString, QNetworkManagerInterfaceDevice *> interfaceDevices; QMap<QString,QString> configuredAccessPoints; //ap, settings path }; |