[Gnash-commit] gnash ChangeLog server/movie_instance.h server/...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/07/10 21:43:00

Modified files:
        .              : ChangeLog 
        server         : movie_instance.h character.h 

Log message:
                * server/: movie_instance.h, character.h: make get_root() a 
const
                  method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3704&r2=1.3705
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_instance.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.85&r2=1.86

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3704
retrieving revision 1.3705
diff -u -b -r1.3704 -r1.3705
--- ChangeLog   10 Jul 2007 21:06:28 -0000      1.3704
+++ ChangeLog   10 Jul 2007 21:42:59 -0000      1.3705
@@ -1,5 +1,7 @@
 2007-07-10 Sandro Santilli <address@hidden>
 
+       * server/: movie_instance.h, character.h: make get_root() a const
+         method.
        * server/movie_root.{cpp,h}: support multiple levels. Untested.
 
 2007-07-10 Sandro Santilli <address@hidden>

Index: server/movie_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_instance.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/movie_instance.h     1 Jul 2007 10:54:23 -0000       1.6
+++ server/movie_instance.h     10 Jul 2007 21:43:00 -0000      1.7
@@ -60,9 +60,9 @@
 
        // Could be implemented in sprite_instance too,
        // returning m_root like it is done for get_root_movie...
-       virtual movie_instance* get_root()
+       virtual movie_instance* get_root() const
        {
-               return this;
+               return const_cast<movie_instance*>(this);
        }
 
        //virtual sprite_instance* get_root_movie()

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- server/character.h  1 Jul 2007 10:54:21 -0000       1.85
+++ server/character.h  10 Jul 2007 21:43:00 -0000      1.86
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: character.h,v 1.85 2007/07/01 10:54:21 bjacques Exp $ */
+/* $Id: character.h,v 1.86 2007/07/10 21:43:00 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -639,7 +639,7 @@
        virtual sprite_instance* get_root_movie();
 
        /// By default call get_root on the parent
-       virtual movie_instance* get_root() {
+       virtual movie_instance* get_root() const {
                return get_parent()->get_root();
        }