CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/01/24 12:05:05
Modified files:
. : ChangeLog
server : debugger.cpp movie_root.cpp
server/asobj : xmlsocket.cpp
Log message:
Use PROPNAME where appropriate
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5485&r2=1.5486
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.152&r2=1.153
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.40&r2=1.41
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5485
retrieving revision 1.5486
diff -u -b -r1.5485 -r1.5486
--- ChangeLog 24 Jan 2008 11:34:20 -0000 1.5485
+++ ChangeLog 24 Jan 2008 12:05:04 -0000 1.5486
@@ -1,5 +1,8 @@
2008-01-24 Sandro Santilli <[EMAIL PROTECTED]>
+ * server/debugger.cpp: use PROPNAME when appropriate
+ * server/movie_root.cpp (getKeyObject): use PROPNAME
+ * server/asobj/xmlsocket.cpp (getEventHandler): use PROPNAME.
* extensions/fileio/fileio.cpp, extensions/gtk2/gtkext.cpp:
Don't convert strings passed to init_member, isn't needed.
* server/vm/ActionExec.cpp: use PROPNAME rather then manually
Index: server/debugger.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/debugger.cpp 21 Jan 2008 20:55:50 -0000 1.23
+++ server/debugger.cpp 24 Jan 2008 12:05:04 -0000 1.24
@@ -703,10 +703,7 @@
// GNASH_REPORT_FUNCTION;
if (_symbols.size()) {
VM& vm = VM::get(); // cache this ?
- std::string namei = name;
- if ( vm.getSWFVersion() < 7 ) {
- boost::to_lower(namei, vm.getLocale());
- }
+ std::string namei = PROPNAME(name);
std::map<void *, std::string>::const_iterator it;
for (it=_symbols.begin(); it != _symbols.end(); it++) {
if (it->second == namei) {
@@ -724,11 +721,9 @@
{
// GNASH_REPORT_FUNCTION;
VM& vm = VM::get(); // cache this ?
- std::string namei = name;
- if ( vm.getSWFVersion() < 7 ) {
- boost::to_lower(namei, vm.getLocale());
- }
- if (namei.size() > 1) {
+ std::string namei = PROPNAME(name);
+ if (namei.size() > 1)
+ {
// log_msg ("Adding symbol %s at address: %p", namei, ptr);
_symbols[ptr] = namei;
}
Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -b -r1.152 -r1.153
--- server/movie_root.cpp 22 Jan 2008 20:06:43 -0000 1.152
+++ server/movie_root.cpp 24 Jan 2008 12:05:04 -0000 1.153
@@ -481,15 +481,12 @@
// This isn't very performant...
// it will keep trying to find it even if impossible
// to find.
+ // TODO: use a named string...
as_value kval;
as_object* global = VM::get().getGlobal();
- std::string objName = "Key";
- if ( vm.getSWFVersion() < 7 )
- {
- boost::to_lower(objName, vm.getLocale());
- }
+ std::string objName = PROPNAME("Key");
if (global->get_member(vm.getStringTable().find(objName),
&kval) )
{
//log_msg("Found member 'Key' in _global: %s",
kval.to_string());
Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- server/asobj/xmlsocket.cpp 21 Jan 2008 20:55:59 -0000 1.40
+++ server/asobj/xmlsocket.cpp 24 Jan 2008 12:05:04 -0000 1.41
@@ -628,12 +628,9 @@
{
boost::intrusive_ptr<as_function> ret;
- std::string key=name;
- VM& vm = VM::get();
- if ( vm.getSWFVersion() < 7 ) boost::to_lower(key,
vm.getLocale());
-
as_value tmp;
- if (!get_member(vm.getStringTable().find(key), &tmp) ) return
ret;
+ string_table& st = getVM().getStringTable();
+ if (!get_member(st.find(PROPNAME(name)), &tmp) ) return ret;
ret = tmp.to_as_function();
return ret;
}
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
