[Gnash-commit] /srv/bzr/gnash/trunk r12029: A few more forward declarations. Remove included smart_ptr.h where it is not being used.

[Bastiaan Jacques]

------------------------------------------------------------
revno: 12029
committer: Bastiaan Jacques <address@hidden>
branch nick: trunk
timestamp: Fri 2010-03-12 16:42:07 +0100
message:
  A few more forward declarations. Remove included smart_ptr.h where it is not 
being used.
modified:
  libcore/Bitmap.h
  libcore/FreetypeGlyphsProvider.h
  libcore/LineStyle.cpp
  libcore/Movie.h
  libcore/MovieLoader.h
  libcore/PropertyList.h
  libcore/SWFMovie.h
  libcore/StaticText.h
  libcore/Timers.h
  libcore/abc/Class.h
  libcore/as_object.h
  libcore/asobj/flash/display/BitmapData_as.h
  libcore/asobj/flash/text/TextFormat_as.h
  libcore/drag_state.h
  libcore/fill_style.h
  libcore/swf/ShapeRecord.cpp
  libcore/swf_function.h
  libcore/vm/with_stack_entry.h

=== modified file 'libcore/Bitmap.h'
--- a/libcore/Bitmap.h  2010-03-11 01:47:08 +0000
+++ b/libcore/Bitmap.h  2010-03-12 15:42:07 +0000
@@ -21,11 +21,14 @@
 
 #include <boost/intrusive_ptr.hpp>
 #include "DisplayObject.h" 
-#include "BitmapInfo.h"
 #include "flash/display/BitmapData_as.h"
 #include "BitmapMovieDefinition.h"
 #include "DynamicShape.h"
 
+namespace gnash {
+    class BitmapInfo;
+}
+
 
 namespace gnash {
 

=== modified file 'libcore/FreetypeGlyphsProvider.h'
--- a/libcore/FreetypeGlyphsProvider.h  2010-01-22 13:45:28 +0000
+++ b/libcore/FreetypeGlyphsProvider.h  2010-03-12 15:42:07 +0000
@@ -20,9 +20,6 @@
 #ifndef GNASH_FREETYPE_H
 #define GNASH_FREETYPE_H
 
-#include "SWFRect.h"
-#include "smart_ptr.h" // for intrusive_ptr
-
 #include <string>
 #include <memory> // for auto_ptr
 #include <boost/thread/mutex.hpp>

=== modified file 'libcore/LineStyle.cpp'
--- a/libcore/LineStyle.cpp     2010-03-11 01:47:08 +0000
+++ b/libcore/LineStyle.cpp     2010-03-12 15:42:07 +0000
@@ -24,6 +24,7 @@
 #include "LineStyle.h"
 #include "log.h"
 #include "SWFStream.h"
+#include "smart_ptr.h"
 #include "movie_definition.h"
 #include "SWF.h"
 #include "GnashException.h"

=== modified file 'libcore/Movie.h'
--- a/libcore/Movie.h   2010-03-11 01:47:08 +0000
+++ b/libcore/Movie.h   2010-03-12 15:42:07 +0000
@@ -26,7 +26,6 @@
 #include <set>
 
 #include "MovieClip.h" // for inheritance
-#include "smart_ptr.h" // for composition
 
 // Forward declarations
 namespace gnash {

=== modified file 'libcore/MovieLoader.h'
--- a/libcore/MovieLoader.h     2010-03-11 01:47:08 +0000
+++ b/libcore/MovieLoader.h     2010-03-12 15:42:07 +0000
@@ -21,9 +21,7 @@
 
 #include "URL.h"
 #include "as_object.h" 
-#include "movie_definition.h" 
 #include "MovieClip.h" 
-#include "smart_ptr.h"
 
 #include <boost/intrusive_ptr.hpp>
 #include <list>

=== modified file 'libcore/PropertyList.h'
--- a/libcore/PropertyList.h    2010-03-11 20:01:11 +0000
+++ b/libcore/PropertyList.h    2010-03-12 15:42:07 +0000
@@ -20,8 +20,6 @@
 #define GNASH_PROPERTYLIST_H
 
 #include "Property.h" // for templated functions
-#include "PropFlags.h" // for templated functions
-#include "ObjectURI.h"
 
 #include <set> 
 #include <map> 

=== modified file 'libcore/SWFMovie.h'
--- a/libcore/SWFMovie.h        2010-03-11 01:47:08 +0000
+++ b/libcore/SWFMovie.h        2010-03-12 15:42:07 +0000
@@ -23,7 +23,6 @@
 #define GNASH_SWF_MOVIE_H
 
 #include "Movie.h" // for inheritance
-#include "smart_ptr.h" // for composition
 #include "SWFMovieDefinition.h" // for dtor visibility by smart ptr
 
 #include <boost/intrusive_ptr.hpp>

=== modified file 'libcore/StaticText.h'
--- a/libcore/StaticText.h      2010-03-11 01:47:08 +0000
+++ b/libcore/StaticText.h      2010-03-12 15:42:07 +0000
@@ -22,7 +22,6 @@
 
 #include "smart_ptr.h" // GNASH_USE_GC
 #include "DisplayObject.h" // for inheritance
-#include "DisplayObject.h"
 #include "swf/DefineTextTag.h"
 
 #include <vector>

=== modified file 'libcore/Timers.h'
--- a/libcore/Timers.h  2010-03-10 16:37:25 +0000
+++ b/libcore/Timers.h  2010-03-12 15:42:07 +0000
@@ -20,7 +20,6 @@
 #define HAVE_TIMERS_H
 
 #include "dsodefs.h"
-#include "as_object.h"
 #include "as_function.h"
 #include "smart_ptr.h"
 
@@ -30,6 +29,7 @@
 // Forward declarations
 namespace gnash {
     class as_function;
+    class as_object;
 }
 
 namespace gnash {

=== modified file 'libcore/abc/Class.h'
--- a/libcore/abc/Class.h       2010-03-10 16:13:07 +0000
+++ b/libcore/abc/Class.h       2010-03-12 15:42:07 +0000
@@ -26,7 +26,6 @@
 #include <map>
 #include <vector>
 #include "string_table.h"
-#include "as_value.h"
 #include "Property.h"
 #include "AbcBlock.h"
 
@@ -43,6 +42,7 @@
     }
     class ClassHierarchy;
     class Property;
+    class as_value;
 }
 
 namespace gnash {

=== modified file 'libcore/as_object.h'
--- a/libcore/as_object.h       2010-03-11 01:47:08 +0000
+++ b/libcore/as_object.h       2010-03-12 15:42:07 +0000
@@ -27,7 +27,6 @@
 #include "string_table.h"
 #include "GC.h" // for inheritance from GcResource (to complete)
 #include "PropertyList.h"
-#include "as_value.h" 
 #include "smart_ptr.h"
 #include "PropFlags.h"
 #include "Relay.h"
@@ -58,6 +57,7 @@
     class movie_root;
     class RunResources;
     class Global_as;
+    class as_value;
 }
 
 namespace gnash {

=== modified file 'libcore/asobj/flash/display/BitmapData_as.h'
--- a/libcore/asobj/flash/display/BitmapData_as.h       2010-03-11 01:47:08 
+0000
+++ b/libcore/asobj/flash/display/BitmapData_as.h       2010-03-12 15:42:07 
+0000
@@ -23,7 +23,6 @@
 
 #include <list>
 #include <vector>
-#include "smart_ptr.h"
 #include "as_object.h"
 
 namespace gnash {

=== modified file 'libcore/asobj/flash/text/TextFormat_as.h'
--- a/libcore/asobj/flash/text/TextFormat_as.h  2010-03-11 01:47:08 +0000
+++ b/libcore/asobj/flash/text/TextFormat_as.h  2010-03-12 15:42:07 +0000
@@ -22,7 +22,6 @@
 #ifndef GNASH_TEXTFORMAT_H
 #define GNASH_TEXTFORMAT_H
 
-#include "as_object.h" 
 #include "TextField.h"
 #include "RGBA.h" 
 
@@ -30,6 +29,10 @@
 #include <boost/cstdint.hpp> 
 #include <string>
 
+namespace gnash {
+    class as_object;
+}
+
 namespace gnash {  
 
 /// A type to hold a simple value but with an additional 'unset' state.

=== modified file 'libcore/drag_state.h'
--- a/libcore/drag_state.h      2010-01-11 06:41:38 +0000
+++ b/libcore/drag_state.h      2010-03-12 15:42:07 +0000
@@ -22,7 +22,6 @@
 #define GNASH_DRAG_STATE_H
 
 #include "SWFRect.h" // for composition
-#include "smart_ptr.h" // we keep DisplayObject being dragged by intrusive_ptr
 
 namespace gnash
 {

=== modified file 'libcore/fill_style.h'
--- a/libcore/fill_style.h      2010-03-11 01:47:08 +0000
+++ b/libcore/fill_style.h      2010-03-12 15:42:07 +0000
@@ -25,7 +25,6 @@
 #include "BitmapInfo.h"
 #include "SWF.h"
 #include "RGBA.h" // for rgba type
-#include "smart_ptr.h" // for BitmapInfo (shared)
 
 #include <vector> // for composition
 #include <iosfwd> // for output operator forward declarations

=== modified file 'libcore/swf/ShapeRecord.cpp'
--- a/libcore/swf/ShapeRecord.cpp       2010-03-11 01:47:08 +0000
+++ b/libcore/swf/ShapeRecord.cpp       2010-03-12 15:42:07 +0000
@@ -20,6 +20,7 @@
 #include "SWF.h"
 #include "SWFStream.h"
 #include "movie_definition.h"
+#include "smart_ptr.h"
 #include "fill_style.h"
 #include "Geometry.h"
 #include "GnashNumeric.h"

=== modified file 'libcore/swf_function.h'
--- a/libcore/swf_function.h    2010-03-11 17:03:04 +0000
+++ b/libcore/swf_function.h    2010-03-12 15:42:07 +0000
@@ -20,7 +20,6 @@
 #define GNASH_SWF_FUNCTION_H
 
 #include "as_function.h" // for inheritance
-#include "as_object.h" // for composition (vector element)
 
 #include "smart_ptr.h"
 #include <vector>
@@ -29,8 +28,9 @@
 
 // Forward declarations
 namespace gnash {
-       class action_buffer;
-       class as_environmnet;
+    class action_buffer;
+    class as_environmnet;
+    class as_object;
 }
 
 namespace gnash {

=== modified file 'libcore/vm/with_stack_entry.h'
--- a/libcore/vm/with_stack_entry.h     2010-03-10 16:13:07 +0000
+++ b/libcore/vm/with_stack_entry.h     2010-03-12 15:42:07 +0000
@@ -19,7 +19,11 @@
 #ifndef GNASH_WITH_STACK_ENTRY_H
 #define GNASH_WITH_STACK_ENTRY_H
 
-#include "smart_ptr.h"
+#include <cstddef> // for size_t
+
+namespace gnash {
+    class as_object;
+}
 
 namespace gnash {