From 5b735131ba0a67aab96938886cc49177d866ab34 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 16 Nov 2010 10:29:31 +0000 Subject: GUI: Push down some header (inter)dependencies svn-id: r54267 --- gui/console.h | 1 - gui/gui-manager.cpp | 1 + gui/gui-manager.h | 2 +- gui/saveload.cpp | 1 + gui/themebrowser.cpp | 1 + gui/widgets/editable.h | 1 - 6 files changed, 4 insertions(+), 3 deletions(-) (limited to 'gui') diff --git a/gui/console.h b/gui/console.h index ab590fbf81..7136043de9 100644 --- a/gui/console.h +++ b/gui/console.h @@ -26,7 +26,6 @@ #define CONSOLE_DIALOG_H #include "gui/dialog.h" -#include "gui/gui-manager.h" namespace GUI { diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp index 5da8705fa8..5109539158 100644 --- a/gui/gui-manager.cpp +++ b/gui/gui-manager.cpp @@ -36,6 +36,7 @@ #include "gui/dialog.h" #include "gui/ThemeEngine.h" #include "gui/ThemeEval.h" +#include "gui/Tooltip.h" #include "graphics/cursorman.h" diff --git a/gui/gui-manager.h b/gui/gui-manager.h index ee1351dc9b..6c0a93d985 100644 --- a/gui/gui-manager.h +++ b/gui/gui-manager.h @@ -33,7 +33,6 @@ #include "graphics/font.h" #include "gui/widget.h" -#include "gui/Tooltip.h" #include "gui/ThemeEngine.h" class OSystem; @@ -42,6 +41,7 @@ namespace GUI { class Dialog; class ThemeEval; +class Tooltip; #define g_gui (GUI::GuiManager::instance()) diff --git a/gui/saveload.cpp b/gui/saveload.cpp index 670c5875fa..939e2ca6e9 100644 --- a/gui/saveload.cpp +++ b/gui/saveload.cpp @@ -29,6 +29,7 @@ #include "gui/message.h" #include "gui/saveload.h" #include "gui/ThemeEval.h" +#include "gui/gui-manager.h" #include "graphics/scaler.h" diff --git a/gui/themebrowser.cpp b/gui/themebrowser.cpp index 3e4b680fef..0056a5d55b 100644 --- a/gui/themebrowser.cpp +++ b/gui/themebrowser.cpp @@ -25,6 +25,7 @@ #include "gui/themebrowser.h" #include "gui/widgets/list.h" #include "gui/widget.h" +#include "gui/gui-manager.h" #include "common/translation.h" diff --git a/gui/widgets/editable.h b/gui/widgets/editable.h index 79e0a942f2..b394e105d1 100644 --- a/gui/widgets/editable.h +++ b/gui/widgets/editable.h @@ -28,7 +28,6 @@ #include "common/str.h" #include "common/rect.h" #include "gui/widget.h" -#include "gui/gui-manager.h" namespace GUI { -- cgit v1.2.3