Skip to content

Commit d67a855

Browse files
committed
clean up in Q_INVOKABLE methods in UserModel class
removed Q_INVOKABEl from signals declare slots where invokable methods could be slots Signed-off-by: Matthieu Gallien <[email protected]>
1 parent 7bf23a7 commit d67a855

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

src/gui/tray/usermodel.h

+13-11
Original file line numberDiff line numberDiff line change
@@ -168,18 +168,10 @@ class UserModel : public QAbstractListModel
168168

169169
int findUserIdForAccount(AccountState *account) const;
170170

171-
Q_INVOKABLE void fetchCurrentActivityModel();
172-
Q_INVOKABLE void openCurrentAccountLocalFolder();
173-
Q_INVOKABLE void openCurrentAccountTalk();
174-
Q_INVOKABLE void openCurrentAccountServer();
175171
Q_INVOKABLE int numUsers();
176172
Q_INVOKABLE QString currentUserServer();
177173
int currentUserId() const;
178174
Q_INVOKABLE bool isUserConnected(const int &id);
179-
Q_INVOKABLE void switchCurrentUser(const int &id);
180-
Q_INVOKABLE void login(const int &id);
181-
Q_INVOKABLE void logout(const int &id);
182-
Q_INVOKABLE void removeAccount(const int &id);
183175

184176
Q_INVOKABLE std::shared_ptr<OCC::UserStatusConnector> userStatusConnector(int id);
185177

@@ -197,14 +189,24 @@ class UserModel : public QAbstractListModel
197189
AvatarRole,
198190
IsCurrentUserRole,
199191
IsConnectedRole,
200-
IdRole
192+
IdRole,
201193
};
202194

203195
AccountAppList appList() const;
204196

205197
signals:
206-
Q_INVOKABLE void addAccount();
207-
Q_INVOKABLE void newUserSelected();
198+
void addAccount();
199+
void newUserSelected();
200+
201+
public slots:
202+
void fetchCurrentActivityModel();
203+
void openCurrentAccountLocalFolder();
204+
void openCurrentAccountTalk();
205+
void openCurrentAccountServer();
206+
void switchCurrentUser(const int &id);
207+
void login(const int &id);
208+
void logout(const int &id);
209+
void removeAccount(const int &id);
208210

209211
protected:
210212
QHash<int, QByteArray> roleNames() const override;

0 commit comments

Comments
 (0)