[Wesnoth-commits] r51502 - /trunk/src/tests/gui/visitor.cpp

[koraq]

Author: mordante
Date: Sat Oct 15 20:06:49 2011
New Revision: 51502

URL: http://svn.gna.org/viewcvs/wesnoth?rev=51502&view=rev
Log:
Remove some old-style-casts.

Modified:
    trunk/src/tests/gui/visitor.cpp

Modified: trunk/src/tests/gui/visitor.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/tests/gui/visitor.cpp?rev=51502&r1=51501&r2=51502&view=diff
==============================================================================
--- trunk/src/tests/gui/visitor.cpp (original)
+++ trunk/src/tests/gui/visitor.cpp Sat Oct 15 20:06:49 2011
@@ -31,7 +31,7 @@
                , 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 @@
        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 @@
        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 @@
        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 @@
 
        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 @@
 
        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 @@
 
        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 @@
 
        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 @@
 
        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 *****/
 


_______________________________________________
Wesnoth-commits mailing list
Wesnoth-commits@gna.org
https://mail.gna.org/listinfo/wesnoth-commits