[Scummvm-cvs-logs] SF.net SVN: scummvm:[36143] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri Jan 30 06:25:18 CET 2009
Revision: 36143
http://scummvm.svn.sourceforge.net/scummvm/?rev=36143&view=rev
Author: fingolfin
Date: 2009-01-30 05:25:17 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
do not include common/debug.h from common/util.h
Modified Paths:
--------------
scummvm/trunk/backends/platform/sdl/sdl.cpp
scummvm/trunk/base/main.cpp
scummvm/trunk/base/plugins.cpp
scummvm/trunk/common/file.cpp
scummvm/trunk/common/mutex.cpp
scummvm/trunk/common/rect.h
scummvm/trunk/common/unarj.cpp
scummvm/trunk/common/util.h
scummvm/trunk/common/xmlparser.h
scummvm/trunk/engines/advancedDetector.cpp
scummvm/trunk/engines/agi/wagparser.cpp
scummvm/trunk/engines/agos/midiparser_s1d.cpp
scummvm/trunk/engines/cine/msg.cpp
scummvm/trunk/engines/cine/part.cpp
scummvm/trunk/engines/cine/saveload.cpp
scummvm/trunk/engines/queen/bankman.cpp
scummvm/trunk/engines/queen/grid.cpp
scummvm/trunk/engines/queen/resource.cpp
scummvm/trunk/engines/scumm/file_nes.cpp
scummvm/trunk/engines/sword1/debug.cpp
scummvm/trunk/engines/sword1/router.cpp
scummvm/trunk/graphics/video/dxa_player.cpp
scummvm/trunk/graphics/video/video_player.cpp
scummvm/trunk/gui/debugger.cpp
scummvm/trunk/sound/audiostream.cpp
scummvm/trunk/sound/flac.cpp
scummvm/trunk/sound/mods/rjp1.cpp
scummvm/trunk/sound/mp3.cpp
scummvm/trunk/sound/musicplugin.h
scummvm/trunk/sound/softsynth/adlib.cpp
scummvm/trunk/sound/softsynth/mt32.cpp
scummvm/trunk/sound/voc.cpp
scummvm/trunk/sound/vorbis.cpp
scummvm/trunk/sound/wave.cpp
Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -32,6 +32,7 @@
#include "backends/platform/sdl/sdl.h"
#include "common/archive.h"
#include "common/config-manager.h"
+#include "common/debug.h"
#include "common/events.h"
#include "common/util.h"
Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/base/main.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -39,6 +39,7 @@
#include "common/archive.h"
#include "common/config-manager.h"
+#include "common/debug.h"
#include "common/events.h"
#include "common/file.h"
#include "common/fs.h"
Modified: scummvm/trunk/base/plugins.cpp
===================================================================
--- scummvm/trunk/base/plugins.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/base/plugins.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -26,6 +26,7 @@
#include "base/plugins.h"
#include "common/func.h"
+#include "common/debug.h"
#ifdef DYNAMIC_MODULES
#include "common/config-manager.h"
Modified: scummvm/trunk/common/file.cpp
===================================================================
--- scummvm/trunk/common/file.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/common/file.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -24,6 +24,7 @@
*/
#include "common/archive.h"
+#include "common/debug.h"
#include "common/file.h"
#include "common/fs.h"
#include "common/util.h"
Modified: scummvm/trunk/common/mutex.cpp
===================================================================
--- scummvm/trunk/common/mutex.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/common/mutex.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -23,6 +23,7 @@
*
*/
+#include "common/debug.h"
#include "common/mutex.h"
#include "common/system.h"
Modified: scummvm/trunk/common/rect.h
===================================================================
--- scummvm/trunk/common/rect.h 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/common/rect.h 2009-01-30 05:25:17 UTC (rev 36143)
@@ -28,6 +28,7 @@
#include "common/scummsys.h"
#include "common/util.h"
+#include "common/debug.h"
namespace Common {
Modified: scummvm/trunk/common/unarj.cpp
===================================================================
--- scummvm/trunk/common/unarj.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/common/unarj.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -29,6 +29,7 @@
#include "common/scummsys.h"
#include "common/archive.h"
+#include "common/debug.h"
#include "common/util.h"
#include "common/unarj.h"
Modified: scummvm/trunk/common/util.h
===================================================================
--- scummvm/trunk/common/util.h 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/common/util.h 2009-01-30 05:25:17 UTC (rev 36143)
@@ -27,7 +27,6 @@
#include "common/scummsys.h"
#include "common/str.h"
-#include "common/debug.h"
#ifdef MIN
#undef MIN
Modified: scummvm/trunk/common/xmlparser.h
===================================================================
--- scummvm/trunk/common/xmlparser.h 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/common/xmlparser.h 2009-01-30 05:25:17 UTC (rev 36143)
@@ -29,6 +29,7 @@
#include "common/scummsys.h"
#include "common/stream.h"
+#include "common/list.h"
#include "common/hashmap.h"
#include "common/hash-str.h"
#include "common/stack.h"
Modified: scummvm/trunk/engines/advancedDetector.cpp
===================================================================
--- scummvm/trunk/engines/advancedDetector.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/engines/advancedDetector.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -25,13 +25,15 @@
#include "base/plugins.h"
+#include "common/debug.h"
#include "common/util.h"
#include "common/hash-str.h"
#include "common/file.h"
#include "common/md5.h"
-#include "engines/advancedDetector.h"
#include "common/config-manager.h"
+#include "engines/advancedDetector.h"
+
/**
* A list of pointers to ADGameDescription structs (or subclasses thereof).
*/
Modified: scummvm/trunk/engines/agi/wagparser.cpp
===================================================================
--- scummvm/trunk/engines/agi/wagparser.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/engines/agi/wagparser.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -26,6 +26,7 @@
#include "common/file.h"
#include "common/util.h"
#include "common/fs.h"
+#include "common/debug.h"
#include "agi/wagparser.h"
Modified: scummvm/trunk/engines/agos/midiparser_s1d.cpp
===================================================================
--- scummvm/trunk/engines/agos/midiparser_s1d.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/engines/agos/midiparser_s1d.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -23,8 +23,7 @@
*
*/
-
-
+#include "common/debug.h"
#include "common/util.h"
#include "sound/mididrv.h"
Modified: scummvm/trunk/engines/cine/msg.cpp
===================================================================
--- scummvm/trunk/engines/cine/msg.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/engines/cine/msg.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -23,7 +23,7 @@
*
*/
-
+#include "common/debug.h"
#include "common/endian.h"
#include "cine/msg.h"
Modified: scummvm/trunk/engines/cine/part.cpp
===================================================================
--- scummvm/trunk/engines/cine/part.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/engines/cine/part.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -23,6 +23,7 @@
*
*/
+#include "common/debug.h"
#include "common/endian.h"
#include "cine/cine.h"
Modified: scummvm/trunk/engines/cine/saveload.cpp
===================================================================
--- scummvm/trunk/engines/cine/saveload.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/engines/cine/saveload.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -23,6 +23,7 @@
*
*/
+#include "common/debug.h"
#include "common/savefile.h"
#include "cine/cine.h"
Modified: scummvm/trunk/engines/queen/bankman.cpp
===================================================================
--- scummvm/trunk/engines/queen/bankman.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/engines/queen/bankman.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -25,9 +25,10 @@
#include "queen/bankman.h"
-
#include "queen/resource.h"
+#include "common/debug.h"
+
namespace Queen {
BankManager::BankManager(Resource *res)
Modified: scummvm/trunk/engines/queen/grid.cpp
===================================================================
--- scummvm/trunk/engines/queen/grid.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/engines/queen/grid.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -30,6 +30,8 @@
#include "queen/logic.h"
#include "queen/queen.h"
+#include "common/debug.h"
+
namespace Queen {
Grid::Grid(QueenEngine *vm)
Modified: scummvm/trunk/engines/queen/resource.cpp
===================================================================
--- scummvm/trunk/engines/queen/resource.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/engines/queen/resource.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -23,7 +23,7 @@
*
*/
-
+#include "common/debug.h"
#include "common/endian.h"
#include "common/config-manager.h"
#include "queen/resource.h"
Modified: scummvm/trunk/engines/scumm/file_nes.cpp
===================================================================
--- scummvm/trunk/engines/scumm/file_nes.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/engines/scumm/file_nes.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -24,6 +24,7 @@
*/
#include "scumm/file_nes.h"
+#include "common/debug.h"
#include "common/endian.h"
#include "common/md5.h"
Modified: scummvm/trunk/engines/sword1/debug.cpp
===================================================================
--- scummvm/trunk/engines/sword1/debug.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/engines/sword1/debug.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -23,7 +23,7 @@
*
*/
-
+#include "common/debug.h"
#include "common/util.h"
#include "sword1/debug.h"
Modified: scummvm/trunk/engines/sword1/router.cpp
===================================================================
--- scummvm/trunk/engines/sword1/router.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/engines/sword1/router.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -23,7 +23,7 @@
*
*/
-
+#include "common/debug.h"
#include "common/util.h"
#include "sword1/router.h"
Modified: scummvm/trunk/graphics/video/dxa_player.cpp
===================================================================
--- scummvm/trunk/graphics/video/dxa_player.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/graphics/video/dxa_player.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -23,6 +23,7 @@
*
*/
+#include "common/debug.h"
#include "common/endian.h"
#include "common/archive.h"
#include "common/system.h"
Modified: scummvm/trunk/graphics/video/video_player.cpp
===================================================================
--- scummvm/trunk/graphics/video/video_player.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/graphics/video/video_player.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -24,6 +24,7 @@
*/
#include "common/archive.h"
+#include "common/debug.h"
#include "common/events.h"
#include "common/system.h"
#include "common/util.h"
Modified: scummvm/trunk/gui/debugger.cpp
===================================================================
--- scummvm/trunk/gui/debugger.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/gui/debugger.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -23,6 +23,7 @@
*
*/
+#include "common/debug.h"
#include "common/system.h"
#include "gui/debugger.h"
Modified: scummvm/trunk/sound/audiostream.cpp
===================================================================
--- scummvm/trunk/sound/audiostream.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/sound/audiostream.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -23,6 +23,7 @@
*
*/
+#include "common/debug.h"
#include "common/endian.h"
#include "common/file.h"
#include "common/list.h"
Modified: scummvm/trunk/sound/flac.cpp
===================================================================
--- scummvm/trunk/sound/flac.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/sound/flac.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -27,6 +27,7 @@
#ifdef USE_FLAC
+#include "common/debug.h"
#include "common/stream.h"
#include "common/util.h"
Modified: scummvm/trunk/sound/mods/rjp1.cpp
===================================================================
--- scummvm/trunk/sound/mods/rjp1.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/sound/mods/rjp1.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -23,6 +23,7 @@
*
*/
+#include "common/debug.h"
#include "common/endian.h"
#include "sound/mods/paula.h"
Modified: scummvm/trunk/sound/mp3.cpp
===================================================================
--- scummvm/trunk/sound/mp3.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/sound/mp3.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -27,6 +27,7 @@
#ifdef USE_MAD
+#include "common/debug.h"
#include "common/stream.h"
#include "common/util.h"
Modified: scummvm/trunk/sound/musicplugin.h
===================================================================
--- scummvm/trunk/sound/musicplugin.h 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/sound/musicplugin.h 2009-01-30 05:25:17 UTC (rev 36143)
@@ -27,6 +27,7 @@
#include "base/plugins.h"
#include "sound/mididrv.h"
+#include "common/list.h"
/**
* Music types that music drivers can implement and engines can rely on.
Modified: scummvm/trunk/sound/softsynth/adlib.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/adlib.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/sound/softsynth/adlib.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -23,6 +23,7 @@
*/
#include "sound/softsynth/emumidi.h"
+#include "common/debug.h"
#include "common/util.h"
#include "sound/fmopl.h"
#include "sound/musicplugin.h"
Modified: scummvm/trunk/sound/softsynth/mt32.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/mt32.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/sound/softsynth/mt32.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -33,6 +33,7 @@
#include "sound/mpu401.h"
#include "common/config-manager.h"
+#include "common/debug.h"
#include "common/events.h"
#include "common/file.h"
#include "common/system.h"
Modified: scummvm/trunk/sound/voc.cpp
===================================================================
--- scummvm/trunk/sound/voc.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/sound/voc.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -23,6 +23,7 @@
*
*/
+#include "common/debug.h"
#include "common/endian.h"
#include "common/util.h"
#include "common/stream.h"
Modified: scummvm/trunk/sound/vorbis.cpp
===================================================================
--- scummvm/trunk/sound/vorbis.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/sound/vorbis.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -27,6 +27,7 @@
#ifdef USE_VORBIS
+#include "common/debug.h"
#include "common/stream.h"
#include "common/util.h"
Modified: scummvm/trunk/sound/wave.cpp
===================================================================
--- scummvm/trunk/sound/wave.cpp 2009-01-30 05:10:24 UTC (rev 36142)
+++ scummvm/trunk/sound/wave.cpp 2009-01-30 05:25:17 UTC (rev 36143)
@@ -23,6 +23,7 @@
*
*/
+#include "common/debug.h"
#include "common/util.h"
#include "common/stream.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list