[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
|
From: |
Bastiaan Jacques |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1769-g1bea001 |
|
Date: |
Thu, 29 Aug 2013 09:39:18 +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 1bea001a73e3b167f5a33058eff8e87e00171842 (commit)
from eec3a8840b9efa83532d426abe1b4de456217756 (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=1bea001a73e3b167f5a33058eff8e87e00171842
commit 1bea001a73e3b167f5a33058eff8e87e00171842
Author: Bastiaan Jacques <address@hidden>
Date: Thu Aug 29 11:37:33 2013 +0200
Remove unneeded includes from header files; replace some with
forward-declarations if possible, and fix up .cpp files.
diff --git a/gui/dump/dump.cpp b/gui/dump/dump.cpp
index 24b3e29..729f8df 100644
--- a/gui/dump/dump.cpp
+++ b/gui/dump/dump.cpp
@@ -61,6 +61,7 @@
#include "NullSoundHandler.h"
#include "as_environment.h"
#include "as_value.h"
+#include "Movie.h"
namespace gnash {
diff --git a/gui/gui.cpp b/gui/gui.cpp
index e5a20c5..2f25fb6 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -38,6 +38,7 @@
#include "RunResources.h"
#include "StreamProvider.h"
#include "ScreenShotter.h"
+#include "Movie.h"
#ifdef GNASH_FPS_DEBUG
#include "ClockTime.h"
diff --git a/gui/qt/Qt4Gui.cpp b/gui/qt/Qt4Gui.cpp
index 089d9bb..7b7af5e 100644
--- a/gui/qt/Qt4Gui.cpp
+++ b/gui/qt/Qt4Gui.cpp
@@ -67,6 +67,7 @@
#include "Qt4Gui.moc"
#include "Renderer.h"
#include "RunResources.h"
+#include "GnashException.h"
// Macro for using gettext strings where Qt expects QStrings
#define _q(Str) QString::fromUtf8(_(Str))
diff --git a/libbase/IOChannel.h b/libbase/IOChannel.h
index c9fa353..50a76cd 100644
--- a/libbase/IOChannel.h
+++ b/libbase/IOChannel.h
@@ -23,7 +23,6 @@
#include <string>
#include <boost/cstdint.hpp> // for boost int types
-#include <iosfwd>
#include "dsodefs.h" // DSOEXPORT
#include "GnashException.h" // for IOException inheritance
diff --git a/libcore/Bitmap.cpp b/libcore/Bitmap.cpp
index faf5864..cad8767 100644
--- a/libcore/Bitmap.cpp
+++ b/libcore/Bitmap.cpp
@@ -28,6 +28,7 @@
#include "movie_root.h"
#include "RunResources.h"
#include "Transform.h"
+#include "BitmapMovieDefinition.h"
namespace gnash {
diff --git a/libcore/Bitmap.h b/libcore/Bitmap.h
index 5c00701..b0f4628 100644
--- a/libcore/Bitmap.h
+++ b/libcore/Bitmap.h
@@ -23,11 +23,11 @@
#include <boost/intrusive_ptr.hpp>
#include "DisplayObject.h"
#include "flash/display/BitmapData_as.h"
-#include "BitmapMovieDefinition.h"
#include "DynamicShape.h"
namespace gnash {
class CachedBitmap;
+ class BitmapMovieDefinition;
}
diff --git a/libcore/ClassHierarchy.h b/libcore/ClassHierarchy.h
index 161afd9..c372c57 100644
--- a/libcore/ClassHierarchy.h
+++ b/libcore/ClassHierarchy.h
@@ -26,7 +26,6 @@
#include <string>
#include <vector>
-#include <iosfwd>
#include "ObjectURI.h"
diff --git a/libcore/DisplayList.h b/libcore/DisplayList.h
index 57932af..14aedf0 100644
--- a/libcore/DisplayList.h
+++ b/libcore/DisplayList.h
@@ -20,7 +20,6 @@
#ifndef GNASH_DLIST_H
#define GNASH_DLIST_H
-#include <string>
#include <list>
#include <iosfwd>
#if GNASH_PARANOIA_LEVEL > 1 && !defined(NDEBUG)
diff --git a/libcore/DisplayObject.cpp b/libcore/DisplayObject.cpp
index 717b0c8..254c4bd 100644
--- a/libcore/DisplayObject.cpp
+++ b/libcore/DisplayObject.cpp
@@ -31,6 +31,9 @@
#include "movie_root.h"
#include "MovieClip.h"
+#include "Movie.h"
+#include "DisplayObject.h"
+#include "Object.h"
#include "VM.h"
#include "fn_call.h"
#include "GnashException.h"
diff --git a/libcore/DynamicShape.h b/libcore/DynamicShape.h
index 50dcb89..c082c23 100644
--- a/libcore/DynamicShape.h
+++ b/libcore/DynamicShape.h
@@ -21,7 +21,6 @@
#ifndef GNASH_DYNAMIC_SHAPE_H
#define GNASH_DYNAMIC_SHAPE_H
-#include <vector>
#include "LineStyle.h"
#include "ShapeRecord.h"
diff --git a/libcore/ExternalInterface.h b/libcore/ExternalInterface.h
index 5d0c635..7ad0047 100644
--- a/libcore/ExternalInterface.h
+++ b/libcore/ExternalInterface.h
@@ -23,7 +23,6 @@
#include <string>
#include <vector>
-#include <map>
#include <set>
#include <boost/shared_ptr.hpp>
diff --git a/libcore/LoadVariablesThread.cpp b/libcore/LoadVariablesThread.cpp
index 2f70eda..4229168 100644
--- a/libcore/LoadVariablesThread.cpp
+++ b/libcore/LoadVariablesThread.cpp
@@ -22,6 +22,7 @@
#include "log.h"
#include "GnashException.h"
#include "utf8.h"
+#include "StreamProvider.h"
#include <string>
#include <boost/scoped_array.hpp>
diff --git a/libcore/LoadVariablesThread.h b/libcore/LoadVariablesThread.h
index 35723d2..bd97ff8 100644
--- a/libcore/LoadVariablesThread.h
+++ b/libcore/LoadVariablesThread.h
@@ -28,10 +28,14 @@
#include <boost/thread/mutex.hpp>
#include <boost/bind.hpp>
-#include "StreamProvider.h" // for inlines
#include "URL.h" // for inlines
namespace gnash {
+ class StreamProvider;
+ class IOChannel;
+}
+
+namespace gnash {
// Exception thrown by LoadVariablesThread constructor if unable to connect
// to the stream input.
diff --git a/libcore/MovieClip.h b/libcore/MovieClip.h
index a82b834..4511107 100644
--- a/libcore/MovieClip.h
+++ b/libcore/MovieClip.h
@@ -27,7 +27,6 @@
#endif
#include <vector>
-#include <list>
#include <map>
#include <string>
#include <boost/ptr_container/ptr_list.hpp>
diff --git a/libcore/MovieLoader.h b/libcore/MovieLoader.h
index b20e155..b67719b 100644
--- a/libcore/MovieLoader.h
+++ b/libcore/MovieLoader.h
@@ -20,7 +20,6 @@
#define GNASH_MOVIE_LOADER_H
#include <boost/intrusive_ptr.hpp>
-#include <list>
#include <string>
#include <boost/ptr_container/ptr_list.hpp>
#include <boost/noncopyable.hpp>
diff --git a/libcore/RGBA.h b/libcore/RGBA.h
index 338caa9..06af1af 100644
--- a/libcore/RGBA.h
+++ b/libcore/RGBA.h
@@ -25,7 +25,6 @@
#include <boost/cstdint.hpp>
#include "dsodefs.h" // for DSOTEXPORT
-#include "SWF.h"
namespace gnash {
diff --git a/libcore/TextField.cpp b/libcore/TextField.cpp
index a220471..e7ec6cc 100644
--- a/libcore/TextField.cpp
+++ b/libcore/TextField.cpp
@@ -60,6 +60,7 @@
#include "Renderer.h"
#include "Transform.h"
#include "ObjectURI.h"
+#include "Movie.h"
// Text fields have a fixed 2 pixel padding for each side (regardless of
border)
#define PADDING_TWIPS 40
diff --git a/libcore/TextField.h b/libcore/TextField.h
index 6541ee9..78df198 100644
--- a/libcore/TextField.h
+++ b/libcore/TextField.h
@@ -25,10 +25,10 @@
#include <vector>
#include "InteractiveObject.h" // for inheritance
-#include "LineStyle.h" // for LineStyle
#include "snappingrange.h"
#include "SWFRect.h" // for inlines
#include "GnashKey.h"
+#include "RGBA.h" // for rgba
// Forward declarations
namespace gnash {
diff --git a/libcore/Timers.h b/libcore/Timers.h
index 44ec571..dac3f52 100644
--- a/libcore/Timers.h
+++ b/libcore/Timers.h
@@ -22,7 +22,6 @@
#include "dsodefs.h"
#include "fn_call.h"
-#include <string>
#include <limits>
// Forward declarations
diff --git a/libcore/asobj/NetStream_as.cpp b/libcore/asobj/NetStream_as.cpp
index cf2110c..386a227 100644
--- a/libcore/asobj/NetStream_as.cpp
+++ b/libcore/asobj/NetStream_as.cpp
@@ -48,6 +48,8 @@
#include "AMFConverter.h"
#include "AMF.h"
#include "SoundUtils.h"
+#include "VideoDecoder.h"
+#include "AudioDecoder.h"
// Define the following macro to have status notification handling debugged
//#define GNASH_DEBUG_STATUS
diff --git a/libcore/asobj/NetStream_as.h b/libcore/asobj/NetStream_as.h
index cf338ed..d55c611 100644
--- a/libcore/asobj/NetStream_as.h
+++ b/libcore/asobj/NetStream_as.h
@@ -29,24 +29,32 @@
#include <string>
#include <boost/ptr_container/ptr_deque.hpp>
#include <boost/scoped_ptr.hpp>
+#include <boost/thread/mutex.hpp>
-#include "MediaParser.h"
#include "PlayHead.h" // for composition
-#include "VideoDecoder.h" // for visibility of dtor
-#include "AudioDecoder.h" // for visibility of dtor
-#include "VirtualClock.h"
#include "Relay.h" // for ActiveRelay inheritance
+#include <memory>
// Forward declarations
namespace gnash {
+ class InterruptableVirtualClock;
+ class as_object;
class CharacterProxy;
class IOChannel;
class NetConnection_as;
class as_function;
class DisplayObject;
struct ObjectURI;
+ namespace image {
+ class GnashImage;
+ }
namespace media {
class MediaHandler;
+ class AudioDecoder;
+ class AudioInfo;
+ class MediaParser;
+ class VideoDecoder;
+ class VideoInfo;
}
namespace sound {
class sound_handler;
diff --git a/libcore/asobj/Sound_as.cpp b/libcore/asobj/Sound_as.cpp
index ac0bb4e..1a05109 100644
--- a/libcore/asobj/Sound_as.cpp
+++ b/libcore/asobj/Sound_as.cpp
@@ -33,6 +33,7 @@
#include "RunResources.h"
#include "log.h"
#include "sound_handler.h"
+#include "MediaParser.h"
#include "AudioDecoder.h"
#include "MediaHandler.h"
#include "sound_definition.h"
diff --git a/libcore/asobj/System_as.h b/libcore/asobj/System_as.h
index cec278b..2e4d0bf 100644
--- a/libcore/asobj/System_as.h
+++ b/libcore/asobj/System_as.h
@@ -20,10 +20,6 @@
#ifndef GNASH_ASOBJ3_SYSTEM_H
#define GNASH_ASOBJ3_SYSTEM_H
-#include <string>
-#include <vector>
-
-
namespace gnash {
// Forward declarations
diff --git a/libcore/asobj/TextFormat_as.cpp b/libcore/asobj/TextFormat_as.cpp
index 129a298..7d1e60c 100644
--- a/libcore/asobj/TextFormat_as.cpp
+++ b/libcore/asobj/TextFormat_as.cpp
@@ -36,7 +36,7 @@
#include "Font.h"
#include "movie_definition.h"
#include "movie_root.h"
-
+#include "Movie.h"
namespace gnash {
diff --git a/libcore/movie_root.h b/libcore/movie_root.h
index 3157f02..a89787b 100644
--- a/libcore/movie_root.h
+++ b/libcore/movie_root.h
@@ -81,10 +81,9 @@
#include <boost/optional.hpp>
#include "dsodefs.h" // DSOEXPORT
+#include "DragState.h"
#include "MouseButtonState.h" // for composition
-#include "DragState.h" // for composition
#include "GnashKey.h" // key::code
-#include "Movie.h"
#include "GnashEnums.h"
#include "MovieClip.h"
#include "SimpleBuffer.h" // for LoadCallback
@@ -119,6 +118,7 @@ namespace gnash {
class RunResources;
class Button;
class VM;
+ class Movie;
}
namespace gnash {
diff --git a/libcore/parser/SWFMovieDefinition.h
b/libcore/parser/SWFMovieDefinition.h
index 7b1e644..94f85e8 100644
--- a/libcore/parser/SWFMovieDefinition.h
+++ b/libcore/parser/SWFMovieDefinition.h
@@ -43,7 +43,6 @@
#include "StringPredicates.h"
#include "SWFRect.h"
#include "GnashNumeric.h"
-#include "GnashAlgorithm.h"
#include "dsodefs.h" // for DSOTEXPORT
// Forward declarations
diff --git a/libcore/swf/SoundInfoRecord.h b/libcore/swf/SoundInfoRecord.h
index be77892..3165788 100644
--- a/libcore/swf/SoundInfoRecord.h
+++ b/libcore/swf/SoundInfoRecord.h
@@ -21,7 +21,7 @@
#ifndef GNASH_SWF_SOUNDINFO_H
#define GNASH_SWF_SOUNDINFO_H
-#include "sound_handler.h" // sound::SoundEnvelopes
+#include "SoundEnvelope.h" // sound::SoundEnvelopes
#include <limits>
diff --git a/libcore/swf/StartSoundTag.h b/libcore/swf/StartSoundTag.h
index 0bcb523..6d6dd63 100644
--- a/libcore/swf/StartSoundTag.h
+++ b/libcore/swf/StartSoundTag.h
@@ -20,7 +20,6 @@
#define GNASH_SWF_STARTSOUND_TAG_H
#include "ControlTag.h" // for inheritance
-#include "sound_handler.h" // for sound_envelope (composition)
#include "SWF.h" // for TagType definition
#include "SoundInfoRecord.h"
diff --git a/libcore/swf/VideoFrameTag.h b/libcore/swf/VideoFrameTag.h
index b4862e2..02c4575 100644
--- a/libcore/swf/VideoFrameTag.h
+++ b/libcore/swf/VideoFrameTag.h
@@ -19,18 +19,13 @@
#ifndef GNASH_SWF_VIDEOFRAMETAG_H
#define GNASH_SWF_VIDEOFRAMETAG_H
-#include "DefinitionTag.h"
-#include "movie_definition.h"
#include "SWF.h"
-#include "SWFRect.h" // for composition
-#include "ControlTag.h"
-#include "VideoDecoder.h"
-
-#include <memory> // for auto_ptr
namespace gnash {
// Forward declarations
class SWFStream;
+ class RunResources;
+ class movie_definition;
}
namespace gnash {
diff --git a/libcore/vm/ASHandlers.h b/libcore/vm/ASHandlers.h
index cbe75f3..a739549 100644
--- a/libcore/vm/ASHandlers.h
+++ b/libcore/vm/ASHandlers.h
@@ -19,7 +19,6 @@
#ifndef GNASH_ASHANDLERS_H
#define GNASH_ASHANDLERS_H
-#include <string>
#include <vector>
#include "SWF.h"
diff --git a/libcore/vm/VM.h b/libcore/vm/VM.h
index 04c6270..6e2edb0 100644
--- a/libcore/vm/VM.h
+++ b/libcore/vm/VM.h
@@ -25,15 +25,12 @@
#endif
#include <map>
-#include <vector>
#include <memory>
-#include <locale>
+#include <boost/array.hpp>
#include <boost/cstdint.hpp>
-#include <boost/random.hpp>
+#include <boost/random/mersenne_twister.hpp> // for mt11213b
#include <boost/noncopyable.hpp>
-#include <boost/array.hpp>
-#include "GC.h"
#include "string_table.h"
#include "SafeStack.h"
#include "CallStack.h"
@@ -46,15 +43,13 @@
// Forward declarations
namespace gnash {
- class Global_as;
- class VM;
- class fn_call;
- class movie_root;
- class NativeFunction;
+ class Global_as;
+ class fn_call;
+ class movie_root;
+ class NativeFunction;
class SharedObjectLibrary;
- class as_value;
- class as_object;
- class VirtualClock;
+ class as_object;
+ class VirtualClock;
class UserFunction;
}
diff --git a/libmedia/FLVParser.h b/libmedia/FLVParser.h
index d302bb1..5a31c14 100644
--- a/libmedia/FLVParser.h
+++ b/libmedia/FLVParser.h
@@ -26,9 +26,7 @@
#include "dsodefs.h"
#include "MediaParser.h" // for inheritance
-#include "SimpleBuffer.h"
-#include <set>
#include <memory>
#include <map>
diff --git a/libmedia/MediaHandler.h b/libmedia/MediaHandler.h
index 4ffd6e0..98f62ce 100644
--- a/libmedia/MediaHandler.h
+++ b/libmedia/MediaHandler.h
@@ -21,14 +21,12 @@
#ifndef GNASH_MEDIAHANDLER_H
#define GNASH_MEDIAHANDLER_H
-#include "MediaParser.h" // for videoCodecType and audioCodecType enums
#include "dsodefs.h" // DSOEXPORT
#include "VideoConverter.h"
#include "GnashFactory.h"
#include <vector>
#include <memory>
-#include <map>
#include <string>
// Forward declarations
@@ -42,6 +40,7 @@ namespace gnash {
class VideoInput;
class AudioInput;
class MediaHandler;
+ class MediaParser;
}
}
diff --git a/librender/agg/Renderer_agg_style.h
b/librender/agg/Renderer_agg_style.h
index dbd3fa0..64b06d5 100644
--- a/librender/agg/Renderer_agg_style.h
+++ b/librender/agg/Renderer_agg_style.h
@@ -40,7 +40,6 @@
#include <agg_pixfmt_rgb.h>
#include <agg_pixfmt_rgba.h>
#pragma GCC diagnostic pop
-#include <iostream>
#include "LinearRGB.h"
#include "Renderer_agg_bitmap.h"
diff --git a/utilities/processor.cpp b/utilities/processor.cpp
index c482c19..95c1f94 100644
--- a/utilities/processor.cpp
+++ b/utilities/processor.cpp
@@ -54,6 +54,7 @@
#include "StreamProvider.h"
#include "RunResources.h"
#include "HostInterface.h"
+#include "Movie.h"
#ifdef RENDERER_AGG
#include "Renderer.h"
-----------------------------------------------------------------------
Summary of changes:
gui/dump/dump.cpp | 1 +
gui/gui.cpp | 1 +
gui/qt/Qt4Gui.cpp | 1 +
libbase/IOChannel.h | 1 -
libcore/Bitmap.cpp | 1 +
libcore/Bitmap.h | 2 +-
libcore/ClassHierarchy.h | 1 -
libcore/DisplayList.h | 1 -
libcore/DisplayObject.cpp | 3 +++
libcore/DynamicShape.h | 1 -
libcore/ExternalInterface.h | 1 -
libcore/LoadVariablesThread.cpp | 1 +
libcore/LoadVariablesThread.h | 6 +++++-
libcore/MovieClip.h | 1 -
libcore/MovieLoader.h | 1 -
libcore/RGBA.h | 1 -
libcore/TextField.cpp | 1 +
libcore/TextField.h | 2 +-
libcore/Timers.h | 1 -
libcore/asobj/NetStream_as.cpp | 2 ++
libcore/asobj/NetStream_as.h | 16 ++++++++++++----
libcore/asobj/Sound_as.cpp | 1 +
libcore/asobj/System_as.h | 4 ----
libcore/asobj/TextFormat_as.cpp | 2 +-
libcore/movie_root.h | 4 ++--
libcore/parser/SWFMovieDefinition.h | 1 -
libcore/swf/SoundInfoRecord.h | 2 +-
libcore/swf/StartSoundTag.h | 1 -
libcore/swf/VideoFrameTag.h | 9 ++-------
libcore/vm/ASHandlers.h | 1 -
libcore/vm/VM.h | 21 ++++++++-------------
libmedia/FLVParser.h | 2 --
libmedia/MediaHandler.h | 3 +--
librender/agg/Renderer_agg_style.h | 1 -
utilities/processor.cpp | 1 +
35 files changed, 47 insertions(+), 52 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1769-g1bea001,
Bastiaan Jacques <=