Various style fixed found using cppcheck

Author: tobbi

src/editor/editor.cpp

@@ -842,13 +842,10 @@ Editor::check_save_prerequisites(const std::function<void ()>& callback) const
     if (sector->get_name() == "main")
     {
       sector_valid = true;
-      for (const auto& spawnpoint : sector->get_objects_by_type<SpawnPointMarker>())
-      {
-        if (spawnpoint.get_name() == "main")
-        {
-          spawnpoint_valid = true;
-        }
-      }
+      const auto& spawnpoints = sector->get_objects_by_type<SpawnPointMarker>();
+      spawnpoint_valid = std::any_of(spawnpoints.begin(), spawnpoints.end(), [](const auto& spawnpoint) {
+        return spawnpoint.get_name() == "main";
+      });
     }
   }
 

src/gui/menu_script.cpp

@@ -31,10 +31,9 @@ ScriptMenu::ScriptMenu(std::string* script_) :
   // Split the script to the lines.
   std::string script = *base_script;
   std::string line_break = "\n";
-  std::string new_line;
   size_t endl_pos = script.find(line_break);
   while (endl_pos != std::string::npos) {
-    new_line = script.substr(0, endl_pos);
+    const auto& new_line = script.substr(0, endl_pos);
     script = script.substr(endl_pos + line_break.length());
     push_string(new_line);
     endl_pos = script.find(line_break);

src/interface/control_textbox.cpp

@@ -17,6 +17,7 @@
 #include "interface/control_textbox.hpp"
 
 #include <math.h>
+#include <numeric>
 
 #include <SDL.h>
 
@@ -363,13 +364,8 @@ ControlTextbox::get_string() const
 std::string
 ControlTextbox::get_contents() const
 {
-  std::string temp;
-
-  for (char c : m_charlist) {
-    temp += c;
-  }
 
-  return temp;
+  return std::accumulate(m_charlist.begin(), m_charlist.end(), "");
 }
 
 std::string

src/object/brick.cpp

@@ -104,10 +104,10 @@ Brick::try_break(Player* player)
     return;
 
   SoundManager::current()->play("sounds/brick.wav", get_pos());
-  Player& player_one = *Sector::get().get_players()[0];
   if (m_coin_counter > 0 ) {
     Sector::get().add<BouncyCoin>(get_pos(), true);
     m_coin_counter--;
+    Player& player_one = *Sector::get().get_players()[0];
     player_one.get_status().add_coins(1);
     if (m_coin_counter == 0)
       m_sprite->set_action("empty");

src/supertux/command_line_arguments.cpp

@@ -73,9 +73,9 @@ void
 CommandLineArguments::print_acknowledgements() const
 {
   IFileStream in("ACKNOWLEDGEMENTS.txt");
-  std::string line;
   if (in.good())
   {
+    std::string line;
     while (std::getline(in, line))
     {
       std::cout << line << std::endl;