[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r10023: Use a sensible name instead
From: |
Benjamin Wolsey |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r10023: Use a sensible name instead of types.h. Clean up includes. |
Date: |
Mon, 20 Oct 2008 19:16:11 +0200 |
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 10023
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Mon 2008-10-20 19:16:11 +0200
message:
Use a sensible name instead of types.h. Clean up includes.
renamed:
libcore/types.cpp => libcore/RGBA.cpp
libcore/types.h => libcore/RGBA.h
modified:
backend/render_handler_agg.cpp
backend/render_handler_ogl.cpp
libcore/DisplayList.h
libcore/Makefile.am
libcore/SWFStream.cpp
libcore/asobj/TextFormat.cpp
libcore/asobj/TextFormat.h
libcore/character.h
libcore/cxform.cpp
libcore/fill_style.h
libcore/font.h
libcore/impl.h
libcore/parser/bitmap_character_def.h
libcore/parser/edit_text_character_def.h
libcore/rect.cpp
libcore/styles.h
libcore/swf/SetBackgroundColorTag.h
libcore/vm/ASHandlers.cpp
libcore/vm/action.cpp
libcore/vm/action.h
libcore/RGBA.cpp
libcore/RGBA.h
------------------------------------------------------------
revno: 10019.1.1
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Mon 2008-10-20 19:06:14 +0200
message:
Rename types.{h,cpp} to RGBA.{h,cpp}, as that's all it contains.
Don't include it where it isn't needed.
renamed:
libcore/types.cpp => libcore/RGBA.cpp
libcore/types.h => libcore/RGBA.h
modified:
backend/render_handler_agg.cpp
backend/render_handler_ogl.cpp
libcore/DisplayList.h
libcore/Makefile.am
libcore/SWFStream.cpp
libcore/asobj/TextFormat.cpp
libcore/asobj/TextFormat.h
libcore/character.h
libcore/cxform.cpp
libcore/fill_style.h
libcore/font.h
libcore/impl.h
libcore/parser/bitmap_character_def.h
libcore/parser/edit_text_character_def.h
libcore/rect.cpp
libcore/styles.h
libcore/swf/SetBackgroundColorTag.h
libcore/vm/ASHandlers.cpp
libcore/vm/action.cpp
libcore/vm/action.h
libcore/RGBA.cpp
libcore/RGBA.h
=== modified file 'backend/render_handler_agg.cpp'
--- a/backend/render_handler_agg.cpp 2008-10-19 19:36:12 +0000
+++ b/backend/render_handler_agg.cpp 2008-10-20 17:06:14 +0000
@@ -124,7 +124,7 @@
#include <cmath>
#include "gnash.h"
-#include "types.h"
+#include "RGBA.h"
#include "image.h"
#include "utility.h"
#include "log.h"
=== modified file 'backend/render_handler_ogl.cpp'
--- a/backend/render_handler_ogl.cpp 2008-10-19 19:36:12 +0000
+++ b/backend/render_handler_ogl.cpp 2008-10-20 17:06:14 +0000
@@ -26,12 +26,11 @@
#include "render_handler.h"
#include "gnash.h"
-#include "types.h"
+#include "RGBA.h"
#include "image.h"
#include "utility.h"
#include "log.h"
-#include "types.h"
#include "image.h"
#include "utility.h"
#include "Range2d.h"
=== modified file 'libcore/DisplayList.h'
--- a/libcore/DisplayList.h 2008-10-19 19:36:12 +0000
+++ b/libcore/DisplayList.h 2008-10-20 17:06:14 +0000
@@ -20,7 +20,6 @@
#ifndef GNASH_DLIST_H
#define GNASH_DLIST_H
-#include "types.h"
#include "impl.h"
#include "snappingrange.h"
#include "character.h"
=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am 2008-10-19 18:04:05 +0000
+++ b/libcore/Makefile.am 2008-10-20 17:06:14 +0000
@@ -106,7 +106,7 @@
styles.cpp \
text.cpp \
timers.cpp \
- types.cpp \
+ RGBA.cpp \
$(FREETYPE_SOURCES) \
$(NULL)
@@ -190,7 +190,7 @@
swf_function.h \
text.h \
timers.h \
- types.h \
+ RGBA.h \
video_stream_instance.h \
$(NULL)
=== renamed file 'libcore/types.cpp' => 'libcore/RGBA.cpp'
--- a/libcore/types.cpp 2008-10-03 10:43:12 +0000
+++ b/libcore/RGBA.cpp 2008-10-20 17:06:14 +0000
@@ -10,7 +10,7 @@
#include <boost/thread.hpp>
-#include "types.h"
+#include "RGBA.h"
#include "utility.h"
#include "log.h"
=== renamed file 'libcore/types.h' => 'libcore/RGBA.h'
--- a/libcore/types.h 2008-08-10 14:57:21 +0000
+++ b/libcore/RGBA.h 2008-10-20 17:06:14 +0000
@@ -33,7 +33,8 @@
/// @param b Blue
/// @param a Alpha (transparency)
///
- rgba(boost::uint8_t r, boost::uint8_t g, boost::uint8_t b,
boost::uint8_t a)
+ rgba(boost::uint8_t r, boost::uint8_t g,
+ boost::uint8_t b, boost::uint8_t a)
:
m_r(r), m_g(g), m_b(b), m_a(a)
{
@@ -84,20 +85,21 @@
/// Throw a ParserException if there's no enough bytes in the
/// currently opened tag for reading. See stream::ensureBytes()
///
- void read(SWFStream& in, int tag_type);
+ void read(SWFStream& in, int tag_type);
/// Initialize from intput stream (reads RGBA)
//
/// Throw a ParserException if there's no enough bytes in the
/// currently opened tag for reading. See stream::ensureBytes()
///
- void read_rgba(SWFStream& in);
+ void read_rgba(SWFStream& in);
/// Initialize from intput stream (reads RGB)
- void read_rgb(SWFStream& in);
+ void read_rgb(SWFStream& in);
/// Set r,g,b.a values
- void set(boost::uint8_t r, boost::uint8_t g, boost::uint8_t
b, boost::uint8_t a)
+ void set(boost::uint8_t r, boost::uint8_t g,
+ boost::uint8_t b, boost::uint8_t a)
{
m_r = r;
m_g = g;
@@ -105,10 +107,10 @@
m_a = a;
}
- void set_lerp(const rgba& a, const rgba& b, float f);
+ void set_lerp(const rgba& a, const rgba& b, float f);
/// Debug log.
- void print() const;
+ void print() const;
/// Debug print.
std::string toString() const;
@@ -118,7 +120,10 @@
bool operator== (const rgba& o) const
{
- return m_r == o.m_r && m_g == o.m_g && m_b == o.m_b &&
m_a == o.m_a;
+ return m_r == o.m_r &&
+ m_g == o.m_g &&
+ m_b == o.m_b &&
+ m_a == o.m_a;
}
bool operator!= (const rgba& o) const
=== modified file 'libcore/SWFStream.cpp'
--- a/libcore/SWFStream.cpp 2008-10-02 16:12:12 +0000
+++ b/libcore/SWFStream.cpp 2008-10-20 17:06:14 +0000
@@ -20,7 +20,6 @@
#include "SWFStream.h"
#include "log.h"
-#include "types.h"
#include "IOChannel.h"
#include "swf.h"
#include "Property.h"
=== modified file 'libcore/asobj/TextFormat.cpp'
--- a/libcore/asobj/TextFormat.cpp 2008-06-09 19:53:46 +0000
+++ b/libcore/asobj/TextFormat.cpp 2008-10-20 17:06:14 +0000
@@ -24,7 +24,7 @@
#include "builtin_function.h" // for getter/setter properties
#include "namedStrings.h"
#include "VM.h"
-#include "types.h" // for PIXELS_TO_TWIPS
+#include "RGBA.h" // for rgba type
#include "StringPredicates.h" // for parseAlignString
#include "smart_ptr.h" // intrusive_ptr
=== modified file 'libcore/asobj/TextFormat.h'
--- a/libcore/asobj/TextFormat.h 2008-05-06 07:59:00 +0000
+++ b/libcore/asobj/TextFormat.h 2008-10-20 17:06:14 +0000
@@ -23,7 +23,7 @@
#include "as_object.h" // for inheritance of TextFormat
#include "edit_text_character_def.h" // for edit_text_character_def::alignment
enum
-#include "types.h" // for rgba
+#include "RGBA.h" // for rgba
#include <boost/cstdint.hpp> // for boost::uint32_t
#include <string>
=== modified file 'libcore/character.h'
--- a/libcore/character.h 2008-10-19 19:36:12 +0000
+++ b/libcore/character.h 2008-10-20 17:06:14 +0000
@@ -24,7 +24,6 @@
#endif
#include "smart_ptr.h" // GNASH_USE_GC
-#include "types.h"
#include "event_id.h" // for inlines
#include "as_object.h" // for inheritance
#include "rect.h" // for composition (invalidated bounds)
=== modified file 'libcore/cxform.cpp'
--- a/libcore/cxform.cpp 2008-08-18 23:53:04 +0000
+++ b/libcore/cxform.cpp 2008-10-20 17:06:14 +0000
@@ -19,7 +19,7 @@
//
#include "cxform.h"
-#include "types.h" // for rgba type :(
+#include "RGBA.h"
#include "SWFStream.h" // for reading from SWF
#include "log.h"
#include "utility.h" // for utility::clamp
=== modified file 'libcore/fill_style.h'
--- a/libcore/fill_style.h 2008-10-19 19:36:12 +0000
+++ b/libcore/fill_style.h 2008-10-20 17:06:14 +0000
@@ -25,6 +25,7 @@
#include "SWFMatrix.h"
#include "bitmap_character_def.h"
#include "swf.h"
+#include "RGBA.h" // for rgba type
#include <vector> // for composition
=== modified file 'libcore/font.h'
--- a/libcore/font.h 2008-09-04 15:32:42 +0000
+++ b/libcore/font.h 2008-10-20 17:06:14 +0000
@@ -25,7 +25,6 @@
#include "smart_ptr.h" // GNASH_USE_GC
-#include "types.h"
#include "resource.h" // for inheritance of font
#include "swf.h" // for tag_type definition
#include "bitmap_info.h" // for dtor visibility by smart pointer
=== modified file 'libcore/impl.h'
--- a/libcore/impl.h 2008-08-08 12:48:33 +0000
+++ b/libcore/impl.h 2008-10-20 17:06:14 +0000
@@ -21,7 +21,6 @@
#include "dsodefs.h"
-#include "types.h"
#include "smart_ptr.h"
#include "swf/TagLoadersTable.h"
=== modified file 'libcore/parser/bitmap_character_def.h'
--- a/libcore/parser/bitmap_character_def.h 2008-08-18 23:53:04 +0000
+++ b/libcore/parser/bitmap_character_def.h 2008-10-20 17:06:14 +0000
@@ -21,7 +21,6 @@
#include "smart_ptr.h" // GNASH_USE_GC
#include "gnash.h" // for bitmap_info definition
#include "ref_counted.h" // for character_def inheritance
-#include "types.h"
#include "smart_ptr.h"
#include "bitmap_info.h" // for dtor visibility by intrusive_ptr
#include "GC.h" // for GcResource (markReachableResources)
=== modified file 'libcore/parser/edit_text_character_def.h'
--- a/libcore/parser/edit_text_character_def.h 2008-09-04 15:32:42 +0000
+++ b/libcore/parser/edit_text_character_def.h 2008-10-20 17:06:14 +0000
@@ -15,11 +15,11 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#ifndef _GNASH_EDIT_TEXT_CHARACTER_DEF_H_
-#define _GNASH_EDIT_TEXT_CHARACTER_DEF_H_
+#ifndef GNASH_EDIT_TEXT_CHARACTER_DEF_H
+#define GNASH_EDIT_TEXT_CHARACTER_DEF_H
#include "smart_ptr.h" // GNASH_USE_GC
-#include "types.h" // what for ?
+#include "RGBA.h" // for rgba type
#include "character_def.h" // for inheritance
#include "rect.h" // for composition
=== modified file 'libcore/rect.cpp'
--- a/libcore/rect.cpp 2008-10-19 18:04:05 +0000
+++ b/libcore/rect.cpp 2008-10-20 17:06:14 +0000
@@ -19,7 +19,6 @@
#include "log.h"
#include "SWFStream.h"
#include "SWFMatrix.h"
-#include "types.h" // for TWIPS_TO_PIXELS
#include "utility.h" // for flerp, clamp...
#include <sstream> // for ::print and ::toString
=== modified file 'libcore/styles.h'
--- a/libcore/styles.h 2008-09-04 15:32:42 +0000
+++ b/libcore/styles.h 2008-10-20 17:06:14 +0000
@@ -10,7 +10,7 @@
#define GNASH_STYLES_H
#include "impl.h"
-#include "types.h"
+#include "RGBA.h"
#include "bitmap_character_def.h"
#include "fill_style.h"
=== modified file 'libcore/swf/SetBackgroundColorTag.h'
--- a/libcore/swf/SetBackgroundColorTag.h 2008-09-04 15:32:42 +0000
+++ b/libcore/swf/SetBackgroundColorTag.h 2008-10-20 17:06:14 +0000
@@ -27,7 +27,7 @@
#include "sprite_instance.h" // for inlines (execute)
#include "movie_definition.h" // for inlines (loader)
#include "log.h" // for log_parse
-#include "types.h" // for rgba class
+#include "RGBA.h" // for rgba class
#include "utility.h" // for frnd
// Forward declarations
=== modified file 'libcore/vm/ASHandlers.cpp'
--- a/libcore/vm/ASHandlers.cpp 2008-10-20 09:42:00 +0000
+++ b/libcore/vm/ASHandlers.cpp 2008-10-20 17:06:14 +0000
@@ -42,7 +42,6 @@
#include "Object.h"
#include "String_as.h" // for automatic as_value::STRING => String as object
#include "Number.h" // for automatic as_value::NUMBER => Number as object
-#include "types.h" // for PIXELS_TO_TWIPS
#include "drag_state.h"
#include "VM.h" // for getting the root
#include "movie_root.h" // for set_drag_state (ActionStartDragMovie)
=== modified file 'libcore/vm/action.cpp'
--- a/libcore/vm/action.cpp 2008-09-16 17:28:57 +0000
+++ b/libcore/vm/action.cpp 2008-10-20 17:06:14 +0000
@@ -22,7 +22,6 @@
#include "as_object.h"
#include "log.h"
#include "as_function.h"
-#include "types.h"
#include "swf.h"
#include "GnashException.h"
#include "as_environment.h"
=== modified file 'libcore/vm/action.h'
--- a/libcore/vm/action.h 2008-09-16 17:28:57 +0000
+++ b/libcore/vm/action.h 2008-10-20 17:06:14 +0000
@@ -24,7 +24,6 @@
#include "dsodefs.h" // for DSOEXPORT
#include "as_object.h"
-#include "types.h"
#include "smart_ptr.h"
#include <vector>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r10023: Use a sensible name instead of types.h. Clean up includes.,
Benjamin Wolsey <=