diff options
| author | Max Horn | 2009-12-09 16:46:14 +0000 |
|---|---|---|
| committer | Max Horn | 2009-12-09 16:46:14 +0000 |
| commit | d60b5ca516e80aebe2183f1525d067ea1796c97c (patch) | |
| tree | 90c5ad8219be8811860ee034492101443df830d5 | |
| parent | 626f85ae5e9d3aea2d528cbf847aee6ec6051407 (diff) | |
| download | scummvm-rg350-d60b5ca516e80aebe2183f1525d067ea1796c97c.tar.gz scummvm-rg350-d60b5ca516e80aebe2183f1525d067ea1796c97c.tar.bz2 scummvm-rg350-d60b5ca516e80aebe2183f1525d067ea1796c97c.zip | |
Include font.h instead of fontman.h in places that don't need fontman :)
svn-id: r46311
| -rw-r--r-- | backends/vkeybd/virtual-keyboard-gui.cpp | 1 | ||||
| -rw-r--r-- | backends/vkeybd/virtual-keyboard-gui.h | 2 | ||||
| -rw-r--r-- | gui/GuiManager.h | 2 | ||||
| -rw-r--r-- | gui/ThemeEngine.cpp | 5 | ||||
| -rw-r--r-- | gui/ThemeEngine.h | 2 | ||||
| -rw-r--r-- | 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 17162d4e3c..316e2ac450 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 6cce210173..9bced3aa9b 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 ab5c653549..a5e75484c3 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 296541e33a..6d477fb4b3 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 2a7031d95d..2da1c3a014 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 498d1767a6..9ac9cf09e1 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 { |