From e9ed12e27bcbc4f4a256e8e3840c1022fd14872e Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Fri, 24 Sep 2021 21:32:06 -0400
Subject: QML the join room dialog

---
 src/ui/NhekoGlobalObject.cpp | 8 +-------
 src/ui/NhekoGlobalObject.h   | 3 ++-
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/NhekoGlobalObject.cpp b/src/ui/NhekoGlobalObject.cpp
index d687a308..11fc5681 100644
--- a/src/ui/NhekoGlobalObject.cpp
+++ b/src/ui/NhekoGlobalObject.cpp
@@ -21,6 +21,7 @@ Nheko::Nheko()
     connect(
       UserSettings::instance().get(), &UserSettings::themeChanged, this, &Nheko::colorsChanged);
     connect(ChatPage::instance(), &ChatPage::contentLoaded, this, &Nheko::updateUserProfile);
+    connect(this, &Nheko::joinRoom, ChatPage::instance(), &ChatPage::joinRoom);
 }
 
 void
@@ -96,13 +97,6 @@ Nheko::openCreateRoomDialog() const
       [](const mtx::requests::CreateRoom &req) { ChatPage::instance()->createRoom(req); });
 }
 
-void
-Nheko::openJoinRoomDialog() const
-{
-    MainWindow::instance()->openJoinRoomDialog(
-      [](const QString &room_id) { ChatPage::instance()->joinRoom(room_id); });
-}
-
 void
 Nheko::reparent(QWindow *win) const
 {
diff --git a/src/ui/NhekoGlobalObject.h b/src/ui/NhekoGlobalObject.h
index 64aad941..c70813c5 100644
--- a/src/ui/NhekoGlobalObject.h
+++ b/src/ui/NhekoGlobalObject.h
@@ -50,7 +50,6 @@ public:
     Q_INVOKABLE void showUserSettingsPage() const;
     Q_INVOKABLE void logout() const;
     Q_INVOKABLE void openCreateRoomDialog() const;
-    Q_INVOKABLE void openJoinRoomDialog() const;
     Q_INVOKABLE void reparent(QWindow *win) const;
 
 public slots:
@@ -61,6 +60,8 @@ signals:
     void profileChanged();
 
     void openLogoutDialog();
+    void openJoinRoomDialog();
+    void joinRoom(QString roomId);
 
 private:
     QScopedPointer<UserProfile> currentUser_;
-- 
cgit 1.5.1