summary refs log tree commit diff
path: root/src/MainWindow.cpp
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2021-10-11 19:53:17 +0000
committerGitHub <noreply@github.com>2021-10-11 19:53:17 +0000
commit088765b427146eda759e0bff6ba28595bb86077c (patch)
treeac16516ff6a5a8648df9c647727fee24d2576757 /src/MainWindow.cpp
parentMerge pull request #755 from Nheko-Reborn/bootstrapping (diff)
parentUse better close-on-Enter logic (diff)
downloadnheko-088765b427146eda759e0bff6ba28595bb86077c.tar.xz
Merge pull request #741 from LorenDB/qmlJoinRoomDlg
QML the join room dialog
Diffstat (limited to 'src/MainWindow.cpp')
-rw-r--r--src/MainWindow.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp

index 0978fc25..777b5b22 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp
@@ -33,7 +33,6 @@ #include "ui/SnackBar.h" #include "dialogs/CreateRoom.h" -#include "dialogs/JoinRoom.h" #include "dialogs/LeaveRoom.h" MainWindow *MainWindow::instance_ = nullptr; @@ -325,18 +324,6 @@ MainWindow::showOverlayProgressBar() } void -MainWindow::openJoinRoomDialog(std::function<void(const QString &room_id)> callback) -{ - auto dialog = new dialogs::JoinRoom(this); - connect(dialog, &dialogs::JoinRoom::joinRoom, this, [callback](const QString &room) { - if (!room.isEmpty()) - callback(room); - }); - - showDialog(dialog); -} - -void MainWindow::openCreateRoomDialog( std::function<void(const mtx::requests::CreateRoom &request)> callback) {