[Gnash-commit] /srv/bzr/gnash/trunk r12043: More forward declares and assorted header shuffling.

[Bastiaan Jacques]

------------------------------------------------------------
revno: 12043
committer: Bastiaan Jacques <address@hidden>
branch nick: trunk
timestamp: Sun 2010-03-14 05:51:25 +0100
message:
  More forward declares and assorted header shuffling.
modified:
  libcore/DisplayObject.h
  libcore/InteractiveObject.h
  libcore/asobj/Date_as.h
  libcore/asobj/Math_as.h
  libcore/asobj/String_as.h
  libcore/asobj/flash/display/BitmapData_as.h
  libcore/asobj/flash/geom/ColorTransform_as.h
  libcore/asobj/flash/media/Sound_as.h
  libcore/asobj/flash/net/NetConnection_as.h
  libcore/asobj/flash/text/TextSnapshot_as.h
  libcore/asobj/flash/xml/XMLNode_as.h

=== modified file 'libcore/DisplayObject.h'
--- a/libcore/DisplayObject.h   2010-03-13 18:00:33 +0000
+++ b/libcore/DisplayObject.h   2010-03-14 04:51:25 +0000
@@ -25,12 +25,12 @@
 #endif
 
 #include "event_id.h" // for inlines
-#include "as_object.h" // for inheritance
 #include "SWFRect.h" // for composition (invalidated bounds)
 #include "SWFMatrix.h" // for composition
 #include "cxform.h" // for composition
 #include "dsodefs.h" //for DSOEXPORT
 #include "snappingrange.h"
+#include "VM.h"
 #ifdef USE_SWFTREE
 # include "tree.hh"
 #endif
@@ -54,6 +54,9 @@
     class StaticText;
     class InteractiveObject;
     class Renderer;
+    class as_object;
+    class as_value;
+    class as_environment;
     namespace SWF {
         class TextRecord;
     }

=== modified file 'libcore/InteractiveObject.h'
--- a/libcore/InteractiveObject.h       2010-03-13 18:00:33 +0000
+++ b/libcore/InteractiveObject.h       2010-03-14 04:51:25 +0000
@@ -21,6 +21,7 @@
 
 #include "DisplayObject.h" // for inheritance
 #include "log.h"
+#include "as_object.h" // for getRoot()
 
 #include <vector>
 #include <cassert>

=== modified file 'libcore/asobj/Date_as.h'
--- a/libcore/asobj/Date_as.h   2010-03-11 01:47:08 +0000
+++ b/libcore/asobj/Date_as.h   2010-03-14 04:51:25 +0000
@@ -20,8 +20,12 @@
 #define GNASH_ASOBJ_DATE_H
 
 #include <string>
-#include "as_object.h" // for inheritance
 #include "ClockTime.h"
+#include "Relay.h"
+
+namespace gnash {
+    class as_object;
+}
 
 namespace gnash {
 

=== modified file 'libcore/asobj/Math_as.h'
--- a/libcore/asobj/Math_as.h   2010-01-11 06:41:38 +0000
+++ b/libcore/asobj/Math_as.h   2010-03-14 04:51:25 +0000
@@ -20,7 +20,9 @@
 #ifndef GNASH_ASOBJ_MATH_H
 #define GNASH_ASOBJ_MATH_H
 
-#include "as_object.h"
+namespace gnash {
+    class as_object;
+}
 
 namespace gnash {
 

=== modified file 'libcore/asobj/String_as.h'
--- a/libcore/asobj/String_as.h 2010-01-11 06:41:38 +0000
+++ b/libcore/asobj/String_as.h 2010-03-14 04:51:25 +0000
@@ -22,7 +22,7 @@
 #define GNASH_STRING_H
 
 #include <string>
-#include "as_object.h"
+#include "Relay.h"
 
 namespace gnash {
 

=== modified file 'libcore/asobj/flash/display/BitmapData_as.h'
--- a/libcore/asobj/flash/display/BitmapData_as.h       2010-03-12 15:42:07 
+0000
+++ b/libcore/asobj/flash/display/BitmapData_as.h       2010-03-14 04:51:25 
+0000
@@ -21,9 +21,10 @@
 #ifndef GNASH_ASOBJ_BITMAPDATA_H
 #define GNASH_ASOBJ_BITMAPDATA_H
 
+#include "Relay.h"
+
 #include <list>
 #include <vector>
-#include "as_object.h"
 
 namespace gnash {
 

=== modified file 'libcore/asobj/flash/geom/ColorTransform_as.h'
--- a/libcore/asobj/flash/geom/ColorTransform_as.h      2010-01-25 18:52:20 
+0000
+++ b/libcore/asobj/flash/geom/ColorTransform_as.h      2010-03-14 04:51:25 
+0000
@@ -22,7 +22,11 @@
 #define GNASH_ASOBJ_COLORTRANSFORM_H
 
 
-#include "as_object.h"
+#include "Relay.h"
+
+namespace gnash {
+    class as_object;
+}
 
 namespace gnash {
 

=== modified file 'libcore/asobj/flash/media/Sound_as.h'
--- a/libcore/asobj/flash/media/Sound_as.h      2010-03-11 01:47:08 +0000
+++ b/libcore/asobj/flash/media/Sound_as.h      2010-03-14 04:51:25 +0000
@@ -22,7 +22,6 @@
 
 
 #include "smart_ptr.h" //GNASH_USE_GC
-#include "as_object.h"
 
 #include <string>
 #include <boost/scoped_ptr.hpp>

=== modified file 'libcore/asobj/flash/net/NetConnection_as.h'
--- a/libcore/asobj/flash/net/NetConnection_as.h        2010-03-11 01:47:08 
+0000
+++ b/libcore/asobj/flash/net/NetConnection_as.h        2010-03-14 04:51:25 
+0000
@@ -20,7 +20,7 @@
 #ifndef GNASH_NETCONNECTION_H
 #define GNASH_NETCONNECTION_H
 
-#include "as_object.h" // for inheritance
+#include "Relay.h" // for inheritance
 
 #include <vector>
 #include <string>
@@ -28,7 +28,8 @@
 
 // Forward declarations
 namespace gnash {
-       class ConnectionHandler;
+    class ConnectionHandler;
+    class as_object;
 }
 
 namespace gnash {

=== modified file 'libcore/asobj/flash/text/TextSnapshot_as.h'
--- a/libcore/asobj/flash/text/TextSnapshot_as.h        2010-01-25 18:52:20 
+0000
+++ b/libcore/asobj/flash/text/TextSnapshot_as.h        2010-03-14 04:51:25 
+0000
@@ -20,9 +20,10 @@
 #ifndef GNASH_ASOBJ3_TEXTSNAPSHOT_H
 #define GNASH_ASOBJ3_TEXTSNAPSHOT_H
 
-
-#include "as_object.h"
-
+namespace gnash {
+    class as_object;
+    class ObjectURI;
+}
 
 namespace gnash {
 

=== modified file 'libcore/asobj/flash/xml/XMLNode_as.h'
--- a/libcore/asobj/flash/xml/XMLNode_as.h      2010-03-13 18:00:33 +0000
+++ b/libcore/asobj/flash/xml/XMLNode_as.h      2010-03-14 04:51:25 +0000
@@ -20,13 +20,16 @@
 #ifndef GNASH_ASOBJ3_XMLNODE_H
 #define GNASH_ASOBJ3_XMLNODE_H
 
-
-#include "as_object.h"
-
 #include <list>
 #include <string>
 #include <sstream>
 
+#include "Relay.h"
+
+namespace gnash {
+    class as_object;
+}
+
 namespace gnash {