From d60b5ca516e80aebe2183f1525d067ea1796c97c Mon Sep 17 00:00:00 2001
From: Max Horn <max@quendi.de>
Date: Wed, 9 Dec 2009 16:46:14 +0000
Subject: [PATCH] Include font.h instead of fontman.h in places that don't need
 fontman :)

svn-id: r46311
---
 backends/vkeybd/virtual-keyboard-gui.cpp | 1 +
 backends/vkeybd/virtual-keyboard-gui.h   | 2 +-
 gui/GuiManager.h                         | 2 +-
 gui/ThemeEngine.cpp                      | 5 +++--
 gui/ThemeEngine.h                        | 2 +-
 gui/console.cpp                          | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/backends/vkeybd/virtual-keyboard-gui.cpp b/backends/vkeybd/virtual-keyboard-gui.cpp
index 17162d4e3ce..316e2ac4507 100644
--- a/backends/vkeybd/virtual-keyboard-gui.cpp
+++ b/backends/vkeybd/virtual-keyboard-gui.cpp
@@ -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 {
diff --git a/backends/vkeybd/virtual-keyboard-gui.h b/backends/vkeybd/virtual-keyboard-gui.h
index 6cce210173e..9bced3aa9bb 100644
--- a/backends/vkeybd/virtual-keyboard-gui.h
+++ b/backends/vkeybd/virtual-keyboard-gui.h
@@ -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 {
diff --git a/gui/GuiManager.h b/gui/GuiManager.h
index ab5c653549a..a5e75484c3b 100644
--- a/gui/GuiManager.h
+++ b/gui/GuiManager.h
@@ -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"
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 296541e33a6..6d477fb4b35 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -31,10 +31,11 @@
 #include "common/fs.h"
 #include "common/unzip.h"
 
-#include "graphics/surface.h"
 #include "graphics/colormasks.h"
-#include "graphics/imagedec.h"
 #include "graphics/cursorman.h"
+#include "graphics/fontman.h"
+#include "graphics/imagedec.h"
+#include "graphics/surface.h"
 #include "graphics/VectorRenderer.h"
 
 #include "gui/launcher.h"
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 2a7031d95d2..2da1c3a014c 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -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"
 
diff --git a/gui/console.cpp b/gui/console.cpp
index 498d1767a6f..9ac9cf09e12 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -32,7 +32,7 @@
 #include "common/events.h"
 #include "common/system.h"
 
-#include "graphics/font.h"
+#include "graphics/fontman.h"
 
 namespace GUI {