X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FModuleManager.cc;h=2bc9295475f19f73b18c42e9cb9a30e1d8bda8c0;hb=9bc655e14d2d8c204ed835896cb51e42d49bd68f;hp=77f190c17eb299c5ec13346a9fd56fb2102a9ceb;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/PPI/ModuleManager.cc b/senf/PPI/ModuleManager.cc
index 77f190c..2bc9295 100644
--- a/senf/PPI/ModuleManager.cc
+++ b/senf/PPI/ModuleManager.cc
@@ -27,10 +27,10 @@
 //#include "ModuleManager.ih"
 
 // Custom includes
-#include "../Scheduler/Scheduler.hh"
-#include "../Utils/membind.hh"
+#include <senf/Scheduler/Scheduler.hh>
+#include <senf/Utils/membind.hh>
 #include "Module.hh"
-#include "../Utils/Console/Console.hh"
+#include <senf/Utils/Console/Console.hh>
 
 //#include "ModuleManager.mpp"
 #define prefix_
@@ -70,23 +70,25 @@ prefix_ void senf::ppi::ModuleManager::run()
 // private members
 
 prefix_ senf::ppi::ModuleManager::ModuleManager()
-    : running_(false), terminate_(false), 
+    : running_(false), terminate_(false),
       initRunner_ ("senf::ppi::init", membind(&ModuleManager::init, this),
                    scheduler::EventHook::PRE, false)
 {
     senf::console::sysdir().add("ppi", consoleDir_);
 
     consoleDir_
-        .add("dump", senf::membind(&ModuleManager::dumpModules, this))
-        .doc("Dump complete PPI structure\n"
-             "The dump will contain one paragraph for each module. The first line gives module\n"
-             "information, additional lines list all connectors and their peers (if connected).\n"
-             "\n"
-             "This information can be processed by 'PPI/drawmodules.py' and 'dot' (from the\n"
-             "graphviz package) to generate a graphic representation of the module structure:\n"
-             "\n"
-             "    $ echo /sys/ppi/dump | nc -q1 <host> <port> \\\n"
-             "          | python PPI/drawmodules.py | dot -Tpng /dev/fd/0 >modules.png\n");
+        .add("dump", senf::console::factory::Command(
+                 senf::membind(&ModuleManager::dumpModules, this))
+             .doc("Dump complete PPI structure\n"
+                  "The dump will contain one paragraph for each module. The first line gives module\n"
+                  "information, additional lines list all connectors and their peers (if connected).\n"
+                  "\n"
+                  "This information can be processed by 'PPI/drawmodules.py' and 'dot' (from the\n"
+                  "graphviz package) to generate a graphic representation of the module structure:\n"
+                  "\n"
+                  "    $ echo /sys/ppi/dump | nc -q1 <host> <port> \\\n"
+                  "          | python PPI/drawmodules.py | dot -Tpng /dev/fd/0 >modules.png\n")
+            );
 }
 
 prefix_ void senf::ppi::ModuleManager::dumpModules(std::ostream & os)