[Gnash-commit] gnash ChangeLog server/impl.cpp server/sprite_i...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/03 11:32:48

Modified files:
        .              : ChangeLog 
        server         : impl.cpp sprite_instance.cpp timers.h 
        server/asobj   : MovieClipLoader.cpp 

Log message:
        tu_string -> std::string.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1006&r2=1.1007
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/MovieClipLoader.cpp?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1006
retrieving revision 1.1007
diff -u -b -r1.1006 -r1.1007
--- ChangeLog   3 Oct 2006 11:08:41 -0000       1.1006
+++ ChangeLog   3 Oct 2006 11:32:48 -0000       1.1007
@@ -16,7 +16,9 @@
 2006-10-03 Markus Gothe <address@hidden>
 
        * server/parser/movie_def_impl.cpp: remove ensure_frame_loaded inlining.
-       * server/xml.cpp, serverxmlsocket.cpp/xmlsocket.{cpp,h}: 
+       * server/xml.cpp, serverxmlsocket.cpp/xmlsocket.{cpp,h}, 
+         server/impl.cpp, server/timers.h, server/spriteinstance.cpp,
+         server/asobj/MovieClipLoader.cpp: 
          tu_string -> std::string.
 
 2006-10-03 Sandro Santilli  <address@hidden>

Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- server/impl.cpp     2 Oct 2006 16:28:11 -0000       1.61
+++ server/impl.cpp     3 Oct 2006 11:32:48 -0000       1.62
@@ -642,7 +642,7 @@
 static std::vector<movie_interface*> s_extern_sprites;
 static movie_interface* s_current_root;
 
-static tu_string s_workdir;
+static std::string s_workdir;
 
 void save_extern_movie(movie_interface* m)
 {

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- server/sprite_instance.cpp  3 Oct 2006 07:35:49 -0000       1.60
+++ server/sprite_instance.cpp  3 Oct 2006 11:32:48 -0000       1.61
@@ -492,7 +492,7 @@
        assert(fn.nargs==6); // name, depth, x, y, width, height
 
        assert(fn.arg(0).get_type()==as_value::STRING);
-       tu_string txt_name = fn.arg(0).to_string();
+       //std::string txt_name = fn.arg(0).to_string();
 
        assert(fn.arg(1).get_type()==as_value::NUMBER);
        //double txt_depth = fn.arg(1).to_number();

Index: server/timers.h
===================================================================
RCS file: /sources/gnash/gnash/server/timers.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/timers.h     26 Aug 2006 13:09:53 -0000      1.8
+++ server/timers.h     3 Oct 2006 11:32:48 -0000       1.9
@@ -88,7 +88,6 @@
       
 
     private:
-      tu_string       _method;
       int             _which;                // Which timer
       double          _interval;
       double          _start;

Index: server/asobj/MovieClipLoader.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/MovieClipLoader.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/asobj/MovieClipLoader.cpp    27 Sep 2006 13:37:47 -0000      1.3
+++ server/asobj/MovieClipLoader.cpp    3 Oct 2006 11:32:48 -0000       1.4
@@ -234,7 +234,7 @@
                return;
        }
 
-       tu_string tu_url = fn.arg(0).to_string(); 
+       std::string str_url = fn.arg(0).to_string(); 
        character* target = fn.env->find_target(fn.arg(1));
        if ( ! target )
        {
@@ -244,7 +244,7 @@
        }
 
        log_msg("load clip: %s, target is: %p\n",
-               tu_url.c_str(), (void*)target);
+               str_url.c_str(), (void*)target);
 
        // Get a pointer to target's sprite parent 
        character* parent = target->get_parent();
@@ -273,9 +273,9 @@
        // wrap in a try/catch block w/out hiding
        // the variable inside the block.
        //
-       URL url(tu_url.c_str(), URL(parent_url.to_string()));
+       URL url(str_url.c_str(), URL(parent_url.to_string()));
 #else
-       URL url(tu_url.c_str(), get_base_url());
+       URL url(str_url.c_str(), get_base_url());
 #endif
        
        log_msg(" resolved url: %s\n", url.str().c_str());
@@ -400,7 +400,7 @@
 void
 moviecliploader_unloadclip(const fn_call& fn)
 {
-  const tu_string filespec = fn.arg(0).to_string();
+  const std::string filespec = fn.arg(0).to_string();
   log_msg("%s: FIXME: Load Movie Clip: %s\n", __FUNCTION__, filespec.c_str());
   
 }
@@ -486,7 +486,7 @@
   //log_msg("%s: FIXME: nargs = %d\n", __FUNCTION__, nargs);
   //moviecliploader_as_object* ptr = (moviecliploader_as_object*) (as_object*) 
this_ptr;
   
-  tu_string url = fn.arg(0).to_string();  
+  std::string url = fn.arg(0).to_string();  
   //as_object *target = (as_object *)env->bottom(first_arg-1).to_object();
   //log_msg("load clip: %s, target is: %p\n", url.c_str(), target);
 
@@ -525,7 +525,7 @@
   log_msg("%s: FIXME: nargs = %d\n", __FUNCTION__, fn.nargs);
   //moviecliploader_as_object* ptr = (moviecliploader_as_object*) (as_object*) 
this_ptr;
   
-  tu_string url = fn.arg(0).to_string();  
+  std::string url = fn.arg(0).to_string();  
   as_object *target = (as_object*) fn.arg(1).to_object();
   log_msg("load clip: %s, target is: %p\n", url.c_str(), (void *)target);