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

Boost.Signals2 like the rest of the event-system-n code.

10 files changed, 31 insertions, 34 deletions

diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 1c72e9c5ac..d8e844d291 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -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);
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index f2b859a090..11c3356c46 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -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);
diff --git a/indra/newview/llfloatergroups.h b/indra/newview/llfloatergroups.h
index b49d38ccd0..0425b81294 100644
--- a/indra/newview/llfloatergroups.h
+++ b/indra/newview/llfloatergroups.h
@@ -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();
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); }
 	
diff --git a/indra/newview/llrecentpeople.h b/indra/newview/llrecentpeople.h
index fce4b8d42b..40ac80e8bc 100644
--- a/indra/newview/llrecentpeople.h
+++ b/indra/newview/llrecentpeople.h
@@ -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); }
 
diff --git a/indra/newview/llteleporthistory.cpp b/indra/newview/llteleporthistory.cpp
index 6fc120d920..99389017cb 100644
--- a/indra/newview/llteleporthistory.cpp
+++ b/indra/newview/llteleporthistory.cpp
@@ -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);
 }
diff --git a/indra/newview/llteleporthistory.h b/indra/newview/llteleporthistory.h
index 5be3dc171f..c68aabe9a1 100644
--- a/indra/newview/llteleporthistory.h
+++ b/indra/newview/llteleporthistory.h
@@ -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
diff --git a/indra/newview/lltoolpipette.h b/indra/newview/lltoolpipette.h
index fcccafe1a4..3b6ebec67e 100644
--- a/indra/newview/lltoolpipette.h
+++ b/indra/newview/lltoolpipette.h
@@ -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);
 	
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 8aa1663bc1..bcb3853106 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -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);
 }
diff --git a/indra/newview/llviewerparcelmgr.h b/indra/newview/llviewerparcelmgr.h
index 4bed1c0486..dc6c2a6287 100644
--- a/indra/newview/llviewerparcelmgr.h
+++ b/indra/newview/llviewerparcelmgr.h
@@ -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();