[Gnash-commit] gnash ChangeLog server/as_value.cpp server/as_v...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/03 13:10:18

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

Log message:
                * server/as_value.{cpp,h}: changed to_string and 
to_string_versioned
                  methods to return by value rather then by const ref. Next 
step will
                  be only using a string member when needed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4508&r2=1.4509
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.65&r2=1.66

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4508
retrieving revision 1.4509
diff -u -b -r1.4508 -r1.4509
--- ChangeLog   3 Oct 2007 13:01:21 -0000       1.4508
+++ ChangeLog   3 Oct 2007 13:10:17 -0000       1.4509
@@ -1,5 +1,11 @@
 2007-10-03 Sandro Santilli <address@hidden>
 
+       * server/as_value.{cpp,h}: changed to_string and to_string_versioned
+         methods to return by value rather then by const ref. Next step will
+         be only using a string member when needed.
+
+2007-10-03 Sandro Santilli <address@hidden>
+
        * testsuite/actionscript.all/MovieClip.as: Test effects of unload
          on clip bounds (confirms we should clean the drawable on unload).
 

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- server/as_value.cpp 27 Sep 2007 22:20:07 -0000      1.78
+++ server/as_value.cpp 3 Oct 2007 13:10:18 -0000       1.79
@@ -71,7 +71,7 @@
 }
 
 // Conversion to const std::string&.
-const std::string&
+std::string
 as_value::to_string(as_environment* env) const
 {
        switch (m_type)
@@ -188,7 +188,7 @@
 }
 
 // Conversion to const std::string&.
-const std::string&
+std::string
 as_value::to_string_versioned(int version, as_environment* env) const
 {
     if (m_type == UNDEFINED) {
@@ -204,13 +204,6 @@
     return to_string(env);
 }
 
-// Version-based Conversion to std::string
-std::string
-as_value::to_std_string_versioned(int version, as_environment* env) const
-{
-       return to_string_versioned(version, env);
-}
-
 // Conversion to primitive value.
 as_value
 as_value::to_primitive(as_environment& env) const

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- server/as_value.h   11 Sep 2007 22:03:05 -0000      1.65
+++ server/as_value.h   3 Oct 2007 13:10:18 -0000       1.66
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.65 2007/09/11 22:03:05 cmusick Exp $ */
+/* $Id: as_value.h,v 1.66 2007/10/03 13:10:18 strk Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -312,21 +312,10 @@
        ///     The environment to use for running the toString() method
        ///     for object values. If NULL, toString() won't be run.
        ///
-       const std::string& to_string(as_environment* env=NULL) const;
+       std::string to_string(as_environment* env=NULL) const;
 
        std::string to_debug_string() const;
 
-       /// Get a version-dependent std::string representation for this value.
-       //
-       /// @param version
-       ///     The SWF version to be compatible with.
-       ///
-       /// @param env
-       ///     The environment to use for running the toString() method
-       ///     for object values. If NULL, toString() won't be run.
-       ///
-       std::string to_std_string_versioned(int version, as_environment* 
env=NULL) const;
-
        /// Get a string representation for this value.
        //
        /// This differs from to_string() in that returned
@@ -338,7 +327,7 @@
        ///     The environment to use for running the toString() method
        ///     for object values. If NULL, toString() won't be run.
        ///
-       const std::string&      to_string_versioned(int version, 
as_environment* env=NULL) const;
+       std::string to_string_versioned(int version, as_environment* env=NULL) 
const;
 
        /// Conversion to number (double)
        //