Skip to content

Commit afcd2b6

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 2bdd4ba commit afcd2b6

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

156156
int findUserIdForAccount(AccountState *account) const;
157157

158-
Q_INVOKABLE void fetchCurrentActivityModel();
159-
Q_INVOKABLE void openCurrentAccountLocalFolder();
160-
Q_INVOKABLE void openCurrentAccountTalk();
161-
Q_INVOKABLE void openCurrentAccountServer();
162158
Q_INVOKABLE int numUsers();
163159
Q_INVOKABLE QString currentUserServer();
164160
int currentUserId() const;
165161
Q_INVOKABLE bool isUserConnected(const int &id);
166-
Q_INVOKABLE void switchCurrentUser(const int &id);
167-
Q_INVOKABLE void login(const int &id);
168-
Q_INVOKABLE void logout(const int &id);
169-
Q_INVOKABLE void removeAccount(const int &id);
170162

171163
Q_INVOKABLE std::shared_ptr<OCC::UserStatusConnector> userStatusConnector(int id);
172164

@@ -184,14 +176,24 @@ class UserModel : public QAbstractListModel
184176
AvatarRole,
185177
IsCurrentUserRole,
186178
IsConnectedRole,
187-
IdRole
179+
IdRole,
188180
};
189181

190182
AccountAppList appList() const;
191183

192184
signals:
193-
Q_INVOKABLE void addAccount();
194-
Q_INVOKABLE void newUserSelected();
185+
void addAccount();
186+
void newUserSelected();
187+
188+
public slots:
189+
void fetchCurrentActivityModel();
190+
void openCurrentAccountLocalFolder();
191+
void openCurrentAccountTalk();
192+
void openCurrentAccountServer();
193+
void switchCurrentUser(const int &id);
194+
void login(const int &id);
195+
void logout(const int &id);
196+
void removeAccount(const int &id);
195197

196198
protected:
197199
QHash<int, QByteArray> roleNames() const override;

0 commit comments

Comments
 (0)