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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/03 12:01:07

Modified files:
        .              : ChangeLog 
        server         : impl.cpp impl.h 
        utilities      : parser.cpp processor.cpp 

Log message:
        std::string.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1007&r2=1.1008
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.h?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/parser.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1007
retrieving revision 1.1008
diff -u -b -r1.1007 -r1.1008
--- ChangeLog   3 Oct 2006 11:32:48 -0000       1.1007
+++ ChangeLog   3 Oct 2006 12:01:06 -0000       1.1008
@@ -18,7 +18,7 @@
        * server/parser/movie_def_impl.cpp: remove ensure_frame_loaded inlining.
        * server/xml.cpp, serverxmlsocket.cpp/xmlsocket.{cpp,h}, 
          server/impl.cpp, server/timers.h, server/spriteinstance.cpp,
-         server/asobj/MovieClipLoader.cpp: 
+         server/asobj/MovieClipLoader.cpp, utilities/processor.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.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- server/impl.cpp     3 Oct 2006 11:32:48 -0000       1.62
+++ server/impl.cpp     3 Oct 2006 12:01:07 -0000       1.63
@@ -36,6 +36,8 @@
 //
 //
 
+/* $Id: impl.cpp,v 1.63 2006/10/03 12:01:07 nihilus Exp $ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -514,7 +516,7 @@
        {
                // Try to load a .gsc file.
                // WILL NOT WORK FOR NETWORK URLS, would need an hash
-               tu_string       cache_filename(movie_url);
+               std::string cache_filename(movie_url);
                cache_filename += ".gsc";
                tu_file* cache_in = new tu_file(cache_filename.c_str(), "rb");
                if (cache_in == NULL

Index: server/impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/impl.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/impl.h       14 Sep 2006 23:54:22 -0000      1.36
+++ server/impl.h       3 Oct 2006 12:01:07 -0000       1.37
@@ -36,6 +36,8 @@
 //
 //
 
+/* $Id: impl.h,v 1.37 2006/10/03 12:01:07 nihilus Exp $ */
+
 #ifndef GNASH_IMPL_H
 #define GNASH_IMPL_H
 

Index: utilities/parser.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/parser.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- utilities/parser.cpp        29 Sep 2006 01:39:51 -0000      1.18
+++ utilities/parser.cpp        3 Oct 2006 12:01:07 -0000       1.19
@@ -36,6 +36,8 @@
 // carries forward this exception.
 //
 
+/* $Id: parser.cpp,v 1.19 2006/10/03 12:01:07 nihilus Exp $ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- utilities/processor.cpp     2 Oct 2006 16:28:12 -0000       1.24
+++ utilities/processor.cpp     3 Oct 2006 12:01:07 -0000       1.25
@@ -37,7 +37,7 @@
 //
 //
 
-/* $Id: processor.cpp,v 1.24 2006/10/02 16:28:12 bjacques Exp $ */
+/* $Id: processor.cpp,v 1.25 2006/10/03 12:01:07 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -102,7 +102,7 @@
 struct movie_data
 {
     gnash::movie_definition*   m_movie;
-    tu_string  m_filename;
+    std::string        m_filename;
 };
 
 static gnash::movie_definition*        play_movie(const char* filename);
@@ -212,7 +212,7 @@
        
        movie_data      md;
        md.m_movie = m;
-       md.m_filename = infiles[i];
+       md.m_filename = std::string(infiles[i]);
        data.push_back(md);
     }
     
@@ -316,7 +316,7 @@
 write_cache_file(const movie_data& md)
 {
     // Open cache file.
-    tu_string  cache_filename(md.m_filename);
+    std::string        cache_filename(md.m_filename);
     cache_filename += ".gsc";
     tu_file    out(cache_filename.c_str(), "wb");      // "gsc" == "gnash 
cache"
     if (out.get_error() == TU_FILE_NO_ERROR) {