[Gnash-commit] gnash ChangeLog server/parser/edit_text_charact...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/09/20 14:18:51

Modified files:
        .              : ChangeLog 
        server/parser  : edit_text_character_def.cpp 
                         edit_text_character_def.h 

Log message:
                * server/parser/edit_text_character_def.cpp,                    
                  server/parser/edit_text_character_def.h: tu_string => 
std::string,
                  use new string reader methods.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.880&r2=1.881
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/edit_text_character_def.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/edit_text_character_def.h?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.880
retrieving revision 1.881
diff -u -b -r1.880 -r1.881
--- ChangeLog   20 Sep 2006 14:15:22 -0000      1.880
+++ ChangeLog   20 Sep 2006 14:18:50 -0000      1.881
@@ -1,5 +1,8 @@
 2006-09-20 Sandro Santilli  <address@hidden>
 
+       * server/parser/edit_text_character_def.cpp,
+         server/parser/edit_text_character_def.h: tu_string => std::string,
+         use new string reader methods.
        * server/stream.{h,cpp}: added memory-friendly string reader
          functions.
        * server/parser/button_character_def.cpp: more symbolic

Index: server/parser/edit_text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/edit_text_character_def.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/parser/edit_text_character_def.cpp   26 Aug 2006 02:08:32 -0000      
1.2
+++ server/parser/edit_text_character_def.cpp   20 Sep 2006 14:18:50 -0000      
1.3
@@ -73,15 +73,11 @@
                m_leading = in->read_s16();
        }
 
-       char*   name = in->read_string();
-       m_default_name = name;
-       delete [] name;
+       in->read_string(m_default_name);
 
        if (has_text)
        {
-               char*   str = in->read_string();
-               m_default_text = str;
-               delete [] str;
+               in->read_string(m_default_text);
        }
 
        IF_VERBOSE_PARSE (

Index: server/parser/edit_text_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/edit_text_character_def.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/parser/edit_text_character_def.h     26 Aug 2006 02:08:32 -0000      
1.2
+++ server/parser/edit_text_character_def.h     20 Sep 2006 14:18:50 -0000      
1.3
@@ -119,13 +119,13 @@
 
        /// Return a reference to the default text associated
        /// with this EditText definition.
-       const tu_string& get_default_text() const {
+       const std::string& get_default_text() const {
                return m_default_text;
        }
 
        /// Return a reference to the default name for
        /// instances of this EditText definition. (?)
-       const tu_string& get_default_name() const {
+       const std::string& get_default_name() const {
                return m_default_name;
        }
 
@@ -218,7 +218,7 @@
        movie_definition*       m_root_def;
 
        rect                    m_rect;
-       tu_string               m_default_name;
+       std::string             m_default_name;
        text_format             m_format;
        bool                    m_word_wrap;
        bool                    m_multiline;
@@ -298,7 +298,7 @@
        uint16_t        m_leading;
 
        /// The default text to be displayed
-       tu_string       m_default_text;
+       std::string     m_default_text;
 
 };