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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/20 22:06:38

Modified files:
        .              : ChangeLog 
        server         : xml.h xml.cpp xmlattrs.h 

Log message:
                * server/xml.{h,cpp}: changed signatures taking event_id        
                  so to take it by const ref; reduced headers inclusion.        
                * server/xmlattrs.h: reduced headers inclusion.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1681&r2=1.1682
http://cvs.savannah.gnu.org/viewcvs/gnash/server/xml.h?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/xml.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/server/xmlattrs.h?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1681
retrieving revision 1.1682
diff -u -b -r1.1681 -r1.1682
--- ChangeLog   20 Nov 2006 21:46:58 -0000      1.1681
+++ ChangeLog   20 Nov 2006 22:06:38 -0000      1.1682
@@ -1,5 +1,11 @@
 2006-11-20 Sandro Santilli <address@hidden>
 
+       * server/xml.{h,cpp}: changed signatures taking event_id
+         so to take it by const ref; reduced headers inclusion.
+       * server/xmlattrs.h: reduced headers inclusion.
+
+2006-11-20 Sandro Santilli <address@hidden>
+
        * server/parser/button_character_def.h: added missing rect.h
          include.
        * server/asobj/: NetConnection.h, System.h:

Index: server/xml.h
===================================================================
RCS file: /sources/gnash/gnash/server/xml.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/xml.h        29 Oct 2006 18:34:11 -0000      1.20
+++ server/xml.h        20 Nov 2006 22:06:38 -0000      1.21
@@ -27,10 +27,11 @@
 
 #include "tu_config.h"
 
+#include "event_id.h"
+#include "action.h"
+
 //#define DEBUG_MEMORY_ALLOCATION 1
 #include <vector>
-#include "action.h"
-#include "impl.h"
 
 #ifdef HAVE_LIBXML
 
@@ -45,6 +46,11 @@
 #include <libxml/parser.h>
 #include <libxml/xmlreader.h>
 
+// Forward declarations
+namespace gnash {
+       class fn_call;
+}
+
 namespace gnash {
   
 /// XML class
@@ -74,7 +80,7 @@
     // Appends a node to the end of the specified object's child list.
     void appendChild(XMLNode *node);
     
-    virtual bool on_event(gnash::event_id id);
+    virtual bool on_event(const gnash::event_id& id);
     virtual void       on_event_load();
     bool loaded()    { return _loaded; }
     
@@ -132,10 +138,16 @@
     int getBytesLoaded()         { return _bytes_loaded; };
     int getBytesTotal()          { return _bytes_total; };
 
-    virtual void       on_xml_event(gnash::event_id id) { on_event(id); }
+    virtual void       on_xml_event(const gnash::event_id& id)
+    {
+       on_event(id);
+    }
   
     // Special event handler; 
-    void       on_event_close() { on_event(gnash::event_id::SOCK_CLOSE); }
+    void       on_event_close()
+    {
+       on_event(gnash::event_id::SOCK_CLOSE);
+    }
   
     XMLNode *operator [] (int x);
 #if 0

Index: server/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/xml.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/xml.cpp      11 Nov 2006 22:44:54 -0000      1.33
+++ server/xml.cpp      20 Nov 2006 22:06:38 -0000      1.34
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: xml.cpp,v 1.33 2006/11/11 22:44:54 strk Exp $ */
+/* $Id: xml.cpp,v 1.34 2006/11/20 22:06:38 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -30,9 +30,6 @@
 #include <vector>
 
 #include "log.h"
-//#include "action.h"
-//#include "impl.h"
-//#include "smart_ptr.h"
 #include "tu_config.h"
 #include "as_function.h" // for as_function
 #include "fn_call.h"
@@ -149,7 +146,7 @@
 
 // Dispatch event handler(s), if any.
 bool
-XML::on_event(event_id /* id */)
+XML::on_event(const event_id& /* id */)
 {
     GNASH_REPORT_FUNCTION;
     

Index: server/xmlattrs.h
===================================================================
RCS file: /sources/gnash/gnash/server/xmlattrs.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/xmlattrs.h   29 Oct 2006 18:34:11 -0000      1.8
+++ server/xmlattrs.h   20 Nov 2006 22:06:38 -0000      1.9
@@ -25,14 +25,16 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_LIBXML
+
 #include "tu_config.h"
 
 //#define DEBUG_MEMORY_ALLOCATION 1
-#include <vector>
-#include "action.h"
-#include "impl.h"
+#include "as_object.h" // for inheritance
 
-#ifdef HAVE_LIBXML
+#include "log.h"
+
+#include <vector>
 
 #ifdef DEBUG_MEMORY_ALLOCATION
        #include "log.h"