[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-
|
From: |
Bastiaan Jacques |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-302-g522478b |
|
Date: |
Sun, 20 Mar 2011 01:17:48 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 522478b059798d57c68421f1f4116c4fbe511288 (commit)
from b1f07f5d0b022c90c0f8b3c6dbb561d0d1d15f27 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=522478b059798d57c68421f1f4116c4fbe511288
commit 522478b059798d57c68421f1f4116c4fbe511288
Author: Bastiaan Jacques <address@hidden>
Date: Sun Mar 20 02:15:42 2011 +0100
Remove unused includes, add forward declarations, use <ioswfd> where
appropriate, move some includes to implementation files.
diff --git a/libbase/BitsReader.h b/libbase/BitsReader.h
index fb01c06..b2f4366 100644
--- a/libbase/BitsReader.h
+++ b/libbase/BitsReader.h
@@ -25,7 +25,6 @@
#include "dsodefs.h"
#include "log.h"
-#include <sstream>
#include <cassert>
#include <boost/cstdint.hpp> // for boost::uint32_t used in this file
diff --git a/libbase/IOChannel.h b/libbase/IOChannel.h
index 8c11369..fe8b42e 100644
--- a/libbase/IOChannel.h
+++ b/libbase/IOChannel.h
@@ -23,7 +23,7 @@
#include <string>
#include <boost/cstdint.hpp> // for boost int types
-#include <ios>
+#include <iosfwd>
#include "dsodefs.h" // DSOEXPORT
#include "GnashException.h" // for IOException inheritance
diff --git a/libcore/CharacterProxy.cpp b/libcore/CharacterProxy.cpp
index 6ff5881..8a4710f 100644
--- a/libcore/CharacterProxy.cpp
+++ b/libcore/CharacterProxy.cpp
@@ -23,6 +23,7 @@
#include "DisplayObject.h"
#include "VM.h"
#include "movie_root.h"
+#include "smart_ptr.h"
#include <string>
diff --git a/libcore/DisplayList.h b/libcore/DisplayList.h
index 78f68b4..dc1c296 100644
--- a/libcore/DisplayList.h
+++ b/libcore/DisplayList.h
@@ -21,12 +21,12 @@
#define GNASH_DLIST_H
#include "snappingrange.h"
-#include "DisplayObject.h"
#include <string>
#include <list>
#include <iosfwd>
#if GNASH_PARANOIA_LEVEL > 1 && !defined(NDEBUG)
+#include "DisplayObject.h"
#include <set> // for testInvariant
#include <algorithm>
#include "log.h"
@@ -42,9 +42,13 @@
#endif
namespace gnash {
- class SWFCxForm;
- class Renderer;
- struct ObjectURI;
+ class SWFCxForm;
+ class Renderer;
+ struct ObjectURI;
+ class Transform;
+ class string_table;
+ class DisplayObject;
+ class SWFMatrix;
}
namespace gnash {
diff --git a/libcore/Function.h b/libcore/Function.h
index 31994fd..21d2e3e 100644
--- a/libcore/Function.h
+++ b/libcore/Function.h
@@ -24,7 +24,6 @@
#include <string>
#include "UserFunction.h"
-#include "smart_ptr.h"
#include "ObjectURI.h"
// Forward declarations
diff --git a/libcore/Function2.h b/libcore/Function2.h
index 20427eb..bc43589 100644
--- a/libcore/Function2.h
+++ b/libcore/Function2.h
@@ -19,12 +19,7 @@
#ifndef GNASH_FUNCTION2_H
#define GNASH_FUNCTION2_H
-#include <vector>
-#include <cassert>
-#include <string>
-
#include "Function.h"
-#include "smart_ptr.h"
// Forward declarations
namespace gnash {
diff --git a/libcore/HostInterface.h b/libcore/HostInterface.h
index 0bdb084..d0c072a 100644
--- a/libcore/HostInterface.h
+++ b/libcore/HostInterface.h
@@ -54,7 +54,7 @@
#include <boost/variant.hpp>
#include <boost/any.hpp>
#include <string>
-#include <ostream>
+#include <iosfwd>
#include "dsodefs.h"
diff --git a/libcore/Movie.h b/libcore/Movie.h
index 173690c..cd9094c 100644
--- a/libcore/Movie.h
+++ b/libcore/Movie.h
@@ -23,7 +23,6 @@
#define GNASH_MOVIE_H
#include <string>
-#include <set>
#include "MovieClip.h" // for inheritance
diff --git a/libcore/MovieClip.h b/libcore/MovieClip.h
index b2beb34..fada1b1 100644
--- a/libcore/MovieClip.h
+++ b/libcore/MovieClip.h
@@ -39,7 +39,6 @@
#include "DisplayObjectContainer.h"
#include "as_environment.h" // for composition
#include "DynamicShape.h" // for composition
-#include "snappingrange.h"
#include "dsodefs.h" // for DSOEXPORT
// Forward declarations
diff --git a/libcore/MovieLoader.h b/libcore/MovieLoader.h
index 3658568..cb67c95 100644
--- a/libcore/MovieLoader.h
+++ b/libcore/MovieLoader.h
@@ -29,13 +29,14 @@
#include <boost/thread/barrier.hpp>
#include "URL.h"
-#include "as_object.h"
#include "MovieClip.h"
+#include "smart_ptr.h"
// Forward declarations
namespace gnash {
class movie_root;
class movie_definition;
+ class as_object;
}
namespace gnash {
diff --git a/libcore/ObjectURI.h b/libcore/ObjectURI.h
index a16af85..79a6129 100644
--- a/libcore/ObjectURI.h
+++ b/libcore/ObjectURI.h
@@ -27,7 +27,6 @@
#include "namedStrings.h"
#include <string>
-#include <ostream>
#include <sstream>
//#define GNASH_STATS_OBJECT_URI_NOCASE 1
diff --git a/libcore/PropertyList.h b/libcore/PropertyList.h
index d4afe52..3221c81 100644
--- a/libcore/PropertyList.h
+++ b/libcore/PropertyList.h
@@ -20,8 +20,6 @@
#define GNASH_PROPERTYLIST_H
#include <set>
-#include <map>
-#include <vector>
#include <string> // for use within map
#include <cassert> // for inlines
#include <utility> // for std::pair
diff --git a/libcore/Relay.cpp b/libcore/Relay.cpp
index c949145..300593c 100644
--- a/libcore/Relay.cpp
+++ b/libcore/Relay.cpp
@@ -19,6 +19,7 @@
#include "movie_root.h"
#include "as_object.h"
#include "Relay.h"
+#include "smart_ptr.h"
namespace gnash {
diff --git a/libcore/SWFMatrix.h b/libcore/SWFMatrix.h
index c3ba1de..ab526bd 100644
--- a/libcore/SWFMatrix.h
+++ b/libcore/SWFMatrix.h
@@ -27,7 +27,7 @@
#include "dsodefs.h" // for DSOEXPORT
-#include <ostream>
+#include <iosfwd>
#include <boost/cstdint.hpp>
// Forward declarations
diff --git a/libcore/Timers.h b/libcore/Timers.h
index 09d8764..b5899a0 100644
--- a/libcore/Timers.h
+++ b/libcore/Timers.h
@@ -20,7 +20,6 @@
#define HAVE_TIMERS_H
#include "dsodefs.h"
-#include "smart_ptr.h"
#include "fn_call.h"
#include <string>
diff --git a/libcore/as_environment.h b/libcore/as_environment.h
index 6e19c2a..fe3b1b7 100644
--- a/libcore/as_environment.h
+++ b/libcore/as_environment.h
@@ -23,7 +23,6 @@
#include <vector>
#include <algorithm>
-#include "smart_ptr.h"
#include "as_value.h"
#include "SafeStack.h"
diff --git a/libcore/as_object.h b/libcore/as_object.h
index 49697ea..bb632a7 100644
--- a/libcore/as_object.h
+++ b/libcore/as_object.h
@@ -27,12 +27,9 @@
#include <vector>
#include <cmath>
#include <utility>
-#include <set>
-#include <sstream>
#include <boost/scoped_ptr.hpp>
#include <boost/noncopyable.hpp>
-#include "string_table.h"
#include "GC.h" // for inheritance from GcResource (to complete)
#include "PropertyList.h"
#include "PropFlags.h"
@@ -51,6 +48,7 @@ namespace gnash {
class RunResources;
class Global_as;
class as_value;
+ class string_table;
}
namespace gnash {
diff --git a/libcore/as_value.h b/libcore/as_value.h
index 9c7bd1a..6f1ea1c 100644
--- a/libcore/as_value.h
+++ b/libcore/as_value.h
@@ -25,7 +25,7 @@
#include <limits>
#include <string>
#include <boost/variant.hpp>
-#include <ostream> // for inlined output operator
+#include <iosfwd> // for inlined output operator
#include <boost/type_traits/is_floating_point.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/cstdint.hpp>
diff --git a/libcore/asobj/XMLNode_as.h b/libcore/asobj/XMLNode_as.h
index 29eb1c5..03e024e 100644
--- a/libcore/asobj/XMLNode_as.h
+++ b/libcore/asobj/XMLNode_as.h
@@ -22,7 +22,6 @@
#include <list>
#include <string>
-#include <sstream>
#include <cassert>
#include "Relay.h"
diff --git a/libcore/asobj/flash/filters/ColorMatrixFilter_as.cpp
b/libcore/asobj/flash/filters/ColorMatrixFilter_as.cpp
index 2fa6d5b..4398b56 100644
--- a/libcore/asobj/flash/filters/ColorMatrixFilter_as.cpp
+++ b/libcore/asobj/flash/filters/ColorMatrixFilter_as.cpp
@@ -15,6 +15,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#include <boost/intrusive_ptr.hpp>
+
#include "ColorMatrixFilter_as.h"
#include "as_object.h"
@@ -22,6 +24,7 @@
#include "Global_as.h"
#include "BitmapFilter_as.h"
#include "Filters.h"
+#include "smart_ptr.h"
namespace gnash {
diff --git a/libcore/asobj/flash/filters/ConvolutionFilter_as.cpp
b/libcore/asobj/flash/filters/ConvolutionFilter_as.cpp
index 30856e6..0698188 100644
--- a/libcore/asobj/flash/filters/ConvolutionFilter_as.cpp
+++ b/libcore/asobj/flash/filters/ConvolutionFilter_as.cpp
@@ -15,6 +15,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#include <boost/intrusive_ptr.hpp>
+
#include "ConvolutionFilter_as.h"
#include "as_object.h"
@@ -22,6 +24,7 @@
#include "Global_as.h"
#include "BitmapFilter_as.h"
#include "Filters.h"
+#include "smart_ptr.h"
namespace gnash {
diff --git a/libcore/asobj/flash/filters/DisplacementMapFilter_as.cpp
b/libcore/asobj/flash/filters/DisplacementMapFilter_as.cpp
index 7b987d6..4ae3ed5 100644
--- a/libcore/asobj/flash/filters/DisplacementMapFilter_as.cpp
+++ b/libcore/asobj/flash/filters/DisplacementMapFilter_as.cpp
@@ -18,6 +18,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#include <boost/intrusive_ptr.hpp>
#include "DisplacementMapFilter_as.h"
@@ -30,6 +31,7 @@
#include "Global_as.h"
#include "BitmapFilter_as.h"
#include "Filters.h"
+#include "smart_ptr.h"
namespace gnash {
diff --git a/libcore/asobj/flash/filters/DropShadowFilter_as.cpp
b/libcore/asobj/flash/filters/DropShadowFilter_as.cpp
index f0deead..8b2d584 100644
--- a/libcore/asobj/flash/filters/DropShadowFilter_as.cpp
+++ b/libcore/asobj/flash/filters/DropShadowFilter_as.cpp
@@ -15,6 +15,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#include <boost/intrusive_ptr.hpp>
+
#include "DropShadowFilter_as.h"
#include "as_object.h"
@@ -22,6 +24,7 @@
#include "Global_as.h"
#include "BitmapFilter_as.h"
#include "Filters.h"
+#include "smart_ptr.h"
namespace gnash {
diff --git a/libcore/asobj/flash/filters/GlowFilter_as.cpp
b/libcore/asobj/flash/filters/GlowFilter_as.cpp
index 570c4bd..0dabc43 100644
--- a/libcore/asobj/flash/filters/GlowFilter_as.cpp
+++ b/libcore/asobj/flash/filters/GlowFilter_as.cpp
@@ -15,6 +15,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#include <boost/intrusive_ptr.hpp>
+
#include "GlowFilter_as.h"
#include "as_object.h"
@@ -22,6 +24,7 @@
#include "Global_as.h"
#include "BitmapFilter_as.h"
#include "Filters.h"
+#include "smart_ptr.h"
namespace gnash {
diff --git a/libcore/asobj/flash/filters/GradientBevelFilter_as.cpp
b/libcore/asobj/flash/filters/GradientBevelFilter_as.cpp
index 2aaadbf..84f7fdc 100644
--- a/libcore/asobj/flash/filters/GradientBevelFilter_as.cpp
+++ b/libcore/asobj/flash/filters/GradientBevelFilter_as.cpp
@@ -15,6 +15,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#include <boost/intrusive_ptr.hpp>
+
#include "GradientBevelFilter_as.h"
#include "as_object.h"
@@ -22,6 +24,7 @@
#include "Global_as.h"
#include "BitmapFilter_as.h"
#include "Filters.h"
+#include "smart_ptr.h"
namespace gnash {
diff --git a/libcore/asobj/flash/filters/GradientGlowFilter_as.cpp
b/libcore/asobj/flash/filters/GradientGlowFilter_as.cpp
index 66154a5..1dff4de 100644
--- a/libcore/asobj/flash/filters/GradientGlowFilter_as.cpp
+++ b/libcore/asobj/flash/filters/GradientGlowFilter_as.cpp
@@ -15,6 +15,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#include <boost/intrusive_ptr.hpp>
+
#include "GradientGlowFilter_as.h"
#include "Filters.h"
@@ -22,6 +24,7 @@
#include "as_object.h"
#include "VM.h"
#include "Global_as.h"
+#include "smart_ptr.h"
namespace gnash {
diff --git a/libcore/asobj/flash/geom/Matrix_as.cpp
b/libcore/asobj/flash/geom/Matrix_as.cpp
index 79f43ff..7c964fa 100644
--- a/libcore/asobj/flash/geom/Matrix_as.cpp
+++ b/libcore/asobj/flash/geom/Matrix_as.cpp
@@ -23,6 +23,7 @@
#include <cmath>
#include <boost/numeric/ublas/matrix.hpp> // boost matrix
#include <boost/numeric/ublas/io.hpp>
+#include <boost/intrusive_ptr.hpp>
#include <sstream>
#include "as_function.h"
diff --git a/libcore/movie_root.h b/libcore/movie_root.h
index a3b6179..6d3d75b 100644
--- a/libcore/movie_root.h
+++ b/libcore/movie_root.h
@@ -79,7 +79,6 @@
#include <boost/noncopyable.hpp>
#include <boost/any.hpp>
-#include "smart_ptr.h"
#include "dsodefs.h" // DSOEXPORT
#include "MouseButtonState.h" // for composition
#include "DragState.h" // for composition
diff --git a/libcore/parser/movie_definition.h
b/libcore/parser/movie_definition.h
index 9cbab3b..4f9644c 100644
--- a/libcore/parser/movie_definition.h
+++ b/libcore/parser/movie_definition.h
@@ -55,7 +55,6 @@
#include <string>
#include <memory> // for auto_ptr
#include <vector> // for PlayList typedef
-#include <set>
#include <boost/intrusive_ptr.hpp>
#include <boost/cstdint.hpp>
diff --git a/libcore/swf/DefineEditTextTag.cpp
b/libcore/swf/DefineEditTextTag.cpp
index 423bfc5..36526d9 100644
--- a/libcore/swf/DefineEditTextTag.cpp
+++ b/libcore/swf/DefineEditTextTag.cpp
@@ -25,6 +25,7 @@
#include "Font.h"
#include "SWFStream.h"
#include "Global_as.h"
+#include "smart_ptr.h"
namespace gnash {
namespace SWF {
diff --git a/libcore/swf/PlaceObject2Tag.cpp b/libcore/swf/PlaceObject2Tag.cpp
index 731a3d1..78a46d3 100644
--- a/libcore/swf/PlaceObject2Tag.cpp
+++ b/libcore/swf/PlaceObject2Tag.cpp
@@ -35,6 +35,7 @@
#include "filter_factory.h"
#include "GnashAlgorithm.h"
#include "action_buffer.h"
+#include "smart_ptr.h"
namespace gnash {
namespace SWF {
diff --git a/libcore/swf/RemoveObjectTag.cpp b/libcore/swf/RemoveObjectTag.cpp
index fecbc2a..2f50665 100644
--- a/libcore/swf/RemoveObjectTag.cpp
+++ b/libcore/swf/RemoveObjectTag.cpp
@@ -24,6 +24,7 @@
#include "SWF.h" // for TagType definition
#include "log.h"
#include "SWFStream.h"
+#include "smart_ptr.h"
namespace gnash {
namespace SWF {
diff --git a/libcore/swf/SWF.h b/libcore/swf/SWF.h
index e8cfc8d..9729bb1 100644
--- a/libcore/swf/SWF.h
+++ b/libcore/swf/SWF.h
@@ -19,7 +19,7 @@
#ifndef GNASH_SWF_H
#define GNASH_SWF_H
-#include <ostream>
+#include <iosfwd>
namespace gnash {
diff --git a/libcore/vm/ActionExec.cpp b/libcore/vm/ActionExec.cpp
index e5258d7..ab4eb77 100644
--- a/libcore/vm/ActionExec.cpp
+++ b/libcore/vm/ActionExec.cpp
@@ -34,6 +34,7 @@
#include "as_environment.h"
#include "SystemClock.h"
#include "CallStack.h"
+#include "smart_ptr.h"
#include <sstream>
#include <string>
diff --git a/libcore/vm/CallStack.h b/libcore/vm/CallStack.h
index e8a6f3d..b0e8638 100644
--- a/libcore/vm/CallStack.h
+++ b/libcore/vm/CallStack.h
@@ -22,7 +22,6 @@
#include <vector>
#include "as_value.h"
-#include "string_table.h"
// Forward declarations
namespace gnash {
diff --git a/libcore/vm/ExecutableCode.h b/libcore/vm/ExecutableCode.h
index a35d7ae..400866f 100644
--- a/libcore/vm/ExecutableCode.h
+++ b/libcore/vm/ExecutableCode.h
@@ -22,7 +22,6 @@
#include <vector>
#include <boost/noncopyable.hpp>
-#include "smart_ptr.h"
#include "ActionExec.h"
#include "Global_as.h"
#include "fn_call.h"
diff --git a/libcore/vm/Machine.h b/libcore/vm/Machine.h
index 8cbb334..2785132 100644
--- a/libcore/vm/Machine.h
+++ b/libcore/vm/Machine.h
@@ -21,7 +21,6 @@
#include <string>
#include <vector>
-#include <sstream>
#include "SafeStack.h"
#include "as_value.h"
#include "log.h"
diff --git a/libcore/vm/VM.h b/libcore/vm/VM.h
index 2e66990..1f1024b 100644
--- a/libcore/vm/VM.h
+++ b/libcore/vm/VM.h
@@ -31,14 +31,12 @@
#include <boost/cstdint.hpp>
#include <boost/random.hpp>
#include <boost/noncopyable.hpp>
-#include <boost/intrusive_ptr.hpp>
#include <boost/array.hpp>
#include "GC.h"
#include "string_table.h"
#include "SafeStack.h"
#include "CallStack.h"
-#include "smart_ptr.h"
#include "as_value.h"
#include "namedStrings.h"
#include "ObjectURI.h"
diff --git a/libcore/vm/fn_call.h b/libcore/vm/fn_call.h
index 3b77b99..57ca7c1 100644
--- a/libcore/vm/fn_call.h
+++ b/libcore/vm/fn_call.h
@@ -23,7 +23,6 @@
#include <vector>
#include <cassert>
#include <ostream>
-#include <sstream>
#include <algorithm>
#include "as_object.h"
diff --git a/plugin/npapi/external.h b/plugin/npapi/external.h
index 4bd117b..7255b01 100644
--- a/plugin/npapi/external.h
+++ b/plugin/npapi/external.h
@@ -24,11 +24,9 @@
#endif
#include <string>
-#include <sstream>
#include <vector>
#include <map>
#include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
#include "npapi.h"
#include "npruntime.h"
-----------------------------------------------------------------------
Summary of changes:
libbase/BitsReader.h | 1 -
libbase/IOChannel.h | 2 +-
libcore/CharacterProxy.cpp | 1 +
libcore/DisplayList.h | 12 ++++++++----
libcore/Function.h | 1 -
libcore/Function2.h | 5 -----
libcore/HostInterface.h | 2 +-
libcore/Movie.h | 1 -
libcore/MovieClip.h | 1 -
libcore/MovieLoader.h | 3 ++-
libcore/ObjectURI.h | 1 -
libcore/PropertyList.h | 2 --
libcore/Relay.cpp | 1 +
libcore/SWFMatrix.h | 2 +-
libcore/Timers.h | 1 -
libcore/as_environment.h | 1 -
libcore/as_object.h | 4 +---
libcore/as_value.h | 2 +-
libcore/asobj/XMLNode_as.h | 1 -
.../asobj/flash/filters/ColorMatrixFilter_as.cpp | 3 +++
.../asobj/flash/filters/ConvolutionFilter_as.cpp | 3 +++
.../flash/filters/DisplacementMapFilter_as.cpp | 2 ++
.../asobj/flash/filters/DropShadowFilter_as.cpp | 3 +++
libcore/asobj/flash/filters/GlowFilter_as.cpp | 3 +++
.../asobj/flash/filters/GradientBevelFilter_as.cpp | 3 +++
.../asobj/flash/filters/GradientGlowFilter_as.cpp | 3 +++
libcore/asobj/flash/geom/Matrix_as.cpp | 1 +
libcore/movie_root.h | 1 -
libcore/parser/movie_definition.h | 1 -
libcore/swf/DefineEditTextTag.cpp | 1 +
libcore/swf/PlaceObject2Tag.cpp | 1 +
libcore/swf/RemoveObjectTag.cpp | 1 +
libcore/swf/SWF.h | 2 +-
libcore/vm/ActionExec.cpp | 1 +
libcore/vm/CallStack.h | 1 -
libcore/vm/ExecutableCode.h | 1 -
libcore/vm/Machine.h | 1 -
libcore/vm/VM.h | 2 --
libcore/vm/fn_call.h | 1 -
plugin/npapi/external.h | 2 --
40 files changed, 43 insertions(+), 38 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-302-g522478b,
Bastiaan Jacques <=