X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FVariables.cti;h=0e9367f73066cb493cb85fad1ce0311260f66d21;hb=1863c038d0400159ce49b851a5b81c2ce698c684;hp=f074c5f3d1156dab3abc7c8a8e86f1fde4d3ec90;hpb=80c6cb7ba9ad7776824c84809f422209adf27331;p=senf.git

diff --git a/Console/Variables.cti b/Console/Variables.cti
index f074c5f..0e9367f 100644
--- a/Console/Variables.cti
+++ b/Console/Variables.cti
@@ -49,8 +49,9 @@ prefix_ Variable const & senf::console::detail::QueryVariable<Variable>::operato
 // senf::console::detail::SetVariable<Variable>
 
 template <class Variable>
-prefix_ senf::console::detail::SetVariable<Variable>::SetVariable(Variable & var)
-    : var_ (var)
+prefix_ senf::console::detail::SetVariable<Variable>::SetVariable(Variable & var,
+                                                                  OnChangeHandler handler)
+    : var_ (var), handler_ (handler)
 {}
 
 template <class Variable>
@@ -66,12 +67,6 @@ prefix_ void senf::console::detail::SetVariable<Variable>::operator()(Variable c
         var_ = value;
 }
 
-template <class Variable>
-prefix_ void senf::console::detail::SetVariable<Variable>::onChange(OnChangeHandler handler)
-{
-    handler_ = handler;
-}
-
 ///////////////////////////////////////////////////////////////////////////
 // senf::console::ConstVariableAttributor<Variable>
 
@@ -118,6 +113,15 @@ senf::console::VariableAttributor<Variable>::typeName(std::string const & name)
 
 template <class Variable>
 prefix_ typename senf::console::VariableAttributor<Variable>
+senf::console::VariableAttributor<Variable>::onChange(OnChangeHandler handler)
+{
+    setOverload_.function( 
+        boost::bind(detail::SetVariable<Variable>(var_, handler),_2));
+    return *this;
+}
+
+template <class Variable>
+prefix_ typename senf::console::VariableAttributor<Variable>
 senf::console::VariableAttributor<Variable>::doc(std::string const & doc)
 {
     ConstVariableAttributor<Variable>::doc(doc);
@@ -135,8 +139,9 @@ senf::console::VariableAttributor<Variable>::formatter(Formatter formatter)
 template <class Variable>
 prefix_
 senf::console::VariableAttributor<Variable>::VariableAttributor(QueryOverload & queryOverload,
-                                                                SetOverload & setOverload)
-    : ConstVariableAttributor<Variable> (queryOverload), setOverload_ (setOverload)
+                                                                SetOverload & setOverload,
+                                                                Variable & var)
+    : ConstVariableAttributor<Variable> (queryOverload), setOverload_ (setOverload), var_ (var)
 {}
 
 ///////////////////////////////////////////////////////////////////////////
@@ -156,7 +161,7 @@ senf::console::detail::VariableNodeCreator<Variable,isConst>::add(DirectoryNode
         node.add(name, typename detail::QueryVariable<Variable>::Function(
                      detail::QueryVariable<Variable>(var))).overload() );
 
-    return VariableAttributor<Variable>(queryOverload, setOverload);
+    return VariableAttributor<Variable>(queryOverload, setOverload, var);
 }
 
 template <class Variable>
@@ -172,6 +177,8 @@ senf::console::detail::VariableNodeCreator<Variable, true>::add(DirectoryNode &
     return ConstVariableAttributor<Variable>(queryOverload);
 }
 
+#ifndef DOXYGEN
+
 template <class Variable>
 prefix_ senf::console::VariableAttributor<Variable> senf::console::
 senf_console_add_node(DirectoryNode & node, std::string const & name, Variable & var, int,
@@ -188,6 +195,8 @@ senf::console::senf_console_add_node(DirectoryNode & node, std::string const & n
     return detail::VariableNodeCreator<Variable>::add(node, name, var.get());
 }
 
+#endif
+
 ///////////////////////////////cti.e///////////////////////////////////////
 #undef prefix_