[Gnash-commit] /srv/bzr/gnash/trunk r12024: More forward declarations.

[Bastiaan Jacques]

------------------------------------------------------------
revno: 12024
committer: Bastiaan Jacques <address@hidden>
branch nick: trunk
timestamp: Thu 2010-03-11 21:01:11 +0100
message:
  More forward declarations.
modified:
  libbase/GC.h
  libbase/smart_ptr.h
  libcore/NativeFunction.h
  libcore/PropertyList.h
  libcore/SWFRect.h
  libcore/Shape.h
  libcore/abc/abc_function.h
  libcore/builtin_function.h
  libcore/movie_root.h

=== modified file 'libbase/GC.h'
--- a/libbase/GC.h      2010-02-01 19:41:02 +0000
+++ b/libbase/GC.h      2010-03-11 20:01:11 +0000
@@ -23,7 +23,6 @@
 #include <list>
 #include <map>
 #include <string>
-#include <algorithm> //for std::find
 
 #ifndef NDEBUG
 # include <boost/thread.hpp>

=== modified file 'libbase/smart_ptr.h'
--- a/libbase/smart_ptr.h       2010-03-11 01:47:08 +0000
+++ b/libbase/smart_ptr.h       2010-03-11 20:01:11 +0000
@@ -40,10 +40,14 @@
 //       else have it map to gc_ptr (yet to be defined)
 
 #include "ref_counted.h"
-#include "GC.h"
 
 #include <typeinfo>
 
+namespace gnash {
+    class GcResource;
+}
+
+
 #define COMPILER_SUPPORTS_ARGUMENT_DEPENDENT_LOOKUP 1
 #ifdef COMPILER_SUPPORTS_ARGUMENT_DEPENDENT_LOOKUP
 namespace gnash {

=== modified file 'libcore/NativeFunction.h'
--- a/libcore/NativeFunction.h  2010-03-10 16:13:07 +0000
+++ b/libcore/NativeFunction.h  2010-03-11 20:01:11 +0000
@@ -20,11 +20,14 @@
 #define GNASH_NATIVE_FUNCTION_H
 
 #include "as_function.h" // for inheritance
-#include "fn_call.h" // for call operator
 
 #include <cassert>
 
 namespace gnash {
+    class fn_call;
+}
+
+namespace gnash {
 
 /// This class implements functions native to the player.
 //

=== modified file 'libcore/PropertyList.h'
--- a/libcore/PropertyList.h    2010-03-11 17:03:04 +0000
+++ b/libcore/PropertyList.h    2010-03-11 20:01:11 +0000
@@ -21,7 +21,6 @@
 
 #include "Property.h" // for templated functions
 #include "PropFlags.h" // for templated functions
-#include "as_value.h" // for templated functions
 #include "ObjectURI.h"
 
 #include <set> 
@@ -41,6 +40,7 @@
     class as_environment;
     class as_function;
     class ObjectURI;
+    class as_value;
 }
 
 namespace gnash {

=== modified file 'libcore/SWFRect.h'
--- a/libcore/SWFRect.h 2010-03-11 01:47:08 +0000
+++ b/libcore/SWFRect.h 2010-03-11 20:01:11 +0000
@@ -22,7 +22,6 @@
 
 #include "dsodefs.h"
 #include "Range2d.h"
-#include "Point2d.h"
 
 #include <string>
 #include <cassert> // for inlines
@@ -33,6 +32,9 @@
 namespace gnash {
     class SWFMatrix;
     class SWFStream;
+    namespace geometry {
+        class Point2d;
+    }
 }
 
 namespace gnash {
@@ -230,7 +232,7 @@
     /// \brief
     /// Make sure that the given point falls in this rectangle, 
     /// modifying it's coordinates if needed.
-    void clamp(point& p) const;
+    void clamp(geometry::Point2d& p) const;
 
     /// Construct and return a Range2d object.
     // TODO: deprecate this.

=== modified file 'libcore/Shape.h'
--- a/libcore/Shape.h   2010-03-11 01:47:08 +0000
+++ b/libcore/Shape.h   2010-03-11 20:01:11 +0000
@@ -20,7 +20,6 @@
 #ifndef GNASH_SHAPE_H
 #define GNASH_SHAPE_H
 
-#include "smart_ptr.h" // GNASH_USE_GC
 #include "DisplayObject.h"
 #include "DefineShapeTag.h"
 #include "DynamicShape.h"

=== modified file 'libcore/abc/abc_function.h'
--- a/libcore/abc/abc_function.h        2010-03-11 17:03:04 +0000
+++ b/libcore/abc/abc_function.h        2010-03-11 20:01:11 +0000
@@ -23,10 +23,14 @@
 #endif
 
 #include "as_function.h"
-#include "as_value.h"
 #include "Method.h"
 
 namespace gnash {
+    class as_value;
+    class CodeStream;
+}
+
+namespace gnash {
 namespace abc {
 
 class Machine;

=== modified file 'libcore/builtin_function.h'
--- a/libcore/builtin_function.h        2010-03-11 01:47:08 +0000
+++ b/libcore/builtin_function.h        2010-03-11 20:01:11 +0000
@@ -20,12 +20,15 @@
 #define GNASH_BUILTIN_FUNCTION_H
 
 #include "as_function.h" 
-#include "fn_call.h" 
-#include "as_environment.h" 
 
 #include <cassert>
 
 namespace gnash {
+    class as_environment;
+    class fn_call;
+}
+
+namespace gnash {
 
 
 

=== modified file 'libcore/movie_root.h'
--- a/libcore/movie_root.h      2010-03-11 01:47:08 +0000
+++ b/libcore/movie_root.h      2010-03-11 20:01:11 +0000
@@ -74,8 +74,6 @@
 #include "dsodefs.h" // DSOEXPORT
 #include "MouseButtonState.h" // for composition
 #include "drag_state.h" // for composition
-#include "smart_ptr.h" // for memory management
-#include "URL.h" // for loadMovie
 #include "GnashKey.h" // key::code
 #include "Movie.h"
 #include "gnash.h" // Quality