livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QAR-1383: convert new uses of Boost.Signals (arriving from other branches) to 

Boost.Signals2 like the rest of the event-system-n code.
master
Nat Goodspeed 2009-06-22 12:52:18 +00:00
parent 844ce9bf88
commit fcaa1ad46f
24 changed files with 96 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/llmessage/llcachename.cpp
View File

@ -97,7 +97,7 @@ public:
{
}
boost::signals::connection setCallback(const LLCacheNameCallback& cb)
boost::signals2::connection setCallback(const LLCacheNameCallback& cb)
{
return mSignal.connect(cb);
}
@ -216,7 +216,7 @@ public:
Impl(LLMessageSystem* msg);
~Impl();
boost::signals::connection addPending(const LLUUID& id, const LLCacheNameCallback& callback);
boost::signals2::connection addPending(const LLUUID& id, const LLCacheNameCallback& callback);
void addPending(const LLUUID& id, const LLHost& host);
void processPendingAsks();
@ -277,10 +277,10 @@ LLCacheName::Impl::~Impl()
for_each(mReplyQueue.begin(), mReplyQueue.end(), DeletePointer());
}
boost::signals::connection LLCacheName::Impl::addPending(const LLUUID& id, const LLCacheNameCallback& callback)
boost::signals2::connection LLCacheName::Impl::addPending(const LLUUID& id, const LLCacheNameCallback& callback)
{
PendingReply* reply = new PendingReply(id, LLHost());
boost::signals::connection res = reply->setCallback(callback);
boost::signals2::connection res = reply->setCallback(callback);
mReplyQueue.push_back(reply);
return res;
}
@ -296,7 +296,7 @@ void LLCacheName::setUpstream(const LLHost& upstream_host)
impl.mUpstreamHost = upstream_host;
}
boost::signals::connection LLCacheName::addObserver(const LLCacheNameCallback& callback)
boost::signals2::connection LLCacheName::addObserver(const LLCacheNameCallback& callback)
{
return impl.mSignal.connect(callback);
}
@ -555,9 +555,9 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
// we call it immediately. -Steve
// NOTE: Even though passing first and last name is a bit of extra overhead, it eliminates the
// potential need for any parsing should any code need to handle first and last name independently.
boost::signals::connection LLCacheName::get(const LLUUID& id, BOOL is_group, const LLCacheNameCallback& callback)
boost::signals2::connection LLCacheName::get(const LLUUID& id, BOOL is_group, const LLCacheNameCallback& callback)
{
boost::signals::connection res;
boost::signals2::connection res;
if(id.isNull())
{
@ -601,7 +601,7 @@ boost::signals::connection LLCacheName::get(const LLUUID& id, BOOL is_group, con
return res;
}
boost::signals::connection LLCacheName::get(const LLUUID& id, BOOL is_group, old_callback_t callback, void* user_data)
boost::signals2::connection LLCacheName::get(const LLUUID& id, BOOL is_group, old_callback_t callback, void* user_data)
{
return get(id, is_group, boost::bind(callback, _1, _2, _3, _4, user_data));
}

10
indra/llmessage/llcachename.h
View File

@ -34,14 +34,14 @@
#define LL_LLCACHENAME_H
#include <boost/bind.hpp>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
class LLMessageSystem;
class LLHost;
class LLUUID;
typedef boost::signal<void (const LLUUID& id,
typedef boost::signals2::signal<void (const LLUUID& id,
const std::string& first_name,
const std::string& last_name,
BOOL is_group)> LLCacheNameSignal;
@ -69,7 +69,7 @@ public:
// for simulators, this is the data server
void setUpstream(const LLHost& upstream_host);
boost::signals::connection addObserver(const LLCacheNameCallback& callback);
boost::signals2::connection addObserver(const LLCacheNameCallback& callback);
// janky old format. Remove after a while. Phoenix. 2008-01-30
void importFile(LLFILE* fp);
@ -96,10 +96,10 @@ public:
// If the data is currently available, may call the callback immediatly
// otherwise, will request the data, and will call the callback when
// available. There is no garuntee the callback will ever be called.
boost::signals::connection get(const LLUUID& id, BOOL is_group, const LLCacheNameCallback& callback);
boost::signals2::connection get(const LLUUID& id, BOOL is_group, const LLCacheNameCallback& callback);
// LEGACY
boost::signals::connection get(const LLUUID& id, BOOL is_group, old_callback_t callback, void* user_data);
boost::signals2::connection get(const LLUUID& id, BOOL is_group, old_callback_t callback, void* user_data);
// This method needs to be called from time to time to send out
// requests.

18
indra/llui/llbutton.cpp
View File

@ -244,43 +244,43 @@ void LLButton::onCommit()
LLUICtrl::onCommit();
}
boost::signals::connection LLButton::setClickedCallback( const commit_signal_t::slot_type& cb )
boost::signals2::connection LLButton::setClickedCallback( const commit_signal_t::slot_type& cb )
{
return mCommitSignal.connect(cb);
}
boost::signals::connection LLButton::setMouseDownCallback( const commit_signal_t::slot_type& cb )
boost::signals2::connection LLButton::setMouseDownCallback( const commit_signal_t::slot_type& cb )
{
return mMouseDownSignal.connect(cb);
}
boost::signals::connection LLButton::setMouseUpCallback( const commit_signal_t::slot_type& cb )
boost::signals2::connection LLButton::setMouseUpCallback( const commit_signal_t::slot_type& cb )
{
return mMouseUpSignal.connect(cb);
}
boost::signals::connection LLButton::setHeldDownCallback( const commit_signal_t::slot_type& cb )
boost::signals2::connection LLButton::setHeldDownCallback( const commit_signal_t::slot_type& cb )
{
return mHeldDownSignal.connect(cb);
}
boost::signals::connection LLButton::setRightClickedCallback( const commit_signal_t::slot_type& cb )
boost::signals2::connection LLButton::setRightClickedCallback( const commit_signal_t::slot_type& cb )
{
return mRightClickSignal.connect(cb);
}
// *TODO: Deprecate (for backwards compatability only)
boost::signals::connection LLButton::setClickedCallback( button_callback_t cb, void* data )
boost::signals2::connection LLButton::setClickedCallback( button_callback_t cb, void* data )
{
return setClickedCallback(boost::bind(cb, data));
}
boost::signals::connection LLButton::setMouseDownCallback( button_callback_t cb, void* data )
boost::signals2::connection LLButton::setMouseDownCallback( button_callback_t cb, void* data )
{
return setMouseDownCallback(boost::bind(cb, data));
}
boost::signals::connection LLButton::setMouseUpCallback( button_callback_t cb, void* data )
boost::signals2::connection LLButton::setMouseUpCallback( button_callback_t cb, void* data )
{
return setMouseUpCallback(boost::bind(cb, data));
}
boost::signals::connection LLButton::setHeldDownCallback( button_callback_t cb, void* data )
boost::signals2::connection LLButton::setHeldDownCallback( button_callback_t cb, void* data )
{
return setHeldDownCallback(boost::bind(cb, data));
}

18
indra/llui/llbutton.h
View File

@ -151,20 +151,20 @@ public:
void setUnselectedLabelColor( const LLColor4& c ) { mUnselectedLabelColor = c; }
void setSelectedLabelColor( const LLColor4& c ) { mSelectedLabelColor = c; }
boost::signals::connection setClickedCallback( const commit_signal_t::slot_type& cb ); // mouse down and up within button
boost::signals::connection setMouseDownCallback( const commit_signal_t::slot_type& cb );
boost::signals::connection setMouseUpCallback( const commit_signal_t::slot_type& cb ); // mouse up, EVEN IF NOT IN BUTTON
boost::signals2::connection setClickedCallback( const commit_signal_t::slot_type& cb ); // mouse down and up within button
boost::signals2::connection setMouseDownCallback( const commit_signal_t::slot_type& cb );
boost::signals2::connection setMouseUpCallback( const commit_signal_t::slot_type& cb ); // mouse up, EVEN IF NOT IN BUTTON
// Passes a 'count' parameter in the commit param payload, i.e. param["count"])
boost::signals::connection setHeldDownCallback( const commit_signal_t::slot_type& cb ); // Mouse button held down and in button
boost::signals::connection setRightClickedCallback( const commit_signal_t::slot_type& cb ); // right mouse down and up within button
boost::signals2::connection setHeldDownCallback( const commit_signal_t::slot_type& cb ); // Mouse button held down and in button
boost::signals2::connection setRightClickedCallback( const commit_signal_t::slot_type& cb ); // right mouse down and up within button
// *TODO: Deprecate (for backwards compatability only)
boost::signals::connection setClickedCallback( button_callback_t cb, void* data );
boost::signals::connection setMouseDownCallback( button_callback_t cb, void* data );
boost::signals::connection setMouseUpCallback( button_callback_t cb, void* data );
boost::signals::connection setHeldDownCallback( button_callback_t cb, void* data );
boost::signals2::connection setClickedCallback( button_callback_t cb, void* data );
boost::signals2::connection setMouseDownCallback( button_callback_t cb, void* data );
boost::signals2::connection setMouseUpCallback( button_callback_t cb, void* data );
boost::signals2::connection setHeldDownCallback( button_callback_t cb, void* data );
void setHeldDownDelay( F32 seconds, S32 frames = 0) { mHeldDownDelay = seconds; mHeldDownFrameDelay = frames; }

8
indra/llui/llmenugl.h
View File

@ -286,12 +286,12 @@ public:
//virtual void draw();
boost::signals::connection setClickCallback( const commit_signal_t::slot_type& cb )
boost::signals2::connection setClickCallback( const commit_signal_t::slot_type& cb )
{
return setCommitCallback(cb);
}
boost::signals::connection setEnableCallback( const enable_signal_t::slot_type& cb )
boost::signals2::connection setEnableCallback( const enable_signal_t::slot_type& cb )
{
return mEnableSignal.connect(cb);
}
@ -336,7 +336,7 @@ public:
// called to rebuild the draw label
virtual void buildDrawLabel( void );
boost::signals::connection setCheckCallback( const enable_signal_t::slot_type& cb )
boost::signals2::connection setCheckCallback( const enable_signal_t::slot_type& cb )
{
return mCheckSignal.connect(cb);
}
@ -834,7 +834,7 @@ private:
// *TODO: Eliminate
// For backwards compatability only; generally just use boost::bind
class view_listener_t : public boost::signals::trackable
class view_listener_t : public boost::signals2::trackable
{
public:
virtual bool handleEvent(const LLSD& userdata) = 0;

4
indra/llui/llmultislider.h
View File

@ -78,8 +78,8 @@ public:
/*virtual*/ void setValue(const LLSD& value);
/*virtual*/ LLSD getValue() const { return mValue; }
boost::signals::connection setMouseDownCallback( const commit_signal_t::slot_type& cb ) { return mMouseDownSignal.connect(cb); }
boost::signals::connection setMouseUpCallback( const commit_signal_t::slot_type& cb ) { return mMouseUpSignal.connect(cb); }
boost::signals2::connection setMouseDownCallback( const commit_signal_t::slot_type& cb ) { return mMouseDownSignal.connect(cb); }
boost::signals2::connection setMouseUpCallback( const commit_signal_t::slot_type& cb ) { return mMouseUpSignal.connect(cb); }
bool findUnusedValue(F32& initVal);
const std::string& addSlider();

4
indra/llui/llmultisliderctrl.cpp
View File

@ -460,12 +460,12 @@ void LLMultiSliderCtrl::setPrecision(S32 precision)
updateText();
}
boost::signals::connection LLMultiSliderCtrl::setSliderMouseDownCallback( const commit_signal_t::slot_type& cb )
boost::signals2::connection LLMultiSliderCtrl::setSliderMouseDownCallback( const commit_signal_t::slot_type& cb )
{
return mMultiSlider->setMouseDownCallback( cb );
}
boost::signals::connection LLMultiSliderCtrl::setSliderMouseUpCallback( const commit_signal_t::slot_type& cb )
boost::signals2::connection LLMultiSliderCtrl::setSliderMouseUpCallback( const commit_signal_t::slot_type& cb )
{
return mMultiSlider->setMouseUpCallback( cb );
}

4
indra/llui/llmultisliderctrl.h
View File

@ -115,8 +115,8 @@ public:
void setLabelColor(const LLColor4& c) { mTextEnabledColor = c; }
void setDisabledLabelColor(const LLColor4& c) { mTextDisabledColor = c; }
boost::signals::connection setSliderMouseDownCallback( const commit_signal_t::slot_type& cb );
boost::signals::connection setSliderMouseUpCallback( const commit_signal_t::slot_type& cb );
boost::signals2::connection setSliderMouseDownCallback( const commit_signal_t::slot_type& cb );
boost::signals2::connection setSliderMouseUpCallback( const commit_signal_t::slot_type& cb );
virtual void onTabInto();

4
indra/llui/llslider.h
View File

@ -67,8 +67,8 @@ public:
virtual void setMinValue(F32 min_value) { LLF32UICtrl::setMinValue(min_value); updateThumbRect(); }
virtual void setMaxValue(F32 max_value) { LLF32UICtrl::setMaxValue(max_value); updateThumbRect(); }
boost::signals::connection setMouseDownCallback( const commit_signal_t::slot_type& cb ) { return mMouseDownSignal.connect(cb); }
boost::signals::connection setMouseUpCallback( const commit_signal_t::slot_type& cb ) { return mMouseUpSignal.connect(cb); }
boost::signals2::connection setMouseDownCallback( const commit_signal_t::slot_type& cb ) { return mMouseDownSignal.connect(cb); }
boost::signals2::connection setMouseUpCallback( const commit_signal_t::slot_type& cb ) { return mMouseUpSignal.connect(cb); }
virtual BOOL handleHover(S32 x, S32 y, MASK mask);
virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);

4
indra/llui/llsliderctrl.cpp
View File

@ -375,12 +375,12 @@ void LLSliderCtrl::setPrecision(S32 precision)
updateText();
}
boost::signals::connection LLSliderCtrl::setSliderMouseDownCallback( const commit_signal_t::slot_type& cb )
boost::signals2::connection LLSliderCtrl::setSliderMouseDownCallback( const commit_signal_t::slot_type& cb )
{
return mSlider->setMouseDownCallback( cb );
}
boost::signals::connection LLSliderCtrl::setSliderMouseUpCallback( const commit_signal_t::slot_type& cb )
boost::signals2::connection LLSliderCtrl::setSliderMouseUpCallback( const commit_signal_t::slot_type& cb )
{
return mSlider->setMouseUpCallback( cb );
}

4
indra/llui/llsliderctrl.h
View File

@ -111,8 +111,8 @@ public:
void setLabelColor(const LLColor4& c) { mTextEnabledColor = c; }
void setDisabledLabelColor(const LLColor4& c) { mTextDisabledColor = c; }
boost::signals::connection setSliderMouseDownCallback( const commit_signal_t::slot_type& cb );
boost::signals::connection setSliderMouseUpCallback( const commit_signal_t::slot_type& cb );
boost::signals2::connection setSliderMouseDownCallback( const commit_signal_t::slot_type& cb );
boost::signals2::connection setSliderMouseUpCallback( const commit_signal_t::slot_type& cb );
/*virtual*/ void onTabInto();

4
indra/llui/lluictrl.cpp
View File

@ -840,11 +840,11 @@ LLUICtrl* LLUICtrl::getParentUICtrl() const
}
// *TODO: Deprecate; for backwards compatability only:
boost::signals::connection LLUICtrl::setCommitCallback( boost::function<void (LLUICtrl*,void*)> cb, void* data)
boost::signals2::connection LLUICtrl::setCommitCallback( boost::function<void (LLUICtrl*,void*)> cb, void* data)
{
return setCommitCallback( boost::bind(cb, _1, data));
}
boost::signals::connection LLUICtrl::setValidateBeforeCommit( boost::function<bool (const LLSD& data)> cb )
boost::signals2::connection LLUICtrl::setValidateBeforeCommit( boost::function<bool (const LLSD& data)> cb )
{
return mValidateSignal.connect(boost::bind(cb, _2));
}

24
indra/llui/lluictrl.h
View File

@ -74,16 +74,16 @@ protected:
};
class LLUICtrl
: public LLView, public LLFocusableElement, public boost::signals::trackable
: public LLView, public LLFocusableElement, public boost::signals2::trackable
{
public:
typedef boost::function<void (LLUICtrl* ctrl, const LLSD& param)> commit_callback_t;
typedef boost::signal<void (LLUICtrl* ctrl, const LLSD& param)> commit_signal_t;
typedef boost::signals2::signal<void (LLUICtrl* ctrl, const LLSD& param)> commit_signal_t;
typedef boost::function<bool (LLUICtrl* ctrl, const LLSD& param)> enable_callback_t;
typedef boost::signal<bool (LLUICtrl* ctrl, const LLSD& param), boost_boolean_combiner> enable_signal_t;
typedef boost::signals2::signal<bool (LLUICtrl* ctrl, const LLSD& param), boost_boolean_combiner> enable_signal_t;
struct CallbackParam : public LLInitParam::Block<CallbackParam>
{
@ -244,12 +244,12 @@ public:
LLUICtrl* getParentUICtrl() const;
boost::signals::connection setCommitCallback( const commit_signal_t::slot_type& cb ) { return mCommitSignal.connect(cb); }
boost::signals::connection setValidateCallback( const enable_signal_t::slot_type& cb ) { return mValidateSignal.connect(cb); }
boost::signals2::connection setCommitCallback( const commit_signal_t::slot_type& cb ) { return mCommitSignal.connect(cb); }
boost::signals2::connection setValidateCallback( const enable_signal_t::slot_type& cb ) { return mValidateSignal.connect(cb); }
// *TODO: Deprecate; for backwards compatability only:
boost::signals::connection setCommitCallback( boost::function<void (LLUICtrl*,void*)> cb, void* data);
boost::signals::connection setValidateBeforeCommit( boost::function<bool (const LLSD& data)> cb );
boost::signals2::connection setCommitCallback( boost::function<void (LLUICtrl*,void*)> cb, void* data);
boost::signals2::connection setValidateBeforeCommit( boost::function<bool (const LLSD& data)> cb );
LLUICtrl* findRootMostFocusRoot();
@ -278,15 +278,15 @@ protected:
LLViewModelPtr mViewModel;
LLControlVariable* mControlVariable;
boost::signals::connection mControlConnection;
boost::signals2::connection mControlConnection;
LLControlVariable* mEnabledControlVariable;
boost::signals::connection mEnabledControlConnection;
boost::signals2::connection mEnabledControlConnection;
LLControlVariable* mDisabledControlVariable;
boost::signals::connection mDisabledControlConnection;
boost::signals2::connection mDisabledControlConnection;
LLControlVariable* mMakeVisibleControlVariable;
boost::signals::connection mMakeVisibleControlConnection;
boost::signals2::connection mMakeVisibleControlConnection;
LLControlVariable* mMakeInvisibleControlVariable;
boost::signals::connection mMakeInvisibleControlConnection;
boost::signals2::connection mMakeInvisibleControlConnection;
private:
BOOL mTabStop;

12
indra/llxml/llcontrol.h
View File

@ -56,7 +56,7 @@
#endif
#include <boost/bind.hpp>
#include <boost/signal.hpp>
#include <boost/signals2.hpp>
#if LL_WINDOWS
# if (_MSC_VER >= 1300 && _MSC_VER < 1400)
@ -92,8 +92,8 @@ class LLControlVariable : public LLRefCount, boost::noncopyable
friend class LLControlGroup;
public:
typedef boost::signal<bool(LLControlVariable* control, const LLSD&), boost_boolean_combiner> validate_signal_t;
typedef boost::signal<void(LLControlVariable* control, const LLSD&)> commit_signal_t;
typedef boost::signals2::signal<bool(LLControlVariable* control, const LLSD&), boost_boolean_combiner> validate_signal_t;
typedef boost::signals2::signal<void(LLControlVariable* control, const LLSD&)> commit_signal_t;
private:
std::string mName;
@ -332,10 +332,6 @@ public:
~LLControlCache()
{
if(mConnection.connected())
{
mConnection.disconnect();
}
}
const T& getValue() const { return mCachedValue; }
@ -378,7 +374,7 @@ private:
private:
T mCachedValue;
eControlType mType;
boost::signals::connection mConnection;
boost::signals2::scoped_connection mConnection;
};
template <typename T>

6
indra/newview/llchiclet.cpp
View File

@ -119,7 +119,7 @@ void LLNotificationChiclet::setCounter(S32 counter)
mCounterText->setText(stream.str());
}
boost::signals::connection LLNotificationChiclet::setClickCallback(
boost::signals2::connection LLNotificationChiclet::setClickCallback(
const commit_callback_t& cb)
{
return mButton->setClickedCallback(cb);
@ -142,7 +142,7 @@ LLChiclet::~LLChiclet()
}
boost::signals::connection LLChiclet::setLeftButtonClickCallback(
boost::signals2::connection LLChiclet::setLeftButtonClickCallback(
const commit_callback_t& cb)
{
return mCommitSignal.connect(cb);
@ -587,7 +587,7 @@ void LLChicletPanel::onRightScrollClick()
scrollRight();
}
boost::signals::connection LLChicletPanel::setChicletClickCallback(
boost::signals2::connection LLChicletPanel::setChicletClickCallback(
const commit_callback_t& cb)
{
return mCommitSignal.connect(cb);

6
indra/newview/llchiclet.h
View File

@ -60,7 +60,7 @@ public:
virtual bool getShowCounter() {return mShowCounter;};
virtual boost::signals::connection setLeftButtonClickCallback(
virtual boost::signals2::connection setLeftButtonClickCallback(
const commit_callback_t& cb);
protected:
@ -158,7 +158,7 @@ public:
S32 getCounter() {return mCounter;};
boost::signals::connection setClickCallback(const commit_callback_t& cb);
boost::signals2::connection setClickCallback(const commit_callback_t& cb);
virtual ~ LLNotificationChiclet();
@ -212,7 +212,7 @@ public:
void onRightScrollClick();
boost::signals::connection setChicletClickCallback(
boost::signals2::connection setChicletClickCallback(
const commit_callback_t& cb);
void onChicletClick(LLUICtrl*ctrl,const LLSD&param);

6
indra/newview/llfloatergroups.h
View File

@ -48,7 +48,7 @@
#include "llfloater.h"
#include <map>
#include <boost/function.hpp>
#include <boost/signal.hpp>
#include <boost/signals2.hpp>
class LLUICtrl;
class LLTextBox;
@ -62,8 +62,8 @@ class LLFloaterGroupPicker : public LLFloater, public LLUIFactory<LLFloaterGroup
public:
~LLFloaterGroupPicker();
// Note: Don't return connection; use boost::bind + boost::signal::trackable to disconnect slots
typedef boost::signal<void (LLUUID id)> signal_t;
// Note: Don't return connection; use boost::bind + boost::signals2::trackable to disconnect slots
typedef boost::signals2::signal<void (LLUUID id)> signal_t;
void setSelectGroupCallback(const signal_t::slot_type& cb) { mGroupSelectSignal.connect(cb); }
void setPowersMask(U64 powers_mask);
BOOL postBuild();

5
indra/newview/llfolderview.h
View File

@ -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); }

6
indra/newview/llrecentpeople.h
View File

@ -39,7 +39,7 @@
#include <vector>
#include <set>
#include <boost/signal.hpp>
#include <boost/signals2.hpp>
/**
* List of people the agent recently interacted with.
@ -56,7 +56,7 @@ class LLRecentPeople: public LLSingleton<LLRecentPeople>, public LLOldEvents::LL
{
LOG_CLASS(LLRecentPeople);
public:
typedef boost::signal<void ()> signal_t;
typedef boost::signals2::signal<void ()> signal_t;
/**
* Add specified avatar to the list if it's not there already.
@ -84,7 +84,7 @@ public:
*
* Multiple callbacks can be set.
*
* @return no connection; use boost::bind + boost::signal::trackable to disconnect slots.
* @return no connection; use boost::bind + boost::signals2::trackable to disconnect slots.
*/
void setChangedCallback(const signal_t::slot_type& cb) { mChangedSignal.connect(cb); }

2
indra/newview/llteleporthistory.cpp
View File

@ -162,7 +162,7 @@ void LLTeleportHistory::updateCurrentLocation()
onHistoryChanged();
}
boost::signals::connection LLTeleportHistory::setHistoryChangedCallback(history_callback_t cb)
boost::signals2::connection LLTeleportHistory::setHistoryChangedCallback(history_callback_t cb)
{
return mHistoryChangedSignal.connect(cb);
}

11
indra/newview/llteleporthistory.h
View File

@ -38,8 +38,7 @@
#include <vector>
#include <string>
#include <boost/function.hpp>
#include <boost/signal.hpp>
#include <boost/signals/connection.hpp>
#include <boost/signals2.hpp>
/**
@ -81,7 +80,7 @@ public:
typedef std::vector<LLTeleportHistoryItem> slurl_list_t;
typedef boost::function<void()> history_callback_t;
typedef boost::signal <void()> history_signal_t;
typedef boost::signals2::signal<void()> history_signal_t;
LLTeleportHistory();
~LLTeleportHistory();
@ -126,7 +125,7 @@ public:
*
* Multiple callbacks can be set.
*/
boost::signals::connection setHistoryChangedCallback(history_callback_t cb);
boost::signals2::connection setHistoryChangedCallback(history_callback_t cb);
/**
* Save history to a file so that we can restore it on startup.
@ -212,14 +211,14 @@ private:
* Using this connection we get notified when a teleport finishes
* or initial location update occurs.
*/
boost::signals::connection mTeleportFinishedConn;
boost::signals2::connection mTeleportFinishedConn;
/**
* Teleport failure notification connection.
*
* Using this connection we get notified when a teleport fails.
*/
boost::signals::connection mTeleportFailedConn;
boost::signals2::connection mTeleportFailedConn;
};
#endif

6
indra/newview/lltoolpipette.h
View File

@ -41,7 +41,7 @@
#include "lltool.h"
#include "lltextureentry.h"
#include <boost/function.hpp>
#include <boost/signal.hpp>
#include <boost/signals2.hpp>
class LLViewerObject;
class LLPickInfo;
@ -58,8 +58,8 @@ public:
virtual BOOL handleHover(S32 x, S32 y, MASK mask);
virtual BOOL handleToolTip(S32 x, S32 y, std::string& msg, LLRect *sticky_rect_screen);
// Note: Don't return connection; use boost::bind + boost::signal::trackable to disconnect slots
typedef boost::signal<void (const LLTextureEntry& te)> signal_t;
// Note: Don't return connection; use boost::bind + boost::signals2::trackable to disconnect slots
typedef boost::signals2::signal<void (const LLTextureEntry& te)> signal_t;
void setToolSelectCallback(const signal_t::slot_type& cb) { mSignal.connect(cb); }
void setResult(BOOL success, const std::string& msg);

6
indra/newview/llviewerparcelmgr.cpp
View File

@ -2392,17 +2392,17 @@ LLViewerImage* LLViewerParcelMgr::getPassImage() const
return sPassImage;
}
boost::signals::connection LLViewerParcelMgr::setAgentParcelChangedCallback(parcel_changed_callback_t cb)
boost::signals2::connection LLViewerParcelMgr::setAgentParcelChangedCallback(parcel_changed_callback_t cb)
{
return mAgentParcelChangedSignal.connect(cb);
}
boost::signals::connection LLViewerParcelMgr::setTeleportFinishedCallback(parcel_changed_callback_t cb)
boost::signals2::connection LLViewerParcelMgr::setTeleportFinishedCallback(parcel_changed_callback_t cb)
{
return mTeleportFinishedSignal.connect(cb);
}
boost::signals::connection LLViewerParcelMgr::setTeleportFailedCallback(parcel_changed_callback_t cb)
boost::signals2::connection LLViewerParcelMgr::setTeleportFailedCallback(parcel_changed_callback_t cb)
{
return mTeleportFailedSignal.connect(cb);
}

11
indra/newview/llviewerparcelmgr.h
View File

@ -41,8 +41,7 @@
#include "llui.h"
#include <boost/function.hpp>
#include <boost/signal.hpp>
#include <boost/signals/connection.hpp>
#include <boost/signals2.hpp>
class LLUUID;
class LLMessageSystem;
@ -84,7 +83,7 @@ class LLViewerParcelMgr : public LLSingleton<LLViewerParcelMgr>
public:
typedef boost::function<void()> parcel_changed_callback_t;
typedef boost::signal <void()> parcel_changed_signal_t;
typedef boost::signals2::signal<void()> parcel_changed_signal_t;
LLViewerParcelMgr();
~LLViewerParcelMgr();
@ -263,9 +262,9 @@ public:
// the agent is banned or not in the allowed group
BOOL isCollisionBanned();
boost::signals::connection setAgentParcelChangedCallback(parcel_changed_callback_t cb);
boost::signals::connection setTeleportFinishedCallback(parcel_changed_callback_t cb);
boost::signals::connection setTeleportFailedCallback(parcel_changed_callback_t cb);
boost::signals2::connection setAgentParcelChangedCallback(parcel_changed_callback_t cb);
boost::signals2::connection setTeleportFinishedCallback(parcel_changed_callback_t cb);
boost::signals2::connection setTeleportFailedCallback(parcel_changed_callback_t cb);
void onTeleportFinished();
void onTeleportFailed();