marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-27 14:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

halcyon: use static method to register object

Browse source
This commit is contained in:
Yari Polla 2023-03-06 02:11:58 +01:00 committed by Devin Lin
parent 1d46f88e6e
commit 348d7821cc
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
containments/homescreens/halcyon/plugin/applicationlistmodel.cpp
View file

@ -30,6 +30,12 @@ ApplicationListModel::ApplicationListModel(QObject *parent)
ApplicationListModel::~ApplicationListModel() = default; ApplicationListModel::~ApplicationListModel() = default;
ApplicationListModel *ApplicationListModel::self()
{
static ApplicationListModel *inst = new ApplicationListModel(nullptr);
return inst;
}
QHash<int, QByteArray> ApplicationListModel::roleNames() const QHash<int, QByteArray> ApplicationListModel::roleNames() const
{ {
return {{ApplicationRole, QByteArrayLiteral("application")}}; return {{ApplicationRole, QByteArrayLiteral("application")}};

1
containments/homescreens/halcyon/plugin/applicationlistmodel.h
View file

@ -24,6 +24,7 @@ public:
ApplicationListModel(QObject *parent = nullptr); ApplicationListModel(QObject *parent = nullptr);
~ApplicationListModel() override; ~ApplicationListModel() override;
static ApplicationListModel *self();
int rowCount(const QModelIndex &parent = QModelIndex()) const override; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;

5
containments/homescreens/halcyon/plugin/halcyonplugin.cpp
View file

@ -14,9 +14,8 @@ void HalcyonPlugin::registerTypes(const char *uri)
WindowListener::instance(); // ensure it is created WindowListener::instance(); // ensure it is created
ApplicationListModel *applicationListModel = new ApplicationListModel{this}; qmlRegisterSingletonType<ApplicationListModel>(uri, 1, 0, "ApplicationListModel", [](QQmlEngine *, QJSEngine *) -> QObject * {
qmlRegisterSingletonType<ApplicationListModel>(uri, 1, 0, "ApplicationListModel", [applicationListModel](QQmlEngine *, QJSEngine *) -> QObject * { return ApplicationListModel::self();
return applicationListModel;
}); });
PinnedModel *pinnedModel = new PinnedModel{this}; PinnedModel *pinnedModel = new PinnedModel{this};