switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Utils / Console / Variables.ih

diff --git a/senf/Utils/Console/Variables.ih b/senf/Utils/Console/Variables.ih
index 23a5074..3c0809a 100644 (file)
--- a/senf/Utils/Console/Variables.ih
+++ b/senf/Utils/Console/Variables.ih
@@ -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 Variables internal header */
@@ -30,7 +35,7 @@
 #include <boost/function.hpp>
 #include <boost/type_traits/is_const.hpp>
 
-///////////////////////////////ih.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace console {
@@ -48,10 +53,13 @@ namespace detail {
         typedef Variable const & Signature ();
         typedef boost::function<Signature> Function;
         typedef detail::ParsedCommandTraits<Signature> Traits;
+        typedef detail::CreateParsedCommandOverload<Traits> CreateOverload;
         typedef Variable const & result_type;
 
         QueryVariable(Variable const & var);
 
+        static typename Traits::Overload::ptr create(Variable const & var);
+
         Variable const & operator()()  const;
 
         Variable const & var_;
@@ -63,38 +71,25 @@ namespace detail {
         typedef void Signature (Variable &);
         typedef boost::function<Signature> Function;
         typedef detail::ParsedCommandTraits<Signature> Traits;
+        typedef detail::CreateParsedCommandOverload<Traits> CreateOverload;
         typedef boost::function<void (Variable const &)> OnChangeHandler;
         typedef void result_type;
-        
+
         SetVariable(Variable & var, OnChangeHandler handler = OnChangeHandler());
-        
+
+        static typename Traits::Overload::ptr create(Variable & var);
+
         void operator()(Variable const & value) const;
 
         Variable & var_;
         OnChangeHandler handler_;
     };
 
-    template <class Variable, bool isConst=boost::is_const<Variable>::value>
-    struct VariableNodeCreator
-    {
-        typedef VariableAttributor<Variable> result_type;
-        static VariableAttributor<Variable> add(DirectoryNode & node, std::string const & name,
-                                                Variable & var);
-    };
-
-    template <class Variable>
-    struct VariableNodeCreator<Variable, true>
-    {
-        typedef ConstVariableAttributor<Variable> result_type;
-        static ConstVariableAttributor<Variable> add(DirectoryNode & node, std::string const & name,
-                                                     Variable const & var);
-    };
-
 #endif
 
 }}}
 
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif
 
 \f