X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FEventManager.hh;h=dcb4997d338bc35a9eb8d9f679d8721dca0b5a60;hb=93d9568d448749dc187e7622b733a4a3caa319df;hp=20535a03649f687184c445ff3f2d19175404fc1b;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/PPI/EventManager.hh b/senf/PPI/EventManager.hh
index 20535a0..dcb4997 100644
--- a/senf/PPI/EventManager.hh
+++ b/senf/PPI/EventManager.hh
@@ -28,13 +28,13 @@
 
 // Custom includes
 #include <boost/ptr_container/ptr_vector.hpp>
-#include "../Scheduler/ClockService.hh"
+#include <senf/Scheduler/ClockService.hh>
 #include "predecl.hh"
 #include "detail/Callback.hh"
 #include "detail/EventBinding.hh"
 
 //#include "EventManager.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace ppi {
@@ -48,7 +48,7 @@ namespace ppi {
     class EventManager
     {
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         // Types
 
 #ifndef DOXYGEN
@@ -59,9 +59,9 @@ namespace ppi {
         {};
 #endif
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         static EventManager & instance();
 
@@ -72,8 +72,8 @@ namespace ppi {
 
         // no conversion constructors
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
 
         ClockService::clock_type now(); ///< Current time at last event dispatch
         ClockService::clock_type time(); ///< Expected time of the last event
@@ -87,6 +87,7 @@ namespace ppi {
                            Descriptor & descriptor);
 
         void destroyModule(module::Module & module);
+        void destroyEvent(EventDescriptor & event);
 
         typedef boost::ptr_vector<detail::EventBindingBase> EventRegistrations;
         EventRegistrations registrations_;
@@ -97,11 +98,12 @@ namespace ppi {
 
         friend class detail::EventBindingBase;
         friend class module::Module;
+        friend class EventDescriptor;
     };
 
 }}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "EventManager.cci"
 #include "EventManager.ct"
 //#include "EventManager.cti"