Kaydet (Commit) 798d7bc0 authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: Id3ed50dc7fd4f783034797b2401ae05c96d002de
üst d86a7eb4
...@@ -125,7 +125,7 @@ namespace dbaui ...@@ -125,7 +125,7 @@ namespace dbaui
}; };
// MySQLNativeSettings // MySQLNativeSettings
MySQLNativeSettings::MySQLNativeSettings( vcl::Window& _rParent, const Link<>& _rControlModificationLink ) MySQLNativeSettings::MySQLNativeSettings( vcl::Window& _rParent, const Link<void*,void>& _rControlModificationLink )
:TabPage( &_rParent, "MysqlNativeSettings", "dbaccess/ui/mysqlnativesettings.ui" ), :TabPage( &_rParent, "MysqlNativeSettings", "dbaccess/ui/mysqlnativesettings.ui" ),
m_aControlModificationLink(_rControlModificationLink) m_aControlModificationLink(_rControlModificationLink)
{ {
......
...@@ -47,14 +47,14 @@ namespace dbaui ...@@ -47,14 +47,14 @@ namespace dbaui
VclPtr<FixedText> m_pDefaultPort; VclPtr<FixedText> m_pDefaultPort;
VclPtr<Edit> m_pSocket; VclPtr<Edit> m_pSocket;
VclPtr<Edit> m_pNamedPipe; VclPtr<Edit> m_pNamedPipe;
Link<> m_aControlModificationLink; Link<void*,void> m_aControlModificationLink;
::svt::ControlDependencyManager ::svt::ControlDependencyManager
m_aControlDependencies; m_aControlDependencies;
DECL_LINK_TYPED(RadioToggleHdl, RadioButton&, void); DECL_LINK_TYPED(RadioToggleHdl, RadioButton&, void);
DECL_LINK_TYPED(EditModifyHdl, Edit&, void); DECL_LINK_TYPED(EditModifyHdl, Edit&, void);
public: public:
MySQLNativeSettings( vcl::Window& _rParent, const Link<>& _rControlModificationLink ); MySQLNativeSettings( vcl::Window& _rParent, const Link<void*,void>& _rControlModificationLink );
virtual ~MySQLNativeSettings(); virtual ~MySQLNativeSettings();
virtual void dispose() override; virtual void dispose() override;
void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ); void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList );
......
...@@ -102,10 +102,9 @@ namespace dbaui ...@@ -102,10 +102,9 @@ namespace dbaui
_rReadonly = !_rValid || (pReadonly && pReadonly->GetValue()); _rReadonly = !_rValid || (pReadonly && pReadonly->GetValue());
} }
IMPL_LINK(OGenericAdministrationPage, OnControlModified, void*, pCtrl) IMPL_LINK_TYPED(OGenericAdministrationPage, OnControlModified, void*, pCtrl, void)
{ {
callModifiedHdl(pCtrl); callModifiedHdl(pCtrl);
return 0;
} }
IMPL_LINK_TYPED(OGenericAdministrationPage, OnControlModifiedClick, Button*, pCtrl, void) IMPL_LINK_TYPED(OGenericAdministrationPage, OnControlModifiedClick, Button*, pCtrl, void)
{ {
......
...@@ -206,7 +206,7 @@ namespace dbaui ...@@ -206,7 +206,7 @@ namespace dbaui
/** This link be used for controls where the tabpage does not need to take any special action when the control /** 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. is modified. The implementation just calls callModifiedHdl.
*/ */
DECL_LINK(OnControlModified, void*); DECL_LINK_TYPED(OnControlModified, void*, void);
DECL_LINK_TYPED(OnControlEditModifyHdl, Edit&, void); DECL_LINK_TYPED(OnControlEditModifyHdl, Edit&, void);
DECL_LINK_TYPED(OnControlModifiedClick, Button*, void); DECL_LINK_TYPED(OnControlModifiedClick, Button*, void);
DECL_LINK_TYPED(ControlModifiedCheckBoxHdl, CheckBox&, void); DECL_LINK_TYPED(ControlModifiedCheckBoxHdl, CheckBox&, void);
......
...@@ -402,9 +402,9 @@ namespace dbaui ...@@ -402,9 +402,9 @@ namespace dbaui
{ {
callModifiedHdl(); callModifiedHdl();
} }
IMPL_LINK( OTableSubscriptionPage, OnTreeEntryChecked, Control*, _pControl ) IMPL_LINK_TYPED( OTableSubscriptionPage, OnTreeEntryChecked, void*, _pControl, void )
{ {
return OnControlModified(static_cast<Button*>(_pControl)); OnControlModified(_pControl);
} }
IMPL_LINK_TYPED( OTableSubscriptionPage, OnTreeEntryCompare, const SvSortData&, _rSortData, sal_Int32 ) IMPL_LINK_TYPED( OTableSubscriptionPage, OnTreeEntryCompare, const SvSortData&, _rSortData, sal_Int32 )
{ {
......
...@@ -65,7 +65,7 @@ namespace dbaui ...@@ -65,7 +65,7 @@ namespace dbaui
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override;
DECL_LINK_TYPED( OnTreeEntryCompare, const SvSortData&, sal_Int32 ); DECL_LINK_TYPED( OnTreeEntryCompare, const SvSortData&, sal_Int32 );
DECL_LINK( OnTreeEntryChecked, Control* ); DECL_LINK_TYPED( OnTreeEntryChecked, void*, void );
DECL_LINK_TYPED( OnTreeEntryButtonChecked, SvTreeListBox*, void ); DECL_LINK_TYPED( OnTreeEntryButtonChecked, SvTreeListBox*, void );
private: private:
......
...@@ -35,7 +35,7 @@ namespace dbaui ...@@ -35,7 +35,7 @@ namespace dbaui
class OMarkableTreeListBox : public DBTreeListBox class OMarkableTreeListBox : public DBTreeListBox
{ {
SvLBoxButtonData* m_pCheckButton; SvLBoxButtonData* m_pCheckButton;
Link<> m_aCheckButtonHandler; Link<void*,void> m_aCheckButtonHandler;
public: public:
OMarkableTreeListBox( vcl::Window* pParent, WinBits nWinStyle=0 ); OMarkableTreeListBox( vcl::Window* pParent, WinBits nWinStyle=0 );
...@@ -47,7 +47,7 @@ public: ...@@ -47,7 +47,7 @@ public:
void CheckButtons(); // make the button states consistent (bottom-up) void CheckButtons(); // make the button states consistent (bottom-up)
/// the handler given is called whenever the check state of one or more items changed /// the handler given is called whenever the check state of one or more items changed
void SetCheckHandler(const Link<>& _rHdl) { m_aCheckButtonHandler = _rHdl; } void SetCheckHandler(const Link<void*,void>& _rHdl) { m_aCheckButtonHandler = _rHdl; }
protected: protected:
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect) override; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect) override;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment