X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FEventManager.hh;h=099ebae7d97d896c99575a3ca9736eb2055bdb57;hb=a1fdb7bb122f0b05be809a922d4b7ef5e125fa67;hp=eff1fabfe86681f45e82f1c8d3eaaf7429c942b4;hpb=989a3b185a4e8854a1a1a01c5b190c9e6dcaf2af;p=senf.git

diff --git a/Scheduler/EventManager.hh b/Scheduler/EventManager.hh
index eff1fab..099ebae 100644
--- a/Scheduler/EventManager.hh
+++ b/Scheduler/EventManager.hh
@@ -23,8 +23,8 @@
 /** \file
     \brief EventManager public header */
 
-#ifndef HH_SchedulerEventManager_
-#define HH_SchedulerEventManager_ 1
+#ifndef HH_SENF_Scheduler_EventManager_
+#define HH_SENF_Scheduler_EventManager_ 1
 
 // Custom includes
 #include <string>
@@ -32,7 +32,7 @@
 #include "../boost/intrusive/ilist.hpp"
 #include "../boost/intrusive/ilist_hook.hpp"
 #include "../Utils/singleton.hh"
-#include "Console/LazyDirectory.hh"
+#include "../Utils/Console/LazyDirectory.hh"
 
 //#include "EventManager.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
@@ -65,11 +65,11 @@ namespace detail {
         ///@}
         ///////////////////////////////////////////////////////////////////////////
 
-        std::string const & name() const;
-        bool enabled() const;
-        unsigned runCount() const;
-        char const * type() const;
-        std::string info() const;
+        std::string const & name() const; ///< Get event name
+        bool enabled() const;           ///< \c true, if event is enabled, \c false otherwise
+        unsigned runCount() const;      ///< Number of times, event was fired
+        char const * type() const;      ///< Event type code
+        std::string info() const;       ///< Additional event information
 
     protected:
         void countRun();
@@ -105,6 +105,8 @@ namespace detail {
         iterator begin() const;
         iterator end() const;
 
+        void listEvents(std::ostream & os);
+
     protected:
 
     private:
@@ -115,8 +117,6 @@ namespace detail {
         friend class singleton<EventManager>;
 
 #ifndef SENF_DISABLE_CONSOLE
-        void consoleEvents(std::ostream & os);
-        
         console::LazyDirectory consoleDir_;
 #endif
     };