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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Wed Dec 9 17:46:15 CET 2009


Revision: 46311
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46311&view=rev
Author:   fingolfin
Date:     2009-12-09 16:46:14 +0000 (Wed, 09 Dec 2009)

Log Message:
-----------
Include font.h instead of fontman.h in places that don't need fontman :)

Modified Paths:
--------------
    scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.cpp
    scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.h
    scummvm/trunk/gui/GuiManager.h
    scummvm/trunk/gui/ThemeEngine.cpp
    scummvm/trunk/gui/ThemeEngine.h
    scummvm/trunk/gui/console.cpp

Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.cpp	2009-12-09 16:45:35 UTC (rev 46310)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.cpp	2009-12-09 16:46:14 UTC (rev 46311)
@@ -28,6 +28,7 @@
 #include "backends/vkeybd/virtual-keyboard-gui.h"
 
 #include "graphics/cursorman.h"
+#include "graphics/fontman.h"
 #include "gui/GuiManager.h"
 
 namespace Common {

Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.h
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.h	2009-12-09 16:45:35 UTC (rev 46310)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.h	2009-12-09 16:46:14 UTC (rev 46311)
@@ -32,7 +32,7 @@
 #include "common/scummsys.h"
 #include "common/rect.h"
 #include "common/system.h"
-#include "graphics/fontman.h"
+#include "graphics/font.h"
 #include "graphics/surface.h"
 
 namespace Common {

Modified: scummvm/trunk/gui/GuiManager.h
===================================================================
--- scummvm/trunk/gui/GuiManager.h	2009-12-09 16:45:35 UTC (rev 46310)
+++ scummvm/trunk/gui/GuiManager.h	2009-12-09 16:46:14 UTC (rev 46311)
@@ -30,7 +30,7 @@
 #include "common/stack.h"
 #include "common/str.h"
 
-#include "graphics/fontman.h"
+#include "graphics/font.h"
 
 #include "gui/widget.h"
 #include "gui/ThemeEngine.h"

Modified: scummvm/trunk/gui/ThemeEngine.cpp
===================================================================
--- scummvm/trunk/gui/ThemeEngine.cpp	2009-12-09 16:45:35 UTC (rev 46310)
+++ scummvm/trunk/gui/ThemeEngine.cpp	2009-12-09 16:46:14 UTC (rev 46311)
@@ -31,10 +31,11 @@
 #include "common/fs.h"
 #include "common/unzip.h"
 
-#include "graphics/surface.h"
 #include "graphics/colormasks.h"
+#include "graphics/cursorman.h"
+#include "graphics/fontman.h"
 #include "graphics/imagedec.h"
-#include "graphics/cursorman.h"
+#include "graphics/surface.h"
 #include "graphics/VectorRenderer.h"
 
 #include "gui/launcher.h"

Modified: scummvm/trunk/gui/ThemeEngine.h
===================================================================
--- scummvm/trunk/gui/ThemeEngine.h	2009-12-09 16:45:35 UTC (rev 46310)
+++ scummvm/trunk/gui/ThemeEngine.h	2009-12-09 16:46:14 UTC (rev 46311)
@@ -30,7 +30,7 @@
 #include "common/system.h"
 #include "common/fs.h"
 #include "graphics/surface.h"
-#include "graphics/fontman.h"
+#include "graphics/font.h"
 
 #define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8"
 

Modified: scummvm/trunk/gui/console.cpp
===================================================================
--- scummvm/trunk/gui/console.cpp	2009-12-09 16:45:35 UTC (rev 46310)
+++ scummvm/trunk/gui/console.cpp	2009-12-09 16:46:14 UTC (rev 46311)
@@ -32,7 +32,7 @@
 #include "common/events.h"
 #include "common/system.h"
 
-#include "graphics/font.h"
+#include "graphics/fontman.h"
 
 namespace GUI {
 


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




More information about the Scummvm-git-logs mailing list