vcl/inc/qt5/QtBuilder.hxx | 8 ++++---- vcl/qt5/QtBuilder.cxx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 501e5a7db75e265ace4b1efbe9b604d97b8e7b1e Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Sun Mar 9 23:21:26 2025 -0700 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Mon Mar 10 21:04:01 2025 +0100 tdf#130857 qt weld: Use more specific QWidget* ... instead of a pointer to the more generic QObject base class. Change-Id: I09629b746dbd3b04d5b78d5a46695795364e6e0c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182711 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/vcl/inc/qt5/QtBuilder.hxx b/vcl/inc/qt5/QtBuilder.hxx index f95fe31b5869..a11a2cf429f9 100644 --- a/vcl/inc/qt5/QtBuilder.hxx +++ b/vcl/inc/qt5/QtBuilder.hxx @@ -39,10 +39,10 @@ private: std::vector<std::pair<QWidget*, QWidget*>> m_aWidgetReplacements; public: - QtBuilder(QObject* pParent, std::u16string_view sUIRoot, const OUString& rUIFile); + QtBuilder(QWidget* pParent, std::u16string_view sUIRoot, const OUString& rUIFile); virtual ~QtBuilder(); - template <typename T = QObject> T* get(const OUString& rId); + template <typename T = QWidget> T* get(const OUString& rId); QObject* makeObject(QObject* pParent, std::u16string_view sName, std::string_view sType, const OUString& sID, stringmap& rMap); @@ -104,8 +104,8 @@ private: template <typename T> inline T* QtBuilder::get(const OUString& rId) { - QObject* w = get_by_name(rId); - return static_cast<T*>(w); + QWidget* pWidget = get_by_name(rId); + return static_cast<T*>(pWidget); } /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx index 97694fde30ac..782d574f7e03 100644 --- a/vcl/qt5/QtBuilder.cxx +++ b/vcl/qt5/QtBuilder.cxx @@ -53,7 +53,7 @@ QString convertAccelerator(const OUString& rText) } } -QtBuilder::QtBuilder(QObject* pParent, std::u16string_view sUIRoot, const OUString& rUIFile) +QtBuilder::QtBuilder(QWidget* pParent, std::u16string_view sUIRoot, const OUString& rUIFile) : WidgetBuilder(sUIRoot, rUIFile, false) { processUIFile(pParent);