widelands

Merge lp:~widelands-dev/widelands/boost-signals2 into lp:widelands

  1. boost-signals2
  2. Merge into trunk
Proposed by Jens Beyer
Status: Merged
Merged at revision: 6695
Proposed branch: lp:~widelands-dev/widelands/boost-signals2
Merge into: lp:widelands
Diff against target: 601 lines (+71/-71)
28 files modified
CMakeLists.txt (+2/-2)
src/game_io/game_loader.cc (+1/-1)
src/logic/building.cc (+1/-1)
src/logic/building.h (+3/-3)
src/logic/instances.h (+2/-2)
src/logic/message.h (+1/-1)
src/logic/player.cc (+1/-1)
src/logic/warelist.h (+2/-2)
src/ui_basic/button.h (+4/-4)
src/ui_basic/checkbox.h (+4/-4)
src/ui_basic/editbox.h (+4/-4)
src/ui_basic/icongrid.h (+4/-4)
src/ui_basic/listselect.h (+4/-4)
src/ui_basic/messagebox.h (+4/-4)
src/ui_basic/multilineeditbox.h (+2/-2)
src/ui_basic/panel.h (+2/-2)
src/ui_basic/radiobutton.h (+3/-3)
src/ui_basic/scrollbar.h (+2/-2)
src/ui_basic/slider.h (+5/-5)
src/ui_basic/table.h (+5/-5)
src/wui/building_ui.cc (+1/-1)
src/wui/fieldaction.cc (+3/-3)
src/wui/gamechatpanel.h (+2/-2)
src/wui/mapview.h (+3/-3)
src/wui/minimap.h (+2/-2)
src/wui/waresdisplay.cc (+1/-1)
src/wui/waresdisplay.h (+2/-2)
src/wui/watchwindow.cc (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/boost-signals2
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+178361@code.launchpad.net

Description of the change

Just for the kicks of it, I ported to (what I think is) boost signals2 ;-)

It compiles and runs fine on Ubuntu 12.04 LTS (with boost 1.46.1).

I also set boost 1.46.1 as minimum required boost version just to make sure, but I am open to set it to 1.39 as this is the version of the last stable API (as hjd says).

To post a comment you must log in.
Revision history for this message
SirVer (sirver) wrote :

Compiles for me and the changes are very straightforward. Merged. Thanks for looking into this Jens!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-07-23 18:09:24 +0000
3+++ CMakeLists.txt 2013-08-02 18:49:35 +0000
4@@ -117,7 +117,7 @@
5 set (Boost_FIND_COMPONENTS unit_test_framework signals)
6 set (Boost_USE_MULTITHREADED ON)
7 set (Boost_DETAILED_FAILURE_MSG ON)
8- find_package(Boost 1.35.0 COMPONENTS unit_test_framework signals REQUIRED)
9+ find_package(Boost 1.46.1 COMPONENTS unit_test_framework signals REQUIRED)
10
11 if (NOT DEFINED MSVC)
12 # If boost unit test library is linked dynamically, BOOST_TEST_DYN_LINK must be defined
13@@ -150,7 +150,7 @@
14 endif(DEFINED MSVC)
15 set (Boost_USE_MULTITHREADED ON)
16 set (Boost_DETAILED_FAILURE_MSG ON)
17- find_package(Boost 1.35.0 COMPONENTS signals REQUIRED)
18+ find_package(Boost 1.46.1 COMPONENTS signals REQUIRED)
19 endif (WL_UNIT_TESTS)
20
21 option (WL_STRICT "If strict compilation mode is requested (almost every warning is an error)" OFF)
22
23=== modified file 'src/game_io/game_loader.cc'
24--- src/game_io/game_loader.cc 2013-07-27 15:09:18 +0000
25+++ src/game_io/game_loader.cc 2013-08-02 18:49:35 +0000
26@@ -20,7 +20,7 @@
27 #include "game_io/game_loader.h"
28
29 #include <boost/bind.hpp>
30-#include <boost/signal.hpp>
31+#include <boost/signals2.hpp>
32
33 #include "game_io/game_cmd_queue_data_packet.h"
34 #include "game_io/game_game_class_data_packet.h"
35
36=== modified file 'src/logic/building.cc'
37--- src/logic/building.cc 2013-07-27 10:37:24 +0000
38+++ src/logic/building.cc 2013-08-02 18:49:35 +0000
39@@ -448,7 +448,7 @@
40
41 PlayerImmovable::cleanup(egbase);
42
43- BOOST_FOREACH(boost::signals::connection& c, options_window_connections)
44+ BOOST_FOREACH(boost::signals2::connection& c, options_window_connections)
45 c.disconnect();
46 }
47
48
49=== modified file 'src/logic/building.h'
50--- src/logic/building.h 2013-07-26 20:19:36 +0000
51+++ src/logic/building.h 2013-08-02 18:49:35 +0000
52@@ -24,7 +24,7 @@
53 #include <string>
54 #include <vector>
55
56-#include <boost/signal.hpp>
57+#include <boost/signals2.hpp>
58
59 #include "ai/ai_hints.h"
60 #include "logic/buildcost.h"
61@@ -261,7 +261,7 @@
62
63 void add_worker(Worker &);
64 void remove_worker(Worker &);
65- mutable boost::signal<void ()> workers_changed;
66+ mutable boost::signals2::signal<void ()> workers_changed;
67
68 void send_message
69 (Game & game,
70@@ -308,7 +308,7 @@
71 bool m_seeing;
72
73 // Signals connected for the option window
74- std::vector<boost::signals::connection> options_window_connections;
75+ std::vector<boost::signals2::connection> options_window_connections;
76
77 // The former buildings descrs, with the current one in last position.
78 FormerBuildings m_old_buildings;
79
80=== modified file 'src/logic/instances.h'
81--- src/logic/instances.h 2013-07-27 15:09:18 +0000
82+++ src/logic/instances.h 2013-08-02 18:49:35 +0000
83@@ -28,7 +28,7 @@
84 #include <boost/function.hpp>
85 #include <boost/noncopyable.hpp>
86 #include <boost/unordered_map.hpp>
87-#include <boost/signal.hpp>
88+#include <boost/signals2.hpp>
89
90 #include "logic/cmd_queue.h"
91 #include "log.h"
92@@ -202,7 +202,7 @@
93 * the game. No conncetion is handled in this class.
94 * \param serial : the object serial
95 */
96- boost::signal<void(uint32_t)> removed;
97+ boost::signals2::signal<void(uint32_t)> removed;
98
99 /**
100 * Attributes are fixed boolean properties of an object.
101
102=== modified file 'src/logic/message.h'
103--- src/logic/message.h 2013-07-27 15:09:18 +0000
104+++ src/logic/message.h 2013-08-02 18:49:35 +0000
105@@ -21,7 +21,7 @@
106 #define MESSAGE_H
107
108 #include <string>
109-#include <boost/signal.hpp>
110+#include <boost/signals2.hpp>
111
112 #include "logic/widelands.h"
113 #include "logic/widelands_geometry.h"
114
115=== modified file 'src/logic/player.cc'
116--- src/logic/player.cc 2013-08-01 08:33:15 +0000
117+++ src/logic/player.cc 2013-08-02 18:49:35 +0000
118@@ -20,7 +20,7 @@
119 #include "logic/player.h"
120
121 #include <boost/bind.hpp>
122-#include <boost/signal.hpp>
123+#include <boost/signals2.hpp>
124
125 #include "economy/economy.h"
126 #include "economy/flag.h"
127
128=== modified file 'src/logic/warelist.h'
129--- src/logic/warelist.h 2013-07-26 20:19:36 +0000
130+++ src/logic/warelist.h 2013-08-02 18:49:35 +0000
131@@ -25,7 +25,7 @@
132
133 #include <SDL.h>
134 #include <boost/bind.hpp>
135-#include <boost/signal.hpp>
136+#include <boost/signals2.hpp>
137
138 #include "logic/widelands.h"
139
140@@ -62,7 +62,7 @@
141 bool operator== (const WareList &) const;
142 bool operator!= (const WareList & wl) const {return not (*this == wl);}
143
144- mutable boost::signal<void ()> changed;
145+ mutable boost::signals2::signal<void ()> changed;
146
147 private:
148 vector_type m_wares;
149
150=== modified file 'src/ui_basic/button.h'
151--- src/ui_basic/button.h 2013-07-26 20:19:36 +0000
152+++ src/ui_basic/button.h 2013-08-02 18:49:35 +0000
153@@ -22,7 +22,7 @@
154
155 #include <boost/bind.hpp>
156 #include <boost/function.hpp>
157-#include <boost/signal.hpp>
158+#include <boost/signals2.hpp>
159
160 #include "constants.h"
161 #include "ui_basic/panel.h"
162@@ -85,9 +85,9 @@
163 // If no background is drawn, the button is drawn over the current background
164 void set_draw_flat_background(bool set);
165
166- boost::signal<void ()> sigclicked;
167- boost::signal<void ()> sigmousein;
168- boost::signal<void ()> sigmouseout;
169+ boost::signals2::signal<void ()> sigclicked;
170+ boost::signals2::signal<void ()> sigmousein;
171+ boost::signals2::signal<void ()> sigmouseout;
172
173 protected:
174 virtual void clicked() {} /// Override this to react on the click.
175
176=== modified file 'src/ui_basic/checkbox.h'
177--- src/ui_basic/checkbox.h 2013-07-26 20:19:36 +0000
178+++ src/ui_basic/checkbox.h 2013-08-02 18:49:35 +0000
179@@ -20,7 +20,7 @@
180 #ifndef UI_CHECKBOX_H
181 #define UI_CHECKBOX_H
182
183-#include <boost/signals.hpp>
184+#include <boost/signals2.hpp>
185
186 #include "ui_basic/panel.h"
187 #include "rgbcolor.h"
188@@ -42,9 +42,9 @@
189 const std::string & tooltip_text = std::string());
190 ~Statebox();
191
192- boost::signal<void ()> changed;
193- boost::signal<void (bool)> changedto;
194- boost::signal<void (bool)> clickedto; // same as changedto but only called when clicked
195+ boost::signals2::signal<void ()> changed;
196+ boost::signals2::signal<void (bool)> changedto;
197+ boost::signals2::signal<void (bool)> clickedto; // same as changedto but only called when clicked
198
199 void set_enabled(bool enabled);
200
201
202=== modified file 'src/ui_basic/editbox.h'
203--- src/ui_basic/editbox.h 2013-07-26 20:19:36 +0000
204+++ src/ui_basic/editbox.h 2013-08-02 18:49:35 +0000
205@@ -21,7 +21,7 @@
206 #define UI_EDITBOX_H
207
208 #include <SDL_keyboard.h>
209-#include <boost/signal.hpp>
210+#include <boost/signals2.hpp>
211
212 #include "align.h"
213 #include "ui_basic/button.h"
214@@ -43,9 +43,9 @@
215 const Image* background = g_gr->images().get("pics/but2.png"), Align align = Align_Center);
216 virtual ~EditBox();
217
218- boost::signal<void ()> changed;
219- boost::signal<void ()> ok;
220- boost::signal<void ()> cancel;
221+ boost::signals2::signal<void ()> changed;
222+ boost::signals2::signal<void ()> ok;
223+ boost::signals2::signal<void ()> cancel;
224
225 const std::string & text() const;
226 void setText(const std::string &);
227
228=== modified file 'src/ui_basic/icongrid.h'
229--- src/ui_basic/icongrid.h 2013-07-26 20:19:36 +0000
230+++ src/ui_basic/icongrid.h 2013-08-02 18:49:35 +0000
231@@ -22,7 +22,7 @@
232
233 #include <vector>
234
235-#include <boost/signal.hpp>
236+#include <boost/signals2.hpp>
237
238 #include "ui_basic/panel.h"
239 #include "ui_basic/textarea.h"
240@@ -41,9 +41,9 @@
241 int32_t x, int32_t y, int32_t cellw, int32_t cellh,
242 int32_t cols);
243
244- boost::signal<void (int32_t)> clicked;
245- boost::signal<void (int32_t)> mouseout;
246- boost::signal<void (int32_t)> mousein;
247+ boost::signals2::signal<void (int32_t)> clicked;
248+ boost::signals2::signal<void (int32_t)> mouseout;
249+ boost::signals2::signal<void (int32_t)> mousein;
250
251 int32_t add
252 (const std::string & name,
253
254=== modified file 'src/ui_basic/listselect.h'
255--- src/ui_basic/listselect.h 2013-07-26 20:19:36 +0000
256+++ src/ui_basic/listselect.h 2013-08-02 18:49:35 +0000
257@@ -24,7 +24,7 @@
258 #include <deque>
259 #include <limits>
260
261-#include <boost/signal.hpp>
262+#include <boost/signals2.hpp>
263
264 #include "align.h"
265 #include "ui_basic/panel.h"
266@@ -51,9 +51,9 @@
267 bool show_check = false);
268 ~BaseListselect();
269
270- boost::signal<void (uint32_t)> selected;
271- boost::signal<void (uint32_t)> clicked;
272- boost::signal<void (uint32_t)> double_clicked;
273+ boost::signals2::signal<void (uint32_t)> selected;
274+ boost::signals2::signal<void (uint32_t)> clicked;
275+ boost::signals2::signal<void (uint32_t)> double_clicked;
276
277 void clear();
278 void sort
279
280=== modified file 'src/ui_basic/messagebox.h'
281--- src/ui_basic/messagebox.h 2013-07-26 20:19:36 +0000
282+++ src/ui_basic/messagebox.h 2013-08-02 18:49:35 +0000
283@@ -20,7 +20,7 @@
284 #ifndef UI_MESSAGEBOX_H
285 #define UI_MESSAGEBOX_H
286
287-#include <boost/signal.hpp>
288+#include <boost/signals2.hpp>
289
290 #include "align.h"
291 #include "ui_basic/window.h"
292@@ -61,9 +61,9 @@
293 Align = Align_Center);
294 ~WLMessageBox();
295
296- boost::signal<void ()> ok;
297- boost::signal<void ()> yes;
298- boost::signal<void ()> no;
299+ boost::signals2::signal<void ()> ok;
300+ boost::signals2::signal<void ()> yes;
301+ boost::signals2::signal<void ()> no;
302
303 bool handle_mousepress (Uint8 btn, int32_t mx, int32_t my);
304 bool handle_mouserelease(Uint8 btn, int32_t mx, int32_t my);
305
306=== modified file 'src/ui_basic/multilineeditbox.h'
307--- src/ui_basic/multilineeditbox.h 2013-07-26 20:19:36 +0000
308+++ src/ui_basic/multilineeditbox.h 2013-08-02 18:49:35 +0000
309@@ -20,7 +20,7 @@
310 #ifndef UI_MULTILINEEDITBOX_H
311 #define UI_MULTILINEEDITBOX_H
312
313-#include <boost/signal.hpp>
314+#include <boost/signals2.hpp>
315
316 #include "ui_basic/panel.h"
317
318@@ -36,7 +36,7 @@
319 Multiline_Editbox
320 (Panel *, int32_t x, int32_t y, uint32_t w, uint32_t h, const std::string & text);
321
322- boost::signal<void ()> changed;
323+ boost::signals2::signal<void ()> changed;
324
325 const std::string & get_text() const;
326 void set_text(const std::string &);
327
328=== modified file 'src/ui_basic/panel.h'
329--- src/ui_basic/panel.h 2013-07-26 19:16:51 +0000
330+++ src/ui_basic/panel.h 2013-08-02 18:49:35 +0000
331@@ -28,7 +28,7 @@
332
333 #include <SDL_keyboard.h>
334 #include <boost/noncopyable.hpp>
335-#include <boost/signals/trackable.hpp>
336+#include <boost/signals2/trackable.hpp>
337
338 #include "point.h"
339
340@@ -57,7 +57,7 @@
341 * its desired size changes, this automatically changes the actual size (which then invokes
342 * \ref layout and \ref move_inside_parent).
343 */
344-struct Panel : boost::signals::trackable, boost::noncopyable {
345+struct Panel : boost::signals2::trackable, boost::noncopyable {
346 enum {
347 pf_handle_mouse = 1, ///< receive mouse events
348 pf_think = 2, ///< call think() function during run
349
350=== modified file 'src/ui_basic/radiobutton.h'
351--- src/ui_basic/radiobutton.h 2013-07-26 20:19:36 +0000
352+++ src/ui_basic/radiobutton.h 2013-08-02 18:49:35 +0000
353@@ -58,9 +58,9 @@
354 Radiogroup();
355 ~Radiogroup();
356
357- boost::signal<void ()> changed;
358- boost::signal<void (int32_t)> changedto;
359- boost::signal<void ()> clicked; // clicked without things changed
360+ boost::signals2::signal<void ()> changed;
361+ boost::signals2::signal<void (int32_t)> changedto;
362+ boost::signals2::signal<void ()> clicked; // clicked without things changed
363
364 int32_t add_button
365 (Panel * parent, Point, const Image* pic, const std::string& tooltip = "", Radiobutton ** = nullptr);
366
367=== modified file 'src/ui_basic/scrollbar.h'
368--- src/ui_basic/scrollbar.h 2013-07-26 20:19:36 +0000
369+++ src/ui_basic/scrollbar.h 2013-08-02 18:49:35 +0000
370@@ -20,7 +20,7 @@
371 #ifndef UI_SCROLLBAR_H
372 #define UI_SCROLLBAR_H
373
374-#include <boost/signal.hpp>
375+#include <boost/signals2.hpp>
376
377 #include "ui_basic/panel.h"
378 #include "rect.h"
379@@ -50,7 +50,7 @@
380 (Panel * parent,
381 int32_t x, int32_t y, uint32_t w, uint32_t h, bool horiz);
382
383- boost::signal<void (int32_t)> moved;
384+ boost::signals2::signal<void (int32_t)> moved;
385
386 void set_steps(int32_t steps);
387 void set_singlestepsize(uint32_t singlestepsize);
388
389=== modified file 'src/ui_basic/slider.h'
390--- src/ui_basic/slider.h 2013-07-26 20:19:36 +0000
391+++ src/ui_basic/slider.h 2013-08-02 18:49:35 +0000
392@@ -19,7 +19,7 @@
393 #ifndef UI_SLIDER_H
394 #define UI_SLIDER_H
395
396-#include <boost/signal.hpp>
397+#include <boost/signals2.hpp>
398
399 #include "graphic/font.h"
400 #include "ui_basic/panel.h"
401@@ -85,8 +85,8 @@
402 void set_highlighted(bool highlighted);
403
404 public:
405- boost::signal<void ()> changed;
406- boost::signal<void (int32_t)> changedto;
407+ boost::signals2::signal<void ()> changed;
408+ boost::signals2::signal<void (int32_t)> changedto;
409
410 private:
411 int32_t m_min_value; // cursor values
412@@ -195,8 +195,8 @@
413
414 void set_labels(std::vector<std::string>);
415
416- boost::signal<void ()> changed;
417- boost::signal<void (int32_t)> changedto;
418+ boost::signals2::signal<void ()> changed;
419+ boost::signals2::signal<void (int32_t)> changedto;
420
421 protected:
422 virtual void draw(RenderTarget & dst);
423
424=== modified file 'src/ui_basic/table.h'
425--- src/ui_basic/table.h 2013-07-26 20:19:36 +0000
426+++ src/ui_basic/table.h 2013-08-02 18:49:35 +0000
427@@ -25,7 +25,7 @@
428 #include <vector>
429
430 #include <boost/function.hpp>
431-#include <boost/signal.hpp>
432+#include <boost/signals2.hpp>
433
434 #include "align.h"
435 #include "ui_basic/panel.h"
436@@ -54,8 +54,8 @@
437 bool descending = false);
438 ~Table();
439
440- boost::signal<void (uint32_t)> selected;
441- boost::signal<void (uint32_t)> double_clicked;
442+ boost::signals2::signal<void (uint32_t)> selected;
443+ boost::signals2::signal<void (uint32_t)> double_clicked;
444
445 /// A column that has a title is sortable (by clicking on the title).
446 void add_column
447@@ -160,8 +160,8 @@
448 bool descending = false);
449 ~Table();
450
451- boost::signal<void (uint32_t)> selected;
452- boost::signal<void (uint32_t)> double_clicked;
453+ boost::signals2::signal<void (uint32_t)> selected;
454+ boost::signals2::signal<void (uint32_t)> double_clicked;
455
456 void add_column
457 (uint32_t width,
458
459=== modified file 'src/wui/building_ui.cc'
460--- src/wui/building_ui.cc 2013-07-26 20:19:36 +0000
461+++ src/wui/building_ui.cc 2013-08-02 18:49:35 +0000
462@@ -57,7 +57,7 @@
463 */
464 void Building::hide_options()
465 {
466- BOOST_FOREACH(boost::signals::connection& c, options_window_connections)
467+ BOOST_FOREACH(boost::signals2::connection& c, options_window_connections)
468 c.disconnect();
469 delete m_optionswindow;
470 m_optionswindow = nullptr;
471
472=== modified file 'src/wui/fieldaction.cc'
473--- src/wui/fieldaction.cc 2013-07-26 20:19:36 +0000
474+++ src/wui/fieldaction.cc 2013-08-02 18:49:35 +0000
475@@ -65,9 +65,9 @@
476 int32_t x, int32_t y,
477 int32_t cols);
478
479- boost::signal<void (Widelands::Building_Index::value_t)> buildclicked;
480- boost::signal<void (Widelands::Building_Index::value_t)> buildmouseout;
481- boost::signal<void (Widelands::Building_Index::value_t)> buildmousein;
482+ boost::signals2::signal<void (Widelands::Building_Index::value_t)> buildclicked;
483+ boost::signals2::signal<void (Widelands::Building_Index::value_t)> buildmouseout;
484+ boost::signals2::signal<void (Widelands::Building_Index::value_t)> buildmousein;
485
486 void add(Widelands::Building_Index::value_t);
487
488
489=== modified file 'src/wui/gamechatpanel.h'
490--- src/wui/gamechatpanel.h 2013-07-26 19:16:51 +0000
491+++ src/wui/gamechatpanel.h 2013-08-02 18:49:35 +0000
492@@ -41,12 +41,12 @@
493 /**
494 * Signal is called when a message has been sent by the user.
495 */
496- boost::signal<void ()> sent;
497+ boost::signals2::signal<void ()> sent;
498
499 /**
500 * Signal is called when the user has aborted entering a message.
501 */
502- boost::signal<void ()> aborted;
503+ boost::signals2::signal<void ()> aborted;
504
505 const std::string & get_edit_text() const {return editbox.text();}
506 void set_edit_text(const std::string & text) {editbox.setText(text);}
507
508=== modified file 'src/wui/mapview.h'
509--- src/wui/mapview.h 2013-07-26 19:16:51 +0000
510+++ src/wui/mapview.h 2013-08-02 18:49:35 +0000
511@@ -21,7 +21,7 @@
512 #define MAPVIEW_H
513
514 #include <boost/function.hpp>
515-#include <boost/signal.hpp>
516+#include <boost/signals2.hpp>
517
518 #include "logic/widelands_geometry.h"
519 #include "ui_basic/panel.h"
520@@ -54,9 +54,9 @@
521 *
522 * Parameters are x/y position in screen coordinates.
523 */
524- boost::signal<void (int32_t, int32_t)> changeview;
525+ boost::signals2::signal<void (int32_t, int32_t)> changeview;
526
527- boost::signal<void ()> fieldclicked;
528+ boost::signals2::signal<void ()> fieldclicked;
529
530 void warp_mouse_to_node(Widelands::Coords);
531
532
533=== modified file 'src/wui/minimap.h'
534--- src/wui/minimap.h 2013-02-09 23:18:23 +0000
535+++ src/wui/minimap.h 2013-08-02 18:49:35 +0000
536@@ -20,7 +20,7 @@
537 #ifndef MINIMAP_H
538 #define MINIMAP_H
539
540-#include <boost/signal.hpp>
541+#include <boost/signals2.hpp>
542
543 #include "ui_basic/button.h"
544 #include "ui_basic/unique_window.h"
545@@ -36,7 +36,7 @@
546
547 MiniMap(Interactive_Base & parent, Registry *);
548
549- boost::signal<void (int32_t, int32_t)> warpview;
550+ boost::signals2::signal<void (int32_t, int32_t)> warpview;
551
552 void set_view_pos(int32_t const x, int32_t const y) {
553 m_view.set_view_pos(x, y);
554
555=== modified file 'src/wui/waresdisplay.cc'
556--- src/wui/waresdisplay.cc 2013-07-26 20:19:36 +0000
557+++ src/wui/waresdisplay.cc 2013-08-02 18:49:35 +0000
558@@ -275,7 +275,7 @@
559
560 void WaresDisplay::remove_all_warelists() {
561 m_warelists.clear();
562- BOOST_FOREACH(boost::signals::connection& c, connections_)
563+ BOOST_FOREACH(boost::signals2::connection& c, connections_)
564 c.disconnect();
565 connections_.clear();
566 update();
567
568=== modified file 'src/wui/waresdisplay.h'
569--- src/wui/waresdisplay.h 2013-07-26 19:16:51 +0000
570+++ src/wui/waresdisplay.h 2013-08-02 18:49:35 +0000
571@@ -22,7 +22,7 @@
572
573 #include <vector>
574
575-#include <boost/signal.hpp>
576+#include <boost/signals2.hpp>
577
578 #include "logic/tribe.h"
579 #include "logic/warelist.h"
580@@ -144,7 +144,7 @@
581 private:
582 typedef std::vector<const Widelands::WareList *> vector_type;
583 vector_type m_warelists;
584- std::vector<boost::signals::connection> connections_;
585+ std::vector<boost::signals2::connection> connections_;
586 };
587
588 std::string waremap_to_richtext
589
590=== modified file 'src/wui/watchwindow.cc'
591--- src/wui/watchwindow.cc 2013-07-26 20:19:36 +0000
592+++ src/wui/watchwindow.cc 2013-08-02 18:49:35 +0000
593@@ -58,7 +58,7 @@
594 return ref_cast<Interactive_GameBase, UI::Panel>(*get_parent()).game();
595 }
596
597- boost::signal<void (Point)> warp_mainview;
598+ boost::signals2::signal<void (Point)> warp_mainview;
599
600 void add_view(Widelands::Coords);
601 void next_view(bool first = false);

Subscribers

People subscribed via source and target branches

to status/vote changes: