X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FEvents.cti;h=a426b4296686148191248bcb3e7ebe747dab5043;hb=8a6697d11e9a6557d9a5c42b4052666fce32bc10;hp=9478b8e9d9cb38fbbc6e5c5902eae6675e2e672e;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/PPI/Events.cti b/senf/PPI/Events.cti
index 9478b8e..a426b42 100644
--- a/senf/PPI/Events.cti
+++ b/senf/PPI/Events.cti
@@ -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 Events inline template implementation */
@@ -30,12 +35,12 @@
 #include "detail/EventBinding.hh"
 
 #define prefix_ inline
-///////////////////////////////cti.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::EventImplementationHelper<EventType,Self>
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // protected members
 
 template <class EventType, class Self>
@@ -52,22 +57,22 @@ prefix_ void senf::ppi::EventImplementationHelper<EventType,Self>::callback(Even
     binding().callback(event);
 }
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // private members
 
 template <class EventType, class Self>
 prefix_ senf::ppi::detail::EventBinding<EventType> &
 senf::ppi::EventImplementationHelper<EventType,Self>::binding()
 {
-    SENF_ASSERT( static_cast<Self*>(this)->binding_ &&
+    SENF_ASSERT( static_cast<Self*>(this)->binding_,
                  "senf::ppi::EventImplementationHelper::binding(): Missing registerEvent()" );
     return * static_cast<Self*>(this)->binding_;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::EventImplementationHelper<void,Self>
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // protected members
 
 template <class Self>
@@ -83,19 +88,19 @@ prefix_ void senf::ppi::EventImplementationHelper<void,Self>::callback()
     binding().callback();
 }
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // private members
 
 template <class Self>
 prefix_ senf::ppi::detail::EventBinding<void> &
 senf::ppi::EventImplementationHelper<void,Self>::binding()
 {
-    SENF_ASSERT( static_cast<Self*>(this)->binding_ &&
+    SENF_ASSERT( static_cast<Self*>(this)->binding_,
                  "senf::ppi::EventImplementationHelper::binding(): Missing registerEvent()" );
     return * static_cast<Self*>(this)->binding_;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::EventImplementation<EventType>
 
 template <class EventType>
@@ -112,7 +117,7 @@ prefix_ senf::ppi::EventManager & senf::ppi::EventImplementation<EventType>::man
     return binding_->manager();
 }
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // protected members
 
 template <class EventType>
@@ -120,7 +125,7 @@ prefix_ senf::ppi::EventImplementation<EventType>::EventImplementation()
     : binding_(0)
 {}
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // private members
 
 template <class EventType>
@@ -136,7 +141,7 @@ senf::ppi::EventImplementation<EventType>::setBinding(detail::EventBinding<Event
     binding_ = & binding;
 }
 
-///////////////////////////////cti.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_