From d5f5e0595a1b9bf56ed07a5c872759e4c62535b9 Mon Sep 17 00:00:00 2001
From: RickyRister <ricky.rister.wang@gmail.com>
Date: Fri, 1 Aug 2025 05:40:23 -0700
Subject: [PATCH] clean up closeRequest usages

---
 cockatrice/src/client/tabs/tab_game.cpp       | 4 ++--
 cockatrice/src/client/tabs/tab_message.cpp    | 7 +------
 cockatrice/src/client/tabs/tab_message.h      | 1 -
 cockatrice/src/client/tabs/tab_room.cpp       | 2 +-
 cockatrice/src/client/tabs/tab_supervisor.cpp | 2 +-
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/cockatrice/src/client/tabs/tab_game.cpp b/cockatrice/src/client/tabs/tab_game.cpp
index 9cb9f7295..f96949074 100644
--- a/cockatrice/src/client/tabs/tab_game.cpp
+++ b/cockatrice/src/client/tabs/tab_game.cpp
@@ -1253,7 +1253,7 @@ void TabGame::createMenuItems()
     aConcede = new QAction(this);
     connect(aConcede, &QAction::triggered, this, &TabGame::actConcede);
     aLeaveGame = new QAction(this);
-    connect(aLeaveGame, &QAction::triggered, this, [this] { closeRequest(); });
+    connect(aLeaveGame, &QAction::triggered, this, &TabGame::closeRequest);
     aFocusChat = new QAction(this);
     connect(aFocusChat, &QAction::triggered, sayEdit, qOverload<>(&LineEditCompleter::setFocus));
     aCloseReplay = nullptr;
@@ -1303,7 +1303,7 @@ void TabGame::createReplayMenuItems()
     aFocusChat = nullptr;
     aLeaveGame = nullptr;
     aCloseReplay = new QAction(this);
-    connect(aCloseReplay, &QAction::triggered, this, [this] { closeRequest(); });
+    connect(aCloseReplay, &QAction::triggered, this, &TabGame::closeRequest);
 
     phasesMenu = nullptr;
     gameMenu = new QMenu(this);
diff --git a/cockatrice/src/client/tabs/tab_message.cpp b/cockatrice/src/client/tabs/tab_message.cpp
index 122ed2c07..06700d4e3 100644
--- a/cockatrice/src/client/tabs/tab_message.cpp
+++ b/cockatrice/src/client/tabs/tab_message.cpp
@@ -39,7 +39,7 @@ TabMessage::TabMessage(TabSupervisor *_tabSupervisor,
     vbox->addWidget(sayEdit);
 
     aLeave = new QAction(this);
-    connect(aLeave, &QAction::triggered, this, [this] { closeRequest(); });
+    connect(aLeave, &QAction::triggered, this, &TabMessage::closeRequest);
 
     messageMenu = new QMenu(this);
     messageMenu->addAction(aLeave);
@@ -86,11 +86,6 @@ QString TabMessage::getTabText() const
     return tr("%1 - Private chat").arg(QString::fromStdString(otherUserInfo->name()));
 }
 
-bool TabMessage::closeRequest()
-{
-    return close();
-}
-
 void TabMessage::closeEvent(QCloseEvent *event)
 {
     emit talkClosing(this);
diff --git a/cockatrice/src/client/tabs/tab_message.h b/cockatrice/src/client/tabs/tab_message.h
index a288767ef..659d0b804 100644
--- a/cockatrice/src/client/tabs/tab_message.h
+++ b/cockatrice/src/client/tabs/tab_message.h
@@ -47,7 +47,6 @@ public:
                const ServerInfo_User &_otherUserInfo);
     ~TabMessage() override;
     void retranslateUi() override;
-    bool closeRequest() override;
     void tabActivated() override;
     QString getUserName() const;
     QString getTabText() const override;
diff --git a/cockatrice/src/client/tabs/tab_room.cpp b/cockatrice/src/client/tabs/tab_room.cpp
index 184a8c540..569a88094 100644
--- a/cockatrice/src/client/tabs/tab_room.cpp
+++ b/cockatrice/src/client/tabs/tab_room.cpp
@@ -103,7 +103,7 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
     hbox->addWidget(userList, 1);
 
     aLeaveRoom = new QAction(this);
-    connect(aLeaveRoom, &QAction::triggered, this, [this] { closeRequest(); });
+    connect(aLeaveRoom, &QAction::triggered, this, &TabRoom::closeRequest);
 
     roomMenu = new QMenu(this);
     roomMenu->addAction(aLeaveRoom);
diff --git a/cockatrice/src/client/tabs/tab_supervisor.cpp b/cockatrice/src/client/tabs/tab_supervisor.cpp
index 3cf23922b..d87cb4744 100644
--- a/cockatrice/src/client/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/client/tabs/tab_supervisor.cpp
@@ -364,7 +364,7 @@ void TabSupervisor::addCloseButtonToTab(Tab *tab, int tabIndex, QAction *manager
         // If managed, all close requests should go through the menu action
         connect(closeButton, &CloseButton::clicked, this, [manager] { checkAndTrigger(manager, false); });
     } else {
-        connect(closeButton, &CloseButton::clicked, tab, [tab] { tab->closeRequest(); });
+        connect(closeButton, &CloseButton::clicked, tab, &Tab::closeRequest);
     }
     tabBar()->setTabButton(tabIndex, closeSide, closeButton);
 }