From 58558c8dd6a9bf888665261a9632768d53a3ab74 Mon Sep 17 00:00:00 2001 From: grumbel Date: Thu, 19 Nov 2009 15:34:29 +0000 Subject: [PATCH] Include optimizations git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6049 837edb03-e0f3-0310-88ca-d4d4e8b29345 --- src/supertux/menu/contrib_menu.hpp | 2 -- src/supertux/menu/contrib_world_menu.cpp | 1 - src/supertux/menu/joystick_menu.cpp | 1 - src/supertux/menu/joystick_menu.hpp | 2 -- src/supertux/menu/keyboard_menu.hpp | 1 - src/supertux/menu/language_menu.hpp | 1 - src/supertux/menu/options_menu.cpp | 7 ------- src/supertux/menu/options_menu.hpp | 1 - src/supertux/menu/profile_menu.cpp | 1 - src/supertux/title_screen.cpp | 7 ------- src/supertux/title_screen.hpp | 1 - 11 files changed, 25 deletions(-) diff --git a/src/supertux/menu/contrib_menu.hpp b/src/supertux/menu/contrib_menu.hpp index b25380b51..3c62d8d77 100644 --- a/src/supertux/menu/contrib_menu.hpp +++ b/src/supertux/menu/contrib_menu.hpp @@ -19,8 +19,6 @@ #include "gui/menu.hpp" -#include -#include class World; diff --git a/src/supertux/menu/contrib_world_menu.cpp b/src/supertux/menu/contrib_world_menu.cpp index 29e81d5fb..fdb84c589 100644 --- 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 5d9fa8301..c6bacb316 100644 --- a/src/supertux/menu/joystick_menu.cpp +++ b/src/supertux/menu/joystick_menu.cpp @@ -20,7 +20,6 @@ #include #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 ff186fde9..d39fad787 100644 --- 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 83b190841..f41204390 100644 --- 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 c2d3a0f58..cdaa6aa30 100644 --- 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 #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 8d0123d71..a930309dd 100644 --- 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 4e70a64f6..78a3b42e1 100644 --- 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 #include "gui/menu.hpp" diff --git a/src/supertux/menu/profile_menu.cpp b/src/supertux/menu/profile_menu.cpp index ef2c0c36e..5ed50722d 100644 --- a/src/supertux/menu/profile_menu.cpp +++ b/src/supertux/menu/profile_menu.cpp @@ -18,7 +18,6 @@ #include -#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 5ac4e9dd5..afbc71730 100644 --- 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 . -#include #include "supertux/title_screen.hpp" -#include -#include #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 492fd114e..3758e222c 100644 --- 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; -- 2.11.0