X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FtestServer.cc;h=fe42969cf94a8ee1cdfce41a28105fdc8f808ef9;hb=748363b235c4651b3992cc291a95dc2e18e45724;hp=dc40117616d8a223858a0be0843bff929c1054cd;hpb=2d5a1fd2cef2d84e16226a7336948f524fbb71c6;p=senf.git

diff --git a/Console/testServer.cc b/Console/testServer.cc
index dc40117..fe42969 100644
--- a/Console/testServer.cc
+++ b/Console/testServer.cc
@@ -30,7 +30,7 @@
 #include <iostream>
 #include "Server.hh"
 #include "Node.hh"
-#include "ObjectDirectory.hh"
+#include "ScopedDirectory.hh"
 #include "../Scheduler/Scheduler.hh"
 #include "../Utils/Logger/SenfLog.hh"
 
@@ -40,13 +40,13 @@
 
 namespace {
     
-    void fn(std::ostream & output, 
-            senf::console::CommandNode::Arguments const & arguments) {
-        senf::console::CommandNode::Arguments::iterator i (arguments.begin());
-        senf::console::CommandNode::Arguments::iterator i_end (arguments.end());
+    void fn(std::ostream & output, senf::console::ParseCommandInfo const & command) {
+        typedef senf::console::ParseCommandInfo::ArgumentsRange::iterator iterator;
+        iterator i (command.arguments().begin());
+        iterator i_end (command.arguments().end());
         for (; i != i_end; ++i) {
-            senf::console::CommandNode::Arguments::value_type::iterator j (i->begin());
-            senf::console::CommandNode::Arguments::value_type::iterator j_end (i->end());
+            iterator::value_type::iterator j (i->begin());
+            iterator::value_type::iterator j_end (i->end());
             for (; j != j_end; ++j) 
                 output << j->value() << ' ';
         }
@@ -55,20 +55,19 @@ namespace {
 
     struct TestObject
     {
-        senf::console::ObjectDirectory<TestObject> dir;
+        senf::console::ScopedDirectory<TestObject> dir;
 
         TestObject() : dir(this) {
             dir.add("blub", &TestObject::blub)
                 .doc("Example of a member function");
         }
         
-        void blub(std::ostream & output, senf::console::CommandNode::Arguments const & args) {
+        void blub(std::ostream & output, senf::console::ParseCommandInfo const &) {
             output << "blub\n";
         }
     };
 
-    void shutdownServer(std::ostream &,
-                        senf::console::CommandNode::Arguments const &)
+    void shutdownServer(std::ostream &, senf::console::ParseCommandInfo const &)
     {
         senf::Scheduler::instance().terminate();
         throw senf::console::Executor::ExitException();