Remove some header includes

SuperTux · Jul 27, 2023 · c0ba8e5 · c0ba8e5
1 parent 9a9d115
commit c0ba8e5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/supertux/menu/sorted_contrib_menu.cpp b/src/supertux/menu/sorted_contrib_menu.cpp
@@ -19,6 +19,7 @@
 
 #include "gui/item_action.hpp"
 #include "supertux/levelset.hpp"
+#include "supertux/world.hpp"
 #include "util/file_system.hpp"
 #include "util/gettext.hpp"
 

diff --git a/src/supertux/menu/sorted_contrib_menu.hpp b/src/supertux/menu/sorted_contrib_menu.hpp
@@ -20,6 +20,8 @@
 
 #include "supertux/menu/world_preview_menu.hpp"
 
+class World;
+
 class SortedContribMenu final : public WorldPreviewMenu
 {
 public:

diff --git a/src/supertux/menu/world_preview_menu.cpp b/src/supertux/menu/world_preview_menu.cpp
@@ -23,8 +23,9 @@
 #include "gui/menu_item.hpp"
 #include "supertux/game_manager.hpp"
 #include "supertux/gameconfig.hpp"
-#include "supertux/resources.hpp"
 #include "supertux/menu/contrib_levelset_menu.hpp"
+#include "supertux/resources.hpp"
+#include "supertux/world.hpp"
 #include "util/file_system.hpp"
 #include "video/drawing_context.hpp"
 #include "video/surface.hpp"
@@ -35,7 +36,7 @@ WorldPreviewMenu::WorldPreviewMenu() :
 }
 
 ItemAction*
-WorldPreviewMenu::add_world(std::string title, std::string folder,
+WorldPreviewMenu::add_world(const std::string& title, const std::string& folder,
                             SurfacePtr preview, Savegame::Progress progress)
 {
   ItemAction& item = add_entry(static_cast<int>(m_world_entries.size()), title);

diff --git a/src/supertux/menu/world_preview_menu.hpp b/src/supertux/menu/world_preview_menu.hpp
@@ -20,10 +20,9 @@
 #include "gui/menu.hpp"
 
 #include "supertux/savegame.hpp"
-#include "supertux/world.hpp"
 #include "video/surface_ptr.hpp"
 
-/* Represents a menu that should show world preview screenshots and progress. */
+/** Represents a menu, which shows world preview screenshots and progress. */
 class WorldPreviewMenu : public Menu
 {
 public:
@@ -32,7 +31,7 @@ class WorldPreviewMenu : public Menu
   void menu_action(MenuItem& item) override;
 
 protected:
-  ItemAction* add_world(std::string title, std::string folder,
+  ItemAction* add_world(const std::string& title, const std::string& folder,
                         SurfacePtr preview = nullptr, Savegame::Progress progress = { -1, -1 });
 
   SurfacePtr find_preview(const std::string& preview_file, const std::string& basedir);