From 343eb9ab1b070e7c30174d9e9b66ae214e68df12 Mon Sep 17 00:00:00 2001 From: Rikard Falkeborn Date: Fri, 14 Apr 2017 20:37:15 +0200 Subject: [PATCH] Add const to some functions --- src/addon/validation.cpp | 2 +- src/ai/default/stage_rca.cpp | 2 +- src/animated.hpp | 2 +- src/arrow.hpp | 2 +- src/carryover.cpp | 2 +- src/display.cpp | 2 +- src/display.hpp | 2 +- src/formatter.hpp | 4 ++-- src/formula/function.cpp | 4 ++-- src/game_initialization/connect_engine.hpp | 4 ++-- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/addon/validation.cpp b/src/addon/validation.cpp index 885b628c044c..d74854bd8c1c 100644 --- a/src/addon/validation.cpp +++ b/src/addon/validation.cpp @@ -32,7 +32,7 @@ namespace { /** * Returns whether the given add-on name char is not whitelisted. */ - inline bool operator()(char c) + inline bool operator()(char c) const { switch(c) { diff --git a/src/ai/default/stage_rca.cpp b/src/ai/default/stage_rca.cpp index 361ce238f062..8a58b2bd6520 100644 --- a/src/ai/default/stage_rca.cpp +++ b/src/ai/default/stage_rca.cpp @@ -72,7 +72,7 @@ config candidate_action_evaluation_loop::to_config() const class desc_sorter_of_candidate_actions { public: - bool operator()(const candidate_action_ptr &a, const candidate_action_ptr &b) + bool operator()(const candidate_action_ptr &a, const candidate_action_ptr &b) const { return a->get_max_score() > b->get_max_score(); } diff --git a/src/animated.hpp b/src/animated.hpp index 3a888ae6dada..52e29f2f958c 100644 --- a/src/animated.hpp +++ b/src/animated.hpp @@ -32,7 +32,7 @@ template class void_value { public: - const T operator()() { return T(); } + const T operator()() const { return T(); } }; template > diff --git a/src/arrow.hpp b/src/arrow.hpp index 0db31311d9ee..703b0e6f14ed 100644 --- a/src/arrow.hpp +++ b/src/arrow.hpp @@ -61,7 +61,7 @@ class arrow { * If it doesn't exist or has missing images, you'll get "under construction" * symbols instead of arrow graphics. */ - std::string get_style() {return style_;} + std::string get_style() const {return style_;} void set_style(const std::string& style); ///If you add more styles, you should look at move::update_arrow_style() static const std::string STYLE_STANDARD; diff --git a/src/carryover.cpp b/src/carryover.cpp index 95901e448c1c..348b7517299f 100644 --- a/src/carryover.cpp +++ b/src/carryover.cpp @@ -164,7 +164,7 @@ void carryover_info::remove_side(const std::string& id) { struct save_id_equals { save_id_equals(const std::string& val) : value (val) {} - bool operator () (carryover& v2) + bool operator () (carryover& v2) const { return value == v2.get_save_id(); } diff --git a/src/display.cpp b/src/display.cpp index 776be1862f25..bfea8d42d48e 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -2065,7 +2065,7 @@ void display::set_default_zoom() } } -bool display::tile_fully_on_screen(const map_location& loc) +bool display::tile_fully_on_screen(const map_location& loc) const { int x = get_location_x(loc); int y = get_location_y(loc); diff --git a/src/display.hpp b/src/display.hpp index 3ab5c40cacef..b28c4faaa4c6 100644 --- a/src/display.hpp +++ b/src/display.hpp @@ -554,7 +554,7 @@ class display : public filter_context, public video2::draw_layering events::generic_event& complete_redraw_event() { return complete_redraw_event_; } /** Check if a tile is fully visible on screen. */ - bool tile_fully_on_screen(const map_location& loc); + bool tile_fully_on_screen(const map_location& loc) const; /** Checks if location @a loc or one of the adjacent tiles is visible on screen. */ bool tile_nearly_on_screen(const map_location &loc) const; diff --git a/src/formatter.hpp b/src/formatter.hpp index 619ee373a6d6..1857ce37763b 100644 --- a/src/formatter.hpp +++ b/src/formatter.hpp @@ -62,12 +62,12 @@ class formatter } #endif - std::string str() { + std::string str() const { return stream_.str(); } // Implicit x-value conversion to string - operator std::string() + operator std::string() const #if HAVE_REF_QUALIFIERS && #endif diff --git a/src/formula/function.cpp b/src/formula/function.cpp index 2d92f53f31a7..2b045ae0ce34 100644 --- a/src/formula/function.cpp +++ b/src/formula/function.cpp @@ -1094,7 +1094,7 @@ class zip_function : public function_expression { struct indexer { size_t i; explicit indexer(size_t i) : i(i) {} - variant operator()(const variant& v) { + variant operator()(const variant& v) const { if(i >= v.num_elements()) { return variant(); } else { @@ -1103,7 +1103,7 @@ class zip_function : public function_expression { } }; struct comparator { - bool operator()(const variant& a, const variant& b) { + bool operator()(const variant& a, const variant& b) const { return a.num_elements() < b.num_elements(); } }; diff --git a/src/game_initialization/connect_engine.hpp b/src/game_initialization/connect_engine.hpp index ce9f591e4416..42bf5250b48d 100644 --- a/src/game_initialization/connect_engine.hpp +++ b/src/game_initialization/connect_engine.hpp @@ -92,7 +92,7 @@ class connect_engine throw "No scenariodata found"; } const std::set& connected_users() const; - const std::vector& user_team_names() + const std::vector& user_team_names() const { return user_team_names_; } std::vector& side_engines() { return side_engines_; } const mp_game_settings& params() const { return params_; } @@ -186,7 +186,7 @@ class side_engine // The id of the side of the previous scenario that should control this side. std::string previous_save_id() const { return (!cfg_["previous_save_id"].empty()) ? cfg_["previous_save_id"] : save_id(); } - const std::vector& controller_options() + const std::vector& controller_options() const { return controller_options_; } const config& cfg() const { return cfg_; } ng::controller controller() const { return controller_; }