diff options
Diffstat (limited to 'common')
40 files changed, 51 insertions, 52 deletions
diff --git a/common/EventRecorder.cpp b/common/EventRecorder.cpp index 1dedbb5059..d2ad4bc475 100644 --- a/common/EventRecorder.cpp +++ b/common/EventRecorder.cpp @@ -28,6 +28,7 @@ #include "common/config-manager.h" #include "common/random.h" #include "common/savefile.h" +#include "common/textconsole.h" DECLARE_SINGLETON(Common::EventRecorder); diff --git a/common/archive.cpp b/common/archive.cpp index c65408b56e..c2c9c8e702 100644 --- a/common/archive.cpp +++ b/common/archive.cpp @@ -25,8 +25,8 @@ #include "common/archive.h" #include "common/fs.h" -#include "common/util.h" #include "common/system.h" +#include "common/textconsole.h" namespace Common { diff --git a/common/archive.h b/common/archive.h index c12ca79be0..375136fa15 100644 --- a/common/archive.h +++ b/common/archive.h @@ -27,7 +27,6 @@ #define COMMON_ARCHIVE_H #include "common/str.h" -#include "common/hash-str.h" #include "common/list.h" #include "common/ptr.h" #include "common/singleton.h" diff --git a/common/config-file.cpp b/common/config-file.cpp index 878d29301f..cd8f0989fc 100644 --- a/common/config-file.cpp +++ b/common/config-file.cpp @@ -27,7 +27,7 @@ #include "common/file.h" #include "common/savefile.h" #include "common/system.h" -#include "common/util.h" +#include "common/textconsole.h" #define MAXLINELEN 256 diff --git a/common/config-file.h b/common/config-file.h index 2f7d9cb650..231162fb3c 100644 --- a/common/config-file.h +++ b/common/config-file.h @@ -26,13 +26,15 @@ #ifndef COMMON_CONFIG_FILE_H #define COMMON_CONFIG_FILE_H -#include "common/config-manager.h" +#include "common/hash-str.h" #include "common/list.h" #include "common/str.h" -#include "common/stream.h" namespace Common { +class SeekableReadStream; +class WriteStream; + /** * This class allows reading/writing INI style config files. * It is used by the ConfigManager for storage, but can also diff --git a/common/config-manager.cpp b/common/config-manager.cpp index 77c918dcae..5f5c14f8de 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -24,10 +24,11 @@ */ #include "common/config-manager.h" +#include "common/debug.h" #include "common/file.h" #include "common/fs.h" -#include "common/util.h" #include "common/system.h" +#include "common/textconsole.h" DECLARE_SINGLETON(Common::ConfigManager); diff --git a/common/dcl.cpp b/common/dcl.cpp index ef45bc92ba..efe1de0415 100644 --- a/common/dcl.cpp +++ b/common/dcl.cpp @@ -25,11 +25,9 @@ #include "common/dcl.h" #include "common/debug.h" -#include "common/debug-channels.h" -#include "common/endian.h" #include "common/memstream.h" #include "common/stream.h" -#include "common/util.h" +#include "common/textconsole.h" namespace Common { diff --git a/common/debug.cpp b/common/debug.cpp index c87d195b76..a8711055fd 100644 --- a/common/debug.cpp +++ b/common/debug.cpp @@ -24,8 +24,8 @@ #include "common/debug.h" #include "common/debug-channels.h" -#include "common/util.h" #include "common/system.h" +#include "common/textconsole.h" #include <stdarg.h> // For va_list etc. diff --git a/common/error.cpp b/common/error.cpp index 8fa58e2259..b07e5ebd74 100644 --- a/common/error.cpp +++ b/common/error.cpp @@ -24,7 +24,6 @@ */ #include "common/error.h" -#include "common/util.h" #include "common/translation.h" diff --git a/common/file.cpp b/common/file.cpp index dec0f2a953..485255bbdb 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -27,8 +27,7 @@ #include "common/debug.h" #include "common/file.h" #include "common/fs.h" -#include "common/util.h" -#include "common/system.h" +#include "common/textconsole.h" namespace Common { diff --git a/common/file.h b/common/file.h index d28cd9c308..c3805baed7 100644 --- a/common/file.h +++ b/common/file.h @@ -27,6 +27,7 @@ #define COMMON_FILE_H #include "common/scummsys.h" +#include "common/fs.h" #include "common/noncopyable.h" #include "common/str.h" #include "common/stream.h" @@ -34,7 +35,6 @@ namespace Common { class Archive; -class FSNode; /** * TODO: vital to document this core class properly!!! For both users and implementors diff --git a/common/fs.cpp b/common/fs.cpp index 87067df2cc..d3cdc0697f 100644 --- a/common/fs.cpp +++ b/common/fs.cpp @@ -22,8 +22,8 @@ * $Id$ */ -#include "common/util.h" #include "common/system.h" +#include "common/textconsole.h" #include "backends/fs/abstract-fs.h" #include "backends/fs/fs-factory.h" diff --git a/common/fs.h b/common/fs.h index 6b20a05013..f93c11159e 100644 --- a/common/fs.h +++ b/common/fs.h @@ -27,6 +27,8 @@ #include "common/array.h" #include "common/archive.h" +#include "common/hash-str.h" +#include "common/hashmap.h" #include "common/ptr.h" #include "common/str.h" diff --git a/common/hashmap.h b/common/hashmap.h index 233d7f5b16..907a107163 100644 --- a/common/hashmap.h +++ b/common/hashmap.h @@ -47,8 +47,6 @@ #include "common/func.h" -#include "common/str.h" -#include "common/util.h" #ifdef DEBUG_HASH_COLLISIONS #include "common/debug.h" diff --git a/common/iff_container.h b/common/iff_container.h index 01fc8017a9..43a551a239 100644 --- a/common/iff_container.h +++ b/common/iff_container.h @@ -29,7 +29,7 @@ #include "common/endian.h" #include "common/func.h" #include "common/stream.h" -#include "common/util.h" +#include "common/textconsole.h" namespace Common { diff --git a/common/macresman.cpp b/common/macresman.cpp index b06d986ca2..489f8f93ce 100644 --- a/common/macresman.cpp +++ b/common/macresman.cpp @@ -31,7 +31,7 @@ #include "common/macresman.h" #include "common/md5.h" #include "common/substream.h" -#include "common/memstream.h" +#include "common/textconsole.h" #ifdef MACOSX #include "common/config-manager.h" diff --git a/common/macresman.h b/common/macresman.h index 2ad0b608a1..fdb3ce491d 100644 --- a/common/macresman.h +++ b/common/macresman.h @@ -33,15 +33,14 @@ */ #include "common/array.h" -#include "common/file.h" +#include "common/fs.h" +#include "common/str.h" #ifndef COMMON_MACRESMAN_H #define COMMON_MACRESMAN_H namespace Common { -class FSNode; - typedef Array<uint16> MacResIDArray; typedef Array<uint32> MacResTagArray; diff --git a/common/md5.cpp b/common/md5.cpp index e4736e85ca..bea9ca0dc5 100644 --- a/common/md5.cpp +++ b/common/md5.cpp @@ -28,10 +28,10 @@ * this program is licensed under the GPL. */ -#include "common/file.h" -#include "common/fs.h" #include "common/md5.h" #include "common/endian.h" +#include "common/str.h" +#include "common/stream.h" namespace Common { diff --git a/common/md5.h b/common/md5.h index 29f3aeeb4c..e613028a5e 100644 --- a/common/md5.h +++ b/common/md5.h @@ -26,11 +26,11 @@ #define COMMON_MD5_H #include "common/scummsys.h" -#include "common/str.h" namespace Common { class ReadStream; +class String; /** * Compute the MD5 checksum of the content of the given ReadStream. diff --git a/common/memstream.h b/common/memstream.h index 13b8e26e8a..ac42e1bad9 100644 --- a/common/memstream.h +++ b/common/memstream.h @@ -27,6 +27,7 @@ #define COMMON_MEMSTREAM_H #include "common/stream.h" +#include "common/types.h" namespace Common { diff --git a/common/stream.cpp b/common/stream.cpp index 1be3fbffea..e870e68b2d 100644 --- a/common/stream.cpp +++ b/common/stream.cpp @@ -26,9 +26,7 @@ #include "common/stream.h" #include "common/memstream.h" #include "common/substream.h" -#include "common/bufferedstream.h" #include "common/str.h" -#include "common/util.h" namespace Common { diff --git a/common/stream.h b/common/stream.h index 65b4971a72..530b50e431 100644 --- a/common/stream.h +++ b/common/stream.h @@ -26,12 +26,12 @@ #ifndef COMMON_STREAM_H #define COMMON_STREAM_H -#include "common/types.h" #include "common/endian.h" +#include "common/scummsys.h" +#include "common/str.h" namespace Common { -class String; class SeekableReadStream; /** diff --git a/common/substream.h b/common/substream.h index 4d90ec5ced..ecf11c54c9 100644 --- a/common/substream.h +++ b/common/substream.h @@ -27,6 +27,7 @@ #define COMMON_SUBSTREAM_H #include "common/stream.h" +#include "common/types.h" namespace Common { diff --git a/common/system.cpp b/common/system.cpp index 1ec7c14617..4e902bcb14 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -28,6 +28,7 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL #include "common/system.h" +#include "common/str.h" #ifdef __PLAYSTATION2__ // for those replaced fopen/fread/etc functions diff --git a/common/system.h b/common/system.h index f727ff62dd..0f01fcd0c3 100644 --- a/common/system.h +++ b/common/system.h @@ -28,25 +28,23 @@ #include "common/scummsys.h" #include "common/noncopyable.h" -#include "common/rect.h" #include "common/list.h" // For OSystem::getSupportedFormats() -#include "graphics/palette.h" // for PaletteManager -#include "graphics/pixelformat.h" - namespace Audio { class Mixer; } namespace Graphics { +struct PixelFormat; struct Surface; } namespace Common { -struct Event; class EventManager; +struct Rect; class SaveFileManager; class SearchSet; +class String; class TimerManager; class SeekableReadStream; class WriteStream; diff --git a/common/textconsole.cpp b/common/textconsole.cpp index 9c72699914..8d62cd4cb2 100644 --- a/common/textconsole.cpp +++ b/common/textconsole.cpp @@ -24,6 +24,7 @@ #include "common/textconsole.h" #include "common/system.h" +#include "common/str.h" namespace Common { diff --git a/common/translation.cpp b/common/translation.cpp index 407da2c883..5494849f4c 100644 --- a/common/translation.cpp +++ b/common/translation.cpp @@ -32,11 +32,11 @@ #define TRANSLATIONS_DAT_VER 2 #include "common/translation.h" -#include "common/archive.h" #include "common/config-manager.h" #include "common/file.h" #include "common/fs.h" #include "common/system.h" +#include "common/textconsole.h" #ifdef USE_TRANSLATION diff --git a/common/translation.h b/common/translation.h index 523f2f4de7..f8183b6350 100644 --- a/common/translation.h +++ b/common/translation.h @@ -25,6 +25,9 @@ #ifndef COMMON_TRANSLATION_H #define COMMON_TRANSLATION_H +#include "common/array.h" +#include "common/fs.h" +#include "common/str.h" #include "common/singleton.h" #include "common/str-array.h" @@ -33,7 +36,6 @@ namespace Common { class File; -class FSNode; enum TranslationIDs { kTranslationAutodetectId = 0, diff --git a/common/unarj.cpp b/common/unarj.cpp index 2c4225f393..4bda7ac753 100644 --- a/common/unarj.cpp +++ b/common/unarj.cpp @@ -30,12 +30,12 @@ #include "common/scummsys.h" #include "common/archive.h" #include "common/debug.h" -#include "common/util.h" #include "common/unarj.h" #include "common/file.h" #include "common/hash-str.h" #include "common/memstream.h" #include "common/bufferedstream.h" +#include "common/textconsole.h" namespace Common { diff --git a/common/unarj.h b/common/unarj.h index fa7d388542..fe23ba5694 100644 --- a/common/unarj.h +++ b/common/unarj.h @@ -32,10 +32,11 @@ #ifndef COMMON_UNARJ_H #define COMMON_UNARJ_H +#include "common/str.h" + namespace Common { class Archive; -class String; /** * This factory method creates an Archive instance corresponding to the content diff --git a/common/unzip.cpp b/common/unzip.cpp index 7b78da0faf..a55dfd1cad 100644 --- a/common/unzip.cpp +++ b/common/unzip.cpp @@ -105,7 +105,6 @@ typedef struct { #include "common/fs.h" #include "common/unzip.h" -#include "common/file.h" #include "common/memstream.h" #include "common/hashmap.h" diff --git a/common/unzip.h b/common/unzip.h index c460840f12..fe7acdcc54 100644 --- a/common/unzip.h +++ b/common/unzip.h @@ -25,12 +25,13 @@ #ifndef COMMON_UNZIP_H #define COMMON_UNZIP_H +#include "common/str.h" + namespace Common { class Archive; class FSNode; class SeekableReadStream; -class String; /** * This factory method creates an Archive instance corresponding to the content diff --git a/common/util.cpp b/common/util.cpp index cba921a142..7ffd5e45b1 100644 --- a/common/util.cpp +++ b/common/util.cpp @@ -23,9 +23,9 @@ */ #include "common/util.h" -#include "common/system.h" #include "common/translation.h" #include "common/config-manager.h" +#include "common/debug.h" namespace Common { diff --git a/common/util.h b/common/util.h index b3dd6a4f64..4493455a8c 100644 --- a/common/util.h +++ b/common/util.h @@ -26,7 +26,6 @@ #define COMMON_UTIL_H #include "common/scummsys.h" -#include "common/textconsole.h" #include "common/str.h" diff --git a/common/winexe.h b/common/winexe.h index af0d70c555..ce2f19cb81 100644 --- a/common/winexe.h +++ b/common/winexe.h @@ -27,11 +27,10 @@ #define COMMON_WINEXE_H #include "common/hash-str.h" +#include "common/str.h" namespace Common { -class String; - class WinResourceID { public: WinResourceID() { _idType = kIDTypeNull; } diff --git a/common/winexe_ne.h b/common/winexe_ne.h index c1d04080ba..2988132040 100644 --- a/common/winexe_ne.h +++ b/common/winexe_ne.h @@ -26,15 +26,14 @@ #ifndef COMMON_WINEXE_NE_H #define COMMON_WINEXE_NE_H -#include "common/array.h" #include "common/list.h" +#include "common/str.h" #include "common/winexe.h" namespace Common { -class MemoryReadStream; +template<class T> class Array; class SeekableReadStream; -class String; /** The default Windows resources. */ enum NEResourceType { diff --git a/common/winexe_pe.cpp b/common/winexe_pe.cpp index 99d44cabbd..6bb831b9c6 100644 --- a/common/winexe_pe.cpp +++ b/common/winexe_pe.cpp @@ -23,9 +23,10 @@ * */ +#include "common/array.h" #include "common/debug.h" +#include "common/endian.h" #include "common/file.h" -#include "common/memstream.h" #include "common/str.h" #include "common/stream.h" #include "common/winexe_pe.h" diff --git a/common/winexe_pe.h b/common/winexe_pe.h index 5298e993ad..60c4adb916 100644 --- a/common/winexe_pe.h +++ b/common/winexe_pe.h @@ -26,14 +26,15 @@ #ifndef COMMON_WINEXE_PE_H #define COMMON_WINEXE_PE_H -#include "common/array.h" +#include "common/hash-str.h" #include "common/hashmap.h" +#include "common/str.h" #include "common/winexe.h" namespace Common { +template<class T> class Array; class SeekableReadStream; -class String; /** The default Windows PE resources. */ enum PEResourceType { diff --git a/common/xmlparser.cpp b/common/xmlparser.cpp index b53a9a33c2..7a6e794e11 100644 --- a/common/xmlparser.cpp +++ b/common/xmlparser.cpp @@ -24,7 +24,6 @@ */ #include "common/xmlparser.h" -#include "common/util.h" #include "common/archive.h" #include "common/fs.h" #include "common/memstream.h" diff --git a/common/xmlparser.h b/common/xmlparser.h index ec8f371681..c456fd0826 100644 --- a/common/xmlparser.h +++ b/common/xmlparser.h @@ -29,6 +29,7 @@ #include "common/scummsys.h" #include "common/types.h" +#include "common/fs.h" #include "common/list.h" #include "common/hashmap.h" #include "common/hash-str.h" @@ -37,7 +38,6 @@ namespace Common { -class FSNode; class SeekableReadStream; #define MAX_XML_DEPTH 8 |