Fonts|Resources|Client: Removed unnecessary dependencies

skyjake · Nov 15, 2013 · bf96265 · bf96265
1 parent d0d211a
commit bf96265
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/doomsday/client/include/resource/fonts.h b/doomsday/client/include/resource/fonts.h
@@ -24,6 +24,7 @@
 #include "AbstractFont"
 #include "uri.hh"
 #include <de/Error>
+#include <de/PathTree>
 #include <de/String>
 #include <QMap>
 

diff --git a/doomsday/client/src/render/rend_font.cpp b/doomsday/client/src/render/rend_font.cpp
@@ -17,10 +17,9 @@
  * http://www.gnu.org/licenses</small>
  */
 
-#include <assert.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
 
 #define DENG_NO_API_MACROS_FONT_RENDER
 
@@ -31,9 +30,8 @@
 #include "de_system.h"
 #include "de_ui.h"
 
-#include "resource/abstractfont.h"
-#include "resource/fonts.h"
-#include "resource/bitmapfont.h"
+#include "BitmapFont"
+#include "CompositeBitmapFont"
 #include "m_misc.h"
 
 #include <de/GLState>

diff --git a/doomsday/client/src/resource/fonts.cpp b/doomsday/client/src/resource/fonts.cpp
@@ -22,23 +22,16 @@
 #include "resource/fonts.h"
 
 #include "de_console.h"
-#include "de_filesys.h"
 #include "dd_main.h" // App_ResourceSystem(), verbose
 #ifdef __CLIENT__
-#  include "gl/gl_main.h"
-#  include "gl/gl_texmanager.h"
+#  include "BitmapFont"
+#  include "CompositeBitmapFont"
 #endif
 #include <de/Error>
-#include <de/NativePath>
-#include <de/Observers>
-#include <de/PathTree>
-#include <de/mathutil.h>
 #include <de/memory.h>
 #include <QList>
 #include <QtAlgorithms>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
+#include <cstdlib>
 
 D_CMD(ListFonts);
 #ifdef DENG_DEBUG

diff --git a/doomsday/client/src/resource/resourcesystem.cpp b/doomsday/client/src/resource/resourcesystem.cpp
@@ -23,6 +23,10 @@
 #include "resource/compositetexture.h"
 #include "resource/patch.h"
 #include "resource/patchname.h"
+#ifdef __CLIENT__
+#  include "BitmapFont"
+#  include "CompositeBitmapFont"
+#endif
 #include "filesys/fs_main.h"
 #include "filesys/lumpindex.h"
 #include <de/ByteRefArray>