[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/23 20:14:13

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp sprite_instance.h 
                         timers.cpp timers.h 
        server/parser  : movie_def_impl.h movie_definition.h 

Log message:
                * server/sprite_instance.cpp: removed compiler warnings.
                * server/: timers.{h,cpp}, sprite_instance.h: includes cleanup.
                  (shouldn't this be under asobj, btw ?)
                * server/parser/: movie_def_impl.h, movie_definition.h:         
                  forward declarations.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1730&r2=1.1731
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_definition.h?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1730
retrieving revision 1.1731
diff -u -b -r1.1730 -r1.1731
--- ChangeLog   23 Nov 2006 19:28:36 -0000      1.1730
+++ ChangeLog   23 Nov 2006 20:14:13 -0000      1.1731
@@ -1,5 +1,13 @@
 2006-11-23 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp: removed compiler warnings.
+       * server/: timers.{h,cpp}, sprite_instance.h: includes cleanup.
+         (shouldn't this be under asobj, btw ?)
+       * server/parser/: movie_def_impl.h, movie_definition.h:
+         forward declarations.
+
+2006-11-23 Sandro Santilli <address@hidden>
+
        * server/parser/bitmap_character_def.h: removed action.h include
        * Makefile.am: fix 'make dumpconfig' output when using GST sound.
        * server/parser/movie_def_impl.cpp: removed compiler warnings.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- server/sprite_instance.cpp  21 Nov 2006 00:25:46 -0000      1.83
+++ server/sprite_instance.cpp  23 Nov 2006 20:14:13 -0000      1.84
@@ -192,7 +192,7 @@
 
        if (fn.nargs > 3 )
        {
-               as_object* initObject = fn.arg(3).to_object();
+               //as_object* initObject = fn.arg(3).to_object();
                //if ( initObject ) newch->copyProperties(*initObject);
        }
 
@@ -787,7 +787,6 @@
        :
        character(parent, id),
        m_mouse_state(UP),
-       m_def(def),
        m_root(r),
        m_play_state(PLAY),
        m_current_frame(0),
@@ -797,6 +796,7 @@
        m_accept_anim_moves(true),
        m_frame_time(0.0f),
        m_has_keypress_event(false),
+       m_def(def),
        m_on_event_load_called(false)
 {
        assert(m_def != NULL);

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- server/sprite_instance.h    21 Nov 2006 00:25:46 -0000      1.40
+++ server/sprite_instance.h    23 Nov 2006 20:14:13 -0000      1.41
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.40 2006/11/21 00:25:46 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.41 2006/11/23 20:14:13 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -28,16 +28,17 @@
 #include "config.h"
 #endif
 
-#include <vector>
-#include <list>
-#include <map>
-
+#include "action.h" // for call_method_parsed (call_method_args)
 #include "edit_text_character.h" // temp hack
 #include "movie_definition.h" // for inlines
 #include "dlist.h" // DisplayList 
 #include "log.h"
 #include "as_environment.h" // for composition
 
+#include <vector>
+#include <list>
+#include <map>
+
 namespace gnash
 {
 

Index: server/timers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/timers.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/timers.cpp   21 Nov 2006 00:25:46 -0000      1.18
+++ server/timers.cpp   23 Nov 2006 20:14:13 -0000      1.19
@@ -18,17 +18,14 @@
 //
 //
 
-/* $Id: timers.cpp,v 1.18 2006/11/21 00:25:46 strk Exp $ */
+/* $Id: timers.cpp,v 1.19 2006/11/23 20:14:13 strk Exp $ */
 
-//#include "action.h"
+#include "timers.h"
 #include "as_function.h" // for class as_function
-//#include "impl.h"
+#include "as_object.h" // for inheritance
 #include "log.h"
 #include "sprite_instance.h"
-
 #include "fn_call.h"
-
-#include "timers.h"
 #include "xml.h"
 
 using namespace std;

Index: server/timers.h
===================================================================
RCS file: /sources/gnash/gnash/server/timers.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/timers.h     3 Nov 2006 14:03:37 -0000       1.11
+++ server/timers.h     23 Nov 2006 20:14:13 -0000      1.12
@@ -21,14 +21,22 @@
 #ifndef __TIMERS_H__
 #define __TIMERS_H__
 
-#include "action.h"
-#include "impl.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "as_value.h" // for struct variable composition
+#include "as_object.h" // for inheritance
 
 #include "tu_timer.h"
 
 #include <string>
 
 namespace gnash {
+       class fn_call;
+}
+
+namespace gnash {
   
   struct variable {
     std::string name;

Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/parser/movie_def_impl.h      21 Nov 2006 00:25:47 -0000      1.21
+++ server/parser/movie_def_impl.h      23 Nov 2006 20:14:13 -0000      1.22
@@ -22,7 +22,6 @@
 
 #include "container.h"
 #include "smart_ptr.h"
-//#include "button.h" // for mouse_button_state
 #include "timers.h" // for Timer
 #include "fontlib.h"
 #include "font.h"
@@ -39,15 +38,20 @@
 #include <memory> // for auto_ptr
 
 #include <pthread.h>
+//
+// Forward declarations
+namespace gnash {
+       class import_info;
+       class movie_def_impl;
+       class movie_root;
+       namespace SWF {
+               class TagLoadersTable;
+       }
+}
 
 namespace gnash
 {
 
-// Forward declarations
-class import_info;
-class movie_def_impl;
-class movie_root;
-
 //
 // Helper for movie_def_impl
 //

Index: server/parser/movie_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_definition.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/parser/movie_definition.h    21 Nov 2006 00:25:47 -0000      1.9
+++ server/parser/movie_definition.h    23 Nov 2006 20:14:13 -0000      1.10
@@ -56,6 +56,11 @@
 #include <string>
 #include <memory> // for auto_ptr
 
+// Forward declarations
+namespace gnash {
+       class bitmap_character_def;
+}
+
 namespace gnash
 {