Skip to content

Commit edd73ed

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 aa87771 commit edd73ed

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
@@ -170,18 +170,10 @@ class UserModel : public QAbstractListModel
170170

171171
int findUserIdForAccount(AccountState *account) const;
172172

173-
Q_INVOKABLE void fetchCurrentActivityModel();
174-
Q_INVOKABLE void openCurrentAccountLocalFolder();
175-
Q_INVOKABLE void openCurrentAccountTalk();
176-
Q_INVOKABLE void openCurrentAccountServer();
177173
Q_INVOKABLE int numUsers();
178174
Q_INVOKABLE QString currentUserServer();
179175
int currentUserId() const;
180176
Q_INVOKABLE bool isUserConnected(const int &id);
181-
Q_INVOKABLE void switchCurrentUser(const int &id);
182-
Q_INVOKABLE void login(const int &id);
183-
Q_INVOKABLE void logout(const int &id);
184-
Q_INVOKABLE void removeAccount(const int &id);
185177

186178
Q_INVOKABLE std::shared_ptr<OCC::UserStatusConnector> userStatusConnector(int id);
187179

@@ -199,14 +191,24 @@ class UserModel : public QAbstractListModel
199191
AvatarRole,
200192
IsCurrentUserRole,
201193
IsConnectedRole,
202-
IdRole
194+
IdRole,
203195
};
204196

205197
AccountAppList appList() const;
206198

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

211213
protected:
212214
QHash<int, QByteArray> roleNames() const override;

0 commit comments

Comments
 (0)