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

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  08/04/30 02:33:06

Modified files:
        .              : ChangeLog 
        server         : dlist.cpp dlist.h sprite_instance.cpp 
                         sprite_instance.h 

Log message:
        * server/dlist.{h,cpp}: move_display_object() renamed to 
move_character(),
          remove_display_object() renamed to remove_character(). maintain name
          consistance.
        * server/sprite_instance.{h,cpp}: adop the new names.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6449&r2=1.6450
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.h?cvsroot=gnash&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.523&r2=1.524
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.188&r2=1.189

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6449
retrieving revision 1.6450
diff -u -b -r1.6449 -r1.6450
--- ChangeLog   29 Apr 2008 17:35:42 -0000      1.6449
+++ ChangeLog   30 Apr 2008 02:33:05 -0000      1.6450
@@ -1,3 +1,10 @@
+2008-04-29 Zou Lunkai <address@hidden>
+       
+       * server/dlist.{h,cpp}: move_display_object() renamed to 
move_character(),
+         remove_display_object() renamed to remove_character(). maintain name
+         consistance.
+       * server/sprite_instance.{h,cpp}: adop the new names.     
+         
 2008-04-29  Rob Savoye  <address@hidden>
 
        * libbase/utility.h: Use C ctyle cast for pthread_self() to work

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- server/dlist.cpp    29 Apr 2008 12:58:48 -0000      1.121
+++ server/dlist.cpp    30 Apr 2008 02:33:05 -0000      1.122
@@ -344,10 +344,10 @@
 }
   
   
-// Updates the transform properties of the object at
+// Updates the transform properties of the character at
 // the specified depth.
 void
-DisplayList::move_display_object(
+DisplayList::move_character(
   int depth,
   const cxform* color_xform,
   const matrix* mat,
@@ -364,7 +364,7 @@
   {
     // FIXME, should this be log_aserror?
     IF_VERBOSE_MALFORMED_SWF(
-    log_swferror(_("move_display_object() -- "
+    log_swferror(_("move_character() -- "
       "can't find object at depth %d"),
       depth);
     );
@@ -404,7 +404,7 @@
   
 // Removes the object at the specified depth.
 void
-DisplayList::remove_display_object(int depth)
+DisplayList::remove_character(int depth)
 {
   //GNASH_REPORT_FUNCTION;
 
@@ -417,7 +417,7 @@
   container_type::size_type size = _charsByDepth.size();
 #endif
 
-  // TODO: would it be legal to call remove_display_object with a depth
+  // TODO: would it be legal to call remove_character with a depth
   //       in the "removed" zone ?
   // TODO: optimize to take by-depth order into account
   container_type::iterator it = std::find_if(

Index: server/dlist.h
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- server/dlist.h      28 Apr 2008 09:04:02 -0000      1.68
+++ server/dlist.h      30 Apr 2008 02:33:06 -0000      1.69
@@ -163,14 +163,14 @@
        ///  See character::get_accept_anim_moves()
        ///
        /// @param color_xform
-       ///     The color tranform to assign to the new character.
+       ///     The color tranform to assign to the character at the given 
depth.
        ///     If NULL the default color transform will be kept.
        //
        /// @param mat
-       ///     The matrix tranform to assign to the new character.
+       ///     The matrix tranform to assign to the character at the given 
depth.
        ///     If NULL the default matrix will be kept.
        ///
-       void    move_display_object(
+       void    move_character(
                int depth,
                const cxform* color_xform,
                const matrix* mat,
@@ -181,7 +181,7 @@
        //
        /// Calls unload on the removed character.
        ///
-       void    remove_display_object(int depth);
+       void    remove_character(int depth);
 
        /// Remove all unloaded character from the list
        //

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -b -r1.523 -r1.524
--- server/sprite_instance.cpp  29 Apr 2008 11:29:03 -0000      1.523
+++ server/sprite_instance.cpp  30 Apr 2008 02:33:06 -0000      1.524
@@ -3346,7 +3346,7 @@
     DisplayList& dlist = const_cast<DisplayList &>( getDisplayList() );
        
        int ratio = tag->getRatio();
-    dlist.move_display_object(
+    dlist.move_character(
         tag->getDepth(), 
         tag->hasCxform() ? &tag->getCxform() : NULL,
         tag->hasMatrix() ? &tag->getMatrix() : NULL,

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -b -r1.188 -r1.189
--- server/sprite_instance.h    29 Apr 2008 11:29:03 -0000      1.188
+++ server/sprite_instance.h    30 Apr 2008 02:33:06 -0000      1.189
@@ -390,7 +390,7 @@
        {
            set_invalidated();
                DisplayList& dlist = const_cast<DisplayList &>( 
getDisplayList() );
-           dlist.remove_display_object(depth);
+           dlist.remove_character(depth);
        }
 
        /// Attach the given character instance to current display list