From 3b6688fe11c162e3e14371e6f7bfa4b66afec8a5 Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.weghorn@posteo.de>
Date: Tue, 26 Nov 2024 22:11:16 +0100
Subject: [PATCH] weld: Rename weld::Dialog::{widget -> button}_for_response

Rename weld::Dialog::widget_for_response to
weld::Dialog_button_for_response as it specifically
returns a weld::Button, not a generic weld::Widget (other than GTK's
`gtk_dialog_get_widget_for_response` [1] which
returns a GtkWidget).

[1] https://docs.gtk.org/gtk3/method.Dialog.get_widget_for_response.html

Change-Id: I3b1dc34c0af752853551d2ebb706109f2214720d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177376
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
---
 dbaccess/source/ui/dlg/sqlmessage.cxx   |  2 +-
 include/vcl/weld.hxx                    |  2 +-
 vcl/inc/jsdialog/jsdialogbuilder.hxx    |  4 ++--
 vcl/inc/qt5/QtInstanceDialog.hxx        |  2 +-
 vcl/inc/qt5/QtInstanceMessageDialog.hxx |  2 +-
 vcl/inc/salvtables.hxx                  |  4 ++--
 vcl/jsdialog/jsdialogbuilder.cxx        |  4 ++--
 vcl/qt5/QtInstanceDialog.cxx            |  2 +-
 vcl/qt5/QtInstanceMessageDialog.cxx     |  4 ++--
 vcl/source/app/salvtables.cxx           |  4 ++--
 vcl/source/control/wizardmachine.cxx    | 10 +++++-----
 vcl/unx/gtk3/gtkinst.cxx                |  4 ++--
 12 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 51459220ac9e..0e539a34cb38 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -507,7 +507,7 @@ void OSQLMessageBox::impl_addDetailsButton()
     if ( bMoreDetailsAvailable )
     {
         m_xDialog->add_button(GetStandardText(StandardButtonType::More), RET_MORE);
-        m_xMoreButton = m_xDialog->weld_widget_for_response(RET_MORE);
+        m_xMoreButton = m_xDialog->weld_button_for_response(RET_MORE);
         m_xMoreButton->connect_clicked(LINK(this, OSQLMessageBox, ButtonClickHdl));
     }
 }
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 350b0c1ae4ba..81554db95c1a 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -629,7 +629,7 @@ public:
     virtual void response(int response) = 0;
     virtual void add_button(const OUString& rText, int response, const OUString& rHelpId = {}) = 0;
     virtual void set_default_response(int response) = 0;
-    virtual std::unique_ptr<Button> weld_widget_for_response(int response) = 0;
+    virtual std::unique_ptr<Button> weld_button_for_response(int response) = 0;
     virtual std::unique_ptr<weld::Container> weld_content_area() = 0;
 
     // shrink the dialog down to shown just these widgets
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 769ce5893199..ec8cef53e238 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -520,7 +520,7 @@ public:
     virtual void collapse(weld::Widget* pEdit, weld::Widget* pButton) override;
     virtual void undo_collapse() override;
     virtual void response(int response) override;
-    virtual std::unique_ptr<weld::Button> weld_widget_for_response(int response) override;
+    virtual std::unique_ptr<weld::Button> weld_button_for_response(int response) override;
     virtual int run() override;
     virtual bool runAsync(std::shared_ptr<weld::DialogController> const& rxOwner,
                           const std::function<void(sal_Int32)>& rEndDialogFn) override;
@@ -537,7 +537,7 @@ public:
     virtual void set_current_page(int nPage) override;
     virtual void set_current_page(const OUString& rIdent) override;
     virtual void response(int response) override;
-    virtual std::unique_ptr<weld::Button> weld_widget_for_response(int response) override;
+    virtual std::unique_ptr<weld::Button> weld_button_for_response(int response) override;
     virtual int run() override;
     virtual bool runAsync(std::shared_ptr<weld::DialogController> const& rxOwner,
                           const std::function<void(sal_Int32)>& rEndDialogFn) override;
diff --git a/vcl/inc/qt5/QtInstanceDialog.hxx b/vcl/inc/qt5/QtInstanceDialog.hxx
index f79791485498..82acf2d6c1dd 100644
--- a/vcl/inc/qt5/QtInstanceDialog.hxx
+++ b/vcl/inc/qt5/QtInstanceDialog.hxx
@@ -54,7 +54,7 @@ public:
 
     virtual void set_centered_on_parent(bool bTrackGeometryRequests) override;
 
-    virtual std::unique_ptr<weld::Button> weld_widget_for_response(int) override;
+    virtual std::unique_ptr<weld::Button> weld_button_for_response(int) override;
 
     virtual void set_default_response(int) override;
 
diff --git a/vcl/inc/qt5/QtInstanceMessageDialog.hxx b/vcl/inc/qt5/QtInstanceMessageDialog.hxx
index 9522bc0ac401..a775b8618050 100644
--- a/vcl/inc/qt5/QtInstanceMessageDialog.hxx
+++ b/vcl/inc/qt5/QtInstanceMessageDialog.hxx
@@ -39,7 +39,7 @@ public:
     virtual void add_button(const OUString& rText, int nResponse,
                             const OUString& rHelpId = {}) override;
     virtual void set_default_response(int nResponse) override;
-    std::unique_ptr<weld::Button> weld_widget_for_response(int nResponse) override;
+    std::unique_ptr<weld::Button> weld_button_for_response(int nResponse) override;
     virtual int run() override;
 
 private:
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index ec2544e9f009..3837576c486e 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -551,7 +551,7 @@ public:
 
     virtual void set_centered_on_parent(bool /*bTrackGeometryRequests*/) override;
 
-    virtual std::unique_ptr<weld::Button> weld_widget_for_response(int nResponse) override;
+    virtual std::unique_ptr<weld::Button> weld_button_for_response(int nResponse) override;
 
     virtual void set_default_response(int nResponse) override;
 
@@ -592,7 +592,7 @@ public:
     virtual void set_page_sensitive(const OUString& rIdent, bool bSensitive) override;
     virtual void set_page_side_help_id(const OUString& rHelpId) override;
     virtual void set_page_side_image(const OUString& rImage) override;
-    std::unique_ptr<weld::Button> weld_widget_for_response(int nResponse) override;
+    std::unique_ptr<weld::Button> weld_button_for_response(int nResponse) override;
 
     virtual ~SalInstanceAssistant() override;
 };
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 800ca9cf5a6f..f5459f2e9a5c 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1413,7 +1413,7 @@ bool JSAssistant::runAsync(std::shared_ptr<Dialog> const& rxSelf,
     return ret;
 }
 
-std::unique_ptr<weld::Button> JSDialog::weld_widget_for_response(int nResponse)
+std::unique_ptr<weld::Button> JSDialog::weld_button_for_response(int nResponse)
 {
     PushButton* pButton
         = dynamic_cast<::PushButton*>(m_xDialog->get_widget_for_response(nResponse));
@@ -1431,7 +1431,7 @@ std::unique_ptr<weld::Button> JSDialog::weld_widget_for_response(int nResponse)
     return xWeldWidget;
 }
 
-std::unique_ptr<weld::Button> JSAssistant::weld_widget_for_response(int nResponse)
+std::unique_ptr<weld::Button> JSAssistant::weld_button_for_response(int nResponse)
 {
     ::PushButton* pButton = nullptr;
     std::unique_ptr<JSButton> xWeldWidget;
diff --git a/vcl/qt5/QtInstanceDialog.cxx b/vcl/qt5/QtInstanceDialog.cxx
index 82a447e3adbd..a975403fbda4 100644
--- a/vcl/qt5/QtInstanceDialog.cxx
+++ b/vcl/qt5/QtInstanceDialog.cxx
@@ -144,7 +144,7 @@ void QtInstanceDialog::set_centered_on_parent(bool)
     // QDialog is centered on parent toplevel by default
 }
 
-std::unique_ptr<weld::Button> QtInstanceDialog::weld_widget_for_response(int)
+std::unique_ptr<weld::Button> QtInstanceDialog::weld_button_for_response(int)
 {
     assert(false && "Not implemented yet");
     return nullptr;
diff --git a/vcl/qt5/QtInstanceMessageDialog.cxx b/vcl/qt5/QtInstanceMessageDialog.cxx
index 854dc7c9b73b..fb27aa544cb6 100644
--- a/vcl/qt5/QtInstanceMessageDialog.cxx
+++ b/vcl/qt5/QtInstanceMessageDialog.cxx
@@ -120,14 +120,14 @@ void QtInstanceMessageDialog::set_default_response(int nResponse)
         m_pMessageDialog->setDefaultButton(pButton);
 }
 
-std::unique_ptr<weld::Button> QtInstanceMessageDialog::weld_widget_for_response(int nResponse)
+std::unique_ptr<weld::Button> QtInstanceMessageDialog::weld_button_for_response(int nResponse)
 {
     SolarMutexGuard g;
     QtInstance& rQtInstance = GetQtInstance();
     if (!rQtInstance.IsMainThread())
     {
         std::unique_ptr<weld::Button> xButton;
-        rQtInstance.RunInMainThread([&] { xButton = weld_widget_for_response(nResponse); });
+        rQtInstance.RunInMainThread([&] { xButton = weld_button_for_response(nResponse); });
         return xButton;
     }
 
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index dcdeb6116761..4f2928e53747 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2945,13 +2945,13 @@ IMPL_LINK(SalInstanceButton, ClickHdl, ::Button*, pButton, void)
     signal_clicked();
 }
 
-std::unique_ptr<weld::Button> SalInstanceDialog::weld_widget_for_response(int nResponse)
+std::unique_ptr<weld::Button> SalInstanceDialog::weld_button_for_response(int nResponse)
 {
     PushButton* pButton = dynamic_cast<PushButton*>(m_xDialog->get_widget_for_response(nResponse));
     return pButton ? std::make_unique<SalInstanceButton>(pButton, nullptr, false) : nullptr;
 }
 
-std::unique_ptr<weld::Button> SalInstanceAssistant::weld_widget_for_response(int nResponse)
+std::unique_ptr<weld::Button> SalInstanceAssistant::weld_button_for_response(int nResponse)
 {
     PushButton* pButton = nullptr;
     if (nResponse == RET_YES)
diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx
index d9f125e33014..45d42fc21e68 100644
--- a/vcl/source/control/wizardmachine.cxx
+++ b/vcl/source/control/wizardmachine.cxx
@@ -806,11 +806,11 @@ namespace vcl
         , m_pCurTabPage(nullptr)
         , m_nCurState(0)
         , m_pFirstPage(nullptr)
-        , m_xFinish(m_xAssistant->weld_widget_for_response(RET_OK))
-        , m_xCancel(m_xAssistant->weld_widget_for_response(RET_CANCEL))
-        , m_xNextPage(m_xAssistant->weld_widget_for_response(RET_YES))
-        , m_xPrevPage(m_xAssistant->weld_widget_for_response(RET_NO))
-        , m_xHelp(m_xAssistant->weld_widget_for_response(RET_HELP))
+        , m_xFinish(m_xAssistant->weld_button_for_response(RET_OK))
+        , m_xCancel(m_xAssistant->weld_button_for_response(RET_CANCEL))
+        , m_xNextPage(m_xAssistant->weld_button_for_response(RET_YES))
+        , m_xPrevPage(m_xAssistant->weld_button_for_response(RET_NO))
+        , m_xHelp(m_xAssistant->weld_button_for_response(RET_HELP))
         , m_pImpl(new WizardMachineImplData)
     {
         implConstruct(nButtonFlags);
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 4c99d3dfe7d1..6558fa36d763 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -7182,7 +7182,7 @@ public:
         return GTK_BUTTON(gtk_dialog_get_widget_for_response(GTK_DIALOG(m_pDialog), nGtkResponse));
     }
 
-    virtual std::unique_ptr<weld::Button> weld_widget_for_response(int nVclResponse) override;
+    virtual std::unique_ptr<weld::Button> weld_button_for_response(int nVclResponse) override;
 
     virtual std::unique_ptr<weld::Container> weld_content_area() override
     {
@@ -10083,7 +10083,7 @@ int GtkInstanceDialog::run()
     return GtkToVcl(ret);
 }
 
-std::unique_ptr<weld::Button> GtkInstanceDialog::weld_widget_for_response(int nVclResponse)
+std::unique_ptr<weld::Button> GtkInstanceDialog::weld_button_for_response(int nVclResponse)
 {
     GtkButton* pButton = get_widget_for_response(VclToGtk(nVclResponse));
     if (!pButton)