From 10b881f997384378a299bff358716db5183b65a5 Mon Sep 17 00:00:00 2001 From: Björn Steinbrink Date: Sat, 13 Aug 2005 12:49:52 +0000 Subject: Huge header cleanup to reduce dependencies and compile time. --- src/resources/buddylist.h | 5 +++-- src/resources/image.cpp | 8 +++++--- src/resources/image.h | 3 ++- src/resources/itemmanager.cpp | 12 +++++++----- src/resources/itemmanager.h | 3 +-- src/resources/mapreader.cpp | 13 ++++++++----- src/resources/mapreader.h | 9 ++++++--- src/resources/music.h | 4 ++-- src/resources/resource.cpp | 4 +++- src/resources/resourcemanager.cpp | 18 ++++++++---------- src/resources/resourcemanager.h | 11 ++++++----- src/resources/soundeffect.h | 4 ++-- 12 files changed, 53 insertions(+), 41 deletions(-) (limited to 'src/resources') diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h index 5f082ba7..33c85723 100644 --- a/src/resources/buddylist.h +++ b/src/resources/buddylist.h @@ -24,9 +24,10 @@ #ifndef _TMW_BUDDYLIST_H #define _TMW_BUDDYLIST_H -#include +#include #include -#include + +#include class BuddyList : public gcn::ListModel { public: diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 38ed994b..9dafc64c 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -21,12 +21,14 @@ * $Id$ */ -#include "../main.h" -#include "../log.h" #include "image.h" -#include + #include +#include "../log.h" +#include "../main.h" + + Image::Image(SDL_Surface *image): image(image) { diff --git a/src/resources/image.h b/src/resources/image.h index a12572bb..7d1fe3c4 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -24,12 +24,13 @@ #ifndef _TMW_IMAGE_H #define _TMW_IMAGE_H -#include "resource.h" #include #ifdef USE_OPENGL #include #endif +#include "resource.h" + /** * Defines a class for loading and storing images. */ diff --git a/src/resources/itemmanager.cpp b/src/resources/itemmanager.cpp index f5abb5cb..ef2d573b 100644 --- a/src/resources/itemmanager.cpp +++ b/src/resources/itemmanager.cpp @@ -20,16 +20,17 @@ * * $Id$ */ - -#include - -#include -#include #include "itemmanager.h" + +#include + #include "resourcemanager.h" + #include "../log.h" +#include "resources/iteminfo.h" + // MSVC libxml2 at the moment doesn't work right when using MinGW, missing this // function at link time. #ifdef WIN32 @@ -37,6 +38,7 @@ #define xmlFree(x) ; #endif + ItemManager::ItemManager() { ResourceManager *resman = ResourceManager::getInstance(); diff --git a/src/resources/itemmanager.h b/src/resources/itemmanager.h index 7cc26a25..ed4889a6 100644 --- a/src/resources/itemmanager.h +++ b/src/resources/itemmanager.h @@ -24,10 +24,9 @@ #ifndef _TMW_ITEM_MANAGER_H #define _TMW_ITEM_MANAGER_H -#include #include -#include "iteminfo.h" +class ItemInfo; /** * Defines a class to load items database. diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 5d15fd08..2b8c7ab6 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -21,16 +21,19 @@ * $Id$ */ -#include "../log.h" #include "mapreader.h" + +#include +#include + #include "resourcemanager.h" -#include "../graphic/spriteset.h" + #include "../base64.h" +#include "../log.h" +#include "../map.h" -#include +#include "../graphic/spriteset.h" -#include -#include const unsigned int DEFAULT_TILE_WIDTH = 32; const unsigned int DEFAULT_TILE_HEIGHT = 32; diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h index be38afeb..f37a67c3 100644 --- a/src/resources/mapreader.h +++ b/src/resources/mapreader.h @@ -24,11 +24,14 @@ #ifndef _INCLUDED_MAPREADER_H #define _INCLUDED_MAPREADER_H -#include "../map.h" -#include "../graphic/spriteset.h" -#include #include +#include + +#include "../graphic/spriteset.h" + +class Map; + /** * A tileset, which is basically just a spriteset but it stores a firstgid. */ diff --git a/src/resources/music.h b/src/resources/music.h index 68f285e4..b8d493e2 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -24,10 +24,10 @@ #ifndef _TMW_MUSIC_H #define _TMW_MUSIC_H -#include "resource.h" -#include #include +#include "resource.h" + /** * Defines a class for loading and storing music. */ diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp index 30e93f76..e13ec359 100644 --- a/src/resources/resource.cpp +++ b/src/resources/resource.cpp @@ -22,10 +22,12 @@ */ #include "resource.h" -#include "resourcemanager.h" #include +#include "resourcemanager.h" + + Resource::Resource(): mRefCount(0) { diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index d185b99a..8f26cf5c 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -21,25 +21,23 @@ * $Id$ */ -#include -#include "../main.h" #include "resourcemanager.h" -#include "../log.h" -#include "../configuration.h" -#include -#include -#include #include +#include #ifdef WIN32 #include #include -#else -#include -#include #endif +#include "image.h" +#include "music.h" +#include "soundeffect.h" + +#include "../log.h" + + ResourceManager *ResourceManager::instance = NULL; ResourceManager::ResourceManager() diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index fa7d9610..a5a01987 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -24,13 +24,14 @@ #ifndef _TMW_RESOURCE_MANAGER_H #define _TMW_RESOURCE_MANAGER_H +#include #include -#include #include -#include "resource.h" -#include "image.h" -#include "music.h" -#include "soundeffect.h" + +class Resource; +class Image; +class Music; +class SoundEffect; /** * A class for loading and managing resources. diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index 2e56df9b..69d9823d 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -24,10 +24,10 @@ #ifndef _TMW_SOUND_EFFECT_H #define _TMW_SOUND_EFFECT_H -#include "resource.h" -#include #include +#include "resource.h" + /** * Defines a class for loading and storing sound effects. */ -- cgit v1.2.3-70-g09d2