Include optimizations

SVN-Revision: 6049

diff --git a/src/supertux/menu/contrib_menu.hpp b/src/supertux/menu/contrib_menu.hpp
index b25380b..3c62d8d 100644 (file)
--- a/src/supertux/menu/contrib_menu.hpp
+++ b/src/supertux/menu/contrib_menu.hpp
@@ -19,8 +19,6 @@
 
 #include "gui/menu.hpp"
 
-#include <vector>
-#include <string>
 
 class World;
 

diff --git a/src/supertux/menu/contrib_world_menu.cpp b/src/supertux/menu/contrib_world_menu.cpp
index 29e81d5..fdb84c5 100644 (file)
--- a/src/supertux/menu/contrib_world_menu.cpp
+++ b/src/supertux/menu/contrib_world_menu.cpp
@@ -18,7 +18,6 @@
 
 #include "audio/sound_manager.hpp"
 #include "gui/menu_item.hpp"
-#include "supertux/globals.hpp"
 #include "supertux/mainloop.hpp"
 #include "supertux/title_screen.hpp"
 #include "supertux/world.hpp"

diff --git a/src/supertux/menu/joystick_menu.cpp b/src/supertux/menu/joystick_menu.cpp
index 5d9fa83..c6bacb3 100644 (file)
--- a/src/supertux/menu/joystick_menu.cpp
+++ b/src/supertux/menu/joystick_menu.cpp
@@ -20,7 +20,6 @@
 #include <sstream>
 
 #include "util/gettext.hpp"
-#include "supertux/gameconfig.hpp"
 
 namespace{
   const int SCAN_JOYSTICKS = Controller::CONTROLCOUNT + 1;

diff --git a/src/supertux/menu/joystick_menu.hpp b/src/supertux/menu/joystick_menu.hpp
index ff186fd..d39fad7 100644 (file)
--- a/src/supertux/menu/joystick_menu.hpp
+++ b/src/supertux/menu/joystick_menu.hpp
@@ -19,8 +19,6 @@
 #define HEADER_SUPERTUX_CONTROL_JOYSTICK_MENU_HPP
 
 #include "control/joystickkeyboardcontroller.hpp"
-#include "control/controller.hpp"
-#include "gui/menu.hpp"
 #include "gui/menu_item.hpp"
 
 class JoystickMenu : public Menu

diff --git a/src/supertux/menu/keyboard_menu.hpp b/src/supertux/menu/keyboard_menu.hpp
index 83b1908..f412043 100644 (file)
--- a/src/supertux/menu/keyboard_menu.hpp
+++ b/src/supertux/menu/keyboard_menu.hpp
@@ -19,7 +19,6 @@
 #define HEADER_SUPERTUX_CONTROL_KEYBOARD_MENU_HPP
 
 #include "control/joystickkeyboardcontroller.hpp"
-#include "gui/menu.hpp"
 #include "gui/menu_item.hpp"
 
 class KeyboardMenu : public Menu

diff --git a/src/supertux/menu/language_menu.hpp b/src/supertux/menu/language_menu.hpp
index c2d3a0f..cdaa6aa 100644 (file)
--- a/src/supertux/menu/language_menu.hpp
+++ b/src/supertux/menu/language_menu.hpp
@@ -18,7 +18,6 @@
 #ifndef HEADER_SUPERTUX_SUPERTUX_LANGUAGE_MENU_HPP
 #define HEADER_SUPERTUX_SUPERTUX_LANGUAGE_MENU_HPP
 
-#include <set>
 
 #include "util/gettext.hpp"
 #include "gui/menu.hpp"

diff --git a/src/supertux/menu/options_menu.cpp b/src/supertux/menu/options_menu.cpp
index 8d0123d..a930309 100644 (file)
--- a/src/supertux/menu/options_menu.cpp
+++ b/src/supertux/menu/options_menu.cpp
@@ -18,19 +18,12 @@
 #include "supertux/menu/options_menu.hpp"
 
 #include "audio/sound_manager.hpp"
-#include "control/joystickkeyboardcontroller.hpp"
-#include "gui/menu.hpp"
-#include "gui/menu_item.hpp"
 #include "gui/menu_manager.hpp"
 #include "supertux/gameconfig.hpp"
-#include "supertux/globals.hpp"
-#include "supertux/main.hpp"
 #include "supertux/menu/joystick_menu.hpp"
 #include "supertux/menu/keyboard_menu.hpp"
 #include "supertux/menu/language_menu.hpp"
 #include "supertux/menu/menu_storage.hpp"
-#include "supertux/menu/profile_menu.hpp"
-#include "util/gettext.hpp"
 #include "video/renderer.hpp"
 
 enum OptionsMenuIDs {

diff --git a/src/supertux/menu/options_menu.hpp b/src/supertux/menu/options_menu.hpp
index 4e70a64..78a3b42 100644 (file)
--- a/src/supertux/menu/options_menu.hpp
+++ b/src/supertux/menu/options_menu.hpp
@@ -18,7 +18,6 @@
 #ifndef HEADER_SUPERTUX_SUPERTUX_OPTIONS_MENU_HPP
 #define HEADER_SUPERTUX_SUPERTUX_OPTIONS_MENU_HPP
 
-#include <memory>
 
 #include "gui/menu.hpp"
 

diff --git a/src/supertux/menu/profile_menu.cpp b/src/supertux/menu/profile_menu.cpp
index ef2c0c3..5ed5072 100644 (file)
--- a/src/supertux/menu/profile_menu.cpp
+++ b/src/supertux/menu/profile_menu.cpp
@@ -18,7 +18,6 @@
 
 #include <sstream>
 
-#include "gui/menu.hpp"
 #include "gui/menu_manager.hpp"
 #include "gui/menu_item.hpp"
 #include "supertux/gameconfig.hpp"

diff --git a/src/supertux/title_screen.cpp b/src/supertux/title_screen.cpp
index 5ac4e9d..afbc717 100644 (file)
--- a/src/supertux/title_screen.cpp
+++ b/src/supertux/title_screen.cpp
@@ -15,17 +15,12 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <version.h>
 
 #include "supertux/title_screen.hpp"
 
-#include <algorithm>
-#include <physfs.h>
 
 #include "audio/sound_manager.hpp"
-#include "gui/menu.hpp"
 #include "gui/menu_manager.hpp"
-#include "gui/menu_item.hpp"
 #include "lisp/parser.hpp"
 #include "object/camera.hpp"
 #include "object/player.hpp"
@@ -33,12 +28,10 @@
 #include "supertux/gameconfig.hpp"
 #include "supertux/globals.hpp"
 #include "supertux/mainloop.hpp"
-#include "supertux/menu/menu_storage.hpp"
 #include "supertux/menu/addon_menu.hpp"
 #include "supertux/menu/contrib_world_menu.hpp"
 #include "supertux/menu/contrib_menu.hpp"
 #include "supertux/menu/main_menu.hpp"
-#include "supertux/menu/options_menu.hpp"
 #include "supertux/resources.hpp"
 #include "supertux/sector.hpp"
 #include "supertux/textscroller.hpp"

diff --git a/src/supertux/title_screen.hpp b/src/supertux/title_screen.hpp
index 492fd11..3758e22 100644 (file)
--- a/src/supertux/title_screen.hpp
+++ b/src/supertux/title_screen.hpp
@@ -18,7 +18,6 @@
 #ifndef HEADER_SUPERTUX_SUPERTUX_TITLE_HPP
 #define HEADER_SUPERTUX_SUPERTUX_TITLE_HPP
 
-#include "addon/addon.hpp"
 #include "supertux/game_session.hpp"
 
 class AddonMenu;