diff options
author | Lorn Potter <lorn.potter@gmail.com> | 2014-10-29 19:40:43 +1000 |
---|---|---|
committer | Lorn Potter <lorn.potter@gmail.com> | 2014-11-06 02:42:38 +0100 |
commit | 4763a3571f3301dd2da6d35636a94e4d1dc1f216 (patch) | |
tree | 139f0967a8705af6181fa6cf53f1a6f79566094c /src/plugins/bearer/networkmanager/qnetworkmanagerengine.h | |
parent | af279b34a8ecccd7dfa0d59b718bc3cf65ebce65 (diff) |
Use a property cache to cut down on blocking calls
Refactor old code
Stop memory leaks
Properly support mobile data (ofono)
Change-Id: I7f23882ee0ee345a049a4a93ddd452b6d2e53710
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 | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h index ab1cfea71e..d2ef9886a3 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h @@ -49,6 +49,8 @@ #include "qnetworkmanagerservice.h" +#include "../linux_common/qofonoservice_linux_p.h" + #include <QMap> #include <QVariant> @@ -89,11 +91,8 @@ public: QNetworkConfigurationPrivatePointer defaultConfiguration(); private Q_SLOTS: - void interfacePropertiesChanged(const QString &path, - const QMap<QString, QVariant> &properties); - void activeConnectionPropertiesChanged(const QString &path, - const QMap<QString, QVariant> &properties); - void devicePropertiesChanged(const QString &path, quint32); + void interfacePropertiesChanged(const QMap<QString, QVariant> &properties); + void activeConnectionPropertiesChanged(const QMap<QString, QVariant> &properties); void deviceAdded(const QDBusObjectPath &path); void deviceRemoved(const QDBusObjectPath &path); @@ -106,8 +105,8 @@ private Q_SLOTS: void newAccessPoint(const QString &path); void removeAccessPoint(const QString &path); - void updateAccessPoint(const QMap<QString, QVariant> &map); void scanFinished(); + void changedModem(); private: QNetworkConfigurationPrivate *parseConnection(const QString &settingsPath, @@ -116,14 +115,21 @@ private: QNetworkManagerInterface *managerInterface; QNetworkManagerSettings *systemSettings; - QNetworkManagerSettings *userSettings; QHash<QString, QNetworkManagerInterfaceDeviceWireless *> wirelessDevices; - QHash<QString, QNetworkManagerConnectionActive *> activeConnections; + QHash<QString, QNetworkManagerConnectionActive *> activeConnectionsList; QList<QNetworkManagerSettingsConnection *> connections; QList<QNetworkManagerInterfaceAccessPoint *> accessPoints; QHash<QString, QNetworkManagerInterfaceDevice *> interfaceDevices; QMap<QString,QString> configuredAccessPoints; //ap, settings path + QHash<QString,QString> connectionInterfaces; // ac, interface + + QOfonoManagerInterface *ofonoManager; + QOfonoNetworkRegistrationInterface *ofonoNetwork; + QOfonoDataConnectionManagerInterface *ofonoContextManager; + QNetworkConfiguration::BearerType currentBearerType(); + QString contextName(const QString &path); + }; QT_END_NAMESPACE |