[Scummvm-cvs-logs] CVS: scummvm/common config-file.cpp,1.14,1.15 config-file.h,1.8,1.9 engine.cpp,1.27,1.28 engine.h,1.31,1.32 file.cpp,1.38,1.39 file.h,1.14,1.15 gameDetector.cpp,1.126,1.127 list.h,1.5,1.6 main.cpp,1.35,1.36 map.h,1.8,1.9 rect.h,1.11,1.12 scaler.cpp,1.35,1.36 scaler.h,1.13,1.14 stdafx.h,1.13,1.14 str.cpp,1.19,1.20 str.h,1.11,1.12 system.h,1.39,1.40 timer.cpp,1.11,1.12 timer.h,1.8,1.9 util.cpp,1.17,1.18 util.h,1.22,1.23

Max Horn fingolfin at users.sourceforge.net
Fri Aug 1 05:19:10 CEST 2003 

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv421

Modified Files:
	config-file.cpp config-file.h engine.cpp engine.h file.cpp 
	file.h gameDetector.cpp list.h main.cpp map.h rect.h 
	scaler.cpp scaler.h stdafx.h str.cpp str.h system.h timer.cpp 
	timer.h util.cpp util.h 
Log Message:
#include cleanup (explicityl specify the location for headers from common/, so that we at some point can get rid of -Icommon; exception is made for stdafx.h, since a) we might want to rename it and b) might want to move it to the top level)

Index: config-file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-file.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- config-file.cpp	21 May 2003 16:48:25 -0000	1.14
+++ config-file.cpp	1 Aug 2003 12:18:35 -0000	1.15
@@ -21,11 +21,8 @@
  */
 
 #include "stdafx.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "config-file.h"
-#include "engine.h" // for debug()
+#include "common/config-file.h"
+#include "common/engine.h" // for debug()
 
 #define MAXLINELEN 256
 

Index: config-file.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-file.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- config-file.h	6 Mar 2003 21:45:17 -0000	1.8
+++ config-file.h	1 Aug 2003 12:18:35 -0000	1.9
@@ -23,10 +23,10 @@
 #ifndef CONFIG_FILE_H
 #define CONFIG_FILE_H
 
-#include "common/util.h"
-#include "common/map.h"
 #include "common/list.h"
+#include "common/map.h"
 #include "common/str.h"
+#include "common/util.h"
 
 class Config {
 public:

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/engine.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- engine.cpp	30 Jul 2003 20:26:59 -0000	1.27
+++ engine.cpp	1 Aug 2003 12:18:35 -0000	1.28
@@ -19,10 +19,10 @@
  */
 
 #include "stdafx.h"
-#include "engine.h"
-#include "config-file.h"
-#include "gameDetector.h"
-#include "timer.h"
+#include "common/config-file.h"
+#include "common/engine.h"
+#include "common/gameDetector.h"
+#include "common/timer.h"
 #include "sound/mixer.h"
 
 /*

Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/engine.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- engine.h	30 Jul 2003 19:25:31 -0000	1.31
+++ engine.h	1 Aug 2003 12:18:35 -0000	1.32
@@ -21,8 +21,8 @@
 #ifndef ENGINE_H
 #define ENGINE_H
 
-#include "scummsys.h"
-#include "system.h"
+#include "common/scummsys.h"
+#include "common/system.h"
 
 extern const char *gScummVMVersion;		// e.g. "0.4.1"
 extern const char *gScummVMBuildDate;	// e.g. "2003-06-24"

Index: file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/file.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- file.cpp	3 Jul 2003 07:03:18 -0000	1.38
+++ file.cpp	1 Aug 2003 12:18:35 -0000	1.39
@@ -19,9 +19,9 @@
  *
  */
 
-#include "file.h"
-#include "util.h"
-#include "engine.h"	// For debug/warning/error
+#include "common/engine.h"	// For debug/warning/error
+#include "common/file.h"
+#include "common/util.h"
 
 FILE *File::fopenNoCase(const char *filename, const char *directory, const char *mode) {
 	FILE *file;

Index: file.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/file.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- file.h	21 Jun 2003 20:21:40 -0000	1.14
+++ file.h	1 Aug 2003 12:18:35 -0000	1.15
@@ -22,9 +22,8 @@
 #ifndef COMMON_FILE_H
 #define COMMON_FILE_H
 
-#include <stdio.h>
 #include "stdafx.h"
-#include "scummsys.h"
+#include "common/scummsys.h"
 
 class File {
 private:

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- gameDetector.cpp	31 Jul 2003 12:33:32 -0000	1.126
+++ gameDetector.cpp	1 Aug 2003 12:18:35 -0000	1.127
@@ -22,11 +22,11 @@
 
 #include "stdafx.h"
 #include "backends/intern.h"
+#include "common/config-file.h"
+#include "common/engine.h"
+#include "common/gameDetector.h"
+#include "common/scaler.h"	// Only for gfx_modes
 #include "sound/mididrv.h"
-#include "engine.h"
-#include "gameDetector.h"
-#include "config-file.h"
-#include "scaler.h"	// Only for gfx_modes
 
 #if defined(HAVE_CONFIG_H)
 #include "config.h"

Index: list.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/list.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- list.h	6 Mar 2003 21:45:23 -0000	1.5
+++ list.h	1 Aug 2003 12:18:35 -0000	1.6
@@ -21,7 +21,7 @@
 #ifndef COMMON_LIST_H
 #define COMMON_LIST_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include <assert.h>
 
 namespace ScummVM {

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/main.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- main.cpp	15 Jul 2003 02:16:33 -0000	1.35
+++ main.cpp	1 Aug 2003 12:18:35 -0000	1.36
@@ -29,10 +29,10 @@
  */
  
 #include "stdafx.h"
-#include "engine.h"
-#include "gameDetector.h"
-#include "config-file.h"
-#include "scaler.h"	// For GFX_NORMAL
+#include "common/config-file.h"
+#include "common/engine.h"
+#include "common/gameDetector.h"
+#include "common/scaler.h"	// For GFX_NORMAL
 #include "gui/newgui.h"
 #include "gui/launcher.h"
 #include "gui/message.h"

Index: map.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/map.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- map.h	6 Mar 2003 21:45:24 -0000	1.8
+++ map.h	1 Aug 2003 12:18:35 -0000	1.9
@@ -21,7 +21,7 @@
 #ifndef COMMON_MAP_H
 #define COMMON_MAP_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 
 namespace ScummVM {
 

Index: rect.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/rect.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- rect.h	1 Jun 2003 17:06:07 -0000	1.11
+++ rect.h	1 Aug 2003 12:18:35 -0000	1.12
@@ -22,8 +22,8 @@
 #ifndef COMMON_RECT_H
 #define COMMON_RECT_H
 
-#include "scummsys.h"
-#include "util.h"
+#include "common/scummsys.h"
+#include "common/util.h"
 
 namespace ScummVM {
 

Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- scaler.cpp	21 Jul 2003 00:07:27 -0000	1.35
+++ scaler.cpp	1 Aug 2003 12:18:35 -0000	1.36
@@ -21,8 +21,8 @@
  */
 
 #include "stdafx.h"
-#include "scummsys.h"
-#include "scaler.h"
+#include "common/scummsys.h"
+#include "common/scaler.h"
 
 // TODO: get rid of the colorMask etc. variables and instead use templates.
 // This should give a respectable boost, since variable access (i.e. memory reads)

Index: scaler.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- scaler.h	22 Jun 2003 14:59:21 -0000	1.13
+++ scaler.h	1 Aug 2003 12:18:35 -0000	1.14
@@ -18,8 +18,8 @@
  * $Header$
  */
 
-#ifndef SCALER_H
-#define SCALER_H
+#ifndef COMMON_SCALER_H
+#define COMMON_SCALER_H
 
 extern int Init_2xSaI (uint32 BitFormat);
 

Index: stdafx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/stdafx.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- stdafx.h	1 Aug 2003 05:44:18 -0000	1.13
+++ stdafx.h	1 Aug 2003 12:18:35 -0000	1.14
@@ -81,7 +81,6 @@
 #include <stdarg.h>
 #include <fcntl.h>
 #include <conio.h>
-#include <malloc.h>
 #include <assert.h>
 #include <mmsystem.h>
 #include <ctype.h>

Index: str.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/str.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- str.cpp	1 Aug 2003 05:41:07 -0000	1.19
+++ str.cpp	1 Aug 2003 12:18:35 -0000	1.20
@@ -19,7 +19,7 @@
  */
 
 #include "stdafx.h"
-#include "str.h"
+#include "common/str.h"
 
 #include <ctype.h>
 

Index: str.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/str.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- str.h	21 May 2003 16:56:45 -0000	1.11
+++ str.h	1 Aug 2003 12:18:35 -0000	1.12
@@ -21,7 +21,7 @@
 #ifndef COMMON_STRING_H
 #define COMMON_STRING_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "common/list.h"
 
 #include <assert.h>

Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/system.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- system.h	31 Jul 2003 12:33:32 -0000	1.39
+++ system.h	1 Aug 2003 12:18:35 -0000	1.40
@@ -23,8 +23,8 @@
 #ifndef COMMON_SYSTEM_H
 #define COMMON_SYSTEM_H
 
-#include "scummsys.h"
-#include "savefile.h"
+#include "common/scummsys.h"
+#include "common/savefile.h"
 
 /**
  * Interface for ScummVM backends. If you want to port ScummVM to a system

Index: timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/timer.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- timer.cpp	3 Jul 2003 11:18:07 -0000	1.11
+++ timer.cpp	1 Aug 2003 12:18:35 -0000	1.12
@@ -21,8 +21,8 @@
 #ifndef __MORPHOS__
 
 #include "stdafx.h"
-#include "scummsys.h"
-#include "timer.h"
+#include "common/scummsys.h"
+#include "common/timer.h"
 
 static Timer *g_timer = NULL;
 

Index: timer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/timer.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- timer.h	5 Jul 2003 15:19:11 -0000	1.8
+++ timer.h	1 Aug 2003 12:18:35 -0000	1.9
@@ -18,11 +18,11 @@
  * $Header$
  */
 
-#ifndef TIMER_H
-#define TIMER_H
+#ifndef COMMON_TIMER_H
+#define COMMON_TIMER_H
 
-#include "scummsys.h"
-#include "engine.h"
+#include "common/scummsys.h"
+#include "common/engine.h"
 
 #define MAX_TIMERS 5
 

Index: util.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- util.cpp	5 Jul 2003 15:37:23 -0000	1.17
+++ util.cpp	1 Aug 2003 12:18:35 -0000	1.18
@@ -19,8 +19,8 @@
  */
 
 #include "stdafx.h"
-#include "engine.h"
-#include "util.h"
+#include "common/engine.h"
+#include "common/util.h"
 
 //
 // 8-bit alpha blending routines

Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- util.h	5 Jul 2003 15:28:27 -0000	1.22
+++ util.h	1 Aug 2003 12:18:35 -0000	1.23
@@ -21,8 +21,8 @@
 #ifndef COMMON_UTIL_H
 #define COMMON_UTIL_H
 
-#include "scummsys.h"
-#include "system.h"
+#include "common/scummsys.h"
+#include "common/system.h"
 
 template<typename T> inline T ABS (T x)			{ return (x>=0) ? x : -x; }
 template<typename T> inline T MIN (T a, T b)	{ return (a<b) ? a : b; }

More information about the Scummvm-git-logs mailing list