[Scummvm-cvs-logs] SF.net SVN: scummvm:[54267] scummvm/trunk/gui

[fingolfin at users.sourceforge.net]

Revision: 54267
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54267&view=rev
Author:   fingolfin
Date:     2010-11-16 10:29:31 +0000 (Tue, 16 Nov 2010)

Log Message:
-----------
GUI: Push down some header (inter)dependencies

Modified Paths:
--------------
    scummvm/trunk/gui/console.h
    scummvm/trunk/gui/gui-manager.cpp
    scummvm/trunk/gui/gui-manager.h
    scummvm/trunk/gui/saveload.cpp
    scummvm/trunk/gui/themebrowser.cpp
    scummvm/trunk/gui/widgets/editable.h

Modified: scummvm/trunk/gui/console.h
===================================================================
--- scummvm/trunk/gui/console.h	2010-11-16 10:24:16 UTC (rev 54266)
+++ scummvm/trunk/gui/console.h	2010-11-16 10:29:31 UTC (rev 54267)
@@ -26,7 +26,6 @@
 #define CONSOLE_DIALOG_H
 
 #include "gui/dialog.h"
-#include "gui/gui-manager.h"
 
 namespace GUI {
 

Modified: scummvm/trunk/gui/gui-manager.cpp
===================================================================
--- scummvm/trunk/gui/gui-manager.cpp	2010-11-16 10:24:16 UTC (rev 54266)
+++ scummvm/trunk/gui/gui-manager.cpp	2010-11-16 10:29:31 UTC (rev 54267)
@@ -36,6 +36,7 @@
 #include "gui/dialog.h"
 #include "gui/ThemeEngine.h"
 #include "gui/ThemeEval.h"
+#include "gui/Tooltip.h"
 
 #include "graphics/cursorman.h"
 

Modified: scummvm/trunk/gui/gui-manager.h
===================================================================
--- scummvm/trunk/gui/gui-manager.h	2010-11-16 10:24:16 UTC (rev 54266)
+++ scummvm/trunk/gui/gui-manager.h	2010-11-16 10:29:31 UTC (rev 54267)
@@ -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 @@
 
 class Dialog;
 class ThemeEval;
+class Tooltip;
 
 #define g_gui	(GUI::GuiManager::instance())
 

Modified: scummvm/trunk/gui/saveload.cpp
===================================================================
--- scummvm/trunk/gui/saveload.cpp	2010-11-16 10:24:16 UTC (rev 54266)
+++ scummvm/trunk/gui/saveload.cpp	2010-11-16 10:29:31 UTC (rev 54267)
@@ -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"
 

Modified: scummvm/trunk/gui/themebrowser.cpp
===================================================================
--- scummvm/trunk/gui/themebrowser.cpp	2010-11-16 10:24:16 UTC (rev 54266)
+++ scummvm/trunk/gui/themebrowser.cpp	2010-11-16 10:29:31 UTC (rev 54267)
@@ -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"
 

Modified: scummvm/trunk/gui/widgets/editable.h
===================================================================
--- scummvm/trunk/gui/widgets/editable.h	2010-11-16 10:24:16 UTC (rev 54266)
+++ scummvm/trunk/gui/widgets/editable.h	2010-11-16 10:29:31 UTC (rev 54267)
@@ -28,7 +28,6 @@
 #include "common/str.h"
 #include "common/rect.h"
 #include "gui/widget.h"
-#include "gui/gui-manager.h"
 
 namespace GUI {
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.