1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414
|
--- a/bear-engine/core/src/engine/code/game.cpp
+++ b/bear-engine/core/src/engine/code/game.cpp
@@ -407,7 +407,7 @@
* \param name The name of the variable.
* \param f The listener.
*/
-boost::signals::connection
+boost::signals2::connection
bear::engine::game::listen_int_variable_change
( const std::string& name, const boost::function<void (int)>& f )
{
@@ -421,7 +421,7 @@
* \param name The name of the variable.
* \param f The listener.
*/
-boost::signals::connection
+boost::signals2::connection
bear::engine::game::listen_uint_variable_change
( const std::string& name, const boost::function<void (unsigned int)>& f )
{
@@ -434,7 +434,7 @@
* \param name The name of the variable.
* \param f The listener.
*/
-boost::signals::connection
+boost::signals2::connection
bear::engine::game::listen_bool_variable_change
( const std::string& name, const boost::function<void (bool)>& f )
{
@@ -447,7 +447,7 @@
* \param name The name of the variable.
* \param f The listener.
*/
-boost::signals::connection
+boost::signals2::connection
bear::engine::game::listen_double_variable_change
( const std::string& name, const boost::function<void (double)>& f )
{
@@ -460,7 +460,7 @@
* \param name The name of the variable.
* \param f The listener.
*/
-boost::signals::connection
+boost::signals2::connection
bear::engine::game::listen_string_variable_change
( const std::string& name, const boost::function<void (std::string)>& f )
{
--- a/bear-engine/core/src/engine/code/game_local_client.cpp
+++ b/bear-engine/core/src/engine/code/game_local_client.cpp
@@ -463,7 +463,7 @@
* \param name The name of the variable.
* \param f The listener.
*/
-boost::signals::connection
+boost::signals2::connection
bear::engine::game_local_client::listen_int_variable_change
( const std::string& name, const boost::function<void (int)>& f )
{
@@ -477,7 +477,7 @@
* \param name The name of the variable.
* \param f The listener.
*/
-boost::signals::connection
+boost::signals2::connection
bear::engine::game_local_client::listen_uint_variable_change
( const std::string& name, const boost::function<void (unsigned int)>& f )
{
@@ -490,7 +490,7 @@
* \param name The name of the variable.
* \param f The listener.
*/
-boost::signals::connection
+boost::signals2::connection
bear::engine::game_local_client::listen_bool_variable_change
( const std::string& name, const boost::function<void (bool)>& f )
{
@@ -503,7 +503,7 @@
* \param name The name of the variable.
* \param f The listener.
*/
-boost::signals::connection
+boost::signals2::connection
bear::engine::game_local_client::listen_double_variable_change
( const std::string& name, const boost::function<void (double)>& f )
{
@@ -516,7 +516,7 @@
* \param name The name of the variable.
* \param f The listener.
*/
-boost::signals::connection
+boost::signals2::connection
bear::engine::game_local_client::listen_string_variable_change
( const std::string& name, const boost::function<void (std::string)>& f )
{
@@ -1183,7 +1183,7 @@
* \param f The function to call when the value of the variable change.
*/
template<typename T>
-boost::signals::connection
+boost::signals2::connection
bear::engine::game_local_client::listen_variable_change
( const std::string& name, boost::function<void (T)> f )
{
--- a/bear-engine/core/src/engine/game.hpp
+++ b/bear-engine/core/src/engine/game.hpp
@@ -104,20 +104,20 @@
void save_game_variables
( std::ostream& os, const std::string& pattern = ".*" );
- boost::signals::connection
+ boost::signals2::connection
listen_int_variable_change
( const std::string& name, const boost::function<void (int)>& f );
- boost::signals::connection
+ boost::signals2::connection
listen_uint_variable_change
( const std::string& name,
const boost::function<void (unsigned int)>& f );
- boost::signals::connection
+ boost::signals2::connection
listen_bool_variable_change
( const std::string& name, const boost::function<void (bool)>& f );
- boost::signals::connection
+ boost::signals2::connection
listen_double_variable_change
( const std::string& name, const boost::function<void (double)>& f );
- boost::signals::connection
+ boost::signals2::connection
listen_string_variable_change
( const std::string& name,
const boost::function<void (const std::string)>& f );
--- a/bear-engine/core/src/engine/game_local_client.hpp
+++ b/bear-engine/core/src/engine/game_local_client.hpp
@@ -137,20 +137,20 @@
bool game_variable_exists( const base_variable& val ) const;
void get_all_game_variables( var_map& vars ) const;
- boost::signals::connection
+ boost::signals2::connection
listen_int_variable_change
( const std::string& name, const boost::function<void (int)>& f );
- boost::signals::connection
+ boost::signals2::connection
listen_uint_variable_change
( const std::string& name,
const boost::function<void (unsigned int)>& f );
- boost::signals::connection
+ boost::signals2::connection
listen_bool_variable_change
( const std::string& name, const boost::function<void (bool)>& f );
- boost::signals::connection
+ boost::signals2::connection
listen_double_variable_change
( const std::string& name, const boost::function<void (double)>& f );
- boost::signals::connection
+ boost::signals2::connection
listen_string_variable_change
( const std::string& name,
const boost::function<void (std::string)>& f );
@@ -201,7 +201,7 @@
( const std::list<std::string>& args, const char sep );
template<typename T>
- boost::signals::connection
+ boost::signals2::connection
listen_variable_change
( const std::string& name, boost::function<void (T)> f );
--- a/bear-engine/core/src/engine/variable/code/var_map.cpp
+++ b/bear-engine/core/src/engine/variable/code/var_map.cpp
@@ -36,7 +36,7 @@
*/
template<typename T>
void bear::engine::var_map::delete_signal::operator()
- ( const std::string& name, boost::signal<void (T)>* value ) const
+ ( const std::string& name, boost::signals2::signal<void (T)>* value ) const
{
delete value;
} // var_map::delete_signal::operator()()
@@ -65,7 +65,7 @@
void bear::engine::var_map::trigger_signal::operator()
( const std::string& name, const T& value ) const
{
- typedef boost::signal<void (T)>* signal_type;
+ typedef boost::signals2::signal<void (T)>* signal_type;
if ( m_signals.exists<signal_type>(name) )
(*m_signals.get<signal_type>(name))(value);
@@ -102,7 +102,7 @@
{
if ( !m_map.exists<T>(name) )
{
- typedef boost::signal<void (T)>* signal_type;
+ typedef boost::signals2::signal<void (T)>* signal_type;
if ( m_signals.exists<signal_type>(name) )
{
--- a/bear-engine/core/src/engine/variable/impl/var_map.tpp
+++ b/bear-engine/core/src/engine/variable/impl/var_map.tpp
@@ -37,10 +37,10 @@
* \param name The name of the variable to listen.
*/
template<typename T>
-boost::signal<void (T)>&
+boost::signals2::signal<void (T)>&
bear::engine::var_map::variable_changed( const std::string& name )
{
- typedef boost::signal<void (T)> signal_type;
+ typedef boost::signals2::signal<void (T)> signal_type;
if ( !m_signals.exists<signal_type*>(name) )
m_signals.set<signal_type*>( name, new signal_type() );
@@ -69,7 +69,7 @@
else
super::set<T>(k, v);
- typedef boost::signal<void (T)> signal_type;
+ typedef boost::signals2::signal<void (T)> signal_type;
if ( signal && m_signals.exists<signal_type*>(k) )
(*m_signals.get<signal_type*>(k))(v);
--- a/bear-engine/core/src/engine/variable/var_map.hpp
+++ b/bear-engine/core/src/engine/variable/var_map.hpp
@@ -36,7 +36,7 @@
#include <claw/meta/type_list.hpp>
#include <string>
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
namespace bear
{
@@ -59,9 +59,9 @@
/** \brief The types of the signals used to observe the variables. */
typedef claw::meta::type_list_maker
- < boost::signal<void (int)>*, boost::signal<void (unsigned int)>*,
- boost::signal<void (bool)>*, boost::signal<void (double)>*,
- boost::signal<void (std::string)>* >::result signal_types;
+ < boost::signals2::signal<void (int)>*, boost::signals2::signal<void (unsigned int)>*,
+ boost::signals2::signal<void (bool)>*, boost::signals2::signal<void (double)>*,
+ boost::signals2::signal<void (std::string)>* >::result signal_types;
/**
* \brief The map containing the signals associated with the variables.
@@ -78,7 +78,7 @@
public:
template<typename T>
void operator()
- ( const std::string& name, boost::signal<void (T)>* value ) const;
+ ( const std::string& name, boost::signals2::signal<void (T)>* value ) const;
}; // class delete_signal
@@ -133,7 +133,7 @@
var_map& operator=( const var_map& that );
template<typename T>
- boost::signal<void (T)>& variable_changed( const std::string& name );
+ boost::signals2::signal<void (T)>& variable_changed( const std::string& name );
template<typename T>
void set( const std::string& k, const T& v );
--- a/plee-the-bear/src/ptb/item/code/power_effect.cpp
+++ b/plee-the-bear/src/ptb/item/code/power_effect.cpp
@@ -127,12 +127,12 @@
/*----------------------------------------------------------------------------*/
/**
- * \brief Add a connection to a boost::signals instance.
+ * \brief Add a connection to a boost::signals2 instance.
* \param c The connection to follow.
*/
-void ptb::power_effect::connect( const boost::signals::connection& c )
+void ptb::power_effect::connect( const boost::signals2::connection& c )
{
- m_signals.push_back( new boost::signals::scoped_connection(c) );
+ m_signals.push_back( new boost::signals2::scoped_connection(c) );
} // power_effect::connect()
/*----------------------------------------------------------------------------*/
--- a/plee-the-bear/src/ptb/item/power_effect.hpp
+++ b/plee-the-bear/src/ptb/item/power_effect.hpp
@@ -35,7 +35,7 @@
#include "universe/forced_movement/forced_rotation.hpp"
#include <claw/smart_ptr.hpp>
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
namespace ptb
{
@@ -59,7 +59,7 @@
private:
typedef
- std::list< claw::memory::smart_ptr<boost::signals::scoped_connection> >
+ std::list< claw::memory::smart_ptr<boost::signals2::scoped_connection> >
signal_connection_list;
public:
@@ -72,7 +72,7 @@
( std::list<bear::universe::physical_item*>& d ) const;
private:
- void connect( const boost::signals::connection& c );
+ void connect( const boost::signals2::connection& c );
std::size_t get_powers_count() const;
--- a/plee-the-bear/src/ptb/layer/status_layer.hpp
+++ b/plee-the-bear/src/ptb/layer/status_layer.hpp
@@ -181,7 +181,7 @@
const static double s_bar_length;
/** \brief The connections to various signals. */
- std::list<boost::signals::connection> m_signals;
+ std::list<boost::signals2::connection> m_signals;
}; // class player_status
@@ -283,7 +283,7 @@
const static unsigned int s_margin;
/** \brief The connections to various signals. */
- std::list<boost::signals::connection> m_signals;
+ std::list<boost::signals2::connection> m_signals;
}; // class status_layer
} // namespace ptb
--- a/plee-the-bear/src/ptb/player_signals.hpp
+++ b/plee-the-bear/src/ptb/player_signals.hpp
@@ -29,7 +29,7 @@
#ifndef __PTB_PLAYER_SIGNALS_HPP__
#define __PTB_PLAYER_SIGNALS_HPP__
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
namespace ptb
{
@@ -41,37 +41,37 @@
{
public:
/** \brief The signal when the player enters in the water. */
- boost::signal<void ()> enters_water_zone;
+ boost::signals2::signal<void ()> enters_water_zone;
/** \brief The signal when the player leaves the water. */
- boost::signal<void ()> leaves_water_zone;
+ boost::signals2::signal<void ()> leaves_water_zone;
/** \brief The signal when the the oxygen gauge changes. */
- boost::signal<void (double)> oxygen_gauge_changed;
+ boost::signals2::signal<void (double)> oxygen_gauge_changed;
/** \brief The signal when the player enters in a cold zone. */
- boost::signal<void ()> enters_cold_zone;
+ boost::signals2::signal<void ()> enters_cold_zone;
/** \brief The signal when the player gos in a cold zone. */
- boost::signal<void ()> leaves_cold_zone;
+ boost::signals2::signal<void ()> leaves_cold_zone;
/** \brief The signal when the the ice gauge changes. */
- boost::signal<void (double)> cold_gauge_changed;
+ boost::signals2::signal<void (double)> cold_gauge_changed;
/** \brief The signal when the player enters in a heat zone. */
- boost::signal<void ()> enters_heat_zone;
+ boost::signals2::signal<void ()> enters_heat_zone;
/** \brief The signal when the player leaves in a heat zone. */
- boost::signal<void ()> leaves_heat_zone;
+ boost::signals2::signal<void ()> leaves_heat_zone;
/** \brief The signal when the the heat gauge changes. */
- boost::signal<void (double)> heat_gauge_changed;
+ boost::signals2::signal<void (double)> heat_gauge_changed;
/** \brief The signal when the player wins energy. */
- boost::signal<void (double)> energy_added;
+ boost::signals2::signal<void (double)> energy_added;
/** \brief The signal when the player loses energy. */
- boost::signal<void (double)> energy_removed;
+ boost::signals2::signal<void (double)> energy_removed;
}; // class player_signals
} // namespace ptb
--- a/plee-the-bear/src/ptb/throwable_item/throwable_items_container.hpp
+++ b/plee-the-bear/src/ptb/throwable_item/throwable_items_container.hpp
@@ -32,7 +32,7 @@
#include "ptb/throwable_item/throwable_item.hpp"
#include "universe/types.hpp"
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
#include <map>
namespace ptb
@@ -80,10 +80,10 @@
public:
/** \brief The signal when the selected throwable item changes. */
- boost::signal<void (const std::string&)> throwable_item_changed;
+ boost::signals2::signal<void (const std::string&)> throwable_item_changed;
/** \brief The signal when stock of current throwable item changes. */
- boost::signal<void (unsigned int)> throwable_item_stock_changed;
+ boost::signals2::signal<void (unsigned int)> throwable_item_stock_changed;
}; // class throwable_items_container
} // namespace ptb
|