X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FLineEditor.cc;h=3b6ee03c10f440981f41a94912af5b862923ddaf;hb=5b2e9a63a43027c71ac470ac9bdecb72e8974951;hp=00faa8b2369fc183758b2bdd15f0819ee8fe6c9c;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Console/LineEditor.cc b/senf/Utils/Console/LineEditor.cc
index 00faa8b..3b6ee03 100644
--- a/senf/Utils/Console/LineEditor.cc
+++ b/senf/Utils/Console/LineEditor.cc
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -27,14 +27,15 @@
 //#include "LineEditor.ih"
 
 // Custom includes
-#include "../Logger/SenfLog.hh"
-#include "../../Utils/range.hh"
+#include <senf/Utils/Logger/SenfLog.hh>
+#include <senf/Utils/Range.hh>
+#include <senf/Utils/membind.hh>
 
 //#include "LineEditor.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::LineEditorSwitcher
 
 prefix_ senf::console::detail::LineEditorSwitcher::LineEditorSwitcher(Client & client)
@@ -71,7 +72,7 @@ prefix_ unsigned senf::console::detail::LineEditorSwitcher::v_width()
     return reader_->width();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::LineEditorClientReader
 
 prefix_ senf::console::detail::LineEditorClientReader::
@@ -85,7 +86,7 @@ LineEditorClientReader(Client & client, LineEditorSwitcher & switcher)
                       senf::membind(&LineEditorClientReader::deleteCharOrExit, this));
     editor_.defineKey(senf::term::KeyParser::Tab,
                       boost::bind(&term::bindings::complete,
-                                  _1, 
+                                  _1,
                                   senf::membind(&LineEditorClientReader::completePath, this)));
     editor_.defineKey(senf::term::KeyParser::Return, &senf::term::bindings::acceptWithRepeat);
 }
@@ -147,7 +148,7 @@ completePath(term::LineEditor & editor, unsigned & b, unsigned & e, std::string
     std::string const & t (editor.text());
     // Search backward from e finding the longest valid path. This does *not* accept all valid
     // path's, only those without embedded white-space. However, this is only for completion so
-    // it's ok. 
+    // it's ok.
     if (b<e) {
         unsigned bb (e-1);
         for (;;) {
@@ -170,7 +171,7 @@ completePath(term::LineEditor & editor, unsigned & b, unsigned & e, std::string
     catch (CommandParser::ParserErrorException & ex) {
         return;
     }
- 
+
     ParseCommandInfo::TokensRange path (cmd.commandPath());
     if (path.empty()) {
         DirectoryNode::ChildrenRange cs (client().cwd().children());
@@ -178,7 +179,7 @@ completePath(term::LineEditor & editor, unsigned & b, unsigned & e, std::string
             completions.push_back(i->first + (i->second->followLink().isDirectory() ? "/" : " "));
         return;
     }
-    
+
     ParseCommandInfo::TokensRange::const_iterator i (path.begin());
     ParseCommandInfo::TokensRange::const_iterator const i_end (boost::prior(path.end()));
     DirectoryNode * dir (& client().cwd());
@@ -194,7 +195,7 @@ completePath(term::LineEditor & editor, unsigned & b, unsigned & e, std::string
             if (parent) dir = parent;
             prefix += "../";
         }
-        else if (*i == WordToken(".")) 
+        else if (*i == WordToken("."))
             prefix += "./";
         else {
             if (dir->hasChild(i->value())) {
@@ -205,7 +206,7 @@ completePath(term::LineEditor & editor, unsigned & b, unsigned & e, std::string
                     return;
                 }
                 prefix += i->value() + "/";
-            } 
+            }
             else {
                 DirectoryNode::ChildrenRange cs (dir->completions(i->value()));
                 if (has_one_elt(cs)) {
@@ -225,7 +226,7 @@ completePath(term::LineEditor & editor, unsigned & b, unsigned & e, std::string
         completions.push_back(j->first + (j->second->followLink().isDirectory() ? "/" : " "));
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "LineEditor.mpp"