From 30cae17e876b8eccde65227178f5b74c96e12b08 Mon Sep 17 00:00:00 2001 From: grumbel Date: Wed, 18 Nov 2009 02:09:12 +0000 Subject: [PATCH] Include optimizations git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6022 837edb03-e0f3-0310-88ca-d4d4e8b29345 --- src/gui/button.hpp | 1 - src/gui/menu.cpp | 2 ++ src/gui/menu.hpp | 9 +++++---- src/gui/menu_item.cpp | 8 +------- src/gui/menu_item.hpp | 2 -- src/object/block.cpp | 10 ---------- src/object/bonus_block.cpp | 1 - src/object/brick.cpp | 9 --------- src/supertux/profile_menu.cpp | 2 ++ 9 files changed, 10 insertions(+), 34 deletions(-) diff --git a/src/gui/button.hpp b/src/gui/button.hpp index 0194dc886..f66d86873 100644 --- a/src/gui/button.hpp +++ b/src/gui/button.hpp @@ -19,7 +19,6 @@ #include #include -#include #include "math/vector.hpp" diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp index 027608868..d92fff92d 100644 --- a/src/gui/menu.cpp +++ b/src/gui/menu.cpp @@ -20,12 +20,14 @@ #include "control/joystickkeyboardcontroller.hpp" #include "gui/menu_item.hpp" +#include "gui/mousecursor.hpp" #include "supertux/main.hpp" #include "supertux/mainloop.hpp" #include "supertux/resources.hpp" #include "supertux/timer.hpp" #include "util/gettext.hpp" #include "video/drawing_context.hpp" +#include "video/font.hpp" static const float MENU_REPEAT_INITIAL = 0.4f; static const float MENU_REPEAT_RATE = 0.1f; diff --git a/src/gui/menu.hpp b/src/gui/menu.hpp index 8ac6db2d0..b74e931ad 100644 --- a/src/gui/menu.hpp +++ b/src/gui/menu.hpp @@ -21,12 +21,13 @@ #include #include -#include "gui/mousecursor.hpp" -#include "video/font.hpp" - -bool confirm_dialog(Surface* background, std::string text); +#include "video/color.hpp" +class DrawingContext; class MenuItem; +class Surface; + +bool confirm_dialog(Surface* background, std::string text); class Menu { diff --git a/src/gui/menu_item.cpp b/src/gui/menu_item.cpp index 892c9e1e2..fd599d790 100644 --- a/src/gui/menu_item.cpp +++ b/src/gui/menu_item.cpp @@ -16,15 +16,9 @@ #include "gui/menu_item.hpp" -#include - -#include "control/joystickkeyboardcontroller.hpp" -#include "supertux/main.hpp" -#include "supertux/mainloop.hpp" #include "supertux/resources.hpp" #include "supertux/timer.hpp" -#include "util/gettext.hpp" -#include "video/drawing_context.hpp" +#include "video/font.hpp" static const float FLICK_CURSOR_TIME = 0.5f; diff --git a/src/gui/menu_item.hpp b/src/gui/menu_item.hpp index dcebc2ac5..aab6e7e6b 100644 --- a/src/gui/menu_item.hpp +++ b/src/gui/menu_item.hpp @@ -22,8 +22,6 @@ #include #include "gui/menu.hpp" -#include "gui/mousecursor.hpp" -#include "video/font.hpp" /* Kinds of menu items */ enum MenuItemKind { diff --git a/src/object/block.cpp b/src/object/block.cpp index 420a4b1ad..29b8b11fe 100644 --- a/src/object/block.cpp +++ b/src/object/block.cpp @@ -18,22 +18,12 @@ #include "audio/sound_manager.hpp" #include "badguy/badguy.hpp" -#include "lisp/list_iterator.hpp" -#include "object/broken_brick.hpp" #include "object/coin.hpp" #include "object/flower.hpp" -#include "object/bouncy_coin.hpp" #include "object/growup.hpp" -#include "object/oneup.hpp" #include "object/player.hpp" #include "object/portable.hpp" -#include "object/specialriser.hpp" -#include "object/star.hpp" -#include "sprite/sprite_manager.hpp" #include "supertux/constants.hpp" -#include "supertux/level.hpp" -#include "supertux/object_factory.hpp" -#include "supertux/sector.hpp" static const float BOUNCY_BRICK_MAX_OFFSET = 8; static const float BOUNCY_BRICK_SPEED = 90; diff --git a/src/object/bonus_block.cpp b/src/object/bonus_block.cpp index 26638075b..55481d7e0 100644 --- a/src/object/bonus_block.cpp +++ b/src/object/bonus_block.cpp @@ -20,7 +20,6 @@ #include "badguy/badguy.hpp" #include "lisp/list_iterator.hpp" #include "object/broken_brick.hpp" -#include "object/coin.hpp" #include "object/flower.hpp" #include "object/bouncy_coin.hpp" #include "object/growup.hpp" diff --git a/src/object/brick.cpp b/src/object/brick.cpp index d05475242..8e3e01dd7 100644 --- a/src/object/brick.cpp +++ b/src/object/brick.cpp @@ -18,21 +18,12 @@ #include "audio/sound_manager.hpp" #include "badguy/badguy.hpp" -#include "lisp/list_iterator.hpp" -#include "object/broken_brick.hpp" -#include "object/coin.hpp" #include "object/flower.hpp" #include "object/bouncy_coin.hpp" -#include "object/growup.hpp" -#include "object/oneup.hpp" #include "object/player.hpp" #include "object/portable.hpp" -#include "object/specialriser.hpp" -#include "object/star.hpp" #include "sprite/sprite_manager.hpp" #include "supertux/constants.hpp" -#include "supertux/level.hpp" -#include "supertux/object_factory.hpp" #include "supertux/sector.hpp" Brick::Brick(const Vector& pos, int data) diff --git a/src/supertux/profile_menu.cpp b/src/supertux/profile_menu.cpp index 9ae1ff7cf..e97a64013 100644 --- a/src/supertux/profile_menu.cpp +++ b/src/supertux/profile_menu.cpp @@ -14,6 +14,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include + #include "gui/menu.hpp" #include "gui/menu_item.hpp" #include "supertux/gameconfig.hpp" -- 2.11.0