minimize some #includes and replace with forward decls

SVN-Revision: 4903

diff --git a/src/Jamfile b/src/Jamfile
index 6371251..ec404cf 100644 (file)
--- a/src/Jamfile
+++ b/src/Jamfile
@@ -31,4 +31,5 @@ LinkWith supertux : squirrel ;
 ExternalLibs supertux : SDL SDLIMAGE GL OPENAL VORBIS VORBISFILE OGG ICONV PHYSFS BINRELOC LIBCURL ;
 Help supertux : "Build the supertux executable" ;
 IncludeDir supertux : squirrel/include squirrel ;
+Package [ Wildcard scripting : *.cpp *.hpp ] ;
 

diff --git a/src/addon_manager.cpp b/src/addon_manager.cpp
index 1459983..a7f19c5 100644 (file)
--- a/src/addon_manager.cpp
+++ b/src/addon_manager.cpp
@@ -23,7 +23,7 @@
 #include <list>
 #include <physfs.h>
 #include <sys/stat.h>
-#include <stdio.h>
+#include <cstdio>
 #include "addon_manager.hpp"
 #include "config.h"
 #include "log.hpp"

diff --git a/src/collision.cpp b/src/collision.cpp
index f96fdea..6e98940 100644 (file)
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -23,9 +23,9 @@
 
 #include <algorithm>
 #include <iostream>
-#include <stdio.h>
-#include <float.h>
-#include <math.h>
+#include <cstdio>
+#include <cfloat>
+#include <cmath>
 #include "math/vector.hpp"
 #include "math/aatriangle.hpp"
 #include "math/rect.hpp"

diff --git a/src/collision.hpp b/src/collision.hpp
index ba6b6f8..fd90a9a 100644 (file)
--- a/src/collision.hpp
+++ b/src/collision.hpp
@@ -20,7 +20,7 @@
 #ifndef __COLLISION_H__
 #define __COLLISION_H__
 
-#include <float.h>
+#include <cfloat>
 #include "collision_hit.hpp"
 #include <limits>
 

diff --git a/src/collision_hit.hpp b/src/collision_hit.hpp
index 0287903..72531f1 100644 (file)
--- a/src/collision_hit.hpp
+++ b/src/collision_hit.hpp
@@ -19,8 +19,8 @@
 #ifndef SUPERTUX_COLLISION_HIT_H
 #define SUPERTUX_COLLISION_HIT_H
 
-#include <float.h>
-#include <math.h>
+#include <cfloat>
+#include <cmath>
 #include "math/vector.hpp"
 
 /**

diff --git a/src/flip_level_transformer.cpp b/src/flip_level_transformer.cpp
index 00d1004..83b8c4d 100644 (file)
--- a/src/flip_level_transformer.cpp
+++ b/src/flip_level_transformer.cpp
@@ -26,6 +26,8 @@
 #include "sector.hpp"
 #include "tile_manager.hpp"
 #include "spawn_point.hpp"
+#include "object/platform.hpp"
+#include "object/block.hpp"
 
 void
 FlipLevelTransformer::transform_sector(Sector* sector)

diff --git a/src/flip_level_transformer.hpp b/src/flip_level_transformer.hpp
index 12459c4..832fe08 100644 (file)
--- a/src/flip_level_transformer.hpp
+++ b/src/flip_level_transformer.hpp
@@ -21,14 +21,13 @@
 #define __FLIP_LEVEL_TRANSFORMER_H__
 
 #include "level_transformer.hpp"
-#include "object/platform.hpp"
-#include "object/path.hpp"
-#include "object/block.hpp"
 
 class TileMap;
 class BadGuy;
 class SpawnPoint;
 class MovingObject;
+class Platform;
+class Block;
 
 /** Vertically or horizontally flip a level */
 class FlipLevelTransformer : public LevelTransformer

diff --git a/src/game_object.hpp b/src/game_object.hpp
index 22aa3a6..5acc833 100644 (file)
--- a/src/game_object.hpp
+++ b/src/game_object.hpp
@@ -21,7 +21,6 @@
 
 #include <string>
 #include "refcounter.hpp"
-#include "lisp/lisp.hpp"
 
 class DrawingContext;
 class ObjectRemoveListener;

diff --git a/src/game_session.hpp b/src/game_session.hpp
index 4143286..ae2a80a 100644 (file)
--- a/src/game_session.hpp
+++ b/src/game_session.hpp
@@ -21,11 +21,9 @@
 
 #include <string>
 #include <SDL.h>
+#include <squirrel.h>
 #include "screen.hpp"
-#include "timer.hpp"
-#include "statistics.hpp"
 #include "math/vector.hpp"
-#include "console.hpp"
 #include "video/surface.hpp"
 #include "object/endsequence.hpp"
 

diff --git a/src/log.hpp b/src/log.hpp
index 9cd5a62..89dbec4 100644 (file)
--- a/src/log.hpp
+++ b/src/log.hpp
@@ -21,7 +21,7 @@
 #define __SUPERTUX_MSG_H__
 
 #include <iostream>
-#include <stdio.h>
+#include <cstdio>
 
 #include "console.hpp"
 

diff --git a/src/main.cpp b/src/main.cpp
index d1d5860..5c27874 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,19 +18,18 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 #include <config.h>
-#include <assert.h>
+#include <cassert>
 
 #include "log.hpp"
 #include "main.hpp"
 
 #include <stdexcept>
 #include <sstream>
-#include <time.h>
-#include <stdlib.h>
+#include <ctime>
+#include <cstdlib>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <assert.h>
 #include <physfs.h>
 #include <SDL.h>
 #include <SDL_image.h>

diff --git a/src/mainloop.cpp b/src/mainloop.cpp
index 07d8536..5e2f3f7 100644 (file)
--- a/src/mainloop.cpp
+++ b/src/mainloop.cpp
@@ -20,7 +20,7 @@
 
 #include "mainloop.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <SDL.h>
 #include "video/drawing_context.hpp"
 #include "control/joystickkeyboardcontroller.hpp"

diff --git a/src/object/path.cpp b/src/object/path.cpp
index 6529cf3..b7a34af 100644 (file)
--- a/src/object/path.cpp
+++ b/src/object/path.cpp
@@ -23,6 +23,7 @@
 
 #include "path.hpp"
 
+#include "lisp/writer.hpp"
 #include "lisp/lisp.hpp"
 #include "lisp/list_iterator.hpp"
 #include "object_factory.hpp"

diff --git a/src/object_factory.cpp b/src/object_factory.cpp
index 4e40fd6..5335140 100644 (file)
--- a/src/object_factory.cpp
+++ b/src/object_factory.cpp
@@ -25,6 +25,7 @@
 #include "lisp/lisp.hpp"
 #include "lisp/parser.hpp"
 #include "object_factory.hpp"
+#include "math/vector.hpp"
 
 Factories* object_factories = 0;
 

diff --git a/src/object_factory.hpp b/src/object_factory.hpp
index 7e06739..a6e4310 100644 (file)
--- a/src/object_factory.hpp
+++ b/src/object_factory.hpp
@@ -23,9 +23,9 @@
 #include <string>
 #include <map>
 
-#include "lisp/lisp.hpp"
-#include "game_object.hpp"
-#include "math/vector.hpp"
+namespace lisp { class Lisp; }
+class Vector;
+class GameObject;
 
 class Factory
 {

diff --git a/src/player_status.cpp b/src/player_status.cpp
index 352fac3..41f5d75 100644 (file)
--- a/src/player_status.cpp
+++ b/src/player_status.cpp
@@ -19,7 +19,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <config.h>
 
-#include <math.h>
+#include <cmath>
 #include "lisp/writer.hpp"
 #include "lisp/lisp.hpp"
 #include "player_status.hpp"

diff --git a/src/player_status.hpp b/src/player_status.hpp
index e231774..85ac059 100644 (file)
--- a/src/player_status.hpp
+++ b/src/player_status.hpp
@@ -20,14 +20,12 @@
 #ifndef SUPERTUX_PLAYERSTATUS_H
 #define SUPERTUX_PLAYERSTATUS_H
 
-#include <assert.h>
 #include <memory>
-#include "lisp/lisp.hpp"
-#include "timer.hpp"
 #include "serializable.hpp"
-#include "sprite/sprite.hpp"
-#include "console.hpp"
-#include "video/surface.hpp"
+
+namespace lisp{ class Writer; }
+namespace lisp{ class Lisp; }
+class Surface;
 
 static const float BORDER_X = 10;
 static const float BORDER_Y = 10;

diff --git a/src/random_generator.cpp b/src/random_generator.cpp
index e48b457..1cfeecf 100644 (file)
--- a/src/random_generator.cpp
+++ b/src/random_generator.cpp
@@ -37,9 +37,8 @@
 
 
 #include <stdexcept>
-#include <time.h>
+#include <ctime>
 #include "random_generator.hpp"
-#include "scripting/squirrel_util.hpp"
 
 RandomGenerator systemRandom;               // global random number generator
 

diff --git a/src/random_generator.hpp b/src/random_generator.hpp
index 480a53e..5e5b3c6 100644 (file)
--- a/src/random_generator.hpp
+++ b/src/random_generator.hpp
@@ -34,8 +34,6 @@
 #ifndef __RANDOM_GENERATOR__
 #define __RANDOM_GENERATOR__
 
-#include "script_interface.hpp"
-
 class RandomGenerator
 {
 private:

diff --git a/src/refcounter.hpp b/src/refcounter.hpp
index e810efe..6b8735a 100644 (file)
--- a/src/refcounter.hpp
+++ b/src/refcounter.hpp
@@ -19,7 +19,7 @@
 #ifndef __REFCOUNTER_HPP__
 #define __REFCOUNTER_HPP__
 
-#include <assert.h>
+#include <cassert>
 
 /**
  * A base class that provides reference counting facilities

diff --git a/src/sector.cpp b/src/sector.cpp
index 125d186..904e1b2 100644 (file)
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -25,8 +25,8 @@
 #include <fstream>
 #include <sstream>
 #include <stdexcept>
-#include <float.h>
-#include <math.h>
+#include <cfloat>
+#include <cmath>
 #include <limits>
 #include <physfs.h>
 

diff --git a/src/sector.hpp b/src/sector.hpp
index 777ce93..1fc487e 100644 (file)
--- a/src/sector.hpp
+++ b/src/sector.hpp
@@ -19,16 +19,13 @@
 #ifndef SUPERTUX_SECTOR_H
 #define SUPERTUX_SECTOR_H
 
-#include <string>
 #include <vector>
 #include <list>
 #include <memory>
 #include <squirrel.h>
 
 #include "direction.hpp"
-#include "math/vector.hpp"
-#include "video/drawing_context.hpp"
-#include "script_interface.hpp"
+#include "video/color.hpp"
 #include "scripting/ssector.hpp"
 
 namespace lisp {
@@ -39,6 +36,7 @@ namespace collision {
 class Constraints;
 }
 
+class Vector;
 class Rect;
 class Sprite;
 class GameObject;
@@ -52,6 +50,7 @@ class MovingObject;
 class CollisionHit;
 class Level;
 class Portable;
+class DrawingContext;
 
 enum MusicType {
   LEVEL_MUSIC,

diff --git a/src/serializable.hpp b/src/serializable.hpp
index ce4d3b7..74adedc 100644 (file)
--- a/src/serializable.hpp
+++ b/src/serializable.hpp
@@ -19,7 +19,7 @@
 #ifndef SUPERTUX_SERIALIZABLE_H
 #define SUPERTUX_SERIALIZABLE_H
 
-#include "lisp/writer.hpp"
+namespace lisp { class Writer; }
 
 class Serializable
 {

diff --git a/src/spawn_point.hpp b/src/spawn_point.hpp
index 17d4908..23bafa8 100644 (file)
--- a/src/spawn_point.hpp
+++ b/src/spawn_point.hpp
@@ -21,7 +21,7 @@
 
 #include <string>
 #include "math/vector.hpp"
-#include "lisp/lisp.hpp"
+namespace lisp { class Lisp; }
 
 class SpawnPoint
 {

diff --git a/src/squirrel/Jamfile b/src/squirrel/Jamfile
index 813349c..c89d20f 100644 (file)
--- a/src/squirrel/Jamfile
+++ b/src/squirrel/Jamfile
@@ -8,8 +8,7 @@ if $(enable_sqdbg) = "yes" {
 }
 
 Library squirrel
-    : [ Wildcard include : *.h ]
-      [ Wildcard squirrel : *.cpp *.h ]
+    : [ Wildcard squirrel : *.cpp *.h ]
       [ Wildcard sqstdlib : *.cpp *.c *.h ]
       $(EXTRA_SOURCES)
     : noinstall
@@ -20,3 +19,4 @@ for i in $(squirrel_OBJECTS) {
     CFLAGS on $(i) = [ Filter [ on $(i) GetVar CFLAGS ] : -Wall -W -Werror ] -include $(top_builddir)/config.h ;
 }
 IncludeDir squirrel : include ;
+Package [ Wildcard include : *.h ] ;

diff --git a/src/statistics.cpp b/src/statistics.cpp
index c21ec3d..8c0b1f8 100644 (file)
--- a/src/statistics.cpp
+++ b/src/statistics.cpp
@@ -20,12 +20,13 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include <config.h>
 
-#include <assert.h>
-#include <math.h>
+#include <cassert>
+#include <cmath>
 #include <sstream>
 #include <limits>
 #include "video/drawing_context.hpp"
 #include "gettext.hpp"
+#include "lisp/writer.hpp"
 #include "lisp/lisp.hpp"
 #include "resources.hpp"
 #include "main.hpp"

diff --git a/src/statistics.hpp b/src/statistics.hpp
index a7b194f..d282e0e 100644 (file)
--- a/src/statistics.hpp
+++ b/src/statistics.hpp
@@ -23,10 +23,11 @@
 #define SUPERTUX_STATISTICS_H
 
 #include "timer.hpp"
-#include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
-#include "video/surface.hpp"
-#include "video/drawing_context.hpp"
+
+namespace lisp { class Writer; }
+namespace lisp { class Lisp; }
+class Surface;
+class DrawingContext;
 
 /** This class is a layer between level and worldmap to keep
  *  track of stuff like scores, and minor, but funny things, like

diff --git a/src/textscroller.hpp b/src/textscroller.hpp
index ad7f397..5198eb9 100644 (file)
--- a/src/textscroller.hpp
+++ b/src/textscroller.hpp
@@ -26,10 +26,11 @@
 #include <map>
 
 #include "screen.hpp"
-#include "video/font.hpp"
+#include "math/vector.hpp"
 
 class DrawingContext;
 class Surface;
+class Font;
 
 /**
  * Helper class for InfoBox: Represents a line of text

diff --git a/src/tile.hpp b/src/tile.hpp
index 7351a32..f0668d5 100644 (file)
--- a/src/tile.hpp
+++ b/src/tile.hpp
@@ -26,7 +26,8 @@
 #include <stdint.h>
 #include "video/surface.hpp"
 #include "math/rect.hpp"
-#include "lisp/lisp.hpp"
+
+namespace lisp { class Lisp; }
 
 class DrawingContext;
 

diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp
index df1f90d..cba2a81 100644 (file)
--- a/src/tile_manager.cpp
+++ b/src/tile_manager.cpp
@@ -24,7 +24,7 @@
 #include <stdexcept>
 #include <sstream>
 #include <iostream>
-#include <assert.h>
+#include <cassert>
 #include <SDL.h>
 #include "video/drawing_context.hpp"
 #include "log.hpp"

diff --git a/src/tile_manager.hpp b/src/tile_manager.hpp
index 64906cf..aaf8a81 100644 (file)
--- a/src/tile_manager.hpp
+++ b/src/tile_manager.hpp
@@ -28,7 +28,7 @@
 #include <map>
 #include <iostream>
 #include <stdint.h>
-#include <assert.h>
+#include <cassert>
 #include "log.hpp"
 #include "tile.hpp"
 

diff --git a/src/timer.cpp b/src/timer.cpp
index 9c94f58..6e9d3d0 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -19,7 +19,7 @@
 //  02111-1307, USA.
 #include <config.h>
 
-#include <math.h>
+#include <cmath>
 #include "timer.hpp"
 
 float game_time = 0;

diff --git a/src/title.cpp b/src/title.cpp
index 56b1e45..6f006a2 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -23,10 +23,10 @@
 #include <iostream>
 #include <sstream>
 #include <stdexcept>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
 #include <unistd.h>
 #include <cmath>
 #include <SDL.h>

diff --git a/src/world.cpp b/src/world.cpp
index 8fd4599..24d22c8 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -19,7 +19,7 @@
 //  02111-1307, USA.
 #include <config.h>
 
-#include <stddef.h>
+#include <cstddef>
 #include <physfs.h>
 #include <stdexcept>
 

diff --git a/src/worldmap/tux.cpp b/src/worldmap/tux.cpp
index b135933..8c4339f 100644 (file)
--- a/src/worldmap/tux.cpp
+++ b/src/worldmap/tux.cpp
@@ -20,6 +20,7 @@
 #include <config.h>
 
 #include "tux.hpp"
+#include "sprite/sprite.hpp"
 #include "sprite/sprite_manager.hpp"
 #include "video/drawing_context.hpp"
 #include "player_status.hpp"

diff --git a/src/worldmap/worldmap.cpp b/src/worldmap/worldmap.cpp
index 65cb1f0..9441b43 100644 (file)
--- a/src/worldmap/worldmap.cpp
+++ b/src/worldmap/worldmap.cpp
@@ -36,6 +36,7 @@
 #include "shrinkfade.hpp"
 #include "video/surface.hpp"
 #include "video/drawing_context.hpp"
+#include "sprite/sprite.hpp"
 #include "sprite/sprite_manager.hpp"
 #include "audio/sound_manager.hpp"
 #include "lisp/parser.hpp"