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

Remove some old-style-casts.

Browse source
This commit is contained in:
Mark de Wever 2011-10-15 18:06:49 +00:00
parent e63088ad51
commit e35de2a8a7
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@ static void add_widget(gui2::tgrid& grid
, const unsigned row
, const unsigned column)
{
BOOST_REQUIRE_NE(widget, (gui2::twidget*)NULL);
BOOST_REQUIRE_NE(widget, static_cast<gui2::twidget*>(NULL));
widget->set_id(id);
grid.set_child(widget
@ -50,7 +50,7 @@ static void test_control()
T control;
std::auto_ptr<gui2::iterator::twalker_> visitor(control.create_walker());
BOOST_REQUIRE_NE(visitor.get(), (void*)NULL);
BOOST_REQUIRE_NE(visitor.get(), static_cast<void*>(NULL));
/***** INITIAL STATE *****/
@ -59,8 +59,8 @@ static void test_control()
BOOST_CHECK_EQUAL(visitor->at_end(gui2::iterator::twalker_::child), true);
BOOST_CHECK_EQUAL(visitor->get(gui2::iterator::twalker_::widget), &control);
BOOST_CHECK_EQUAL(visitor->get(gui2::iterator::twalker_::grid), (void*)NULL);
BOOST_CHECK_EQUAL(visitor->get(gui2::iterator::twalker_::child), (void*)NULL);
BOOST_CHECK_EQUAL(visitor->get(gui2::iterator::twalker_::grid), static_cast<void*>(NULL));
BOOST_CHECK_EQUAL(visitor->get(gui2::iterator::twalker_::child), static_cast<void*>(NULL));
/***** VISITING WIDGET *****/
@ -72,9 +72,9 @@ static void test_control()
BOOST_CHECK_EQUAL(visitor->at_end(gui2::iterator::twalker_::grid), true);
BOOST_CHECK_EQUAL(visitor->at_end(gui2::iterator::twalker_::child), true);
BOOST_CHECK_EQUAL(visitor->get(gui2::iterator::twalker_::widget), (void*)NULL);
BOOST_CHECK_EQUAL(visitor->get(gui2::iterator::twalker_::grid), (void*)NULL);
BOOST_CHECK_EQUAL(visitor->get(gui2::iterator::twalker_::child), (void*)NULL);
BOOST_CHECK_EQUAL(visitor->get(gui2::iterator::twalker_::widget), static_cast<void*>(NULL));
BOOST_CHECK_EQUAL(visitor->get(gui2::iterator::twalker_::grid), static_cast<void*>(NULL));
BOOST_CHECK_EQUAL(visitor->get(gui2::iterator::twalker_::child), static_cast<void*>(NULL));
/***** POST END *****/
@ -108,7 +108,7 @@ static void test_grid()
BOOST_CHECK_EQUAL(visitor->at_end(gui2::iterator::twalker_::child), false);
BOOST_REQUIRE_NE(visitor->get(gui2::iterator::twalker_::child), (void*)NULL);
BOOST_REQUIRE_NE(visitor->get(gui2::iterator::twalker_::child), static_cast<void*>(NULL));
BOOST_CHECK_EQUAL(visitor->get(gui2::iterator::twalker_::child)->id(), "(1,1)");
/***** LABEL 2,1 *****/
@ -117,7 +117,7 @@ static void test_grid()
BOOST_CHECK_EQUAL(visitor->at_end(gui2::iterator::twalker_::child), false);
BOOST_REQUIRE_NE(visitor->get(gui2::iterator::twalker_::child), (void*)NULL);
BOOST_REQUIRE_NE(visitor->get(gui2::iterator::twalker_::child), static_cast<void*>(NULL));
BOOST_CHECK_EQUAL(visitor->get(gui2::iterator::twalker_::child)->id(), "(2,1)");
/***** LABEL 1,2 *****/
@ -126,7 +126,7 @@ static void test_grid()
BOOST_CHECK_EQUAL(visitor->at_end(gui2::iterator::twalker_::child), false);
BOOST_REQUIRE_NE(visitor->get(gui2::iterator::twalker_::child), (void*)NULL);
BOOST_REQUIRE_NE(visitor->get(gui2::iterator::twalker_::child), static_cast<void*>(NULL));
BOOST_CHECK_EQUAL(visitor->get(gui2::iterator::twalker_::child)->id(), "(1,2)");
/***** LABEL 2,2 *****/
@ -135,7 +135,7 @@ static void test_grid()
BOOST_CHECK_EQUAL(visitor->at_end(gui2::iterator::twalker_::child), false);
BOOST_REQUIRE_NE(visitor->get(gui2::iterator::twalker_::child), (void*)NULL);
BOOST_REQUIRE_NE(visitor->get(gui2::iterator::twalker_::child), static_cast<void*>(NULL));
BOOST_CHECK_EQUAL(visitor->get(gui2::iterator::twalker_::child)->id(), "(2,2)");
/***** END *****/
@ -144,7 +144,7 @@ static void test_grid()
BOOST_CHECK_EQUAL(visitor->at_end(gui2::iterator::twalker_::child), true);
BOOST_CHECK_EQUAL(visitor->get(gui2::iterator::twalker_::child), (void*)NULL);
BOOST_CHECK_EQUAL(visitor->get(gui2::iterator::twalker_::child), static_cast<void*>(NULL));
/***** POST END *****/