qt, refactor: Replace BitcoinGUI::trayIconActivated with a lambda

hebasto · UdjinM6 · commit 272c475a138e · 2025-02-27T16:04:47.000+03:00
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -796,7 +796,12 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel, interfaces::BlockAndH
 #ifndef Q_OS_MAC
             // Show main window on tray icon click
             // Note: ignore this on Mac - this is not the way tray should work there
-            connect(trayIcon, &QSystemTrayIcon::activated, this, &BitcoinGUI::trayIconActivated);
+            connect(trayIcon, &QSystemTrayIcon::activated, [this](QSystemTrayIcon::ActivationReason reason) {
+                if (reason == QSystemTrayIcon::Trigger) {
+                    // Click on system tray icon triggers show/hide of the main window
+                    toggleHidden();
+                }
+            });
 #else
             // Note: on macOS, the Dock icon is also used to provide menu functionality
             // similar to one for tray icon
@@ -1068,17 +1073,6 @@ void BitcoinGUI::createIconMenu(QMenu *pmenu)
 #endif
 }
 
-#ifndef Q_OS_MAC
-void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason)
-{
-    if(reason == QSystemTrayIcon::Trigger)
-    {
-        // Click on system tray icon triggers show/hide of the main window
-        toggleHidden();
-    }
-}
-#endif
-
 void BitcoinGUI::optionsClicked()
 {
     openOptionsDialogWithTab(OptionsDialog::TAB_MAIN);
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
@@ -371,10 +371,6 @@ public Q_SLOTS:
     void showHelpMessageClicked();
     /** Show CoinJoin help message dialog */
     void showCoinJoinHelpClicked();
-#ifndef Q_OS_MAC
-    /** Handle tray icon clicked */
-    void trayIconActivated(QSystemTrayIcon::ActivationReason reason);
-#endif
 
     /** Show window if hidden, unminimize when minimized, rise when obscured or show if hidden and fToggleHidden is true */
     void showNormalIfMinimized() { showNormalIfMinimized(false); }
