ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

weld: Rename weld::Dialog::{widget -> button}_for_response

Browse Source 
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>
This commit is contained in:
Michael Weghorn
2024-11-27 08:21:50 +01:00
parent cf108a359b
commit 3b6688fe11
12 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbaccess/source/ui/dlg/sqlmessage.cxx
+1 -1
View File
@@ -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));
}
}
include/vcl/weld.hxx
+1 -1
View File
@@ -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
vcl/inc/jsdialog/jsdialogbuilder.hxx
+2 -2
View File
@@ -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;
vcl/inc/qt5/QtInstanceDialog.hxx
+1 -1
View File
@@ -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;
vcl/inc/qt5/QtInstanceMessageDialog.hxx
+1 -1
View File
@@ -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:
vcl/inc/salvtables.hxx
+2 -2
View File
@@ -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;
};
vcl/jsdialog/jsdialogbuilder.cxx
+2 -2
View File
@@ -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;
vcl/qt5/QtInstanceDialog.cxx
+1 -1
View File
@@ -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;
vcl/qt5/QtInstanceMessageDialog.cxx
+2 -2
View File
@@ -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;
}
vcl/source/app/salvtables.cxx
+2 -2
View File
@@ -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)
vcl/source/control/wizardmachine.cxx
+5 -5
View File
@@ -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);
vcl/unx/gtk3/gtkinst.cxx
+2 -2
View File
@@ -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)