[Gnash-commit] /srv/bzr/gnash/trunk r12022: Header shuffling and correcting.

[Bastiaan Jacques]

------------------------------------------------------------
revno: 12022
committer: Bastiaan Jacques <address@hidden>
branch nick: trunk
timestamp: Thu 2010-03-11 18:03:04 +0100
message:
  Header shuffling and correcting.
modified:
  libbase/GnashImagePng.h
  libbase/GnashSystemNetHeaders.h
  libcore/AMFConverter.h
  libcore/Button.cpp
  libcore/MorphShape.h
  libcore/MovieClip.h
  libcore/Property.h
  libcore/PropertyList.h
  libcore/TextField.h
  libcore/abc/abc_function.h
  libcore/asobj/Global_as.h
  libcore/swf/DefineButtonSoundTag.h
  libcore/swf/DefineButtonTag.h
  libcore/swf_function.h
  libcore/vm/Machine.h
  libmedia/ffmpeg/VideoConverterFfmpeg.h

=== modified file 'libbase/GnashImagePng.h'
--- a/libbase/GnashImagePng.h   2010-01-18 07:40:53 +0000
+++ b/libbase/GnashImagePng.h   2010-03-11 17:03:04 +0000
@@ -25,7 +25,7 @@
 
 #include "dsodefs.h"
 #include "GnashImage.h"
-#include "boost/scoped_array.hpp"
+#include <boost/scoped_array.hpp>
 
 
 extern "C" {

=== modified file 'libbase/GnashSystemNetHeaders.h'
--- a/libbase/GnashSystemNetHeaders.h   2010-01-11 06:41:38 +0000
+++ b/libbase/GnashSystemNetHeaders.h   2010-03-11 17:03:04 +0000
@@ -27,6 +27,10 @@
 #ifndef GNASH_NET_HEADERS_H
 #define GNASH_NET_HEADERS_H
 
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
 /// @todo A configure 'test' (a #define in gnashconfig.h) might be a better
 ///       way of checking for compiler.
 #if defined(HAVE_WINSOCK_H) && !defined(__OS2__)

=== modified file 'libcore/AMFConverter.h'
--- a/libcore/AMFConverter.h    2010-03-11 01:47:08 +0000
+++ b/libcore/AMFConverter.h    2010-03-11 17:03:04 +0000
@@ -25,7 +25,6 @@
 #include <vector>
 
 #include "dsodefs.h"
-#include "GnashException.h"
 #include "AMF.h"
 
 namespace gnash {

=== modified file 'libcore/Button.cpp'
--- a/libcore/Button.cpp        2010-03-11 01:47:08 +0000
+++ b/libcore/Button.cpp        2010-03-11 17:03:04 +0000
@@ -41,6 +41,7 @@
 #include "SoundInfoRecord.h" 
 #include "Global_as.h" 
 #include "RunResources.h"
+#include "sound_definition.h"
 
 #include <boost/bind.hpp>
 

=== modified file 'libcore/MorphShape.h'
--- a/libcore/MorphShape.h      2010-03-11 01:47:08 +0000
+++ b/libcore/MorphShape.h      2010-03-11 17:03:04 +0000
@@ -22,7 +22,6 @@
 
 #include "smart_ptr.h" // GNASH_USE_GC
 #include "DisplayObject.h"
-#include "Geometry.h"
 #include "swf/DefineMorphShapeTag.h"
 #include <boost/intrusive_ptr.hpp>
 #include <cassert>

=== modified file 'libcore/MovieClip.h'
--- a/libcore/MovieClip.h       2010-03-11 01:47:08 +0000
+++ b/libcore/MovieClip.h       2010-03-11 17:03:04 +0000
@@ -32,7 +32,7 @@
 #include "DisplayObjectContainer.h"
 #include "as_environment.h" // for composition
 #include "DynamicShape.h" // for composition
-#include "Range2d.h"
+#include "snappingrange.h"
 #include "dsodefs.h" // for DSOEXPORT
 
 #include <boost/intrusive_ptr.hpp>

=== modified file 'libcore/Property.h'
--- a/libcore/Property.h        2010-03-10 16:13:07 +0000
+++ b/libcore/Property.h        2010-03-11 17:03:04 +0000
@@ -22,7 +22,6 @@
 
 #include "PropFlags.h"
 #include "as_value.h"
-#include "string_table.h"
 #include "ObjectURI.h"
 
 #include <boost/variant.hpp>

=== modified file 'libcore/PropertyList.h'
--- a/libcore/PropertyList.h    2010-01-11 06:41:38 +0000
+++ b/libcore/PropertyList.h    2010-03-11 17:03:04 +0000
@@ -22,7 +22,6 @@
 #include "Property.h" // for templated functions
 #include "PropFlags.h" // for templated functions
 #include "as_value.h" // for templated functions
-#include "string_table.h"
 #include "ObjectURI.h"
 
 #include <set> 

=== modified file 'libcore/TextField.h'
--- a/libcore/TextField.h       2010-03-11 01:47:08 +0000
+++ b/libcore/TextField.h       2010-03-11 17:03:04 +0000
@@ -21,7 +21,7 @@
 
 #include "InteractiveObject.h" // for inheritance
 #include "LineStyle.h" // for LineStyle
-#include "Range2d.h"
+#include "snappingrange.h"
 #include "SWFRect.h" // for inlines
 
 #include <boost/intrusive_ptr.hpp>

=== modified file 'libcore/abc/abc_function.h'
--- a/libcore/abc/abc_function.h        2010-03-11 01:47:08 +0000
+++ b/libcore/abc/abc_function.h        2010-03-11 17:03:04 +0000
@@ -24,9 +24,6 @@
 
 #include "as_function.h"
 #include "as_value.h"
-#include "SafeStack.h"
-#include "as_object.h"
-#include "as_environment.h"
 #include "Method.h"
 
 namespace gnash {

=== modified file 'libcore/asobj/Global_as.h'
--- a/libcore/asobj/Global_as.h 2010-03-11 01:47:08 +0000
+++ b/libcore/asobj/Global_as.h 2010-03-11 17:03:04 +0000
@@ -22,7 +22,6 @@
 
 #include "as_object.h" // for inheritance
 #include "fn_call.h"
-#include "GnashException.h"
 #include "log.h"
 
 #include <string>

=== modified file 'libcore/swf/DefineButtonSoundTag.h'
--- a/libcore/swf/DefineButtonSoundTag.h        2010-03-11 01:47:08 +0000
+++ b/libcore/swf/DefineButtonSoundTag.h        2010-03-11 17:03:04 +0000
@@ -21,9 +21,8 @@
 #ifndef GNASH_SWF_DEFINEBUTTONSOUNDTAG_H
 #define GNASH_SWF_DEFINEBUTTONSOUNDTAG_H
 
+#include "SoundInfoRecord.h" 
 #include "SWF.h"
-#include "sound_definition.h" // For sound_sample. Ugh.
-#include "SoundInfoRecord.h" 
 
 #include <vector>
 
@@ -31,6 +30,7 @@
     class SWFStream;
     class RunResources;
     class movie_definition;
+    class sound_sample;
 }
 
 namespace gnash {

=== modified file 'libcore/swf/DefineButtonTag.h'
--- a/libcore/swf/DefineButtonTag.h     2010-03-11 01:47:08 +0000
+++ b/libcore/swf/DefineButtonTag.h     2010-03-11 17:03:04 +0000
@@ -23,12 +23,10 @@
 
 #include "smart_ptr.h" // GNASH_USE_GC
 #include "DefinitionTag.h"
-#include "sound_definition.h"
 #include "SWFMatrix.h" // for composition
 #include "cxform.h" // for composition
 #include "action_buffer.h" // for composition of ButtonAction
 #include "filter_factory.h" // for Filters (composition of button_record)
-#include "sound_handler.h" // for sound_handler::sound_envelope in a vector..
 #include "DefineButtonSoundTag.h"
 #include "SWF.h"
 #include "Button.h"

=== modified file 'libcore/swf_function.h'
--- a/libcore/swf_function.h    2010-03-11 01:47:08 +0000
+++ b/libcore/swf_function.h    2010-03-11 17:03:04 +0000
@@ -21,7 +21,6 @@
 
 #include "as_function.h" // for inheritance
 #include "as_object.h" // for composition (vector element)
-#include "VM.h" //fow SWF version
 
 #include "smart_ptr.h"
 #include <vector>

=== modified file 'libcore/vm/Machine.h'
--- a/libcore/vm/Machine.h      2010-03-11 01:47:08 +0000
+++ b/libcore/vm/Machine.h      2010-03-11 17:03:04 +0000
@@ -24,7 +24,6 @@
 #include <sstream>
 #include "SafeStack.h"
 #include "as_value.h"
-#include "as_environment.h"
 #include "VM.h"
 #include "fn_call.h"
 #include "log.h"

=== modified file 'libmedia/ffmpeg/VideoConverterFfmpeg.h'
--- a/libmedia/ffmpeg/VideoConverterFfmpeg.h    2010-01-25 18:52:20 +0000
+++ b/libmedia/ffmpeg/VideoConverterFfmpeg.h    2010-03-11 17:03:04 +0000
@@ -21,8 +21,6 @@
 #include "ffmpegHeaders.h"
 #include "VideoConverter.h"
 
-#include "log.h"
-
 #if HAVE_SWSCALE_H
 extern "C" {
 #include <libswscale/swscale.h>