mirror of
https://github.com/Nheko-Reborn/nheko.git
synced 2024-11-24 12:08:50 +03:00
Fix UserSettingsModel and Communities singleton instantiation
This commit is contained in:
parent
dd7b627e3d
commit
0278c9d5fb
4 changed files with 8 additions and 1 deletions
|
@ -6,6 +6,7 @@
|
||||||
#define INVITEESMODEL_H
|
#define INVITEESMODEL_H
|
||||||
|
|
||||||
#include <QAbstractListModel>
|
#include <QAbstractListModel>
|
||||||
|
#include <QQmlEngine>
|
||||||
#include <QVector>
|
#include <QVector>
|
||||||
|
|
||||||
#include "timeline/TimelineModel.h"
|
#include "timeline/TimelineModel.h"
|
||||||
|
@ -34,6 +35,8 @@ private:
|
||||||
class InviteesModel final : public QAbstractListModel
|
class InviteesModel final : public QAbstractListModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
QML_ELEMENT
|
||||||
|
QML_UNCREATABLE("")
|
||||||
|
|
||||||
Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
|
Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
|
||||||
Q_PROPERTY(TimelineModel *room READ room CONSTANT)
|
Q_PROPERTY(TimelineModel *room READ room CONSTANT)
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <QAbstractListModel>
|
#include <QAbstractListModel>
|
||||||
|
#include <QQmlEngine>
|
||||||
#include <QSortFilterProxyModel>
|
#include <QSortFilterProxyModel>
|
||||||
|
|
||||||
#include <mtx/events/power_levels.hpp>
|
#include <mtx/events/power_levels.hpp>
|
||||||
|
@ -79,6 +80,8 @@ private:
|
||||||
class MemberList final : public QSortFilterProxyModel
|
class MemberList final : public QSortFilterProxyModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
QML_ELEMENT
|
||||||
|
QML_UNCREATABLE("")
|
||||||
|
|
||||||
Q_PROPERTY(QString roomName READ roomName NOTIFY roomNameChanged)
|
Q_PROPERTY(QString roomName READ roomName NOTIFY roomNameChanged)
|
||||||
Q_PROPERTY(int memberCount READ memberCount NOTIFY memberCountChanged)
|
Q_PROPERTY(int memberCount READ memberCount NOTIFY memberCountChanged)
|
||||||
|
|
|
@ -456,6 +456,7 @@ class UserSettingsModel : public QAbstractListModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
QML_ELEMENT
|
QML_ELEMENT
|
||||||
|
QML_SINGLETON
|
||||||
|
|
||||||
enum Indices
|
enum Indices
|
||||||
{
|
{
|
||||||
|
|
|
@ -154,7 +154,7 @@ public:
|
||||||
void restoreCollapsed();
|
void restoreCollapsed();
|
||||||
};
|
};
|
||||||
|
|
||||||
CommunitiesModel(QObject *parent = nullptr);
|
CommunitiesModel(QObject *parent);
|
||||||
|
|
||||||
static CommunitiesModel *create(QQmlEngine *qmlEngine, QJSEngine *)
|
static CommunitiesModel *create(QQmlEngine *qmlEngine, QJSEngine *)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue