From 9767def438c4265319c3eef99e0531ee5164054e Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Mon, 17 Mar 2014 10:52:24 +0100 Subject: Rename misleading class name The API is: ListView { model: wifiManager.networks } currently if user calls print(wifiManager.networks) it will print: QWifiNetworkList The docs of ListView states that model property expects a subclass of QAbstractListModel. QWifiNetworkList sounds like a subclass of QList which is misleading. This patch renames the class to QWifiNetworkListModel. This does not change the public API (doesn't brake compatibility in any way), just improves the documentation of library. Task-number: QTEE-445 Change-Id: I71f07cb22617f3a7f41a0403d1c63c4357310325 Reviewed-by: Andy Nichols --- src/imports/wifi/qwifimanager.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/imports/wifi/qwifimanager.h') diff --git a/src/imports/wifi/qwifimanager.h b/src/imports/wifi/qwifimanager.h index 432f411..4b76368 100644 --- a/src/imports/wifi/qwifimanager.h +++ b/src/imports/wifi/qwifimanager.h @@ -25,7 +25,7 @@ #include -#include "qwifinetworklist.h" +#include "qwifinetworklistmodel.h" class QWifiManagerEventThread; @@ -37,7 +37,7 @@ class QWifiManager : public QObject Q_PROPERTY(bool backendReady READ isbackendReady NOTIFY backendReadyChanged) Q_PROPERTY(bool scanning READ scanning WRITE setScanning NOTIFY scanningChanged) Q_PROPERTY(QString connectedSSID READ connectedSSID NOTIFY connectedSSIDChanged) - Q_PROPERTY(QWifiNetworkList *networks READ networks CONSTANT) + Q_PROPERTY(QWifiNetworkListModel *networks READ networks CONSTANT) public: enum NetworkState { @@ -50,7 +50,7 @@ public: QWifiManager(); ~QWifiManager(); - QWifiNetworkList *networks() { return &m_networks; } + QWifiNetworkListModel *networks() { return &m_networks; } QString connectedSSID() const { return m_connectedSSID; } bool scanning() const { return m_scanning; } void setScanning(bool scanning); @@ -87,7 +87,7 @@ private: friend class QWifiManagerEventThread; QString m_connectedSSID; - QWifiNetworkList m_networks; + QWifiNetworkListModel m_networks; QWifiManagerEventThread *m_eventThread; int m_scanTimer; -- cgit v1.2.3 From 88a2385ab7b9f33437ce648a70757b9d8c8a48c7 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Wed, 19 Mar 2014 18:41:20 +0100 Subject: [Wifi] Add new enums and make some API changes - Now QtWifi can provide feedback when incorrect password is entered. - networkStateChanged signal provides a reference to the currently active network connection. - bug fixes in QWifiManager::connect Task-number: QTEE-408 Change-Id: Ic7458b864f09aef3cfca40fb081dec45e0bba7db Reviewed-by: Eirik Aavitsland --- src/imports/wifi/qwifimanager.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/imports/wifi/qwifimanager.h') diff --git a/src/imports/wifi/qwifimanager.h b/src/imports/wifi/qwifimanager.h index 4b76368..162190e 100644 --- a/src/imports/wifi/qwifimanager.h +++ b/src/imports/wifi/qwifimanager.h @@ -42,6 +42,8 @@ class QWifiManager : public QObject public: enum NetworkState { Disconnected, + Authenticating, + HandshakeFailed, ObtainingIPAddress, DhcpRequestFailed, Connected @@ -50,7 +52,7 @@ public: QWifiManager(); ~QWifiManager(); - QWifiNetworkListModel *networks() { return &m_networks; } + QWifiNetworkListModel *networks() { return &m_networkListModel; } QString connectedSSID() const { return m_connectedSSID; } bool scanning() const { return m_scanning; } void setScanning(bool scanning); @@ -65,10 +67,10 @@ public slots: void disconnect(); signals: - void scanningChanged(bool arg); - void networkStateChanged(); + void scanningChanged(bool scanning); + void networkStateChanged(QWifiNetwork *network); void backendReadyChanged(); - void connectedSSIDChanged(const QString &); + void connectedSSIDChanged(const QString &ssid); protected: bool event(QEvent *); @@ -76,8 +78,10 @@ protected: void handleConnected(); void connectToBackend(); void disconnectFromBackend(); + void exitEventThread(); QByteArray call(const char *command) const; bool checkedCall(const char *command) const; + void updateNetworkState(NetworkState state); protected slots: void connectedToDaemon(); @@ -87,7 +91,7 @@ private: friend class QWifiManagerEventThread; QString m_connectedSSID; - QWifiNetworkListModel m_networks; + QWifiNetworkListModel m_networkListModel; QWifiManagerEventThread *m_eventThread; int m_scanTimer; @@ -99,6 +103,8 @@ private: QLocalSocket *m_daemonClientSocket; QByteArray m_request; bool m_exitingEventThread; + bool m_startingUp; + QWifiNetwork *m_network; }; #endif // QWIFIMANAGER_H -- cgit v1.2.3