[Gnash-commit] gnash ChangeLog server/xml.cpp server/xmlsocket...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/03 10:44:42

Modified files:
        .              : ChangeLog 
        server         : xml.cpp xmlsocket.cpp xmlsocket.h 

Log message:
        tu_string -> std::string.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1004&r2=1.1005
http://cvs.savannah.gnu.org/viewcvs/gnash/server/xml.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/xmlsocket.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/xmlsocket.h?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1004
retrieving revision 1.1005
diff -u -b -r1.1004 -r1.1005
--- ChangeLog   3 Oct 2006 10:10:35 -0000       1.1004
+++ ChangeLog   3 Oct 2006 10:44:41 -0000       1.1005
@@ -14,6 +14,8 @@
 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}: 
+         tu_string -> std::string.
 
 2006-10-03 Sandro Santilli  <address@hidden>
 

Index: server/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/xml.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/xml.cpp      2 Oct 2006 13:04:38 -0000       1.28
+++ server/xml.cpp      3 Oct 2006 10:44:41 -0000       1.29
@@ -36,7 +36,7 @@
 //
 //
 
-/* $Id: xml.cpp,v 1.28 2006/10/02 13:04:38 nihilus Exp $ */
+/* $Id: xml.cpp,v 1.29 2006/10/03 10:44:41 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -906,7 +906,7 @@
   
     xml_as_object *xml_obj = (xml_as_object*)fn.this_ptr;
   
-    const tu_string filespec = 
fn.env->bottom(fn.first_arg_bottom_index).to_string();
+    const std::string filespec = 
fn.env->bottom(fn.first_arg_bottom_index).to_string();
 
     // If the file doesn't exist, don't try to do anything.
     if (stat(filespec.c_str(), &stats) < 0) {
@@ -1134,7 +1134,7 @@
     
     xml_as_object*     ptr = (xml_as_object*) (as_object*) fn.this_ptr;
     assert(ptr);
-    tu_string filespec = fn.env->bottom(fn.first_arg_bottom_index).to_string();
+    std::string filespec = 
fn.env->bottom(fn.first_arg_bottom_index).to_string();
     //fn.result->set(ptr->obj.loaded());
     fn.result->set_bool(ptr->obj.loaded());
 }

Index: server/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/xmlsocket.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/xmlsocket.cpp        29 Sep 2006 10:03:10 -0000      1.25
+++ server/xmlsocket.cpp        3 Oct 2006 10:44:41 -0000       1.26
@@ -394,7 +394,7 @@
 }
 
 bool
-XMLSocket::send(tu_string str)
+XMLSocket::send(std::string str)
 {
   //GNASH_REPORT_FUNCTION;
   
@@ -402,7 +402,7 @@
   int ret = write(_sockfd, str.c_str(), str.size());
 
   //log_msg("%s: sent %d bytes, data was %s\n", __FUNCTION__, ret, 
str.c_str());
-  if (ret == str.size()) {
+  if (ret == static_cast<signed int>(str.size())) {
     return true;
   } else {
     return false;
@@ -412,25 +412,25 @@
 // Callbacks
 
 void
-XMLSocket::onClose(tu_string /* str */)
+XMLSocket::onClose(std::string /* str */)
 {
   log_msg("%s: \n", __FUNCTION__);
 }
 
 void
-XMLSocket::onConnect(tu_string /* str */)
+XMLSocket::onConnect(std::string /* str */)
 {
   log_msg("%s: \n", __FUNCTION__);
 }
 
 void
-XMLSocket::onData(tu_string /* str */)
+XMLSocket::onData(std::string /* str */)
 {
   log_msg("%s: \n", __FUNCTION__);
 }
 
 void
-XMLSocket::onXML(tu_string /* str */)
+XMLSocket::onXML(std::string /* str */)
 {
   log_msg("%s: \n", __FUNCTION__);
 }
@@ -512,8 +512,8 @@
   log_msg("%s: nargs=%d\n", __FUNCTION__, fn.nargs);
   xmlsocket_as_object* ptr = (xmlsocket_as_object*) (as_object*) fn.this_ptr;
   assert(ptr);
-  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();
+  const std::string host = 
fn.env->bottom(fn.first_arg_bottom_index).to_string();
+  std::string port_str = 
fn.env->bottom(fn.first_arg_bottom_index-1).to_string();
   double port = atof(port_str.c_str());
 
   ptr->obj.connect(host.c_str(), static_cast<int>(port));
@@ -574,7 +574,7 @@
   
   xmlsocket_as_object* ptr = (xmlsocket_as_object*) (as_object*) fn.this_ptr;
   assert(ptr);
-  const tu_string object = fn.env->bottom( 
fn.first_arg_bottom_index).to_string();
+  const std::string object = fn.env->bottom( 
fn.first_arg_bottom_index).to_string();
   //  log_msg("%s: host=%s, port=%g\n", __FUNCTION__, host, port);
   fn.result->set_bool(ptr->obj.send(object));
 }
@@ -670,7 +670,6 @@
   int           i;
   as_c_function_ptr    func;
   as_function*       as_func;
-  tu_string     data; 
 
   xmlsocket_as_object* ptr = (xmlsocket_as_object*)fn.this_ptr;
   assert(ptr);
@@ -758,7 +757,6 @@
 {
   as_value     method;
   as_value     val;
-  tu_string     data;
   static bool first = true;     // This event handler should only be executed 
once.
 
   if (!first) {

Index: server/xmlsocket.h
===================================================================
RCS file: /sources/gnash/gnash/server/xmlsocket.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/xmlsocket.h  15 Sep 2006 00:22:43 -0000      1.10
+++ server/xmlsocket.h  3 Oct 2006 10:44:41 -0000       1.11
@@ -60,7 +60,7 @@
   ~XMLSocket();
   
   bool connect(const char *host, int port);
-  bool send(tu_string str);
+  bool send(std::string str);
   void close();
 
   
@@ -79,10 +79,10 @@
   void processing(bool x);
  
   // Event Handlers
-  void onClose(tu_string);
-  void onConnect(tu_string);
-  void onData(tu_string);
-  void onXML(tu_string);
+  void onClose(std::string);
+  void onConnect(std::string);
+  void onData(std::string);
+  void onXML(std::string);
 
   // These handle the array of XML nodes
   void push(as_object *obj);
@@ -93,7 +93,7 @@
   int checkSockets(int x);
 
  private:
-  tu_string     _host;
+  std::string  _host;
   short         _port;
   int           _sockfd;
   bool          _data;