From 81406171a0d6b6751e9eb1777faf6ea895affcc7 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Wed, 29 Sep 2021 20:15:25 -0400
Subject: QML the logout dialog

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

(limited to 'src/ui')

diff --git a/src/ui/NhekoGlobalObject.cpp b/src/ui/NhekoGlobalObject.cpp
index d6824996..1a20cbc2 100644
--- a/src/ui/NhekoGlobalObject.cpp
+++ b/src/ui/NhekoGlobalObject.cpp
@@ -13,6 +13,7 @@
 #include "Logging.h"
 #include "MainWindow.h"
 #include "UserSettingsPage.h"
+#include "WebRTCSession.h"
 #include "Utils.h"
 
 Nheko::Nheko()
@@ -83,9 +84,9 @@ Nheko::showUserSettingsPage() const
 }
 
 void
-Nheko::openLogoutDialog() const
+Nheko::logout() const
 {
-    MainWindow::instance()->openLogoutDialog();
+    ChatPage::instance()->initiateLogout();
 }
 
 void
diff --git a/src/ui/NhekoGlobalObject.h b/src/ui/NhekoGlobalObject.h
index aa8435d1..64aad941 100644
--- a/src/ui/NhekoGlobalObject.h
+++ b/src/ui/NhekoGlobalObject.h
@@ -48,7 +48,7 @@ public:
     Q_INVOKABLE void openLink(QString link) const;
     Q_INVOKABLE void setStatusMessage(QString msg) const;
     Q_INVOKABLE void showUserSettingsPage() const;
-    Q_INVOKABLE void openLogoutDialog() const;
+    Q_INVOKABLE void logout() const;
     Q_INVOKABLE void openCreateRoomDialog() const;
     Q_INVOKABLE void openJoinRoomDialog() const;
     Q_INVOKABLE void reparent(QWindow *win) const;
@@ -60,6 +60,8 @@ signals:
     void colorsChanged();
     void profileChanged();
 
+    void openLogoutDialog();
+
 private:
     QScopedPointer<UserProfile> currentUser_;
 };
-- 
cgit 1.5.1


From 2f7ce486667cff5492e0edb4dd392c188a59d79e Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Sat, 9 Oct 2021 16:48:30 -0400
Subject: make lint

---
 src/ui/NhekoGlobalObject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui')

diff --git a/src/ui/NhekoGlobalObject.cpp b/src/ui/NhekoGlobalObject.cpp
index 1a20cbc2..d687a308 100644
--- a/src/ui/NhekoGlobalObject.cpp
+++ b/src/ui/NhekoGlobalObject.cpp
@@ -13,8 +13,8 @@
 #include "Logging.h"
 #include "MainWindow.h"
 #include "UserSettingsPage.h"
-#include "WebRTCSession.h"
 #include "Utils.h"
+#include "WebRTCSession.h"
 
 Nheko::Nheko()
 {
-- 
cgit 1.5.1