[Gnash-commit] gnash ChangeLog server/as_object.h server/as_va...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/05/29 12:53:45

Modified files:
        .              : ChangeLog 
        server         : as_object.h as_value.cpp movie_instance.cpp 
                         movie_root.cpp movie_root.h sprite_instance.cpp 

Log message:
                * server/movie_root.{h,cpp}: drop some dead code.
                * server/as_value.cpp: pass std::string, not const char*.
                * server/as_object.h: drop sstream header (may as well do
                  this while touching movie_root.h).
                * server/movie_instance.cpp: header cleanup.
                * server/sprite_instance.cpp: pointless bit of const 
correctness.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6760&r2=1.6761
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.h?cvsroot=gnash&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.136&r2=1.137
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_instance.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.197&r2=1.198
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.131&r2=1.132
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.545&r2=1.546

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6760
retrieving revision 1.6761
diff -u -b -r1.6760 -r1.6761
--- ChangeLog   29 May 2008 12:45:11 -0000      1.6760
+++ ChangeLog   29 May 2008 12:53:43 -0000      1.6761
@@ -1,5 +1,14 @@
 2008-05-29 Benjamin Wolsey <address@hidden>
 
+       * server/movie_root.{h,cpp}: drop some dead code.
+       * server/as_value.cpp: pass std::string, not const char*.
+       * server/as_object.h: drop sstream header (may as well do
+         this while touching movie_root.h).
+       * server/movie_instance.cpp: header cleanup.
+       * server/sprite_instance.cpp: pointless bit of const correctness.
+
+2008-05-29 Benjamin Wolsey <address@hidden>
+
        * server/asobj/{string.cpp,gstring.h}: get VM from object. Make
          init_string_instance take const std::string&, as that's what
          is usually passed to it.

Index: server/as_object.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.h,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- server/as_object.h  7 May 2008 09:41:13 -0000       1.110
+++ server/as_object.h  29 May 2008 12:53:44 -0000      1.111
@@ -33,7 +33,6 @@
 #include "as_prop_flags.h" // for enum
 #include "GnashException.h"
 #include "event_id.h" // for event_id
-#include <sstream>
 
 #if defined(__GNUC__) && __GNUC__ > 2
 #  include <cxxabi.h>

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -b -r1.136 -r1.137
--- server/as_value.cpp 25 May 2008 10:05:20 -0000      1.136
+++ server/as_value.cpp 29 May 2008 12:53:44 -0000      1.137
@@ -766,7 +766,7 @@
                        return ptr(to_character());
 
                case STRING:
-                       return init_string_instance(getStr().c_str());
+                       return init_string_instance(getStr());
 
                case NUMBER:
                        return init_number_instance(getNum());

Index: server/movie_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_instance.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/movie_instance.cpp   21 May 2008 16:08:23 -0000      1.28
+++ server/movie_instance.cpp   29 May 2008 12:53:44 -0000      1.29
@@ -15,13 +15,10 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
 #include "movie_instance.h"
 #include "movie_definition.h"
 #include "movie_root.h"
+#include "log.h"
 
 #include <vector>
 #include <string>

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -b -r1.197 -r1.198
--- server/movie_root.cpp       25 May 2008 10:05:21 -0000      1.197
+++ server/movie_root.cpp       29 May 2008 12:53:44 -0000      1.198
@@ -99,7 +99,6 @@
        m_mouse_x(0),
        m_mouse_y(0),
        m_mouse_buttons(0),
-       m_userdata(NULL),
        m_on_event_xmlsocket_ondata_called(false),
        m_on_event_xmlsocket_onxml_called(false),
        m_on_event_load_progress_called(false),

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- server/movie_root.h 24 May 2008 13:41:10 -0000      1.131
+++ server/movie_root.h 29 May 2008 12:53:44 -0000      1.132
@@ -396,10 +396,6 @@
        getRootMovie()->set_play_state(s);
     }
 
-
-    void * get_userdata() { return m_userdata; }
-    void set_userdata(void * ud ) { m_userdata = ud;  }
-
        /// Notify still loaded character listeners for key events
        DSOEXPORT void notify_key_listeners(key::code k, bool down);
 
@@ -859,7 +855,6 @@
 
     float       m_timer;
     int         m_mouse_x, m_mouse_y, m_mouse_buttons;
-    void *      m_userdata;
 
     mouse_button_state  m_mouse_button_state;
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.545
retrieving revision 1.546
diff -u -b -r1.545 -r1.546
--- server/sprite_instance.cpp  29 May 2008 10:34:55 -0000      1.545
+++ server/sprite_instance.cpp  29 May 2008 12:53:44 -0000      1.546
@@ -2627,7 +2627,7 @@
   if ( playlist )
   {
        PlayList::const_iterator it = playlist->begin();
-    PlayList::const_iterator e = playlist->end();
+    const PlayList::const_iterator e = playlist->end();
        for(; it != e; it++)
        {
                (*it)->execute_action(this, m_display_list);