[Gnash-commit] gnash ChangeLog server/character.cpp server/cha...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/03/09 10:18:49

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

Log message:
                * server/: sprite_instance.{cpp,h}, character.{cpp,h}:
                  Moved getNextUnnamedInstanceName() from sprite_instance
                  to character, for use withing other character types
                  (like buttons) and use a single counter for the whole
                  application.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2585&r2=1.2586
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.191&r2=1.192
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.75&r2=1.76

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2585
retrieving revision 1.2586
diff -u -b -r1.2585 -r1.2586
--- ChangeLog   9 Mar 2007 10:03:42 -0000       1.2585
+++ ChangeLog   9 Mar 2007 10:18:49 -0000       1.2586
@@ -1,5 +1,13 @@
 2007-03-09 Sandro Santilli <address@hidden>
 
+       * server/: sprite_instance.{cpp,h}, character.{cpp,h}:
+         Moved getNextUnnamedInstanceName() from sprite_instance
+         to character, for use withing other character types
+         (like buttons) and use a single counter for the whole
+         application.
+
+2007-03-09 Sandro Santilli <address@hidden>
+
        * server/asobj/Object.cpp: remove TESTING
          warnings for getOwnProperty, isPrototypeOf and
          isPropertyEnumerable. Warn only once about unimplemented

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/character.cpp        28 Feb 2007 17:25:25 -0000      1.22
+++ server/character.cpp        9 Mar 2007 10:18:49 -0000       1.23
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.cpp,v 1.22 2007/02/28 17:25:25 udog Exp $ */
+/* $Id: character.cpp,v 1.23 2007/03/09 10:18:49 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -34,6 +34,19 @@
 namespace gnash
 {
 
+// Initialize unnamed instance count
+unsigned int character::_lastUnnamedInstanceNum=0;
+
+/*protected static*/
+std::string
+character::getNextUnnamedInstanceName()
+{
+       std::stringstream ss;
+       ss << "instance" << ++_lastUnnamedInstanceNum;
+       return ss.str();
+}
+
+
 // TODO: this should likely go in movie_root instead !
 void
 character::do_mouse_drag()

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- server/character.h  8 Mar 2007 18:40:18 -0000       1.55
+++ server/character.h  9 Mar 2007 10:18:49 -0000       1.56
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.55 2007/03/08 18:40:18 udog Exp $ */
+/* $Id: character.h,v 1.56 2007/03/09 10:18:49 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -77,9 +77,14 @@
        void    (*m_display_callback)(void*);
        void*   m_display_callback_user_ptr;
 
+       /// Used to assign a name to unnamed instances
+       static unsigned int _lastUnnamedInstanceNum;
 
 protected:
 
+       /// Used to assign a name to unnamed instances
+       static std::string getNextUnnamedInstanceName();
+
        /// Name of this character (if any)
        std::string     _name;
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -b -r1.191 -r1.192
--- server/sprite_instance.cpp  8 Mar 2007 14:51:35 -0000       1.191
+++ server/sprite_instance.cpp  9 Mar 2007 10:18:49 -0000       1.192
@@ -83,9 +83,6 @@
 static void attachMovieClipInterface(as_object& o);
 static void attachMovieClipProperties(as_object& o);
 
-// Initialize unnamed instance count
-unsigned int sprite_instance::_lastUnnamedInstanceNum=0;
-
 //------------------------------------------------
 // Utility funx
 //------------------------------------------------
@@ -3701,15 +3698,6 @@
        _target_dot.clear();
 }
 
-/*private static*/
-std::string
-sprite_instance::getNextUnnamedInstanceName()
-{
-       std::stringstream ss;
-       ss << "instance" << ++_lastUnnamedInstanceNum;
-       return ss.str();
-}
-
 /* private static */
 bool
 sprite_instance::sameEvents(const Events& eventsMap, const SWFEventsVector& 
eventsVect)

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- server/sprite_instance.h    8 Mar 2007 09:33:40 -0000       1.75
+++ server/sprite_instance.h    9 Mar 2007 10:18:49 -0000       1.76
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.75 2007/03/08 09:33:40 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.76 2007/03/09 10:18:49 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -652,12 +652,6 @@
 
 private:
 
-       // Used to assign a name to unnamed (movieclip-only?) instances
-       static unsigned int _lastUnnamedInstanceNum;
-
-       // Used to assign a name to unnamed (movieclip-only?) instances
-       static std::string getNextUnnamedInstanceName();
-
        /// Execute a single action buffer (DOACTION block)
        void execute_action(action_buffer& ab);