summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-02-18 13:38:12 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-02-18 15:48:31 +0000
commit548c2274c9ba7542d6bcae5fefd1400ee4e22fc3 (patch)
tree7963bec49ed00b89090bd213a7db36a85bc88f87 /vcl/inc
parent423b79e7366203db3f57dea75b8cb9eb852b5614 (diff)
move from boost::signal to typed Link
it doesn't really gain us much to have a handful of boost::signal use in a sea of Links This also fixes a regression in commit 051b29e1025253f35f87a04e297760aa8b40611f Author: Luboš Luňák <l.lunak@collabora.com> Date: Sun Sep 14 15:45:02 2014 +0200 convert Edit autocomplete Hdl to boost signals2 where the conversion was... - if ( maAutocompleteHdl.IsSet() ) + if ( autocompleteSignal.empty() ) instead of the correct + if ( !autocompleteSignal.empty() ) Change-Id: I27270d94c782485c0a7e929bc4980af4527fe82b
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/listbox.hxx21
-rw-r--r--vcl/inc/pch/precompiled_vcl.hxx2
2 files changed, 10 insertions, 13 deletions
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index 611f6b07dfde..f316e8f7501d 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -24,8 +24,6 @@
#include <vcl/floatwin.hxx>
#include <vcl/quickselectionengine.hxx>
-#include <boost/signals2/signal.hpp>
-
#include <vector>
#include <memory>
@@ -231,6 +229,7 @@ private:
Link<LinkParamNone*,void> maSelectHdl;
Link<LinkParamNone*,void> maCancelHdl;
Link<ImplListBoxWindow*,void> maDoubleClickHdl;
+ Link<UserDrawEvent*, void> maUserDrawHdl;
Link<LinkParamNone*,void> maMRUChangedHdl;
Link<sal_Int32,void> maFocusHdl;
Link<LinkParamNone*,void> maListItemSelectHdl;
@@ -332,11 +331,10 @@ public:
void SetSelectHdl( const Link<LinkParamNone*,void>& rLink ) { maSelectHdl = rLink; }
void SetCancelHdl( const Link<LinkParamNone*,void>& rLink ) { maCancelHdl = rLink; }
void SetDoubleClickHdl( const Link<ImplListBoxWindow*,void>& rLink ) { maDoubleClickHdl = rLink; }
+ void SetUserDrawHdl( const Link<UserDrawEvent*, void>& rLink ) { maUserDrawHdl = rLink; }
void SetMRUChangedHdl( const Link<LinkParamNone*,void>& rLink ) { maMRUChangedHdl = rLink; }
void SetFocusHdl( const Link<sal_Int32,void>& rLink ) { maFocusHdl = rLink ; }
- boost::signals2::signal< void ( UserDrawEvent* ) > userDrawSignal;
-
void SetListItemSelectHdl( const Link<LinkParamNone*,void>& rLink ) { maListItemSelectHdl = rLink ; }
bool IsSelectionChanged() const { return mbSelectionChanged; }
sal_uInt16 GetSelectModifier() const { return mnSelectModifier; }
@@ -460,9 +458,7 @@ public:
void SetSelectHdl( const Link<LinkParamNone*,void>& rLink ) { maLBWindow->SetSelectHdl( rLink ); }
void SetCancelHdl( const Link<LinkParamNone*,void>& rLink ) { maLBWindow->SetCancelHdl( rLink ); }
void SetDoubleClickHdl( const Link<ImplListBoxWindow*,void>& rLink ) { maLBWindow->SetDoubleClickHdl( rLink ); }
-
- boost::signals2::signal< void ( UserDrawEvent* ) > userDrawSignal;
-
+ void SetUserDrawHdl( const Link<UserDrawEvent*, void>& rLink ) { maLBWindow->SetUserDrawHdl( rLink ); }
void SetFocusHdl( const Link<sal_Int32,void>& rLink ) { maLBWindow->SetFocusHdl( rLink ); }
void SetListItemSelectHdl( const Link<LinkParamNone*,void>& rLink ) { maLBWindow->SetListItemSelectHdl( rLink ); }
void SetSelectionChangedHdl( const Link<sal_Int32,void>& rLnk ) { maLBWindow->GetEntryList()->SetSelectionChangedHdl( rLnk ); }
@@ -535,6 +531,9 @@ private:
Rectangle maFocusRect;
Size maUserItemSize;
+ Link<void*,void> maMBDownHdl;
+ Link<UserDrawEvent*, void> maUserDrawHdl;
+
/// bitfield
bool mbUserDrawEnabled : 1;
bool mbInUserDraw : 1;
@@ -563,8 +562,8 @@ public:
void MBDown();
- boost::signals2::signal< void ( ImplWin* ) > buttonDownSignal;
- boost::signals2::signal< void ( UserDrawEvent* ) > userDrawSignal;
+ void SetMBDownHdl( const Link<void*,void>& rLink ) { maMBDownHdl = rLink; }
+ void SetUserDrawHdl( const Link<UserDrawEvent*, void>& rLink ) { maUserDrawHdl = rLink; }
void SetUserItemSize( const Size& rSz ) { maUserItemSize = rSz; }
@@ -588,14 +587,14 @@ class ImplBtn : public PushButton
{
private:
bool mbDown;
+ Link<void*,void> maMBDownHdl;
public:
ImplBtn( vcl::Window* pParent, WinBits nWinStyle = 0 );
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
void MBDown();
-
- boost::signals2::signal< void ( ImplBtn* ) > buttonDownSignal;
+ void SetMBDownHdl( const Link<void*,void>& rLink ) { maMBDownHdl = rLink; }
};
void ImplInitDropDownButton( PushButton* pButton );
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 4d79b7caac3b..d3ef8195580e 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -59,8 +59,6 @@
#include <boost/multi_array.hpp>
#include <boost/optional.hpp>
#include <boost/shared_array.hpp>
-#include <boost/signals2/connection.hpp>
-#include <boost/signals2/signal.hpp>
#include <osl/conditn.hxx>
#include <osl/diagnose.h>
#include <osl/diagnose.hxx>