diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-08-02 10:19:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-08-02 15:04:28 +0200 |
commit | d5220a535400440c657dc3000a7e078f17112861 (patch) | |
tree | e8ecf0307f0f208c846cac12a5372b3f4aa91bf8 | |
parent | cad0716b35da8920e9270db121add091f7cd1b3e (diff) |
void* -> weld::Widget*
Change-Id: I1341fa27fd184ff1302b867aea6c215c22fb477d
Reviewed-on: https://gerrit.libreoffice.org/76847
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/admincontrols.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/admincontrols.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/adminpages.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/adminpages.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/detailpages.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/detailpages.hxx | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index dab449091e36..5bf0805206a0 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -218,7 +218,7 @@ using namespace ::com::sun::star; callModifiedHdl(); } - void OLDAPConnectionPageSetup::callModifiedHdl(void *) + void OLDAPConnectionPageSetup::callModifiedHdl(weld::Widget*) { bool bRoadmapState = ((!m_xETHostServer->get_text().isEmpty() ) && ( !m_xETBaseDN->get_text().isEmpty() ) && (!m_xFTPortNumber->get_label().isEmpty() )); SetRoadmapStateValue(bRoadmapState); @@ -344,7 +344,7 @@ using namespace ::com::sun::star; callModifiedHdl(); } - void MySQLNativeSetupPage::callModifiedHdl(void*) + void MySQLNativeSetupPage::callModifiedHdl(weld::Widget*) { SetRoadmapStateValue( m_xMySQLSettings->canAdvance() ); @@ -512,7 +512,7 @@ using namespace ::com::sun::star; aMsg.run(); } - void OGeneralSpecialJDBCConnectionPageSetup::callModifiedHdl(void* pControl) + void OGeneralSpecialJDBCConnectionPageSetup::callModifiedHdl(weld::Widget* pControl) { if (pControl == m_xETDriverClass.get()) m_xPBTestJavaDriver->set_sensitive( !m_xETDriverClass->get_text().trim().isEmpty() ); diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 8cbe44c1297f..f5ae1a6fbaf8 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -80,7 +80,7 @@ namespace dbaui static VclPtr<OGenericAdministrationPage> CreateLDAPTabPage( TabPageParent pParent, const SfxItemSet& _rAttrSet ); OLDAPConnectionPageSetup( TabPageParent pParent, const SfxItemSet& _rCoreAttrs ); virtual ~OLDAPConnectionPageSetup() override; - virtual void callModifiedHdl(void* pControl = nullptr) override; + virtual void callModifiedHdl(weld::Widget* pControl = nullptr) override; protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; @@ -121,7 +121,7 @@ namespace dbaui virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; - virtual void callModifiedHdl(void* pControl = nullptr) override; + virtual void callModifiedHdl(weld::Widget* pControl = nullptr) override; }; // OGeneralSpecialJDBCConnectionPageSetup @@ -144,7 +144,7 @@ namespace dbaui virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override; - virtual void callModifiedHdl(void* pControl = nullptr) override; + virtual void callModifiedHdl(weld::Widget* pControl = nullptr) override; DECL_LINK(OnTestJavaClickHdl, weld::Button&, void); diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 6f16870a3158..3af6b2a6eb2c 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -30,7 +30,7 @@ namespace dbaui { // MySQLNativeSettings - MySQLNativeSettings::MySQLNativeSettings(weld::Widget* pParent, const Link<void*,void>& rControlModificationLink) + MySQLNativeSettings::MySQLNativeSettings(weld::Widget* pParent, const Link<weld::Widget*,void>& rControlModificationLink) : m_xBuilder(Application::CreateBuilder(pParent, "dbaccess/ui/mysqlnativesettings.ui")) , m_xContainer(m_xBuilder->weld_widget("MysqlNativeSettings")) , m_xDatabaseNameLabel(m_xBuilder->weld_label("dbnamelabel")) diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index 5b675d77cc13..219f93f0e6dd 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -45,13 +45,13 @@ namespace dbaui std::unique_ptr<weld::Label> m_xDefaultPort; std::unique_ptr<weld::Entry> m_xSocket; std::unique_ptr<weld::Entry> m_xNamedPipe; - Link<void*,void> m_aControlModificationLink; + Link<weld::Widget*,void> m_aControlModificationLink; DECL_LINK(RadioToggleHdl, weld::ToggleButton&, void); DECL_LINK(SpinModifyHdl, weld::SpinButton&, void); DECL_LINK(EditModifyHdl, weld::Entry&, void); public: - MySQLNativeSettings(weld::Widget* pParent, const Link<void*,void>& rControlModificationLink); + MySQLNativeSettings(weld::Widget* pParent, const Link<weld::Widget*,void>& rControlModificationLink); void fillControls( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList ); void fillWindows( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList ); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index f68abd8e262a..58464f36643c 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -114,7 +114,7 @@ namespace dbaui _rReadonly = !_rValid || (pReadonly && pReadonly->GetValue()); } - IMPL_LINK(OGenericAdministrationPage, OnControlModified, void*, pCtrl, void) + IMPL_LINK(OGenericAdministrationPage, OnControlModified, weld::Widget*, pCtrl, void) { callModifiedHdl(pCtrl); } diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index 1b41fbc18040..1bd217274066 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -182,7 +182,7 @@ namespace dbaui virtual void ActivatePage() override; protected: - virtual void callModifiedHdl(void* /*pControl*/ = nullptr) { m_aModifiedHandler.Call(this); } + virtual void callModifiedHdl(weld::Widget* /*pControl*/ = nullptr) { m_aModifiedHandler.Call(this); } /// called from within DeactivatePage. The page is allowed to be deactivated if this method returns sal_True virtual bool prepareLeave() { return true; } @@ -256,7 +256,7 @@ namespace dbaui /** This link be used for controls where the tabpage does not need to take any special action when the control is modified. The implementation just calls callModifiedHdl. */ - DECL_LINK(OnControlModified, void*, void); + DECL_LINK(OnControlModified, weld::Widget*, void); DECL_LINK(OnControlEntryModifyHdl, weld::Entry&, void); DECL_LINK(OnControlSpinButtonModifyHdl, weld::SpinButton&, void); DECL_LINK(OnControlModifiedButtonClick, weld::ToggleButton&, void); diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index aab7e8d8d80f..b8453c87f6bf 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -489,7 +489,7 @@ namespace dbaui aMsg.run(); } - void OGeneralSpecialJDBCDetailsPage::callModifiedHdl(void* pControl) + void OGeneralSpecialJDBCDetailsPage::callModifiedHdl(weld::Widget* pControl) { if (m_bUseClass && pControl == m_xEDDriverClass.get()) m_xTestJavaDriver->set_sensitive(!m_xEDDriverClass->get_text().trim().isEmpty()); diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index 2e895d1fb412..af535194ee20 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -172,7 +172,7 @@ namespace dbaui virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; - virtual void callModifiedHdl(void* pControl = nullptr) override; + virtual void callModifiedHdl(weld::Widget* pControl = nullptr) override; DECL_LINK(OnTestJavaClickHdl, weld::Button&, void); |