poz/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

core/model: return ObjectModel values list directly

Browse source
This commit is contained in:
outfoxxed 2025-05-17 17:03:03 -07:00
parent 6dbc310df4
commit 61f00a0442
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
2 changed files with 2 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/core/model.cpp
View file

@ -23,23 +23,6 @@ QHash<int, QByteArray> UntypedObjectModel::roleNames() const {
return {{Qt::UserRole, "modelData"}}; return {{Qt::UserRole, "modelData"}};
} }
QQmlListProperty<QObject> UntypedObjectModel::values() {
return QQmlListProperty<QObject>(
this,
nullptr,
&UntypedObjectModel::valuesCount,
&UntypedObjectModel::valueAt
);
}
qsizetype UntypedObjectModel::valuesCount(QQmlListProperty<QObject>* property) {
return static_cast<UntypedObjectModel*>(property->object)->valuesList.count(); // NOLINT
}
QObject* UntypedObjectModel::valueAt(QQmlListProperty<QObject>* property, qsizetype index) {
return static_cast<UntypedObjectModel*>(property->object)->valuesList.at(index); // NOLINT
}
void UntypedObjectModel::insertObject(QObject* object, qsizetype index) { void UntypedObjectModel::insertObject(QObject* object, qsizetype index) {
auto iindex = index == -1 ? this->valuesList.length() : index; auto iindex = index == -1 ? this->valuesList.length() : index;
emit this->objectInsertedPre(object, iindex); emit this->objectInsertedPre(object, iindex);

4
src/core/model.hpp
View file

@ -42,7 +42,7 @@ class UntypedObjectModel: public QAbstractListModel {
Q_OBJECT; Q_OBJECT;
/// The content of the object model, as a QML list. /// The content of the object model, as a QML list.
/// The values of this property will always be of the type of the model. /// The values of this property will always be of the type of the model.
Q_PROPERTY(QQmlListProperty<QObject> values READ values NOTIFY valuesChanged); Q_PROPERTY(QList<QObject*> values READ values NOTIFY valuesChanged);
QML_NAMED_ELEMENT(ObjectModel); QML_NAMED_ELEMENT(ObjectModel);
QML_UNCREATABLE("ObjectModels cannot be created directly."); QML_UNCREATABLE("ObjectModels cannot be created directly.");
@ -53,7 +53,7 @@ public:
[[nodiscard]] QVariant data(const QModelIndex& index, qint32 role) const override; [[nodiscard]] QVariant data(const QModelIndex& index, qint32 role) const override;
[[nodiscard]] QHash<int, QByteArray> roleNames() const override; [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
[[nodiscard]] QQmlListProperty<QObject> values(); [[nodiscard]] QList<QObject*> values() const { return this->valuesList; };
void removeAt(qsizetype index); void removeAt(qsizetype index);
Q_INVOKABLE qsizetype indexOf(QObject* object); Q_INVOKABLE qsizetype indexOf(QObject* object);