X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FIOEvent.hh;h=68f58d202d113a9890e2e185f3edec8befe4385b;hb=ab7ff164ab5ae711ec09ce2b24228510f1ffdcff;hp=ac081289d2b0ef43aad87a807648f4b05b6436f2;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/PPI/IOEvent.hh b/senf/PPI/IOEvent.hh
index ac08128..68f58d2 100644
--- a/senf/PPI/IOEvent.hh
+++ b/senf/PPI/IOEvent.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // 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 IOEvent public header */
@@ -27,12 +32,12 @@
 #define HH_SENF_PPI_IOEvent_ 1
 
 // Custom includes
-#include <senf/Scheduler/Scheduler.hh>
-#include "Events.hh"
+#include <senf/Scheduler/FdEvent.hh>
 #include <senf/Utils/Exception.hh>
+#include "Events.hh"
 
 //#include "IOEvent.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace ppi {
@@ -54,7 +59,7 @@ namespace ppi {
         type of event is specified using the \a events mask with values from EventFlags.
 
         There are two types of flags:
-        
+
         \li <em>Event flags</em> (\ref Read, \ref Prio, \ref Write) specify the type of event. The
             callback will be called whenever one of the specified events occurs on the filehandle
         \li <em>Error flags</em> (\ref Hup, \ref Err) specify some type of error condition on the
@@ -70,13 +75,13 @@ namespace ppi {
         : public EventImplementation<IOEventInfo>
     {
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         // Types
 
         // This is stupid, however there is no way to import the Scheduler::EventId enum together
         // with the enumeration symbols
 
-        enum EventFlags { 
+        enum EventFlags {
               Read  = scheduler::FdEvent::EV_READ   /**< FileHandle is readable */
             , Prio = scheduler::FdEvent::EV_PRIO    /**< FileHandle priority data is readable */
             , Write = scheduler::FdEvent::EV_WRITE  /**< FileHandle is writable */
@@ -84,45 +89,42 @@ namespace ppi {
             , Err = scheduler::FdEvent::EV_ERR      /**< Some other error condition on FileHandle */
         };
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         IOEvent();
 
         template <class Handle>
         IOEvent(Handle handle, unsigned events);
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
 
         template <class Handle>
         void set(Handle handle, unsigned events);
 
         /** \brief Unhandled error condition */
         struct ErrorException : public senf::Exception
-        { ErrorException() : senf::Exception("senf::ppi::IOEvent::ErrorException"){} };
+        { ErrorException() : senf::Exception("senf::ppi::IOEvent::ErrorException") {} };
 
         /** \brief Unhandled hangup condition */
         struct HangupException : public senf::Exception
-        { HangupException() : senf::Exception("senf::ppi::IOEvent::HangupException"){} };
-
-    protected:
+        { HangupException() : senf::Exception("senf::ppi::IOEvent::HangupException") {} };
 
     private:
         virtual void v_enable();
         virtual void v_disable();
-        
+
         void cb(int event);
 
         int fd_;
         scheduler::FdEvent event_;
     };
 
-    
 }}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "IOEvent.cci"
 #include "IOEvent.ct"
 #include "IOEvent.cti"