diff options
| author | Loren Burkholder <computersemiexpert@outlook.com> | 2021-07-17 16:49:34 -0400 |
|---|---|---|
| committer | Loren Burkholder <computersemiexpert@outlook.com> | 2021-07-20 21:47:46 -0400 |
| commit | baa9dfe110698a741eedc6209e33a4db687dffbe (patch) | |
| tree | fc18dab8c43907e9ccf8ae407e64717947ac479c /src/timeline | |
| parent | Use fancy spinner (courtesy of redsky) (diff) | |
| download | nheko-baa9dfe110698a741eedc6209e33a4db687dffbe.tar.xz | |
Clean up code
Diffstat (limited to 'src/timeline')
| -rw-r--r-- | src/timeline/TimelineModel.cpp | 6 | ||||
| -rw-r--r-- | src/timeline/TimelineViewManager.cpp | 8 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 516a499b..7ce0e98a 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -1074,7 +1074,7 @@ TimelineModel::openRoomSettings(QString room_id) { RoomSettings *settings = new RoomSettings(room_id == QString() ? roomId() : room_id, this); connect(this, &TimelineModel::roomAvatarUrlChanged, settings, &RoomSettings::avatarChanged); - openRoomSettingsDialog(settings); + emit openRoomSettingsDialog(settings); } void @@ -1082,9 +1082,9 @@ TimelineModel::openInviteUsers(QString roomId) { InviteesModel *model = new InviteesModel{this}; connect(model, &InviteesModel::accept, this, [this, model, roomId]() { - manager_->inviteUsers(roomId == QString() ? room_id_ : roomId, model->mxids()); + emit manager_->inviteUsers(roomId == QString() ? room_id_ : roomId, model->mxids()); }); - openInviteUsersDialog(model); + emit openInviteUsersDialog(model); } void diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp index 8daa2124..64493e5b 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp @@ -430,14 +430,6 @@ TimelineViewManager::openImageOverlayInternal(QString eventId, QImage img) }); } -// void -// TimelineViewManager::openInviteUsersDialog() -//{ -// TODO: move this somewhere where it will actually work (probably Rooms) -// MainWindow::instance()->openInviteUsersDialog( -// [this](const QStringList &invitees) { emit inviteUsers(invitees); }); -//} - void TimelineViewManager::openLeaveRoomDialog(QString roomid) const { |