added changing of name through edit modal, removed old roomsettings

4 files changed, 3 insertions, 11 deletions

diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 29808fdd..efeba146 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -808,9 +808,9 @@ TimelineModel::openUserProfile(QString userid, bool global)
 }
 
 void
-TimelineModel::openRoomSettings(QString roomid)
+TimelineModel::openRoomSettings()
 {
-        RoomSettings *settings = new RoomSettings(roomid, this);
+        RoomSettings *settings = new RoomSettings(roomId(), this);
         connect(this, &TimelineModel::roomAvatarUrlChanged, settings, &RoomSettings::avatarChanged);
         openRoomSettingsDialog(settings);
 }
diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h
index 1a12a8c3..29207318 100644
--- a/src/timeline/TimelineModel.h
+++ b/src/timeline/TimelineModel.h
@@ -214,7 +214,7 @@ public:
         Q_INVOKABLE void viewRawMessage(QString id) const;
         Q_INVOKABLE void viewDecryptedRawMessage(QString id) const;
         Q_INVOKABLE void openUserProfile(QString userid, bool global = false);
-        Q_INVOKABLE void openRoomSettings(QString roomid);
+        Q_INVOKABLE void openRoomSettings();
         Q_INVOKABLE void replyAction(QString id);
         Q_INVOKABLE void readReceiptsAction(QString id) const;
         Q_INVOKABLE void redactEvent(QString id);
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index 99a2e388..0ed680f8 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -395,12 +395,6 @@ TimelineViewManager::openLeaveRoomDialog() const
 {
         MainWindow::instance()->openLeaveRoomDialog(timeline_->roomId());
 }
-void
-TimelineViewManager::openRoomSettings()
-{
-        MainWindow::instance()->openRoomSettings(timeline_->roomId());
-        timeline_->openRoomSettings(timeline_->roomId());
-}
 
 void
 TimelineViewManager::verifyUser(QString userid)
diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h
index a2d37342..3e58bb43 100644
--- a/src/timeline/TimelineViewManager.h
+++ b/src/timeline/TimelineViewManager.h
@@ -18,7 +18,6 @@
 #include "WebRTCSession.h"
 #include "emoji/EmojiModel.h"
 #include "emoji/Provider.h"
-#include "dialogs/RoomSettingsOld.h"
 
 class MxcImageProvider;
 class BlurhashProvider;
@@ -70,7 +69,6 @@ public:
         Q_INVOKABLE void openInviteUsersDialog();
         Q_INVOKABLE void openMemberListDialog() const;
         Q_INVOKABLE void openLeaveRoomDialog() const;
-        Q_INVOKABLE void openRoomSettings();
         Q_INVOKABLE void removeVerificationFlow(DeviceVerificationFlow *flow);
 
         void verifyUser(QString userid);