diff options
21 files changed, 58 insertions, 40 deletions
diff --git a/.cmake.conf b/.cmake.conf index 377be00..10bc1fd 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.5.0") +set(QT_REPO_MODULE_VERSION "6.8.0") diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 15841e7..cf4c0ce 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -1,4 +1,5 @@ version: 2 +tags: ["documentation"] accept_configuration: condition: or conditions: diff --git a/dependencies.yaml b/dependencies.yaml index d9301d1..51d76f7 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../../qt/qtdeclarative: - ref: 1df17b067c1412823066955d67895a9a5e63af99 + ref: c63bb2bad5b4e741ed8a1e16d8f1f916c9baf61d required: true ../qttools: - ref: 4b600512329ab595b5971ee79ee104db956f6129 + ref: 0d80d76bf14905204a248655cd88fe6cfd5706db required: false diff --git a/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/CustomTableView.qml b/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/CustomTableView.qml index 059795c..d7c9917 100644 --- a/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/CustomTableView.qml +++ b/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/CustomTableView.qml @@ -73,7 +73,7 @@ ColumnLayout { id: delegateRectangle width: parent.width height: listView.height * 0.1 - property var delegateData: modelData + property var delegateData: entry Row { anchors.fill: parent diff --git a/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/NetworkListView.qml b/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/NetworkListView.qml index b4f3d0e..128cff2 100644 --- a/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/NetworkListView.qml +++ b/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/NetworkListView.qml @@ -61,7 +61,7 @@ ListView { font.pixelSize: Globals.subTitleFontSize font.family: Globals.appFont color: connected ? Globals.buttonGreenColor : "white" - text: (modelData.type === NetworkSettingsType.Wired) ? modelData["name"] + " (" + modelData["id"] + ")" : name + text: (type === NetworkSettingsType.Wired) ? name + " (" + entry["id"] + ")" : name } Row { id: ipRow diff --git a/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/WifiSelectorDelegate.qml b/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/WifiSelectorDelegate.qml index 9c2ad11..bcee3f1 100644 --- a/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/WifiSelectorDelegate.qml +++ b/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/WifiSelectorDelegate.qml @@ -47,14 +47,14 @@ ItemDelegate { elide: Text.ElideRight horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter - text: modelData["name"] + text: entry["name"] } WifiSignalMonitor { id: signalMonitor anchors.right: parent.right height: parent.height width: height - signalStrength: modelData.wirelessConfig["signalStrength"] + signalStrength: entry.wirelessConfig["signalStrength"] connected: connected } } diff --git a/src/networksettings/CMakeLists.txt b/src/networksettings/CMakeLists.txt index 35a3a27..03e43f4 100644 --- a/src/networksettings/CMakeLists.txt +++ b/src/networksettings/CMakeLists.txt @@ -19,6 +19,7 @@ qt_internal_add_module(NetworkSettings qnetworksettingsservice.cpp qnetworksettingsservice.h qnetworksettingsservicemodel.cpp qnetworksettingsservicemodel.h qnetworksettingsuseragent.cpp qnetworksettingsuseragent.h + qnetworksettingsglobal.h DBUS_INTERFACE_SOURCES connman/connman_manager.xml connman/connman_service.xml diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp index bc92f97..94eec14 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp @@ -180,7 +180,7 @@ void QNetworkSettingsManagerPrivate::onTechnologyAdded(const QDBusObjectPath &te { Q_Q(QNetworkSettingsManager); - foreach (QNetworkSettingsInterface* item, m_interfaceModel.getModel()) { + for (QNetworkSettingsInterface* item : m_interfaceModel.getModel()) { ConnmanSettingsInterface* interface = qobject_cast<ConnmanSettingsInterface*>(item); if (interface->path() == technology.path()) { return; // we already know the interface/technology @@ -204,7 +204,7 @@ void QNetworkSettingsManagerPrivate::onTechnologyRemoved(const QDBusObjectPath & { Q_Q(QNetworkSettingsManager); - foreach (QNetworkSettingsInterface* item, m_interfaceModel.getModel()) { + for (QNetworkSettingsInterface* item : m_interfaceModel.getModel()) { ConnmanSettingsInterface* tech = qobject_cast<ConnmanSettingsInterface*>(item); if (tech->path() == technology.path()) { m_interfaceModel.removeInterface(tech->name()); @@ -221,7 +221,7 @@ void QNetworkSettingsManagerPrivate::getServicesFinished(QDBusPendingCallWatcher if (reply.isError()) return; - foreach (const ConnmanMapStruct &object, reply.value()) { + for (const ConnmanMapStruct &object : reply.value()) { const QString servicePath = object.objectPath.path(); handleNewService(servicePath); } @@ -236,7 +236,7 @@ void QNetworkSettingsManagerPrivate::getTechnologiesFinished(QDBusPendingCallWat if (reply.isError()) return; - foreach (const ConnmanMapStruct &object, reply.value()) { + for (const ConnmanMapStruct &object : reply.value()) { ConnmanSettingsInterface *item = new ConnmanSettingsInterface(object.objectPath.path(), object.propertyMap, this); item->scanServices(); @@ -253,30 +253,40 @@ void QNetworkSettingsManagerPrivate::getTechnologiesFinished(QDBusPendingCallWat void QNetworkSettingsManagerPrivate::onServicesChanged(ConnmanMapStructList changed, const QList<QDBusObjectPath> &removed) { Q_Q(QNetworkSettingsManager); - foreach (const QDBusObjectPath &dpath, removed) { + for (const QDBusObjectPath &dpath : removed) { QString path = dpath.path(); if (m_serviceModel->removeService(path)) emit q->servicesChanged(); if (auto service = m_unnamedServices.take(path)) - if (!service->placeholderState()) + if (!service->placeholderState()) { + disconnect(service, &QNetworkSettingsService::nameChanged, + this, &QNetworkSettingsManagerPrivate::serviceReady); + disconnect(service, &QNetworkSettingsService::typeChanged, + this, &QNetworkSettingsManagerPrivate::serviceReady); service->deleteLater(); + } if (auto service = m_unknownServices.take(path)) - if (!service->placeholderState()) + if (!service->placeholderState()) { + disconnect(service, &QNetworkSettingsService::nameChanged, + this, &QNetworkSettingsManagerPrivate::serviceReady); + disconnect(service, &QNetworkSettingsService::typeChanged, + this, &QNetworkSettingsManagerPrivate::serviceReady); service->deleteLater(); + } m_unnamedServicesForSsidConnection.remove(path); // do not delete here } QStringList newServices; - foreach (const ConnmanMapStruct &map, changed) { + for (const ConnmanMapStruct &map : changed) { QString path = map.objectPath.path(); if (m_unknownServices.contains(path) || m_unnamedServices.contains(path)) continue; bool found = false; - foreach (QNetworkSettingsService* service, m_serviceModel->getModel()) { + for (QNetworkSettingsService* service : m_serviceModel->getModel()) { if (service->id() == path && service->placeholderState() == false) { found = true; break; @@ -286,7 +296,7 @@ void QNetworkSettingsManagerPrivate::onServicesChanged(ConnmanMapStructList chan newServices.append(map.objectPath.path()); } - foreach (QString newService, newServices) { + for (QString newService : newServices) { handleNewService(newService); } @@ -360,7 +370,7 @@ void QNetworkSettingsManagerPrivate::serviceReady() } //Update the interface state accordingly - foreach (QNetworkSettingsInterface* item, m_interfaceModel.getModel()) { + for (QNetworkSettingsInterface* item : m_interfaceModel.getModel()) { ConnmanSettingsInterface* technology = qobject_cast<ConnmanSettingsInterface*>(item); if (technology->name() == service->name() && technology->type() == service->type()) { technology->setState(technology->state()); diff --git a/src/networksettings/connman/qnetworksettingsservice_p.cpp b/src/networksettings/connman/qnetworksettingsservice_p.cpp index dce48d9..082b458 100644 --- a/src/networksettings/connman/qnetworksettingsservice_p.cpp +++ b/src/networksettings/connman/qnetworksettingsservice_p.cpp @@ -439,7 +439,7 @@ void QNetworkSettingsServicePrivate::updateProperty(const QString& key, const QV else if (key == PropertySecurity) { QStringList value = qdbus_cast<QStringList>(val); QNetworkSettingsWireless::Securities securities; - foreach (const QString str, value) { + for (const QString &str : value) { if (str == AttributeNone || str == AttributeWps) { securities |= QNetworkSettingsWireless::Security::None; } diff --git a/src/networksettings/qnetworksettings.h b/src/networksettings/qnetworksettings.h index 7a66642..6006149 100644 --- a/src/networksettings/qnetworksettings.h +++ b/src/networksettings/qnetworksettings.h @@ -31,8 +31,8 @@ #include <QtNetworkSettings/qnetworksettingsglobal.h> -#include <QObject> -#include <QUrl> +#include <QtCore/qobject.h> +#include <QtCore/qurl.h> #include <QtNetworkSettings/qnetworksettingsaddressmodel.h> QT_BEGIN_NAMESPACE diff --git a/src/networksettings/qnetworksettingsaddressmodel.h b/src/networksettings/qnetworksettingsaddressmodel.h index 671bd7b..b08f381 100644 --- a/src/networksettings/qnetworksettingsaddressmodel.h +++ b/src/networksettings/qnetworksettingsaddressmodel.h @@ -29,7 +29,7 @@ #ifndef QNETWORKSETTINGSADDRESSMODEL_H #define QNETWORKSETTINGSADDRESSMODEL_H -#include <QStringListModel> +#include <QtCore/qstringlistmodel.h> #include <QtNetworkSettings/qnetworksettingsglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/networksettings/qnetworksettingsinterface.h b/src/networksettings/qnetworksettingsinterface.h index 33219e8..5fb9636 100644 --- a/src/networksettings/qnetworksettingsinterface.h +++ b/src/networksettings/qnetworksettingsinterface.h @@ -29,7 +29,7 @@ #ifndef QNETWORKSETTINGSINTERFACE_H #define QNETWORKSETTINGSINTERFACE_H -#include <QObject> +#include <QtCore/qobject.h> #include <QtNetworkSettings/qnetworksettings.h> QT_BEGIN_NAMESPACE diff --git a/src/networksettings/qnetworksettingsinterfacemodel.cpp b/src/networksettings/qnetworksettingsinterfacemodel.cpp index da428b1..95eff25 100644 --- a/src/networksettings/qnetworksettingsinterfacemodel.cpp +++ b/src/networksettings/qnetworksettingsinterfacemodel.cpp @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE QNetworkSettingsInterfaceModel::QNetworkSettingsInterfaceModel(QObject *parent) : QAbstractListModel(parent) { - m_roleNames.insert(Qt::UserRole, "modelData"); + m_roleNames.insert(Qt::UserRole, "entry"); m_roleNames.insert(Type, "type"); m_roleNames.insert(Status, "status"); m_roleNames.insert(Name, "name"); @@ -191,7 +191,7 @@ void QNetworkSettingsInterfaceModel::connectionStatusChanged() QNetworkSettingsInterface *s = qobject_cast<QNetworkSettingsInterface*>(sender()); int row = 0; - foreach (QNetworkSettingsInterface* item, m_items) { + for (QNetworkSettingsInterface* item : m_items) { if (item == s) { updated(row); break; @@ -205,7 +205,7 @@ void QNetworkSettingsInterfaceModel::poweredChanged() { QNetworkSettingsInterface *s = qobject_cast<QNetworkSettingsInterface*>(sender()); int row = 0; - foreach (QNetworkSettingsInterface* item, m_items) { + for (QNetworkSettingsInterface* item : m_items) { if (item == s) { updated(row); break; diff --git a/src/networksettings/qnetworksettingsinterfacemodel.h b/src/networksettings/qnetworksettingsinterfacemodel.h index a448f0a..aa6aa69 100644 --- a/src/networksettings/qnetworksettingsinterfacemodel.h +++ b/src/networksettings/qnetworksettingsinterfacemodel.h @@ -29,7 +29,7 @@ #ifndef QNETWORKSETTINGSINTERFACEMODEL_H #define QNETWORKSETTINGSINTERFACEMODEL_H -#include <QAbstractListModel> +#include <QtCore/QAbstractListModel> #include <QtNetworkSettings/qnetworksettingsglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/networksettings/qnetworksettingsmanager.cpp b/src/networksettings/qnetworksettingsmanager.cpp index 32df2de..7ec82fa 100644 --- a/src/networksettings/qnetworksettingsmanager.cpp +++ b/src/networksettings/qnetworksettingsmanager.cpp @@ -191,7 +191,7 @@ QNetworkSettingsService* QNetworkSettingsManager::service(const QString& name, i { Q_D(QNetworkSettingsManager); - foreach (QNetworkSettingsService* service, d->serviceModel()->getModel()) { + for (QNetworkSettingsService* service : d->serviceModel()->getModel()) { if (service->name() == name && service->type() == type) { return service; } @@ -299,7 +299,7 @@ QNetworkSettingsInterface* QNetworkSettingsManager::interface(int type, int inst Q_D(QNetworkSettingsManager); int matchingInstance = 0; - foreach (QNetworkSettingsInterface* interface, d->m_interfaceModel.getModel()) { + for (QNetworkSettingsInterface* interface : d->m_interfaceModel.getModel()) { if (interface->type() == type) { if (matchingInstance == instance) { return interface; diff --git a/src/networksettings/qnetworksettingsmanager.h b/src/networksettings/qnetworksettingsmanager.h index b31dcbd..9f562d3 100644 --- a/src/networksettings/qnetworksettingsmanager.h +++ b/src/networksettings/qnetworksettingsmanager.h @@ -29,7 +29,7 @@ #ifndef QNETWORKSETTINGSMANAGER_H #define QNETWORKSETTINGSMANAGER_H -#include <QObject> +#include <QtCore/qobject.h> #include <QtNetworkSettings/qnetworksettingsglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/networksettings/qnetworksettingsservice.h b/src/networksettings/qnetworksettingsservice.h index af8c726..0b71d50 100644 --- a/src/networksettings/qnetworksettingsservice.h +++ b/src/networksettings/qnetworksettingsservice.h @@ -29,7 +29,7 @@ #ifndef QNETWORKSETTINGSSERVICE_H #define QNETWORKSETTINGSSERVICE_H -#include <QObject> +#include <QtCore/qobject.h> #include <QtNetworkSettings/qnetworksettings.h> QT_BEGIN_NAMESPACE diff --git a/src/networksettings/qnetworksettingsservicemodel.cpp b/src/networksettings/qnetworksettingsservicemodel.cpp index b069277..0927bcc 100644 --- a/src/networksettings/qnetworksettingsservicemodel.cpp +++ b/src/networksettings/qnetworksettingsservicemodel.cpp @@ -65,7 +65,8 @@ QT_BEGIN_NAMESPACE QNetworkSettingsServiceModel::QNetworkSettingsServiceModel(QObject *parent) : QAbstractListModel(parent) { - m_roleNames.insert(Qt::UserRole, "modelData"); + m_roleNames.insert(Qt::UserRole, "entry"); + m_roleNames.insert(Type, "type"); m_roleNames.insert(Name, "name"); m_roleNames.insert(SignalStrength, "signalStrength"); m_roleNames.insert(Connected, "connected"); @@ -108,6 +109,9 @@ QVariant QNetworkSettingsServiceModel::data(const QModelIndex & index, int role) if (role == Qt::UserRole) { return QVariant::fromValue(static_cast<QObject*>(item)); } + else if (role == Type) { + return item->type(); + } else if (role == Name) { return item->name(); } @@ -230,7 +234,7 @@ void QNetworkSettingsServiceModel::updated(int row) QNetworkSettingsService* QNetworkSettingsServiceModel::getByName(const QString& name) { QNetworkSettingsService* ret = nullptr; - foreach (QNetworkSettingsService* item, m_items) { + for (QNetworkSettingsService* item : m_items) { if (item->name() == name) { ret = item; break; @@ -255,7 +259,7 @@ void QNetworkSettingsServiceModel::connectionStatusChanged() QNetworkSettingsService *s = qobject_cast<QNetworkSettingsService*>(sender()); int row = 0; - foreach (QNetworkSettingsService* item, m_items) { + for (QNetworkSettingsService* item : m_items) { if (item == s) { updated(row); break; @@ -272,7 +276,7 @@ void QNetworkSettingsServiceModel::signalStrengthChanged() { QNetworkSettingsWireless *s = qobject_cast<QNetworkSettingsWireless*>(sender()); int row = 0; - foreach (QNetworkSettingsService* item, m_items) { + for (QNetworkSettingsService* item : m_items) { if (item->wirelessConfig() == s) { updated(row); break; @@ -430,7 +434,7 @@ int QNetworkSettingsServiceFilter::activeRow() const QNetworkSettingsServiceModel* model = qobject_cast<QNetworkSettingsServiceModel*>(sourceModel()); QList<QNetworkSettingsService*> data = model->getModel(); int row = 0; - foreach (QNetworkSettingsService* item, data) { + for (QNetworkSettingsService* item : data) { if (item->type() == m_type && (item->state() == QNetworkSettingsState::Ready || item->state() == QNetworkSettingsState::Online)) { diff --git a/src/networksettings/qnetworksettingsservicemodel.h b/src/networksettings/qnetworksettingsservicemodel.h index a12202b..b4392d2 100644 --- a/src/networksettings/qnetworksettingsservicemodel.h +++ b/src/networksettings/qnetworksettingsservicemodel.h @@ -29,7 +29,7 @@ #ifndef QNETWORKSETTINGSSERVICEMODEL_H #define QNETWORKSETTINGSSERVICEMODEL_H -#include <QSortFilterProxyModel> +#include <QtCore/qsortfilterproxymodel.h> #include <QtNetworkSettings/qnetworksettings.h> QT_BEGIN_NAMESPACE diff --git a/src/networksettings/qnetworksettingsuseragent.h b/src/networksettings/qnetworksettingsuseragent.h index aa63315..63964b6 100644 --- a/src/networksettings/qnetworksettingsuseragent.h +++ b/src/networksettings/qnetworksettingsuseragent.h @@ -29,7 +29,7 @@ #ifndef QNETWORKSETTINGSUSERAGENT_H #define QNETWORKSETTINGSUSERAGENT_H -#include <QObject> +#include <QtCore/qobject.h> #include <QtNetworkSettings/qnetworksettingsglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/networksettingsqml/qnetworksettingsforeign.cpp b/src/networksettingsqml/qnetworksettingsforeign.cpp index e3d1414..e0d73c0 100644 --- a/src/networksettingsqml/qnetworksettingsforeign.cpp +++ b/src/networksettingsqml/qnetworksettingsforeign.cpp @@ -69,7 +69,9 @@ \qmlproperty model NetworkSettingsManager::services \readonly - Holds the service model. + Holds the service model. A delegate in a view that uses + the \e services model can access the NetworkService + item with the \e entry role. The services list in the model can be controlled with the \c type property, and NetworkService items can be retrieved @@ -99,7 +101,7 @@ Holds the interface model. A delegate in a view that uses the \e interfaces model can access the NetworkInterface - item with the \e dataModel role. + item with the \e entry role. \sa NetworkInterface */ |