Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
nheko
Commits
0278c9d5
Verified
Commit
0278c9d5
authored
1 year ago
by
Nicolas Werner
Browse files
Options
Downloads
Patches
Plain Diff
Fix UserSettingsModel and Communities singleton instantiation
parent
dd7b627e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#4929
failed
1 year ago
Stage: sign
Changes
4
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/InviteesModel.h
+3
-0
3 additions, 0 deletions
src/InviteesModel.h
src/MemberList.h
+3
-0
3 additions, 0 deletions
src/MemberList.h
src/UserSettingsPage.h
+1
-0
1 addition, 0 deletions
src/UserSettingsPage.h
src/timeline/CommunitiesModel.h
+1
-1
1 addition, 1 deletion
src/timeline/CommunitiesModel.h
with
8 additions
and
1 deletion
src/InviteesModel.h
+
3
−
0
View file @
0278c9d5
...
...
@@ -6,6 +6,7 @@
#define INVITEESMODEL_H
#include
<QAbstractListModel>
#include
<QQmlEngine>
#include
<QVector>
#include
"timeline/TimelineModel.h"
...
...
@@ -34,6 +35,8 @@ private:
class
InviteesModel
final
:
public
QAbstractListModel
{
Q_OBJECT
QML_ELEMENT
QML_UNCREATABLE
(
""
)
Q_PROPERTY
(
int
count
READ
rowCount
NOTIFY
countChanged
)
Q_PROPERTY
(
TimelineModel
*
room
READ
room
CONSTANT
)
...
...
This diff is collapsed.
Click to expand it.
src/MemberList.h
+
3
−
0
View file @
0278c9d5
...
...
@@ -5,6 +5,7 @@
#pragma once
#include
<QAbstractListModel>
#include
<QQmlEngine>
#include
<QSortFilterProxyModel>
#include
<mtx/events/power_levels.hpp>
...
...
@@ -79,6 +80,8 @@ private:
class
MemberList
final
:
public
QSortFilterProxyModel
{
Q_OBJECT
QML_ELEMENT
QML_UNCREATABLE
(
""
)
Q_PROPERTY
(
QString
roomName
READ
roomName
NOTIFY
roomNameChanged
)
Q_PROPERTY
(
int
memberCount
READ
memberCount
NOTIFY
memberCountChanged
)
...
...
This diff is collapsed.
Click to expand it.
src/UserSettingsPage.h
+
1
−
0
View file @
0278c9d5
...
...
@@ -456,6 +456,7 @@ class UserSettingsModel : public QAbstractListModel
{
Q_OBJECT
QML_ELEMENT
QML_SINGLETON
enum
Indices
{
...
...
This diff is collapsed.
Click to expand it.
src/timeline/CommunitiesModel.h
+
1
−
1
View file @
0278c9d5
...
...
@@ -154,7 +154,7 @@ public:
void
restoreCollapsed
();
};
CommunitiesModel
(
QObject
*
parent
=
nullptr
);
CommunitiesModel
(
QObject
*
parent
);
static
CommunitiesModel
*
create
(
QQmlEngine
*
qmlEngine
,
QJSEngine
*
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment