diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-06-22 12:52:18 +0000 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-06-22 12:52:18 +0000 |
| commit | fcaa1ad46fd1df4cfec9dee12caf6e7b5bf32136 (patch) | |
| tree | 2427269d55e15764ff3cd6511ac7d5729e816869 /indra/newview/llfolderview.h | |
| parent | 844ce9bf885bcc88caa8620cf729061672af3b37 (diff) | |
QAR-1383: convert new uses of Boost.Signals (arriving from other branches) to
Boost.Signals2 like the rest of the event-system-n code.
Diffstat (limited to 'indra/newview/llfolderview.h')
| -rw-r--r-- | indra/newview/llfolderview.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index 848d289bb9..9d91f0d64e 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -45,8 +45,7 @@ #include <map> #include <deque> #include <boost/function.hpp> -#include <boost/signal.hpp> -#include <boost/signals/connection.hpp> +#include <boost/signals2.hpp> #include "lluictrl.h" #include "v4color.h" @@ -768,7 +767,7 @@ public: void setFilterPermMask(PermissionMask filter_perm_mask) { mFilter.setFilterPermissions(filter_perm_mask); } void setAllowMultiSelect(BOOL allow) { mAllowMultiSelect = allow; } - typedef boost::signal<void (const std::deque<LLFolderViewItem*>& items, BOOL user_action)> signal_t; + typedef boost::signals2::signal<void (const std::deque<LLFolderViewItem*>& items, BOOL user_action)> signal_t; void setSelectCallback(const signal_t::slot_type& cb) { mSelectSignal.connect(cb); } void setReshapeCallback(const signal_t::slot_type& cb) { mReshapeSignal.connect(cb); } |