diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/wifi/pluginmain.cpp | 2 | ||||
-rw-r--r-- | src/imports/wifi/qwifimanager.h | 8 | ||||
-rw-r--r-- | src/imports/wifi/qwifinetworklistmodel.cpp (renamed from src/imports/wifi/qwifinetworklist.cpp) | 14 | ||||
-rw-r--r-- | src/imports/wifi/qwifinetworklistmodel.h (renamed from src/imports/wifi/qwifinetworklist.h) | 10 | ||||
-rw-r--r-- | src/imports/wifi/wifi.pro | 4 |
5 files changed, 19 insertions, 19 deletions
diff --git a/src/imports/wifi/pluginmain.cpp b/src/imports/wifi/pluginmain.cpp index 3c560f9..97f16f3 100644 --- a/src/imports/wifi/pluginmain.cpp +++ b/src/imports/wifi/pluginmain.cpp @@ -68,7 +68,7 @@ public: Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.labs.wifi")); qmlRegisterType<QWifiManager>(uri, 0, 1, "WifiManager"); - qmlRegisterType<QWifiNetworkList>(); + qmlRegisterType<QWifiNetworkListModel>(); qmlRegisterSingletonType<QWifiGlobal>(uri, 0, 1, "Interface", global_object_wifi); } }; 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 <cutils/properties.h> -#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; diff --git a/src/imports/wifi/qwifinetworklist.cpp b/src/imports/wifi/qwifinetworklistmodel.cpp index 0bb9ead..bd1d37d 100644 --- a/src/imports/wifi/qwifinetworklist.cpp +++ b/src/imports/wifi/qwifinetworklistmodel.cpp @@ -16,37 +16,37 @@ ** the contact form at http://qt.digia.com/ ** ****************************************************************************/ -#include "qwifinetworklist.h" +#include "qwifinetworklistmodel.h" #include <QtCore> const int ID_NETWORK = (Qt::ItemDataRole) (Qt::UserRole + 1); -QWifiNetworkList::QWifiNetworkList(QWifiManager *manager) +QWifiNetworkListModel::QWifiNetworkListModel(QWifiManager *manager) : m_manager(manager) { } -QHash<int, QByteArray> QWifiNetworkList::roleNames() const +QHash<int, QByteArray> QWifiNetworkListModel::roleNames() const { QHash<int, QByteArray> names; names.insert(ID_NETWORK, "network"); return names; } -QVariant QWifiNetworkList::data(const QModelIndex &index, int role) const +QVariant QWifiNetworkListModel::data(const QModelIndex &index, int role) const { QWifiNetwork *n = m_networks.at(index.row()); switch (role) { case ID_NETWORK: return QVariant::fromValue((QObject *) n); } - qWarning("QWifiNetworkList::data(), undefined role: %d\n", role); + qWarning("QWifiNetworkListModel::data(), undefined role: %d\n", role); return QVariant(); } -QWifiNetwork *QWifiNetworkList::networkForSSID(const QByteArray &ssid, int *pos) +QWifiNetwork *QWifiNetworkListModel::networkForSSID(const QByteArray &ssid, int *pos) { for (int i=0; i<m_networks.size(); ++i) { if (m_networks.at(i)->ssid() == ssid) { @@ -58,7 +58,7 @@ QWifiNetwork *QWifiNetworkList::networkForSSID(const QByteArray &ssid, int *pos) return 0; } -void QWifiNetworkList::parseScanResults(const QByteArray &results) +void QWifiNetworkListModel::parseScanResults(const QByteArray &results) { QList<QByteArray> lines = results.split('\n'); diff --git a/src/imports/wifi/qwifinetworklist.h b/src/imports/wifi/qwifinetworklistmodel.h index 84e78fc..2827c8a 100644 --- a/src/imports/wifi/qwifinetworklist.h +++ b/src/imports/wifi/qwifinetworklistmodel.h @@ -16,8 +16,8 @@ ** the contact form at http://qt.digia.com/ ** ****************************************************************************/ -#ifndef QWIFINETWORKLIST_H -#define QWIFINETWORKLIST_H +#ifndef QWIFINETWORKLISTMODEL_H +#define QWIFINETWORKLISTMODEL_H #include <QtCore/QAbstractListModel> #include <QtCore/QList> @@ -26,13 +26,13 @@ class QWifiManager; -class QWifiNetworkList : public QAbstractListModel +class QWifiNetworkListModel : public QAbstractListModel { Q_OBJECT public: - QWifiNetworkList(QWifiManager *manager); + QWifiNetworkListModel(QWifiManager *manager); void parseScanResults(const QByteArray &data); @@ -48,4 +48,4 @@ private: QList<QWifiNetwork *> m_networks; }; -#endif // QWIFINETWORKLIST_H +#endif // QWIFINETWORKLISTMODEL_H diff --git a/src/imports/wifi/wifi.pro b/src/imports/wifi/wifi.pro index 0231479..b920978 100644 --- a/src/imports/wifi/wifi.pro +++ b/src/imports/wifi/wifi.pro @@ -8,12 +8,12 @@ SOURCES += \ pluginmain.cpp \ qwifimanager.cpp \ qwifinetwork.cpp \ - qwifinetworklist.cpp + qwifinetworklistmodel.cpp HEADERS += \ qwifimanager.h \ qwifinetwork.h \ - qwifinetworklist.h + qwifinetworklistmodel.h LIBS += -lhardware_legacy -lcutils |