X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FEventManager.hh;h=ed46ca6e2446b41defd107d6f7f482a3f685e491;hb=refs%2Fheads%2Fmaster;hp=cd6cb87951d9b376bce8afc1a7aca60db651868d;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Scheduler/EventManager.hh b/senf/Scheduler/EventManager.hh
index cd6cb87..ed46ca6 100644
--- a/senf/Scheduler/EventManager.hh
+++ b/senf/Scheduler/EventManager.hh
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// 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.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// 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.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// 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.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief EventManager public header */
@@ -29,13 +34,12 @@
 // Custom includes
 #include <string>
 #include <boost/iterator/filter_iterator.hpp>
-#include <boost/intrusive/ilist.hpp>
-#include <boost/intrusive/ilist_hook.hpp>
-#include "../Utils/singleton.hh"
-#include "../Utils/Console/LazyDirectory.hh"
+#include <senf/boost_intrusive/ilist.hpp>
+#include <senf/boost_intrusive/ilist_hook.hpp>
+#include <senf/Utils/singleton.hh>
 
 //#include "EventManager.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace scheduler {
@@ -52,18 +56,18 @@ namespace detail {
         : public EventListBase
     {
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         // Types
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
-        
+        //\{
+
         explicit Event(std::string const & name);
         virtual ~Event();
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
 
         std::string const & name() const; ///< Get event name
         bool enabled() const;           ///< \c true, if event is enabled, \c false otherwise
@@ -91,7 +95,7 @@ namespace detail {
     public:
         using singleton<EventManager>::instance;
         using singleton<EventManager>::alive;
-        
+
         struct IteratorFilter {
             bool operator()(Event const & e);
         };
@@ -115,15 +119,11 @@ namespace detail {
         EventList events_;
 
         friend class singleton<EventManager>;
-
-#ifndef SENF_DISABLE_CONSOLE
-        console::LazyDirectory consoleDir_;
-#endif
     };
 
 }}}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "EventManager.cci"
 //#include "EventManager.ct"
 //#include "EventManager.cti"