[Gnash-commit] gnash ChangeLog server/as_object.cpp server/as_...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/19 00:10:05

Modified files:
        .              : ChangeLog 
        server         : as_object.cpp as_object.h 

Log message:
         rename visitProperties to visitPropertyValues, use it from 
copyProperties.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5212&r2=1.5213
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.cpp?cvsroot=gnash&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.h?cvsroot=gnash&r1=1.87&r2=1.88

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5212
retrieving revision 1.5213
diff -u -b -r1.5212 -r1.5213
--- ChangeLog   18 Dec 2007 23:55:49 -0000      1.5212
+++ ChangeLog   19 Dec 2007 00:10:05 -0000      1.5213
@@ -1,5 +1,10 @@
 2007-12-18 Sandro Santilli <address@hidden>
 
+       * server/as_object.{h,cpp}: rename visitProperties to
+         visitPropertyValues, use it from copyProperties.
+
+2007-12-18 Sandro Santilli <address@hidden>
+
        * server/as_object.h: add a visitProperties templated method.
        * server/edit_text_character.{cpp,h}: allow TextField.variable
          to point to a normal object, not fully correct yet but a minimal

Index: server/as_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- server/as_object.cpp        22 Nov 2007 13:20:10 -0000      1.86
+++ server/as_object.cpp        19 Dec 2007 00:10:05 -0000      1.87
@@ -709,9 +709,7 @@
        PropsCopier copier(*this);
 
        // TODO: check if non-visible properties should be also copied !
-       o._members.visitValues(copier,
-                       // Need const_cast due to getValue getting non-const ...
-                       const_cast<as_object&>(o));
+       o.visitPropertyValues(copier);
 }
 
 void

Index: server/as_object.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.h,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- server/as_object.h  18 Dec 2007 23:55:50 -0000      1.87
+++ server/as_object.h  19 Dec 2007 00:10:05 -0000      1.88
@@ -721,7 +721,7 @@
        ///
        void enumerateProperties(std::map<std::string, std::string>& to);
 
-       /// Visit the list of properties 
+       /// Visit the properties of this object by key/as_value pairs
        //
        /// The method will invoke the given visitor method
        /// passing it two arguments: key of the property and
@@ -734,9 +734,11 @@
        ///     as second argument.
        ///
        template <class V>
-       void visitProperties(V& visitor) const
+       void visitPropertyValues(V& visitor) const
        {
-               _members.visitValues(visitor, *this);
+               _members.visitValues(visitor, 
+                       // Need const_cast due to getValue getting non-const ...
+                       const_cast<as_object&>(*this));
        }