1
--- a/bear-engine/core/src/engine/code/game.cpp
2
+++ b/bear-engine/core/src/engine/code/game.cpp
4
* \param name The name of the variable.
5
* \param f The listener.
7
-boost::signals::connection
8
+boost::signals2::connection
9
bear::engine::game::listen_int_variable_change
10
( const std::string& name, const boost::function<void (int)>& f )
13
* \param name The name of the variable.
14
* \param f The listener.
16
-boost::signals::connection
17
+boost::signals2::connection
18
bear::engine::game::listen_uint_variable_change
19
( const std::string& name, const boost::function<void (unsigned int)>& f )
22
* \param name The name of the variable.
23
* \param f The listener.
25
-boost::signals::connection
26
+boost::signals2::connection
27
bear::engine::game::listen_bool_variable_change
28
( const std::string& name, const boost::function<void (bool)>& f )
31
* \param name The name of the variable.
32
* \param f The listener.
34
-boost::signals::connection
35
+boost::signals2::connection
36
bear::engine::game::listen_double_variable_change
37
( const std::string& name, const boost::function<void (double)>& f )
40
* \param name The name of the variable.
41
* \param f The listener.
43
-boost::signals::connection
44
+boost::signals2::connection
45
bear::engine::game::listen_string_variable_change
46
( const std::string& name, const boost::function<void (std::string)>& f )
48
--- a/bear-engine/core/src/engine/code/game_local_client.cpp
49
+++ b/bear-engine/core/src/engine/code/game_local_client.cpp
51
* \param name The name of the variable.
52
* \param f The listener.
54
-boost::signals::connection
55
+boost::signals2::connection
56
bear::engine::game_local_client::listen_int_variable_change
57
( const std::string& name, const boost::function<void (int)>& f )
60
* \param name The name of the variable.
61
* \param f The listener.
63
-boost::signals::connection
64
+boost::signals2::connection
65
bear::engine::game_local_client::listen_uint_variable_change
66
( const std::string& name, const boost::function<void (unsigned int)>& f )
69
* \param name The name of the variable.
70
* \param f The listener.
72
-boost::signals::connection
73
+boost::signals2::connection
74
bear::engine::game_local_client::listen_bool_variable_change
75
( const std::string& name, const boost::function<void (bool)>& f )
78
* \param name The name of the variable.
79
* \param f The listener.
81
-boost::signals::connection
82
+boost::signals2::connection
83
bear::engine::game_local_client::listen_double_variable_change
84
( const std::string& name, const boost::function<void (double)>& f )
87
* \param name The name of the variable.
88
* \param f The listener.
90
-boost::signals::connection
91
+boost::signals2::connection
92
bear::engine::game_local_client::listen_string_variable_change
93
( const std::string& name, const boost::function<void (std::string)>& f )
96
* \param f The function to call when the value of the variable change.
99
-boost::signals::connection
100
+boost::signals2::connection
101
bear::engine::game_local_client::listen_variable_change
102
( const std::string& name, boost::function<void (T)> f )
104
--- a/bear-engine/core/src/engine/game.hpp
105
+++ b/bear-engine/core/src/engine/game.hpp
106
@@ -104,20 +104,20 @@
107
void save_game_variables
108
( std::ostream& os, const std::string& pattern = ".*" );
110
- boost::signals::connection
111
+ boost::signals2::connection
112
listen_int_variable_change
113
( const std::string& name, const boost::function<void (int)>& f );
114
- boost::signals::connection
115
+ boost::signals2::connection
116
listen_uint_variable_change
117
( const std::string& name,
118
const boost::function<void (unsigned int)>& f );
119
- boost::signals::connection
120
+ boost::signals2::connection
121
listen_bool_variable_change
122
( const std::string& name, const boost::function<void (bool)>& f );
123
- boost::signals::connection
124
+ boost::signals2::connection
125
listen_double_variable_change
126
( const std::string& name, const boost::function<void (double)>& f );
127
- boost::signals::connection
128
+ boost::signals2::connection
129
listen_string_variable_change
130
( const std::string& name,
131
const boost::function<void (const std::string)>& f );
132
--- a/bear-engine/core/src/engine/game_local_client.hpp
133
+++ b/bear-engine/core/src/engine/game_local_client.hpp
134
@@ -137,20 +137,20 @@
135
bool game_variable_exists( const base_variable& val ) const;
136
void get_all_game_variables( var_map& vars ) const;
138
- boost::signals::connection
139
+ boost::signals2::connection
140
listen_int_variable_change
141
( const std::string& name, const boost::function<void (int)>& f );
142
- boost::signals::connection
143
+ boost::signals2::connection
144
listen_uint_variable_change
145
( const std::string& name,
146
const boost::function<void (unsigned int)>& f );
147
- boost::signals::connection
148
+ boost::signals2::connection
149
listen_bool_variable_change
150
( const std::string& name, const boost::function<void (bool)>& f );
151
- boost::signals::connection
152
+ boost::signals2::connection
153
listen_double_variable_change
154
( const std::string& name, const boost::function<void (double)>& f );
155
- boost::signals::connection
156
+ boost::signals2::connection
157
listen_string_variable_change
158
( const std::string& name,
159
const boost::function<void (std::string)>& f );
161
( const std::list<std::string>& args, const char sep );
164
- boost::signals::connection
165
+ boost::signals2::connection
166
listen_variable_change
167
( const std::string& name, boost::function<void (T)> f );
169
--- a/bear-engine/core/src/engine/variable/code/var_map.cpp
170
+++ b/bear-engine/core/src/engine/variable/code/var_map.cpp
174
void bear::engine::var_map::delete_signal::operator()
175
- ( const std::string& name, boost::signal<void (T)>* value ) const
176
+ ( const std::string& name, boost::signals2::signal<void (T)>* value ) const
179
} // var_map::delete_signal::operator()()
181
void bear::engine::var_map::trigger_signal::operator()
182
( const std::string& name, const T& value ) const
184
- typedef boost::signal<void (T)>* signal_type;
185
+ typedef boost::signals2::signal<void (T)>* signal_type;
187
if ( m_signals.exists<signal_type>(name) )
188
(*m_signals.get<signal_type>(name))(value);
191
if ( !m_map.exists<T>(name) )
193
- typedef boost::signal<void (T)>* signal_type;
194
+ typedef boost::signals2::signal<void (T)>* signal_type;
196
if ( m_signals.exists<signal_type>(name) )
198
--- a/bear-engine/core/src/engine/variable/impl/var_map.tpp
199
+++ b/bear-engine/core/src/engine/variable/impl/var_map.tpp
201
* \param name The name of the variable to listen.
204
-boost::signal<void (T)>&
205
+boost::signals2::signal<void (T)>&
206
bear::engine::var_map::variable_changed( const std::string& name )
208
- typedef boost::signal<void (T)> signal_type;
209
+ typedef boost::signals2::signal<void (T)> signal_type;
211
if ( !m_signals.exists<signal_type*>(name) )
212
m_signals.set<signal_type*>( name, new signal_type() );
217
- typedef boost::signal<void (T)> signal_type;
218
+ typedef boost::signals2::signal<void (T)> signal_type;
220
if ( signal && m_signals.exists<signal_type*>(k) )
221
(*m_signals.get<signal_type*>(k))(v);
222
--- a/bear-engine/core/src/engine/variable/var_map.hpp
223
+++ b/bear-engine/core/src/engine/variable/var_map.hpp
225
#include <claw/meta/type_list.hpp>
228
-#include <boost/signal.hpp>
229
+#include <boost/signals2.hpp>
235
/** \brief The types of the signals used to observe the variables. */
236
typedef claw::meta::type_list_maker
237
- < boost::signal<void (int)>*, boost::signal<void (unsigned int)>*,
238
- boost::signal<void (bool)>*, boost::signal<void (double)>*,
239
- boost::signal<void (std::string)>* >::result signal_types;
240
+ < boost::signals2::signal<void (int)>*, boost::signals2::signal<void (unsigned int)>*,
241
+ boost::signals2::signal<void (bool)>*, boost::signals2::signal<void (double)>*,
242
+ boost::signals2::signal<void (std::string)>* >::result signal_types;
245
* \brief The map containing the signals associated with the variables.
250
- ( const std::string& name, boost::signal<void (T)>* value ) const;
251
+ ( const std::string& name, boost::signals2::signal<void (T)>* value ) const;
253
}; // class delete_signal
256
var_map& operator=( const var_map& that );
259
- boost::signal<void (T)>& variable_changed( const std::string& name );
260
+ boost::signals2::signal<void (T)>& variable_changed( const std::string& name );
263
void set( const std::string& k, const T& v );
264
--- a/plee-the-bear/src/ptb/item/code/power_effect.cpp
265
+++ b/plee-the-bear/src/ptb/item/code/power_effect.cpp
266
@@ -127,12 +127,12 @@
268
/*----------------------------------------------------------------------------*/
270
- * \brief Add a connection to a boost::signals instance.
271
+ * \brief Add a connection to a boost::signals2 instance.
272
* \param c The connection to follow.
274
-void ptb::power_effect::connect( const boost::signals::connection& c )
275
+void ptb::power_effect::connect( const boost::signals2::connection& c )
277
- m_signals.push_back( new boost::signals::scoped_connection(c) );
278
+ m_signals.push_back( new boost::signals2::scoped_connection(c) );
279
} // power_effect::connect()
281
/*----------------------------------------------------------------------------*/
282
--- a/plee-the-bear/src/ptb/item/power_effect.hpp
283
+++ b/plee-the-bear/src/ptb/item/power_effect.hpp
285
#include "universe/forced_movement/forced_rotation.hpp"
287
#include <claw/smart_ptr.hpp>
288
-#include <boost/signals.hpp>
289
+#include <boost/signals2.hpp>
297
- std::list< claw::memory::smart_ptr<boost::signals::scoped_connection> >
298
+ std::list< claw::memory::smart_ptr<boost::signals2::scoped_connection> >
299
signal_connection_list;
303
( std::list<bear::universe::physical_item*>& d ) const;
306
- void connect( const boost::signals::connection& c );
307
+ void connect( const boost::signals2::connection& c );
309
std::size_t get_powers_count() const;
311
--- a/plee-the-bear/src/ptb/layer/status_layer.hpp
312
+++ b/plee-the-bear/src/ptb/layer/status_layer.hpp
314
const static double s_bar_length;
316
/** \brief The connections to various signals. */
317
- std::list<boost::signals::connection> m_signals;
318
+ std::list<boost::signals2::connection> m_signals;
320
}; // class player_status
323
const static unsigned int s_margin;
325
/** \brief The connections to various signals. */
326
- std::list<boost::signals::connection> m_signals;
327
+ std::list<boost::signals2::connection> m_signals;
329
}; // class status_layer
331
--- a/plee-the-bear/src/ptb/player_signals.hpp
332
+++ b/plee-the-bear/src/ptb/player_signals.hpp
334
#ifndef __PTB_PLAYER_SIGNALS_HPP__
335
#define __PTB_PLAYER_SIGNALS_HPP__
337
-#include <boost/signal.hpp>
338
+#include <boost/signals2.hpp>
345
/** \brief The signal when the player enters in the water. */
346
- boost::signal<void ()> enters_water_zone;
347
+ boost::signals2::signal<void ()> enters_water_zone;
349
/** \brief The signal when the player leaves the water. */
350
- boost::signal<void ()> leaves_water_zone;
351
+ boost::signals2::signal<void ()> leaves_water_zone;
353
/** \brief The signal when the the oxygen gauge changes. */
354
- boost::signal<void (double)> oxygen_gauge_changed;
355
+ boost::signals2::signal<void (double)> oxygen_gauge_changed;
357
/** \brief The signal when the player enters in a cold zone. */
358
- boost::signal<void ()> enters_cold_zone;
359
+ boost::signals2::signal<void ()> enters_cold_zone;
361
/** \brief The signal when the player gos in a cold zone. */
362
- boost::signal<void ()> leaves_cold_zone;
363
+ boost::signals2::signal<void ()> leaves_cold_zone;
365
/** \brief The signal when the the ice gauge changes. */
366
- boost::signal<void (double)> cold_gauge_changed;
367
+ boost::signals2::signal<void (double)> cold_gauge_changed;
369
/** \brief The signal when the player enters in a heat zone. */
370
- boost::signal<void ()> enters_heat_zone;
371
+ boost::signals2::signal<void ()> enters_heat_zone;
373
/** \brief The signal when the player leaves in a heat zone. */
374
- boost::signal<void ()> leaves_heat_zone;
375
+ boost::signals2::signal<void ()> leaves_heat_zone;
377
/** \brief The signal when the the heat gauge changes. */
378
- boost::signal<void (double)> heat_gauge_changed;
379
+ boost::signals2::signal<void (double)> heat_gauge_changed;
381
/** \brief The signal when the player wins energy. */
382
- boost::signal<void (double)> energy_added;
383
+ boost::signals2::signal<void (double)> energy_added;
385
/** \brief The signal when the player loses energy. */
386
- boost::signal<void (double)> energy_removed;
387
+ boost::signals2::signal<void (double)> energy_removed;
388
}; // class player_signals
391
--- a/plee-the-bear/src/ptb/throwable_item/throwable_items_container.hpp
392
+++ b/plee-the-bear/src/ptb/throwable_item/throwable_items_container.hpp
394
#include "ptb/throwable_item/throwable_item.hpp"
395
#include "universe/types.hpp"
397
-#include <boost/signal.hpp>
398
+#include <boost/signals2.hpp>
405
/** \brief The signal when the selected throwable item changes. */
406
- boost::signal<void (const std::string&)> throwable_item_changed;
407
+ boost::signals2::signal<void (const std::string&)> throwable_item_changed;
409
/** \brief The signal when stock of current throwable item changes. */
410
- boost::signal<void (unsigned int)> throwable_item_stock_changed;
411
+ boost::signals2::signal<void (unsigned int)> throwable_item_stock_changed;
412
}; // class throwable_items_container
added
removed
debian/patches/ptb-signals-v2.diff
