0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixup 79adc68

Browse source
This commit is contained in:
Charles Dang 2018-06-08 20:05:51 +11:00
parent 424e0e0ab4
commit ea5945b357
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/tests/gui/fire_event.cpp
View file

@ -80,7 +80,7 @@ static void add_widget(gui2::grid& grid
, const unsigned row , const unsigned row
, const unsigned column) , const unsigned column)
{ {
BOOST_REQUIRE_NE(widget, static_cast<gui2::widget*>(nullptr)); BOOST_REQUIRE_NE(widget.get(), static_cast<gui2::widget*>(nullptr));
widget->set_id(id); widget->set_id(id);
grid.set_child(widget grid.set_child(widget
@ -130,11 +130,11 @@ BOOST_AUTO_TEST_CASE(test_fire_event)
grid.set_id("root"); grid.set_id("root");
connect_signals(sstr, grid); connect_signals(sstr, grid);
auto child_grid = std::make_shared<grid>(1, 1); auto child_grid = std::make_shared<gui2::grid>(1, 1);
add_widget(grid, child_grid, "level 1", 0, 0); add_widget(grid, child_grid, "level 1", 0, 0);
connect_signals(sstr, *child_grid); connect_signals(sstr, *child_grid);
auto child = std::make_shared<grid>(1, 1); auto child = std::make_shared<gui2:grid>(1, 1);
add_widget(*child_grid, child, "level 2", 0, 0); add_widget(*child_grid, child, "level 2", 0, 0);
connect_signals(sstr, *child); connect_signals(sstr, *child);

18
src/tests/gui/iterator.cpp
View file

@ -110,7 +110,7 @@ static void add_widget(gui2::grid& grid
, const unsigned row , const unsigned row
, const unsigned column) , const unsigned column)
{ {
BOOST_REQUIRE_NE(widget, static_cast<gui2::widget*>(nullptr)); BOOST_REQUIRE_NE(widget.get(), static_cast<gui2::widget*>(nullptr));
widget->set_id(id); widget->set_id(id);
grid.set_child(widget grid.set_child(widget
@ -182,16 +182,16 @@ static void test_grid()
gui2::grid grid(2 ,2); gui2::grid grid(2 ,2);
grid.set_id("0"); grid.set_id("0");
auto g = std::make_shared<grid>(2, 2); auto g = std::make_shared<gui2::grid>(2, 2);
add_widget(grid, g, "1", 0, 0); add_widget(grid, g, "1", 0, 0);
add_widget(grid, gui2::build_single_widget_and_cast_to<label>();, "2", 1, 0); add_widget(grid, gui2::build_single_widget_and_cast_to<gui2::label>(), "2", 1, 0);
add_widget(grid, gui2::build_single_widget_and_cast_to<label>(), "3", 0, 1); add_widget(grid, gui2::build_single_widget_and_cast_to<gui2::label>(), "3", 0, 1);
add_widget(grid, gui2::build_single_widget_and_cast_to<label>(), "4", 1, 1); add_widget(grid, gui2::build_single_widget_and_cast_to<gui2::label>(), "4", 1, 1);
add_widget(*g, gui2::build_single_widget_and_cast_to<label>(), "5", 0, 0); add_widget(*g, gui2::build_single_widget_and_cast_to<gui2::label>(), "5", 0, 0);
add_widget(*g, gui2::build_single_widget_and_cast_to<label>(), "6", 1, 0); add_widget(*g, gui2::build_single_widget_and_cast_to<gui2::label>(), "6", 1, 0);
add_widget(*g, gui2::build_single_widget_and_cast_to<label>(), "7", 0, 1); add_widget(*g, gui2::build_single_widget_and_cast_to<gui2::label>(), "7", 0, 1);
add_widget(*g, gui2::build_single_widget_and_cast_to<label>(), "8", 1, 1); add_widget(*g, gui2::build_single_widget_and_cast_to<gui2::label>(), "8", 1, 1);
{ {
std::stringstream sstr; std::stringstream sstr;

10
src/tests/gui/visitor.cpp
View file

@ -30,7 +30,7 @@ static void add_widget(gui2::grid& grid
, const unsigned row , const unsigned row
, const unsigned column) , const unsigned column)
{ {
BOOST_REQUIRE_NE(widget, static_cast<gui2::widget*>(nullptr)); BOOST_REQUIRE_NE(widget.get(), static_cast<gui2::widget*>(nullptr));
widget->set_id(id); widget->set_id(id);
grid.set_child(widget grid.set_child(widget
@ -94,10 +94,10 @@ static void test_grid()
/* Test the child part here. */ /* Test the child part here. */
gui2::grid grid(2 ,2); gui2::grid grid(2 ,2);
add_widget(grid, gui2::build_single_widget_and_cast_to<label>(), "(1,1)", 0, 0); add_widget(grid, gui2::build_single_widget_and_cast_to<gui2::label>(), "(1,1)", 0, 0);
add_widget(grid, gui2::build_single_widget_and_cast_to<label>(), "(1,2)", 0, 1); add_widget(grid, gui2::build_single_widget_and_cast_to<gui2::label>(), "(1,2)", 0, 1);
add_widget(grid, gui2::build_single_widget_and_cast_to<label>(), "(2,1)", 1, 0); add_widget(grid, gui2::build_single_widget_and_cast_to<gui2::label>(), "(2,1)", 1, 0);
add_widget(grid, gui2::build_single_widget_and_cast_to<label>(), "(2,2)", 1, 1); add_widget(grid, gui2::build_single_widget_and_cast_to<gui2::label>(), "(2,2)", 1, 1);
const std::unique_ptr<gui2::iteration::walker_base> visitor(grid.create_walker()); const std::unique_ptr<gui2::iteration::walker_base> visitor(grid.create_walker());