[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r10966: Give arrays unique names.
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r10966: Give arrays unique names. |
|
Date: |
Tue, 02 Jun 2009 08:44:43 +0200 |
|
User-agent: |
Bazaar (1.13.1) |
------------------------------------------------------------
revno: 10966
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Tue 2009-06-02 08:44:43 +0200
message:
Give arrays unique names.
removed:
libcore/asobj/Mouse_as.cpp
libcore/asobj/Mouse_as.h
modified:
libcore/asobj/flash/accessibility/accessibility.am
libcore/asobj/flash/accessibility/accessibility_pkg.cpp
libcore/asobj/flash/desktop/desktop.am
libcore/asobj/flash/desktop/desktop_pkg.cpp
libcore/asobj/flash/display/display.am
libcore/asobj/flash/display/display_pkg.cpp
libcore/asobj/flash/errors/errors.am
libcore/asobj/flash/errors/errors_pkg.cpp
libcore/asobj/flash/events/events.am
libcore/asobj/flash/events/events_pkg.cpp
libcore/asobj/flash/external/external.am
libcore/asobj/flash/external/external_pkg.cpp
libcore/asobj/flash/filters/filters.am
libcore/asobj/flash/filters/filters_pkg.cpp
libcore/asobj/flash/geom/geom.am
libcore/asobj/flash/geom/geom_pkg.cpp
libcore/asobj/flash/media/media.am
libcore/asobj/flash/media/media_pkg.cpp
libcore/asobj/flash/net/net.am
libcore/asobj/flash/net/net_pkg.cpp
libcore/asobj/flash/printing/printing.am
libcore/asobj/flash/printing/printing_pkg.cpp
libcore/asobj/flash/sampler/sampler.am
libcore/asobj/flash/sampler/sampler_pkg.cpp
libcore/asobj/flash/system/system.am
libcore/asobj/flash/system/system_pkg.cpp
libcore/asobj/flash/text/text.am
libcore/asobj/flash/text/text_pkg.cpp
libcore/asobj/flash/ui/ui.am
libcore/asobj/flash/ui/ui_pkg.cpp
libcore/asobj/flash/utils/utils.am
libcore/asobj/flash/utils/utils_pkg.cpp
libcore/asobj/flash/xml/xml.am
libcore/asobj/flash/xml/xml_pkg.cpp
------------------------------------------------------------
revno: 10951.1.1
committer: Benjamin Wolsey <address@hidden>
branch nick: test
timestamp: Mon 2009-06-01 21:12:38 +0200
message:
Give arrays unique names, so including them isn't quite so hairy.
modified:
libcore/asobj/flash/accessibility/accessibility.am
libcore/asobj/flash/accessibility/accessibility_pkg.cpp
libcore/asobj/flash/desktop/desktop.am
libcore/asobj/flash/desktop/desktop_pkg.cpp
libcore/asobj/flash/display/display.am
libcore/asobj/flash/display/display_pkg.cpp
libcore/asobj/flash/errors/errors.am
libcore/asobj/flash/errors/errors_pkg.cpp
libcore/asobj/flash/events/events.am
libcore/asobj/flash/events/events_pkg.cpp
libcore/asobj/flash/external/external.am
libcore/asobj/flash/external/external_pkg.cpp
libcore/asobj/flash/filters/filters.am
libcore/asobj/flash/filters/filters_pkg.cpp
libcore/asobj/flash/geom/geom.am
libcore/asobj/flash/geom/geom_pkg.cpp
libcore/asobj/flash/media/media.am
libcore/asobj/flash/media/media_pkg.cpp
libcore/asobj/flash/net/net.am
libcore/asobj/flash/net/net_pkg.cpp
libcore/asobj/flash/printing/printing.am
libcore/asobj/flash/printing/printing_pkg.cpp
libcore/asobj/flash/sampler/sampler.am
libcore/asobj/flash/sampler/sampler_pkg.cpp
libcore/asobj/flash/system/system.am
libcore/asobj/flash/system/system_pkg.cpp
libcore/asobj/flash/text/text.am
libcore/asobj/flash/text/text_pkg.cpp
libcore/asobj/flash/ui/ui.am
libcore/asobj/flash/ui/ui_pkg.cpp
libcore/asobj/flash/utils/utils.am
libcore/asobj/flash/utils/utils_pkg.cpp
libcore/asobj/flash/xml/xml.am
libcore/asobj/flash/xml/xml_pkg.cpp
=== removed file 'libcore/asobj/Mouse_as.cpp'
--- a/libcore/asobj/Mouse_as.cpp 2009-04-02 08:18:16 +0000
+++ b/libcore/asobj/Mouse_as.cpp 1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-// Mouse.cpp: ActionScript "Mouse" input device class, for Gnash.
-//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#include "Mouse_as.h"
-#include "as_object.h" // for inheritance
-#include "log.h"
-#include "fn_call.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
-#include "builtin_function.h" // need builtin_function
-#include "VM.h" // for registerNative
-#include "Object.h" // for getObjectInterface
-#include "AsBroadcaster.h" // for initializing self as a broadcaster
-#include "movie_root.h" // for GUI callback
-
-namespace gnash {
-
-// Forward declarations
-namespace {
- as_value mouse_hide(const fn_call& fn);
- as_value mouse_show(const fn_call& fn);
-
- void attachMouseInterface(as_object& o);
-}
-
-/// Mouse isn't a proper class in AS
-//
-/// Gnash's Mouse_as just has static methods.
-void
-Mouse_as::registerNative(as_object& o)
-{
- VM& vm = o.getVM();
-
- vm.registerNative(mouse_show, 5, 0);
- vm.registerNative(mouse_hide, 5, 1);
-}
-
-
-// extern (used by Global.cpp)
-void
-Mouse_as::init(as_object& global)
-{
- // This is going to be the global Mouse "class"/"function"
- boost::intrusive_ptr<as_object> obj = new as_object(getObjectInterface());
- attachMouseInterface(*obj);
-
- // Register _global.Mouse
- global.init_member("Mouse", obj.get());
-
-}
-
-
-namespace {
-
-void
-attachMouseInterface(as_object& o)
-{
- VM& vm = o.getVM();
-
- const int flags = as_prop_flags::dontEnum |
- as_prop_flags::dontDelete |
- as_prop_flags::readOnly;
-
- o.init_member("show", vm.getNative(5, 0), flags);
- o.init_member("hide", vm.getNative(5, 1), flags);
-
- // Mouse is always initialized as an AsBroadcaster, even for
- // SWF5.
- AsBroadcaster::initialize(o);
-}
-
-/// Returns whether the mouse was visible before the call.
-//
-/// The return is not a boolean, but rather 1 or 0.
-as_value
-mouse_hide(const fn_call& fn)
-{
- boost::intrusive_ptr<as_object> obj = ensureType<as_object>(fn.this_ptr);
-
- movie_root& m = obj->getVM().getRoot();
-
- const int success = (m.callInterface("Mouse.hide") == "true") ? 1 : 0;
-
- // returns 1 if mouse was visible before call.
- return as_value(success);
-}
-
-/// Returns whether the mouse was visible before the call.
-//
-/// The return is not a boolean, but rather 1 or 0.
-as_value
-mouse_show(const fn_call& fn)
-{
- boost::intrusive_ptr<as_object> obj=ensureType<as_object>(fn.this_ptr);
-
- movie_root& m = obj->getVM().getRoot();
-
- const int success = (m.callInterface("Mouse.show") == "true") ? 1 : 0;
-
- // returns 1 if Mouse was visible before call.
- return as_value(success);
-}
-
-} // anonymous namespace
-} // end of gnash namespace
=== removed file 'libcore/asobj/Mouse_as.h'
--- a/libcore/asobj/Mouse_as.h 2009-02-25 22:33:03 +0000
+++ b/libcore/asobj/Mouse_as.h 1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// 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_ASOBJ_MOUSE_H
-#define GNASH_ASOBJ_MOUSE_H
-
-namespace gnash {
-
-class as_object;
-
-class Mouse_as
-{
-public:
- /// Register native functions with the VM
- static void registerNative(as_object& global);
-
- /// Initialize the global Mouse class
- static void init(as_object& global);
-};
-
-} // end of gnash namespace
-
-#endif
-
=== modified file 'libcore/asobj/flash/accessibility/accessibility.am'
--- a/libcore/asobj/flash/accessibility/accessibility.am 2009-05-29
07:36:14 +0000
+++ b/libcore/asobj/flash/accessibility/accessibility.am 2009-06-01
19:12:38 +0000
@@ -44,7 +44,7 @@
echo "#ifndef GNASH_ASOBJ_FLASH_ACCESSIBILITY_H" >> $${header}; \
echo "#define GNASH_ASOBJ_FLASH_ACCESSIBILITY_H 1" >> $${header}; \
echo "#include \"sharedlib.h\"" >> $${header}; \
- echo "static gnash::SharedLib::initentry *as3classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as3accessibilityclasses[] =
{" >> $${header}; \
sources="`echo $(ACCESSIBILITY_SOURCES) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
=== modified file 'libcore/asobj/flash/accessibility/accessibility_pkg.cpp'
--- a/libcore/asobj/flash/accessibility/accessibility_pkg.cpp 2009-05-29
08:12:11 +0000
+++ b/libcore/asobj/flash/accessibility/accessibility_pkg.cpp 2009-06-01
19:12:38 +0000
@@ -43,8 +43,8 @@
// Call the [objectname]_init() function for each class.
int i = 0;
- while (as3classes[i]) {
- as3classes[i](*pkg);
+ while (as3accessibilityclasses[i]) {
+ as3accessibilityclasses[i](*pkg);
++i;
}
=== modified file 'libcore/asobj/flash/desktop/desktop.am'
--- a/libcore/asobj/flash/desktop/desktop.am 2009-05-29 07:36:14 +0000
+++ b/libcore/asobj/flash/desktop/desktop.am 2009-06-01 19:12:38 +0000
@@ -50,7 +50,7 @@
echo "#ifndef GNASH_ASOBJ_FLASH_DESKTOP_H" >> $${header}; \
echo "#define GNASH_ASOBJ_FLASH_DESKTOP_H 1" >> $${header}; \
echo "#include \"sharedlib.h\"" >> $${header}; \
- echo "static gnash::SharedLib::initentry *as3classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as3desktopclasses[] = {" >>
$${header}; \
sources="`echo $(DESKTOP_SOURCES) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
=== modified file 'libcore/asobj/flash/desktop/desktop_pkg.cpp'
--- a/libcore/asobj/flash/desktop/desktop_pkg.cpp 2009-05-29 08:12:11
+0000
+++ b/libcore/asobj/flash/desktop/desktop_pkg.cpp 2009-06-01 19:12:38
+0000
@@ -43,8 +43,8 @@
// Call the [objectname]_init() function for each class.
int i = 0;
- while (as3classes[i]) {
- as3classes[i](*pkg);
+ while (as3desktopclasses[i]) {
+ as3desktopclasses[i](*pkg);
++i;
}
=== modified file 'libcore/asobj/flash/display/display.am'
--- a/libcore/asobj/flash/display/display.am 2009-05-29 08:30:14 +0000
+++ b/libcore/asobj/flash/display/display.am 2009-06-01 19:12:38 +0000
@@ -203,7 +203,7 @@
echo "#ifndef GNASH_ASOBJ_FLASH_DISPLAY_H" >> $${header}; \
echo "#define GNASH_ASOBJ_FLASH_DISPLAY_H 1" >> $${header}; \
echo "#include \"sharedlib.h\"" >> $${header}; \
- echo "static gnash::SharedLib::initentry *as3classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as3displayclasses[] = {" >>
$${header}; \
sources="`echo $(DISPLAY_SOURCES) $(DISPLAY_SOURCES_AS2) | cut -d ' '
-f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
@@ -212,7 +212,7 @@
done; \
echo ' 0' >> $${header}; \
echo '};' >> $${header}; \
- echo "static gnash::SharedLib::initentry *as2classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as2displayclasses[] = {" >>
$${header}; \
sources="`echo $(DISPLAY_SOURCES_AS2) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
=== modified file 'libcore/asobj/flash/display/display_pkg.cpp'
--- a/libcore/asobj/flash/display/display_pkg.cpp 2009-05-29 08:12:11
+0000
+++ b/libcore/asobj/flash/display/display_pkg.cpp 2009-06-01 19:12:38
+0000
@@ -74,14 +74,14 @@
int i = 0;
if (as3) {
- while (as3classes[i]) {
- as3classes[i](*pkg);
+ while (as3displayclasses[i]) {
+ as3displayclasses[i](*pkg);
++i;
}
}
else {
- while (as2classes[i]) {
- as2classes[i](*pkg);
+ while (as2displayclasses[i]) {
+ as2displayclasses[i](*pkg);
++i;
}
}
=== modified file 'libcore/asobj/flash/errors/errors.am'
--- a/libcore/asobj/flash/errors/errors.am 2009-05-29 07:36:14 +0000
+++ b/libcore/asobj/flash/errors/errors.am 2009-06-01 19:12:38 +0000
@@ -71,7 +71,7 @@
echo "#ifndef GNASH_ASOBJ_FLASH_ERRORS_H" >> $${header}; \
echo "#define GNASH_ASOBJ_FLASH_ERRORS_H 1" >> $${header}; \
echo "#include \"sharedlib.h\"" >> $${header}; \
- echo "static gnash::SharedLib::initentry *as3classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as3errorsclasses[] = {" >>
$${header}; \
sources="`echo $(ERRORS_SOURCES) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
=== modified file 'libcore/asobj/flash/errors/errors_pkg.cpp'
--- a/libcore/asobj/flash/errors/errors_pkg.cpp 2009-05-29 08:12:11 +0000
+++ b/libcore/asobj/flash/errors/errors_pkg.cpp 2009-06-01 19:12:38 +0000
@@ -48,8 +48,8 @@
// Call the [objectname]_init() function for each class.
int i = 0;
- while (as3classes[i]) {
- as3classes[i](*pkg);
+ while (as3errorsclasses[i]) {
+ as3errorsclasses[i](*pkg);
++i;
}
=== modified file 'libcore/asobj/flash/events/events.am'
--- a/libcore/asobj/flash/events/events.am 2009-05-29 07:36:14 +0000
+++ b/libcore/asobj/flash/events/events.am 2009-06-01 19:12:38 +0000
@@ -149,7 +149,7 @@
echo "#ifndef GNASH_ASOBJ_FLASH_EVENTS_H" >> $${header}; \
echo "#define GNASH_ASOBJ_FLASH_EVENTS_H 1" >> $${header}; \
echo "#include \"sharedlib.h\"" >> $${header}; \
- echo "static gnash::SharedLib::initentry *as3classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as3eventsclasses[] = {" >>
$${header}; \
sources="`echo $(EVENTS_SOURCES) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
=== modified file 'libcore/asobj/flash/events/events_pkg.cpp'
--- a/libcore/asobj/flash/events/events_pkg.cpp 2009-05-29 08:12:11 +0000
+++ b/libcore/asobj/flash/events/events_pkg.cpp 2009-06-01 19:12:38 +0000
@@ -64,8 +64,8 @@
// Call the [objectname]_init() function for each class.
int i = 0;
- while(as3classes[i]) {
- as3classes[i](*pkg);
+ while(as3eventsclasses[i]) {
+ as3eventsclasses[i](*pkg);
++i;
}
=== modified file 'libcore/asobj/flash/external/external.am'
--- a/libcore/asobj/flash/external/external.am 2009-05-29 07:36:14 +0000
+++ b/libcore/asobj/flash/external/external.am 2009-06-01 19:12:38 +0000
@@ -41,7 +41,7 @@
echo "#ifndef GNASH_ASOBJ_FLASH_EXTERNAL_H" >> $${header}; \
echo "#define GNASH_ASOBJ_FLASH_EXTERNAL_H 1" >> $${header}; \
echo "#include \"sharedlib.h\"" >> $${header}; \
- echo "static gnash::SharedLib::initentry *as3classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as3externalclasses[] = {" >>
$${header}; \
sources="`echo $(EXTERNAL_SOURCES) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
=== modified file 'libcore/asobj/flash/external/external_pkg.cpp'
--- a/libcore/asobj/flash/external/external_pkg.cpp 2009-05-29 14:23:52
+0000
+++ b/libcore/asobj/flash/external/external_pkg.cpp 2009-06-01 19:12:38
+0000
@@ -42,8 +42,8 @@
// Call the [objectname]_init() function for each class.
int i = 0;
- while (as3classes[i]) {
- as3classes[i](*pkg);
+ while (as3externalclasses[i]) {
+ as3externalclasses[i](*pkg);
++i;
}
=== modified file 'libcore/asobj/flash/filters/filters.am'
--- a/libcore/asobj/flash/filters/filters.am 2009-05-29 07:36:14 +0000
+++ b/libcore/asobj/flash/filters/filters.am 2009-06-01 19:12:38 +0000
@@ -99,7 +99,7 @@
echo "#ifndef GNASH_ASOBJ_FLASH_FILTERS_H" >> $${header}; \
echo "#define GNASH_ASOBJ_FLASH_FILTERS_H 1" >> $${header}; \
echo "#include \"sharedlib.h\"" >> $${header}; \
- echo "static gnash::SharedLib::initentry *as3classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as3filtersclasses[] = {" >>
$${header}; \
sources="`echo $(FILTERS_SOURCES) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
=== modified file 'libcore/asobj/flash/filters/filters_pkg.cpp'
--- a/libcore/asobj/flash/filters/filters_pkg.cpp 2009-05-29 08:12:11
+0000
+++ b/libcore/asobj/flash/filters/filters_pkg.cpp 2009-06-01 19:12:38
+0000
@@ -54,8 +54,8 @@
// Call the [objectname]_init() function for each class.
int i = 0;
do {
- as3classes[i](*pkg);
- } while (as3classes[++i] != 0);
+ as3filtersclasses[i](*pkg);
+ } while (as3filtersclasses[++i] != 0);
return pkg;
}
=== modified file 'libcore/asobj/flash/geom/geom.am'
--- a/libcore/asobj/flash/geom/geom.am 2009-05-29 07:36:14 +0000
+++ b/libcore/asobj/flash/geom/geom.am 2009-06-01 19:12:38 +0000
@@ -59,7 +59,7 @@
echo "#ifndef GNASH_ASOBJ_FLASH_GEOM_H" >> $${header}; \
echo "#define GNASH_ASOBJ_FLASH_GEOM_H 1" >> $${header}; \
echo "#include \"sharedlib.h\"" >> $${header}; \
- echo "static gnash::SharedLib::initentry *as3classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as3geomclasses[] = {" >>
$${header}; \
sources="`echo $(GEOM_SOURCES) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
=== modified file 'libcore/asobj/flash/geom/geom_pkg.cpp'
--- a/libcore/asobj/flash/geom/geom_pkg.cpp 2009-05-29 08:12:11 +0000
+++ b/libcore/asobj/flash/geom/geom_pkg.cpp 2009-06-01 19:12:38 +0000
@@ -47,8 +47,8 @@
// Call the [objectname]_init() function for each class.
int i = 0;
- while (as3classes[i]) {
- as3classes[i](*pkg);
+ while (as3geomclasses[i]) {
+ as3geomclasses[i](*pkg);
++i;
}
=== modified file 'libcore/asobj/flash/media/media.am'
--- a/libcore/asobj/flash/media/media.am 2009-05-29 07:36:14 +0000
+++ b/libcore/asobj/flash/media/media.am 2009-06-01 19:12:38 +0000
@@ -82,7 +82,7 @@
echo "#ifndef GNASH_ASOBJ_FLASH_MEDIA_H" >> $${header}; \
echo "#define GNASH_ASOBJ_FLASH_MEDIA_H 1" >> $${header}; \
echo "#include \"sharedlib.h\"" >> $${header}; \
- echo "static gnash::SharedLib::initentry *as3classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as3mediaclasses[] = {" >>
$${header}; \
sources="`echo $(MEDIA_SOURCES) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
=== modified file 'libcore/asobj/flash/media/media_pkg.cpp'
--- a/libcore/asobj/flash/media/media_pkg.cpp 2009-05-29 08:12:11 +0000
+++ b/libcore/asobj/flash/media/media_pkg.cpp 2009-06-01 19:12:38 +0000
@@ -50,8 +50,8 @@
// Call the [objectname]_init() function for each class.
int i = 0;
- while (as3classes[i]) {
- as3classes[i](*pkg);
+ while (as3mediaclasses[i]) {
+ as3mediaclasses[i](*pkg);
++i;
}
=== modified file 'libcore/asobj/flash/net/net.am'
--- a/libcore/asobj/flash/net/net.am 2009-05-29 08:30:14 +0000
+++ b/libcore/asobj/flash/net/net.am 2009-06-01 19:12:38 +0000
@@ -144,7 +144,7 @@
echo "#ifndef GNASH_ASOBJ_FLASH_NET_H" >> $${header}; \
echo "#define GNASH_ASOBJ_FLASH_NET_H 1" >> $${header}; \
echo "#include \"sharedlib.h\"" >> $${header}; \
- echo "static gnash::SharedLib::initentry *as3classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as3netclasses[] = {" >>
$${header}; \
sources="`echo $(NET_SOURCES) $(NET_SOURCES_AS2) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
@@ -153,7 +153,7 @@
done; \
echo ' 0' >> $${header}; \
echo '};' >> $${header}; \
- echo "static gnash::SharedLib::initentry *as2classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as2netclasses[] = {" >>
$${header}; \
sources="`echo $(NET_SOURCES_AS2) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
=== modified file 'libcore/asobj/flash/net/net_pkg.cpp'
--- a/libcore/asobj/flash/net/net_pkg.cpp 2009-05-29 08:30:14 +0000
+++ b/libcore/asobj/flash/net/net_pkg.cpp 2009-06-01 19:12:38 +0000
@@ -62,14 +62,14 @@
int i = 0;
if (as3) {
- while (as3classes[i]) {
- as3classes[i](*pkg);
+ while (as3netclasses[i]) {
+ as3netclasses[i](*pkg);
++i;
}
}
else {
- while (as2classes[i]) {
- as2classes[i](*pkg);
+ while (as2netclasses[i]) {
+ as2netclasses[i](*pkg);
++i;
}
}
=== modified file 'libcore/asobj/flash/printing/printing.am'
--- a/libcore/asobj/flash/printing/printing.am 2009-05-29 07:36:14 +0000
+++ b/libcore/asobj/flash/printing/printing.am 2009-06-01 19:12:38 +0000
@@ -49,7 +49,7 @@
echo "#ifndef GNASH_ASOBJ_FLASH_PRINTING_H" >> $${header}; \
echo "#define GNASH_ASOBJ_FLASH_PRINTING_H 1" >> $${header}; \
echo "#include \"sharedlib.h\"" >> $${header}; \
- echo "static gnash::SharedLib::initentry *as3classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as3printingclasses[] = {" >>
$${header}; \
sources="`echo $(PRINTING_SOURCES) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
=== modified file 'libcore/asobj/flash/printing/printing_pkg.cpp'
--- a/libcore/asobj/flash/printing/printing_pkg.cpp 2009-05-29 14:13:41
+0000
+++ b/libcore/asobj/flash/printing/printing_pkg.cpp 2009-06-01 19:12:38
+0000
@@ -44,8 +44,8 @@
// Call the [objectname]_init() function for each class.
int i = 0;
- while (as3classes[i]) {
- as3classes[i](*pkg);
+ while (as3printingclasses[i]) {
+ as3printingclasses[i](*pkg);
++i;
}
=== modified file 'libcore/asobj/flash/sampler/sampler.am'
--- a/libcore/asobj/flash/sampler/sampler.am 2009-05-29 07:36:14 +0000
+++ b/libcore/asobj/flash/sampler/sampler.am 2009-06-01 19:12:38 +0000
@@ -54,7 +54,7 @@
echo "#ifndef GNASH_ASOBJ_FLASH_SAMPLAR_H" >> $${header}; \
echo "#define GNASH_ASOBJ_FLASH_SAMPLAR_H 1" >> $${header}; \
echo "#include \"sharedlib.h\"" >> $${header}; \
- echo "static gnash::SharedLib::initentry *as3classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as3samplerclasses[] = {" >>
$${header}; \
sources="`echo $(SAMPLAR_SOURCES) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
=== modified file 'libcore/asobj/flash/sampler/sampler_pkg.cpp'
--- a/libcore/asobj/flash/sampler/sampler_pkg.cpp 2009-05-29 14:13:41
+0000
+++ b/libcore/asobj/flash/sampler/sampler_pkg.cpp 2009-06-01 19:12:38
+0000
@@ -45,8 +45,8 @@
// Call the [objectname]_init() function for each class.
int i = 0;
- while (as3classes[++i] != 0) {
- as3classes[i](*pkg);
+ while (as3samplerclasses[++i] != 0) {
+ as3samplerclasses[i](*pkg);
}
return pkg;
=== modified file 'libcore/asobj/flash/system/system.am'
--- a/libcore/asobj/flash/system/system.am 2009-05-29 07:36:14 +0000
+++ b/libcore/asobj/flash/system/system.am 2009-06-01 19:12:38 +0000
@@ -80,7 +80,7 @@
echo "#ifndef GNASH_ASOBJ_FLASH_SYSTEM_H" >> $${header}; \
echo "#define GNASH_ASOBJ_FLASH_SYSTEM_H 1" >> $${header}; \
echo "#include \"sharedlib.h\"" >> $${header}; \
- echo "static gnash::SharedLib::initentry *as3classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as3systemclasses[] = {" >>
$${header}; \
sources="`echo $(SYSTEM_SOURCES) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
=== modified file 'libcore/asobj/flash/system/system_pkg.cpp'
--- a/libcore/asobj/flash/system/system_pkg.cpp 2009-05-29 14:13:41 +0000
+++ b/libcore/asobj/flash/system/system_pkg.cpp 2009-06-01 19:12:38 +0000
@@ -49,8 +49,8 @@
// Call the [objectname]_init() function for each class.
int i = 0;
- while (as3classes[i]) {
- as3classes[i](*pkg);
+ while (as3systemclasses[i]) {
+ as3systemclasses[i](*pkg);
++i;
}
=== modified file 'libcore/asobj/flash/text/text.am'
--- a/libcore/asobj/flash/text/text.am 2009-05-29 14:13:41 +0000
+++ b/libcore/asobj/flash/text/text.am 2009-06-01 19:12:38 +0000
@@ -130,7 +130,7 @@
echo "#ifndef GNASH_ASOBJ_FLASH_TEXT_H" >> $${header}; \
echo "#define GNASH_ASOBJ_FLASH_TEXT_H 1" >> $${header}; \
echo "#include \"sharedlib.h\"" >> $${header}; \
- echo "static gnash::SharedLib::initentry *as3classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as3textclasses[] = {" >>
$${header}; \
sources="`echo $(TEXT_SOURCES) $(TEXT_SOURCES_AS2) | cut -d ' ' -f
2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
@@ -139,7 +139,7 @@
done; \
echo ' 0' >> $${header}; \
echo '};' >> $${header}; \
- echo "static gnash::SharedLib::initentry *as2classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as2textclasses[] = {" >>
$${header}; \
sources="`echo $(TEXT_SOURCES_AS2) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
=== modified file 'libcore/asobj/flash/text/text_pkg.cpp'
--- a/libcore/asobj/flash/text/text_pkg.cpp 2009-05-29 14:13:41 +0000
+++ b/libcore/asobj/flash/text/text_pkg.cpp 2009-06-01 19:12:38 +0000
@@ -59,14 +59,14 @@
int i = 0;
if (as3) {
- while (as3classes[i]) {
- as3classes[i](*pkg);
+ while (as3textclasses[i]) {
+ as3textclasses[i](*pkg);
++i;
}
}
else {
- while (as2classes[i]) {
- as2classes[i](*pkg);
+ while (as2textclasses[i]) {
+ as2textclasses[i](*pkg);
++i;
}
}
=== modified file 'libcore/asobj/flash/ui/ui.am'
--- a/libcore/asobj/flash/ui/ui.am 2009-05-29 07:36:14 +0000
+++ b/libcore/asobj/flash/ui/ui.am 2009-06-01 19:12:38 +0000
@@ -65,7 +65,7 @@
echo "#ifndef GNASH_ASOBJ_FLASH_UI_H" >> $${header}; \
echo "#define GNASH_ASOBJ_FLASH_UI_H 1" >> $${header}; \
echo "#include \"sharedlib.h\"" >> $${header}; \
- echo "static gnash::SharedLib::initentry *as3classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as3uiclasses[] = {" >>
$${header}; \
sources="`echo $(UI_SOURCES) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
=== modified file 'libcore/asobj/flash/ui/ui_pkg.cpp'
--- a/libcore/asobj/flash/ui/ui_pkg.cpp 2009-05-29 14:13:41 +0000
+++ b/libcore/asobj/flash/ui/ui_pkg.cpp 2009-06-01 19:12:38 +0000
@@ -46,8 +46,8 @@
// Call the [objectname]_init() function for each class.
int i = 0;
- while (as3classes[i]) {
- as3classes[i](*pkg);
+ while (as3uiclasses[i]) {
+ as3uiclasses[i](*pkg);
++i;
}
=== modified file 'libcore/asobj/flash/utils/utils.am'
--- a/libcore/asobj/flash/utils/utils.am 2009-05-29 07:36:14 +0000
+++ b/libcore/asobj/flash/utils/utils.am 2009-06-01 19:12:38 +0000
@@ -74,7 +74,7 @@
echo "#ifndef GNASH_ASOBJ_FLASH_UTILS_H" >> $${header}; \
echo "#define GNASH_ASOBJ_FLASH_UTILS_H 1" >> $${header}; \
echo "#include \"sharedlib.h\"" >> $${header}; \
- echo "static gnash::SharedLib::initentry *as3classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as3utilsclasses[] = {" >>
$${header}; \
sources="`echo $(UTILS_SOURCES) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
=== modified file 'libcore/asobj/flash/utils/utils_pkg.cpp'
--- a/libcore/asobj/flash/utils/utils_pkg.cpp 2009-05-29 14:13:41 +0000
+++ b/libcore/asobj/flash/utils/utils_pkg.cpp 2009-06-01 19:12:38 +0000
@@ -49,8 +49,8 @@
// Call the [objectname]_init() function for each class.
int i = 0;
- while (as3classes[i]) {
- as3classes[i](*pkg);
+ while (as3utilsclasses[i]) {
+ as3utilsclasses[i](*pkg);
++i;
}
=== modified file 'libcore/asobj/flash/xml/xml.am'
--- a/libcore/asobj/flash/xml/xml.am 2009-05-29 07:36:14 +0000
+++ b/libcore/asobj/flash/xml/xml.am 2009-06-01 19:12:38 +0000
@@ -49,7 +49,7 @@
echo "#ifndef GNASH_ASOBJ_FLASH_XML_H" >> $${header}; \
echo "#define GNASH_ASOBJ_FLASH_XML_H 1" >> $${header}; \
echo "#include \"sharedlib.h\"" >> $${header}; \
- echo "static gnash::SharedLib::initentry *as3classes[] = {" >>
$${header}; \
+ echo "static gnash::SharedLib::initentry *as3xmlclasses[] = {" >>
$${header}; \
sources="`echo $(XML_SOURCES) | cut -d ' ' -f 2-`"; \
for i in $${sources}; do \
item=`basename $$i | sed -e 's:\_as.cpp::'`; \
=== modified file 'libcore/asobj/flash/xml/xml_pkg.cpp'
--- a/libcore/asobj/flash/xml/xml_pkg.cpp 2009-05-29 14:13:41 +0000
+++ b/libcore/asobj/flash/xml/xml_pkg.cpp 2009-06-01 19:12:38 +0000
@@ -45,8 +45,8 @@
// Call the [objectname]_init() function for each class.
int i = 0;
- while (as3classes[i]) {
- as3classes[i](*pkg);
+ while (as3xmlclasses[i]) {
+ as3xmlclasses[i](*pkg);
++i;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r10966: Give arrays unique names.,
Benjamin Wolsey <=