diff options
| author | Gatis Paeglis <gatis.paeglis@digia.com> | 2014-03-14 17:04:59 +0100 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@digia.com> | 2014-03-18 17:05:01 +0200 |
| commit | cb7775bf6eac1140cb40131efe87cb9fbc9b78ba (patch) | |
| tree | c1287ba6e88e84cdc9c29ba591ed77081de72512 /src | |
| parent | af296297e1d91228e8f63846c388fa1796b59e8a (diff) | |
Remove unnecessary roles from QWifiNetworkList
Currently there are 2 ways to access the same property from list
view's delegate:
network.ssid
ssid
This is not needed, from the API point of view it is more readible
when properties are accesed with network.* prefix. As is done in
launchersettings demo.
"network" role returns QWifiNetwork object which exposes the required
properties with Q_PROPERTY.
Change-Id: Idd55891d44c4f356a6774575508a38729c60c335
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/wifi/qwifinetworklist.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/imports/wifi/qwifinetworklist.cpp b/src/imports/wifi/qwifinetworklist.cpp index 60fdc53..0bb9ead 100644 --- a/src/imports/wifi/qwifinetworklist.cpp +++ b/src/imports/wifi/qwifinetworklist.cpp @@ -20,12 +20,7 @@ #include <QtCore> -const int ID_BSSID = (Qt::ItemDataRole) (Qt::UserRole + 1); -const int ID_SSID = (Qt::ItemDataRole) (Qt::UserRole + 2); -const int ID_SIGNAL = (Qt::ItemDataRole) (Qt::UserRole + 3); -const int ID_WPA2 = (Qt::ItemDataRole) (Qt::UserRole + 4); -const int ID_WPA = (Qt::ItemDataRole) (Qt::UserRole + 5); -const int ID_NETWORK = (Qt::ItemDataRole) (Qt::UserRole + 6); +const int ID_NETWORK = (Qt::ItemDataRole) (Qt::UserRole + 1); QWifiNetworkList::QWifiNetworkList(QWifiManager *manager) : m_manager(manager) @@ -35,11 +30,6 @@ QWifiNetworkList::QWifiNetworkList(QWifiManager *manager) QHash<int, QByteArray> QWifiNetworkList::roleNames() const { QHash<int, QByteArray> names; - names.insert(ID_BSSID, "bssid"); - names.insert(ID_SSID, "ssid"); - names.insert(ID_SIGNAL, "strength"); - names.insert(ID_WPA2, "wpa2"); - names.insert(ID_WPA, "wpa"); names.insert(ID_NETWORK, "network"); return names; } @@ -47,14 +37,8 @@ QHash<int, QByteArray> QWifiNetworkList::roleNames() const QVariant QWifiNetworkList::data(const QModelIndex &index, int role) const { QWifiNetwork *n = m_networks.at(index.row()); - switch (role) { - case ID_BSSID: return n->bssid(); - case ID_SSID: return n->ssid(); - case ID_SIGNAL: return n->signalStrength(); - case ID_WPA2: return n->supportsWPA2(); - case ID_WPA: return n->supportsWPA(); - case ID_NETWORK: return QVariant::fromValue((QObject *) n); + case ID_NETWORK: return QVariant::fromValue((QObject *) n); } qWarning("QWifiNetworkList::data(), undefined role: %d\n", role); |