[Gnash-commit] /srv/bzr/gnash/trunk r12036: A bit more header shuffling, and add more forward declarations.

[Bastiaan Jacques]

------------------------------------------------------------
revno: 12036
committer: Bastiaan Jacques <address@hidden>
branch nick: trunk
timestamp: Sat 2010-03-13 19:00:33 +0100
message:
  A bit more header shuffling, and add more forward declarations.
modified:
  gui/Kde4Gui.cpp
  gui/Player.h
  gui/gui.h
  libcore/DisplayObject.h
  libcore/DynamicShape.cpp
  libcore/InteractiveObject.h
  libcore/Shape.cpp
  libcore/Timers.h
  libcore/as_function.h
  libcore/as_object.h
  libcore/asobj/flash/net/NetStream_as.h
  libcore/asobj/flash/xml/XMLNode_as.h
  libcore/builtin_function.h
  libcore/fill_style.cpp
  libcore/fontlib.cpp
  libcore/swf/DefineButtonTag.h
  libcore/swf/DefineMorphShapeTag.h
  libcore/swf/DefineShapeTag.h
  libcore/swf/TextRecord.cpp
  libcore/vm/Machine.h

=== modified file 'gui/Kde4Gui.cpp'
--- a/gui/Kde4Gui.cpp   2010-02-23 17:40:25 +0000
+++ b/gui/Kde4Gui.cpp   2010-03-13 18:00:33 +0000
@@ -57,6 +57,7 @@
 #include "Range2d.h"
 
 #include "gnash.h"
+#include "smart_ptr.h"
 #include "movie_definition.h" 
 #include "log.h"
 

=== modified file 'gui/Player.h'
--- a/gui/Player.h      2010-03-11 01:47:08 +0000
+++ b/gui/Player.h      2010-03-13 18:00:33 +0000
@@ -29,7 +29,6 @@
 #include "MediaHandler.h" 
 #include "gui.h"
 #include "movie_definition.h" 
-#include "smart_ptr.h"
 #include "movie_root.h"
 #include "RunResources.h"
 

=== modified file 'gui/gui.h'
--- a/gui/gui.h 2010-03-11 01:47:08 +0000
+++ b/gui/gui.h 2010-03-13 18:00:33 +0000
@@ -27,7 +27,6 @@
 #include "snappingrange.h"  // for InvalidatedRanges
 #include "GnashKey.h" // for gnash::key::code type
 #include "Renderer.h" // for gnash::key::code type
-#include "smart_ptr.h"
 #include "VirtualClock.h"
 #include "SystemClock.h"
 #include "gnash.h" // for Quality

=== modified file 'libcore/DisplayObject.h'
--- a/libcore/DisplayObject.h   2010-03-11 01:47:08 +0000
+++ b/libcore/DisplayObject.h   2010-03-13 18:00:33 +0000
@@ -24,7 +24,6 @@
 #include "gnashconfig.h" // USE_SWFTREE
 #endif
 
-#include "smart_ptr.h" // GNASH_USE_GC
 #include "event_id.h" // for inlines
 #include "as_object.h" // for inheritance
 #include "SWFRect.h" // for composition (invalidated bounds)

=== modified file 'libcore/DynamicShape.cpp'
--- a/libcore/DynamicShape.cpp  2010-01-14 12:03:17 +0000
+++ b/libcore/DynamicShape.cpp  2010-03-13 18:00:33 +0000
@@ -15,6 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+#include "smart_ptr.h"
 #include "DynamicShape.h"
 #include "fill_style.h"
 #include "Renderer.h"

=== modified file 'libcore/InteractiveObject.h'
--- a/libcore/InteractiveObject.h       2010-03-11 01:47:08 +0000
+++ b/libcore/InteractiveObject.h       2010-03-13 18:00:33 +0000
@@ -19,7 +19,6 @@
 #ifndef GNASH_INTERACTIVE_DISPLAY_OBJECT_H
 #define GNASH_INTERACTIVE_DISPLAY_OBJECT_H
 
-#include "smart_ptr.h" // GNASH_USE_GC
 #include "DisplayObject.h" // for inheritance
 #include "log.h"
 

=== modified file 'libcore/Shape.cpp'
--- a/libcore/Shape.cpp 2010-01-11 06:41:38 +0000
+++ b/libcore/Shape.cpp 2010-03-13 18:00:33 +0000
@@ -18,6 +18,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
+#include "smart_ptr.h"
 #include "Shape.h"
 
 namespace gnash

=== modified file 'libcore/Timers.h'
--- a/libcore/Timers.h  2010-03-12 15:42:07 +0000
+++ b/libcore/Timers.h  2010-03-13 18:00:33 +0000
@@ -22,6 +22,7 @@
 #include "dsodefs.h"
 #include "as_function.h"
 #include "smart_ptr.h"
+#include "fn_call.h"
 
 #include <string>
 #include <limits>

=== modified file 'libcore/as_function.h'
--- a/libcore/as_function.h     2010-03-11 01:47:08 +0000
+++ b/libcore/as_function.h     2010-03-13 18:00:33 +0000
@@ -20,14 +20,13 @@
 #define GNASH_AS_FUNCTION_H
 
 #include <string>
-#include "smart_ptr.h" // GNASH_USE_GC
 #include "as_object.h" // for inheritance
-#include "fn_call.h"
 
 // Forward declarations
 namespace gnash {
-       class NativeFunction;
-       class Global_as;
+    class NativeFunction;
+    class Global_as;
+    template <typename T> class FunctionArgs;
 }
 
 namespace gnash {
@@ -97,7 +96,7 @@
     ///                 necessitates returning a different object from the
     ///                 passed 'this' pointer.
     as_object* construct(as_object& newobj, const as_environment& env,
-            fn_call::Args& args);
+            FunctionArgs<as_value>& args);
 
        /// Return true if this is a built-in class.
        virtual bool isBuiltin() { return false; }
@@ -128,7 +127,7 @@
 /// @return         A newly-created object constructed by the specified
 ///                 function.
 as_object* constructInstance(as_function& ctor, const as_environment& env,
-        fn_call::Args& args);
+        FunctionArgs<as_value>& args);
 
 /// Initialize the global Function constructor
 void function_class_init(as_object& global, const ObjectURI& uri);

=== modified file 'libcore/as_object.h'
--- a/libcore/as_object.h       2010-03-12 15:42:07 +0000
+++ b/libcore/as_object.h       2010-03-13 18:00:33 +0000
@@ -23,11 +23,9 @@
 #include "gnashconfig.h"
 #endif
 
-#include "smart_ptr.h" // GNASH_USE_GC
 #include "string_table.h"
 #include "GC.h" // for inheritance from GcResource (to complete)
 #include "PropertyList.h"
-#include "smart_ptr.h"
 #include "PropFlags.h"
 #include "Relay.h"
 #include "ObjectURI.h"

=== modified file 'libcore/asobj/flash/net/NetStream_as.h'
--- a/libcore/asobj/flash/net/NetStream_as.h    2010-03-11 01:47:08 +0000
+++ b/libcore/asobj/flash/net/NetStream_as.h    2010-03-13 18:00:33 +0000
@@ -25,9 +25,7 @@
 #define __STDC_CONSTANT_MACROS
 #endif
 
-#include "smart_ptr.h" // GNASH_USE_GC
 #include "MediaParser.h"
-#include "as_function.h" // for visibility of destructor by intrusive_ptr
 #include "PlayHead.h" // for composition
 
 #include "VideoDecoder.h" // for visibility of dtor
@@ -35,6 +33,8 @@
 
 #include "VirtualClock.h"
 
+#include "Relay.h" // for ActiveRelay inheritance
+
 #include <boost/intrusive_ptr.hpp>
 #include <string>
 #include <deque>
@@ -45,6 +45,9 @@
     class CharacterProxy;
     class IOChannel;
     class NetConnection_as;
+    class as_function;
+    class DisplayObject;
+    class ObjectURI;
     namespace media {
         class MediaHandler;
     }

=== modified file 'libcore/asobj/flash/xml/XMLNode_as.h'
--- a/libcore/asobj/flash/xml/XMLNode_as.h      2010-03-10 16:37:25 +0000
+++ b/libcore/asobj/flash/xml/XMLNode_as.h      2010-03-13 18:00:33 +0000
@@ -22,7 +22,6 @@
 
 
 #include "as_object.h"
-#include "smart_ptr.h" // GNASH_USE_GC
 
 #include <list>
 #include <string>

=== modified file 'libcore/builtin_function.h'
--- a/libcore/builtin_function.h        2010-03-11 20:01:11 +0000
+++ b/libcore/builtin_function.h        2010-03-13 18:00:33 +0000
@@ -20,16 +20,12 @@
 #define GNASH_BUILTIN_FUNCTION_H
 
 #include "as_function.h" 
+#include "as_environment.h"
+#include "fn_call.h"
 
 #include <cassert>
 
 namespace gnash {
-    class as_environment;
-    class fn_call;
-}
-
-namespace gnash {
-
 
 
 /// This is a special type of function implementing AS-code in C++

=== modified file 'libcore/fill_style.cpp'
--- a/libcore/fill_style.cpp    2010-03-08 06:34:21 +0000
+++ b/libcore/fill_style.cpp    2010-03-13 18:00:33 +0000
@@ -19,6 +19,7 @@
 
 // Based on work of Thatcher Ulrich <address@hidden> 2003
 
+#include "smart_ptr.h"
 #include "fill_style.h"
 #include "log.h"
 #include "SWFStream.h"

=== modified file 'libcore/fontlib.cpp'
--- a/libcore/fontlib.cpp       2010-01-14 11:37:19 +0000
+++ b/libcore/fontlib.cpp       2010-03-13 18:00:33 +0000
@@ -9,6 +9,7 @@
 #include "gnashconfig.h" // HAVE_ZLIB_H, USE_SWFTREE
 #endif
 
+#include "smart_ptr.h"
 #include "Font.h"
 #include "log.h"
 #include "DefineShapeTag.h"

=== modified file 'libcore/swf/DefineButtonTag.h'
--- a/libcore/swf/DefineButtonTag.h     2010-03-11 17:03:04 +0000
+++ b/libcore/swf/DefineButtonTag.h     2010-03-13 18:00:33 +0000
@@ -21,7 +21,6 @@
 #ifndef GNASH_SWF_DEFINEBUTTONTAG_H
 #define GNASH_SWF_DEFINEBUTTONTAG_H
 
-#include "smart_ptr.h" // GNASH_USE_GC
 #include "DefinitionTag.h"
 #include "SWFMatrix.h" // for composition
 #include "cxform.h" // for composition

=== modified file 'libcore/swf/DefineMorphShapeTag.h'
--- a/libcore/swf/DefineMorphShapeTag.h 2010-01-11 06:41:38 +0000
+++ b/libcore/swf/DefineMorphShapeTag.h 2010-03-13 18:00:33 +0000
@@ -23,7 +23,6 @@
 #ifndef GNASH_SWF_MORPH_SHAPE_H
 #define GNASH_SWF_MORPH_SHAPE_H
 
-#include "smart_ptr.h" // GNASH_USE_GC
 #include "SWF.h"
 #include "ShapeRecord.h"
 #include "DefinitionTag.h"

=== modified file 'libcore/swf/DefineShapeTag.h'
--- a/libcore/swf/DefineShapeTag.h      2009-12-19 19:03:28 +0000
+++ b/libcore/swf/DefineShapeTag.h      2010-03-13 18:00:33 +0000
@@ -10,7 +10,6 @@
 #define GNASH_SHAPE_CHARACTER_DEF_H
 
 #include "DefinitionTag.h" // for inheritance of DefineShapeTag
-#include "smart_ptr.h" // GNASH_USE_GC
 #include "SWF.h"
 #include "ShapeRecord.h"
 

=== modified file 'libcore/swf/TextRecord.cpp'
--- a/libcore/swf/TextRecord.cpp        2010-01-11 06:41:38 +0000
+++ b/libcore/swf/TextRecord.cpp        2010-03-13 18:00:33 +0000
@@ -20,6 +20,7 @@
 #include "SWFStream.h"
 #include "SWFMatrix.h"
 #include "cxform.h"
+#include "smart_ptr.h"
 #include "movie_definition.h"
 #include "DisplayObject.h"
 #include "SWF.h"

=== modified file 'libcore/vm/Machine.h'
--- a/libcore/vm/Machine.h      2010-03-12 03:52:58 +0000
+++ b/libcore/vm/Machine.h      2010-03-13 18:00:33 +0000
@@ -24,7 +24,6 @@
 #include <sstream>
 #include "SafeStack.h"
 #include "as_value.h"
-#include "fn_call.h"
 #include "log.h"
 
 namespace gnash {
@@ -42,6 +41,7 @@
     class Property;
     class CodeStream;
     class VM;
+    template <typename T> class FunctionArgs;
 }
 
 
@@ -297,7 +297,7 @@
 
        void print_scope_stack();
 
-       void get_args(size_t argc, fn_call::Args& args);
+       void get_args(size_t argc, FunctionArgs<as_value>& args);
        
        void load_function(CodeStream* stream, boost::uint32_t maxRegisters);