[Wesnoth-cvs-commits] wesnoth/src multiplayer_connect.cpp multiplayer...

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    05/02/21 00:37:29

Modified files:
        src            : multiplayer_connect.cpp multiplayer_connect.hpp 

Log message:
        fixed Visual C++6 compile errors

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.105&tr2=1.106&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.hpp.diff?tr1=1.25&tr2=1.26&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.105 
wesnoth/src/multiplayer_connect.cpp:1.106
--- wesnoth/src/multiplayer_connect.cpp:1.105   Sun Feb 20 23:12:52 2005
+++ wesnoth/src/multiplayer_connect.cpp Mon Feb 21 00:37:28 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.105 2005/02/20 23:12:52 gruikya Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.106 2005/02/21 00:37:28 Sirp Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -10,7 +10,8 @@
 
    See the COPYING file for more details.
 */
-
+
+#include "global.hpp"
 #include "multiplayer_connect.hpp"
 #include "font.hpp"
 #include "preferences.hpp"
@@ -548,7 +549,7 @@
 
 void connect::hide_children(bool hide)
 {
-       mp::ui::hide_children(hide);
+       ui::hide_children(hide);
 
        waiting_label_.hide(hide);
        // Hiding the scrollpane automatically hides its contents
@@ -571,7 +572,7 @@
 
 void connect::process_network_data(const config& data, const 
network::connection sock)
 {
-       mp::ui::process_network_data(data, sock);
+       ui::process_network_data(data, sock);
 
        if (!data["side_drop"].empty()) {
                const int side_drop = 
lexical_cast_default<int>(data["side_drop"], 0) - 1;
@@ -709,7 +710,7 @@
 
 void connect::layout_children(const SDL_Rect& rect)
 {
-       mp::ui::layout_children(rect);
+       ui::layout_children(rect);
 
        SDL_Rect ca = client_area();
 
@@ -749,7 +750,6 @@
        scroll_pane_rect.h = launch_.location().y - scroll_pane_rect.y - 
gui::ButtonVPadding;
 
        scroll_pane_.set_location(scroll_pane_rect);
-       config::child_iterator sd;
 }
 
 void connect::lists_init(bool changes_allowed)
@@ -817,11 +817,11 @@
                sides_.push_back(side(*this, **sd, index, 100, 
changes_allowed));
        }
        // This function must be called after the sides_ vector is fully 
populated.
-       for(side_list::iterator sd = sides_.begin(); sd != sides_.end(); ++sd) {
-               const int side_num = sd - sides_.begin();
+       for(side_list::iterator s = sides_.begin(); s != sides_.end(); ++s) {
+               const int side_num = s - sides_.begin();
                const int spos = 60 * side_num;
 
-               sd->add_widgets_to_scrollpane(scroll_pane_, spos);
+               s->add_widgets_to_scrollpane(scroll_pane_, spos);
        }
 }
 
Index: wesnoth/src/multiplayer_connect.hpp
diff -u wesnoth/src/multiplayer_connect.hpp:1.25 
wesnoth/src/multiplayer_connect.hpp:1.26
--- wesnoth/src/multiplayer_connect.hpp:1.25    Sun Feb 20 22:30:27 2005
+++ wesnoth/src/multiplayer_connect.hpp Mon Feb 21 00:37:28 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.hpp,v 1.25 2005/02/20 22:30:27 gruikya Exp $ */
+/* $Id: multiplayer_connect.hpp,v 1.26 2005/02/21 00:37:28 Sirp Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -37,7 +37,7 @@
                network::connection connection;
        };
 
-       typedef std::vector<connected_user> connected_user_list;
+       typedef std::vector<connected_user> connected_user_list;
 
        class side {
        public:
@@ -124,7 +124,10 @@
 
                bool enabled_;
                bool changed_;
-       };
+       };
+
+       friend class side;
+
        typedef std::vector<side> side_list;