[Gnash-commit] gnash ./ChangeLog server/MovieClipLoader.cpp se...

[Jim Garrison]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Jim Garrison <address@hidden>   06/03/01 00:54:44

Modified files:
        .              : ChangeLog 
        server         : MovieClipLoader.cpp Sprite.cpp action.cpp 
                         array.cpp text.cpp xml.cpp xmlsocket.cpp 

Log message:
        * server/MovieClipLoader.cpp, server/Sprite.cpp,
        server/action.cpp, server/array.cpp, server/text.cpp,
        server/xml.cpp, server/xmlsocket.cpp: first step in migration to
        std::string

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.166&tr2=1.167&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/MovieClipLoader.cpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Sprite.cpp.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/action.cpp.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/array.cpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/text.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xml.cpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xmlsocket.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.166 gnash/ChangeLog:1.167
--- gnash/ChangeLog:1.166       Tue Feb 28 22:05:00 2006
+++ gnash/ChangeLog     Wed Mar  1 00:54:43 2006
@@ -1,3 +1,10 @@
+2006-02-28  Jim Garrison  <address@hidden>
+
+       * server/MovieClipLoader.cpp, server/Sprite.cpp,
+       server/action.cpp, server/array.cpp, server/text.cpp,
+       server/xml.cpp, server/xmlsocket.cpp: first step in migration to 
+       std::string
+
 2006-02-28  Tomas Groth Christensen  <address@hidden>
 
        * testsuite/actionscript.all/gen-test.sh: made the test-generator use 
case-sensitivity, since MM flashplayer is casesensitive.
Index: gnash/server/MovieClipLoader.cpp
diff -u gnash/server/MovieClipLoader.cpp:1.10 
gnash/server/MovieClipLoader.cpp:1.11
--- gnash/server/MovieClipLoader.cpp:1.10       Sun Feb 26 21:44:53 2006
+++ gnash/server/MovieClipLoader.cpp    Wed Mar  1 00:54:43 2006
@@ -361,7 +361,7 @@
                save_extern_movie(extern_movie);
     
                character* tar = (character*)target;
-               const char* name = tar->get_name();
+               const char* name = tar->get_name().c_str();
                Uint16 depth = tar->get_depth();
                bool use_cxform = false;
                cxform color_transform =  tar->get_cxform();
@@ -445,7 +445,7 @@
                //target->add_bitmap_info(bi);
 
                character* tar = (character*)mov;
-               const char* name = tar->get_name();
+               const char* name = tar->get_name().c_str();
                Uint16 id = tar->get_id();
                //log_msg("Target name is: %s, ID: %d\n", name, id);
 
Index: gnash/server/Sprite.cpp
diff -u gnash/server/Sprite.cpp:1.15 gnash/server/Sprite.cpp:1.16
--- gnash/server/Sprite.cpp:1.15        Sun Feb 26 21:44:53 2006
+++ gnash/server/Sprite.cpp     Wed Mar  1 00:54:43 2006
@@ -712,7 +712,7 @@
                    {
                        // In ActionScript 2.0, event method names are CASE 
SENSITIVE.
                        // In ActionScript 1.0, event method names are CASE 
INSENSITIVE.
-                       const tu_stringi&       method_name = 
id.get_function_name().to_tu_stringi();
+                       const tu_stringi&       method_name = 
id.get_function_name();
                        if (method_name.length() > 0)
                            {
                                as_value        method;
Index: gnash/server/action.cpp
diff -u gnash/server/action.cpp:1.53 gnash/server/action.cpp:1.54
--- gnash/server/action.cpp:1.53        Mon Feb 27 03:58:03 2006
+++ gnash/server/action.cpp     Wed Mar  1 00:54:43 2006
@@ -169,7 +169,7 @@
                        save_extern_movie(extern_movie);
       
                        character* tar = (character*)target;
-                       const char* name = tar->get_name();
+                       const char* name = tar->get_name().c_str();
                        Uint16 depth = tar->get_depth();
                        bool use_cxform = false;
                        cxform color_transform =  tar->get_cxform();
@@ -2759,7 +2759,7 @@
 
                                                if (! 
member.get_member_flags().get_dont_enum())
                                                {
-                                                       
env->push(as_value(it->first));
+                                                       
env->push(as_value(it->first.c_str()));
 
                                                        
IF_VERBOSE_ACTION(log_msg("---enumerate - push: %s\n",
                                                                                
  it->first.c_str()));
@@ -2778,7 +2778,7 @@
 
                                                        if (! 
member.get_member_flags().get_dont_enum())
                                                        {
-                                                               
env->push(as_value(it->first));
+                                                               
env->push(as_value(it->first.c_str()));
 
                                                                
IF_VERBOSE_ACTION(log_msg("---enumerate - push: %s\n",
                                                                                
          it->first.c_str()));
Index: gnash/server/array.cpp
diff -u gnash/server/array.cpp:1.11 gnash/server/array.cpp:1.12
--- gnash/server/array.cpp:1.11 Tue Feb 14 07:09:10 2006
+++ gnash/server/array.cpp      Wed Mar  1 00:54:43 2006
@@ -52,7 +52,7 @@
        {
                double value;
                as_value temp;
-               temp.set_string((const char *)name);
+               temp.set_string(name.c_str());
                value = temp.to_number();
 
                // if we were sent a string that can't convert like "asdf", it 
returns as NaN. -1 means invalid index
Index: gnash/server/text.cpp
diff -u gnash/server/text.cpp:1.8 gnash/server/text.cpp:1.9
--- gnash/server/text.cpp:1.8   Sun Feb 26 21:44:53 2006
+++ gnash/server/text.cpp       Wed Mar  1 00:54:43 2006
@@ -425,7 +425,7 @@
                        //if (name == "text")
                {
                        int version = 
get_parent()->get_movie_definition()->get_version();
-                       set_text_value(val.to_tu_string_versioned(version));
+                       
set_text_value(val.to_tu_string_versioned(version).c_str());
                        return;
                }
                case M_X:
Index: gnash/server/xml.cpp
diff -u gnash/server/xml.cpp:1.13 gnash/server/xml.cpp:1.14
--- gnash/server/xml.cpp:1.13   Sat Feb 25 03:54:03 2006
+++ gnash/server/xml.cpp        Wed Mar  1 00:54:43 2006
@@ -888,7 +888,7 @@
   
     // Set the argument to the function event handler based on whether the load
     // was successful or failed.
-    ret = xml_obj->obj.load(filespec);
+    ret = xml_obj->obj.load(filespec.c_str());
     fn.result->set_bool(ret);
 
     if (ret == false) {
Index: gnash/server/xmlsocket.cpp
diff -u gnash/server/xmlsocket.cpp:1.8 gnash/server/xmlsocket.cpp:1.9
--- gnash/server/xmlsocket.cpp:1.8      Sat Feb 25 03:54:03 2006
+++ gnash/server/xmlsocket.cpp  Wed Mar  1 00:54:44 2006
@@ -529,7 +529,7 @@
   const tu_string host = fn.env->bottom(fn.first_arg_bottom_index).to_string();
   tu_string port_str = 
fn.env->bottom(fn.first_arg_bottom_index-1).to_tu_string();
   double port = atof(port_str.c_str());
-  ret = ptr->obj.connect(host, static_cast<int>(port));
+  ret = ptr->obj.connect(host.c_str(), static_cast<int>(port));
 
 #if 0
   // Push result onto stack for onConnect