mail[Wesnoth-commits] r28609 - in /trunk/src: editor2/editor_controller.cpp editor2/mouse_action.cpp gui/dialogs/editor_generate_map.cpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by koraq on August 15, 2008 - 21:16:
Author: mordante
Date: Fri Aug 15 21:16:15 2008
New Revision: 28609

URL: http://svn.gna.org/viewcvs/wesnoth?rev=28609&view=rev
Log:
Comment out unused parameters and remove an unused variable.

Modified:
    trunk/src/editor2/editor_controller.cpp
    trunk/src/editor2/mouse_action.cpp
    trunk/src/gui/dialogs/editor_generate_map.cpp

Modified: trunk/src/editor2/editor_controller.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor2/editor_controller.cpp?rev=28609&r1=28608&r2=28609&view=diff
==============================================================================
--- trunk/src/editor2/editor_controller.cpp (original)
+++ trunk/src/editor2/editor_controller.cpp Fri Aug 15 21:16:15 2008
@@ -65,7 +65,6 @@
        adjust_sizes(gui(), *size_specs_);
        palette_ = new terrain_palette(gui(), *size_specs_, get_map(), 
game_config,
                foreground_terrain_, background_terrain_);
-       const config::child_list& children = 
game_config.get_children("brush");
        foreach (const config* i, game_config.get_children("brush")) {
                brushes_.push_back(brush(*i));
        }
@@ -845,7 +844,7 @@
        refresh_after_action();
 }
 
-void editor_controller::mouse_motion(int x, int y, const bool browse, bool 
update)
+void editor_controller::mouse_motion(int x, int y, const bool /*browse*/, 
bool update)
 {
        if (mouse_handler_base::mouse_motion_default(x, y, update)) return;
        gamemap::location hex_clicked = gui().hex_clicked_on(x, y);
@@ -891,13 +890,13 @@
        return false;
 }
 
-void editor_controller::left_drag_end(int x, int y, const bool browse)
+void editor_controller::left_drag_end(int x, int y, const bool /*browse*/)
 {
        editor_action* a = get_mouse_action()->drag_end(*gui_, x, y);
        perform_refresh_delete(a);
 }
 
-void editor_controller::left_mouse_up(int x, int y, const bool browse)
+void editor_controller::left_mouse_up(int /*x*/, int /*y*/, const bool 
/*browse*/)
 {
        refresh_after_action();
 }

Modified: trunk/src/editor2/mouse_action.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor2/mouse_action.cpp?rev=28609&r1=28608&r2=28609&view=diff
==============================================================================
--- trunk/src/editor2/mouse_action.cpp (original)
+++ trunk/src/editor2/mouse_action.cpp Fri Aug 15 21:16:15 2008
@@ -33,30 +33,34 @@
        }
 }
 
-std::set<gamemap::location> mouse_action::affected_hexes(editor_display& 
disp, const gamemap::location& hex)
+std::set<gamemap::location> mouse_action::affected_hexes(
+               editor_display& /*disp*/, const gamemap::location& hex)
 {
        std::set<gamemap::location> res;
        res.insert(hex);
        return res;
 }
 
-editor_action* mouse_action::drag(editor_display& disp, int x, int y, bool& 
partial, editor_action* last_undo)
-{
-       return NULL;
-}
-
-editor_action* mouse_action::drag_end(editor_display& disp, int x, int y)
-{
-       return NULL;
-}
-
-editor_action* mouse_action::key_event(editor_display& disp, const 
SDL_Event& e)
+editor_action* mouse_action::drag( editor_display& /*disp*/, 
+               int /*x*/, int /*y*/, bool& /*partial*/, editor_action* 
/*last_undo*/)
+{
+       return NULL;
+}
+
+editor_action* mouse_action::drag_end(
+               editor_display& /*disp*/, int /*x*/, int /*y*/)
+{
+       return NULL;
+}
+
+editor_action* mouse_action::key_event(
+       editor_display& /*disp*/, const SDL_Event& /*e*/)
 {
        return NULL;
 }
 
 std::set<gamemap::location> brush_drag_mouse_action::affected_hexes(
-       editor_display& disp, const gamemap::location& hex)
+       editor_display& /*disp*/, const gamemap::location& hex)
 {
        return get_brush().project(hex);
 }
@@ -68,7 +72,8 @@
        return click_perform(disp, affected_hexes(disp, hex));
 }
 
-editor_action* brush_drag_mouse_action::drag(editor_display& disp, int x, 
int y, bool& partial, editor_action* last_undo)
+editor_action* brush_drag_mouse_action::drag(editor_display& disp, 
+               int x, int y, bool& /*partial*/, editor_action* /*last_undo*/)
 {
        gamemap::location hex = disp.hex_clicked_on(x, y);
        move(disp, hex);
@@ -81,7 +86,8 @@
        }
 }
        
-editor_action* brush_drag_mouse_action::drag_end(editor_display& disp, int 
x, int y)
+editor_action* brush_drag_mouse_action::drag_end(
+               editor_display& /*disp*/, int /*x*/, int /*y*/)
 {
        return NULL;
 }
@@ -94,7 +100,8 @@
 }
 
 
-editor_action* mouse_action_paint::click_perform(editor_display& disp, const 
std::set<gamemap::location>& hexes)
+editor_action* mouse_action_paint::click_perform(
+               editor_display& /*disp*/, const std::set<gamemap::location>& 
hexes)
 {
        bool one_layer = (key_[SDLK_RALT] || key_[SDLK_LALT]);
        return new editor_action_paint_area(hexes, terrain_, one_layer);
@@ -118,7 +125,8 @@
        }
 }
 
-editor_action* mouse_action_select::key_event(editor_display& disp, const 
SDL_Event& e)
+editor_action* mouse_action_select::key_event(
+               editor_display& disp, const SDL_Event& /*e*/)
 {
        // Force an actual move
        gamemap::location tmp = previous_move_hex_;
@@ -127,7 +135,8 @@
        return NULL;
 }
 
-editor_action* mouse_action_select::click_perform(editor_display& disp, 
const std::set<gamemap::location>& hexes)
+editor_action* mouse_action_select::click_perform(
+               editor_display& /*disp*/, const std::set<gamemap::location>& 
hexes)
 {
        editor_action* a(NULL); 
        if (selecting_) {
@@ -138,9 +147,8 @@
        return a;
 }
 
-
 std::set<gamemap::location> mouse_action_paste::affected_hexes(
-       editor_display& disp, const gamemap::location& hex)
+       editor_display& /*disp*/, const gamemap::location& hex)
 {
        return paste_.get_offset_area(hex);
 }

Modified: trunk/src/gui/dialogs/editor_generate_map.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/editor_generate_map.cpp?rev=28609&r1=28608&r2=28609&view=diff
==============================================================================
--- trunk/src/gui/dialogs/editor_generate_map.cpp (original)
+++ trunk/src/gui/dialogs/editor_generate_map.cpp Fri Aug 15 21:16:15 2008
@@ -39,11 +39,11 @@
        return build(video, get_id(EDITOR_GENERATE_MAP));
 }
 
-void teditor_generate_map::pre_show(CVideo& /*video*/, twindow& window)
+void teditor_generate_map::pre_show(CVideo& /*video*/, twindow& /*window*/)
 {
 }
 
-void teditor_generate_map::post_show(twindow& window)
+void teditor_generate_map::post_show(twindow& /*window*/)
 {
 }
 




Related Messages


Powered by MHonArc, Updated Fri Aug 15 21:41:13 2008