[Gnash-commit] gnash ChangeLog server/impl.h server/swf_event.h

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/24 00:39:36

Modified files:
        .              : ChangeLog 
        server         : impl.h 
Added files:
        server         : swf_event.h 

Log message:
                * server/impl.h, server/swf_event.h: moved swf_event class
                  into its own header.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.694&r2=1.695
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.h?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_event.h?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.694
retrieving revision 1.695
diff -u -b -r1.694 -r1.695
--- ChangeLog   23 Aug 2006 23:03:21 -0000      1.694
+++ ChangeLog   24 Aug 2006 00:39:36 -0000      1.695
@@ -1,5 +1,7 @@
 2006-08-23 Sandro Santilli  <address@hidden>
 
+       * server/impl.h, server/swf_event.h: moved swf_event class
+         into its own header.
        * server/swf/ASHandlers.cpp (CommonGetUrl): simplified and fixed
          URL parsing code by use of the URL class; added check for
          NULL urls and comments about future improvements; use the

Index: server/impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/impl.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/impl.h       4 Aug 2006 14:45:52 -0000       1.31
+++ server/impl.h       24 Aug 2006 00:39:36 -0000      1.32
@@ -44,7 +44,7 @@
 #endif
 
 #include "gnash.h"
-#include "action_buffer.h"
+//#include "action_buffer.h"
 #include "types.h"
 #include "log.h"
 #include "container.h"
@@ -61,7 +61,7 @@
 namespace gnash {
 
 // Forward declarations
-class action_buffer;
+//class action_buffer;
 struct bitmap_character_def;
 struct bitmap_info;
 class character;
@@ -70,7 +70,6 @@
 class font;
 class movie_root;
 struct stream;
-struct swf_event;
 
 struct sound_sample : public resource //virtual public ref_counted
 {
@@ -144,38 +143,6 @@
 void   register_tag_loader(SWF::tag_type t,
                SWF::TagLoadersTable::loader_function lf);
        
-//
-// swf_event
-//
-
-/// For embedding event handlers in place_object_2
-struct swf_event
-{
-    // NOTE: DO NOT USE THESE AS VALUE TYPES IN AN
-    // std::vector<>!  They cannot be moved!  The private
-    // operator=(const swf_event&) should help guard
-    // against that.
-
-    event_id   m_event;
-    action_buffer      m_action_buffer;
-    as_value   m_method;
-
-    swf_event()
-       {
-       }
-
-    void       attach_to(character* ch) const
-       {
-           ch->set_event_handler(m_event, m_method);
-       }
-
-private:
-    // DON'T USE THESE
-    swf_event(const swf_event& /*s*/) { assert(0); }
-    void       operator=(const swf_event& /*s*/) { assert(0); }
-};
-
-
 }      // end namespace gnash
 
 

Index: server/swf_event.h
===================================================================
RCS file: server/swf_event.h
diff -N server/swf_event.h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ server/swf_event.h  24 Aug 2006 00:39:36 -0000      1.1
@@ -0,0 +1,89 @@
+// 
+//   Copyright (C) 2005, 2006 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
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
+//
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+// 
+//
+//
+
+#ifndef GNASH_SWF_EVENT_H
+#define GNASH_SWF_EVENT_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "as_value.h" // for composition
+#include "action_buffer.h" // for composition
+#include "action.h" // for event_id
+
+#include <cassert>
+
+namespace gnash {
+
+//
+// swf_event
+//
+
+/// For embedding event handlers in place_object_2
+struct swf_event
+{
+    // NOTE: DO NOT USE THESE AS VALUE TYPES IN AN
+    // std::vector<>!  They cannot be moved!  The private
+    // operator=(const swf_event&) should help guard
+    // against that.
+
+    event_id   m_event;
+    action_buffer      m_action_buffer;
+    as_value   m_method;
+
+    swf_event()
+       {
+       }
+
+    void       attach_to(character* ch) const
+       {
+           ch->set_event_handler(m_event, m_method);
+       }
+
+private:
+    // DON'T USE THESE
+    swf_event(const swf_event& /*s*/) { assert(0); }
+    void       operator=(const swf_event& /*s*/) { assert(0); }
+};
+
+
+}      // end namespace gnash
+
+
+#endif // GNASH_SWF_EVENT_H