From ae48811ba43ff9eb9d599e1f4488f40e416fc6f4 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Sun, 4 Feb 2018 22:12:27 +1100 Subject: [PATCH] Cleaned up cases of ;; [ci skip] --- src/gui/dialogs/game_stats.cpp | 2 +- src/gui/widgets/toggle_panel.hpp | 2 +- src/image_modifications.cpp | 2 +- src/scripting/lua_unit_type.cpp | 2 +- src/serialization/string_utils.cpp | 4 ++-- src/units/unit.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/dialogs/game_stats.cpp b/src/gui/dialogs/game_stats.cpp index 5ee58ef0107f..29bae01a8f39 100644 --- a/src/gui/dialogs/game_stats.cpp +++ b/src/gui/dialogs/game_stats.cpp @@ -201,7 +201,7 @@ void game_stats::pre_show(window& window) column_settings["label"] = team.uses_fog() ? _("yes") : _("no"); row_data_settings.emplace("team_fog", column_settings); - column_settings["label"] = team.uses_shroud() ? _("yes") : _("no");; + column_settings["label"] = team.uses_shroud() ? _("yes") : _("no"); row_data_settings.emplace("team_shroud", column_settings); settings_list.add_row(row_data_settings); diff --git a/src/gui/widgets/toggle_panel.hpp b/src/gui/widgets/toggle_panel.hpp index 1696e441df94..dfce41fcd17b 100644 --- a/src/gui/widgets/toggle_panel.hpp +++ b/src/gui/widgets/toggle_panel.hpp @@ -92,7 +92,7 @@ class toggle_panel : public panel, public selectable_item /** Inherited from selectable_item */ unsigned get_value() const override { - return state_num_;; + return state_num_; } /** Inherited from selectable_item */ diff --git a/src/image_modifications.cpp b/src/image_modifications.cpp index 67fa55a8c010..d393b59ec5b5 100644 --- a/src/image_modifications.cpp +++ b/src/image_modifications.cpp @@ -455,7 +455,7 @@ surface light_modification::operator()(const surface& src) const { nsurf = make_neutral_surface(surf_); } - return light_surface(src, nsurf);; + return light_surface(src, nsurf); } surface scale_modification::operator()(const surface& src) const diff --git a/src/scripting/lua_unit_type.cpp b/src/scripting/lua_unit_type.cpp index f682976337c6..e79389d0f617 100644 --- a/src/scripting/lua_unit_type.cpp +++ b/src/scripting/lua_unit_type.cpp @@ -238,5 +238,5 @@ const unit_type* luaW_tounittype(lua_State* L, int idx) const unit_type& luaW_checkunittype(lua_State* L, int idx) { - return **static_cast(luaL_checkudata(L, idx, UnitType));; + return **static_cast(luaL_checkudata(L, idx, UnitType)); } diff --git a/src/serialization/string_utils.cpp b/src/serialization/string_utils.cpp index ef0e514afa40..3d01579157aa 100644 --- a/src/serialization/string_utils.cpp +++ b/src/serialization/string_utils.cpp @@ -253,7 +253,7 @@ std::vector square_parenthetical_split(const std::string& val, } if(!part.empty()){ - ERR_GENERAL << "Mismatched parenthesis:\n"< parenthetical_split(const std::string& val, res.push_back(std::move(new_val)); if(!part.empty()){ - ERR_GENERAL << "Mismatched parenthesis:\n"<