switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Utils / Console / Config.hh

diff --git a/senf/Utils/Console/Config.hh b/senf/Utils/Console/Config.hh
index 7c2b817..1b80ce6 100644 (file)
--- a/senf/Utils/Console/Config.hh
+++ b/senf/Utils/Console/Config.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 Config public header */
@@ -33,7 +38,7 @@
 
 //#include "Config.mpp"
 #include "Config.ih"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace console {
@@ -56,26 +61,26 @@ namespace console {
 
         This bundle may also be passed to other code which may use restricted parsing to parse
         partial information from all configuration sources.
-        
+
         \ingroup console_access
       */
     class ConfigBundle
     {
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         ConfigBundle();                     ///< root node is set to console::root()
         ConfigBundle(DirectoryNode & root); ///< Set custom root node
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
 
         template <class Source>
         Source & add(boost::intrusive_ptr<Source> source);
                                         ///< Add configuration source
-       
+
         void parse();                   ///< Parse config bundle
                                         /**< All nodes already parsed are skipped */
         void parse(DirectoryNode & restrict); ///< Parse config bundle under \a restrict
@@ -134,14 +139,14 @@ namespace detail {
     protected:
         template <class Source>
         Source & add(boost::intrusive_ptr<Source> source);
-        
+
     private:
         ConfigBundle bundle_;
     };
 
 }}}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "Config.cci"
 //#include "Config.ct"
 #include "Config.cti"