X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FTermlib%2FEditor.cc;h=f99c95d800e93a900e964a1b262227f7cf46573f;hb=5b2e9a63a43027c71ac470ac9bdecb72e8974951;hp=bc081ca1f6071c9ef0b1674a87387cfe2f5acbda;hpb=9cb871b939efe93e35dd96808d25089399acfc46;p=senf.git

diff --git a/senf/Utils/Termlib/Editor.cc b/senf/Utils/Termlib/Editor.cc
index bc081ca..f99c95d 100644
--- a/senf/Utils/Termlib/Editor.cc
+++ b/senf/Utils/Termlib/Editor.cc
@@ -32,13 +32,13 @@
 
 //#include "Editor.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ senf::term::BaseEditor::BaseEditor(AbstractTerminal & terminal)
     : terminal_ (&terminal),
-      keyTimeout_ (senf::ClockService::milliseconds(DEFAULT_KEY_TIMEOUT_MS)),
+      keyTimeout_ (ClockService::milliseconds(DEFAULT_KEY_TIMEOUT_MS)),
       timer_ ("senf::term::BaseEditor::keySequenceTimeout",
-              senf::membind(&BaseEditor::keySequenceTimeout, this)),
+              membind(&BaseEditor::keySequenceTimeout, this)),
       column_ (0u), displayHeight_ (1u), line_ (0u)
 {
     terminal_->setCallbacks(*this);
@@ -220,7 +220,7 @@ prefix_ bool senf::term::BaseEditor::cb_init()
 prefix_ void senf::term::BaseEditor::cb_charReceived(char c)
 {
     inputBuffer_ += c;
-    timer_.timeout(senf::scheduler::eventTime() + keyTimeout_);
+    timer_.timeout(scheduler::eventTime() + keyTimeout_);
     processKeys();
 }
 
@@ -242,9 +242,9 @@ prefix_ void senf::term::BaseEditor::keySequenceTimeout()
 prefix_ void senf::term::BaseEditor::processKeys()
 {
     do {
-        std::pair<senf::term::KeyParser::keycode_t, std::string::size_type> result
+        std::pair<KeyParser::keycode_t, std::string::size_type> result
             (keyParser_.lookup(inputBuffer_));
-        if (result.first == senf::term::KeyParser::Incomplete)
+        if (result.first == KeyParser::Incomplete)
             return;
         v_keyReceived(result.first);
         inputBuffer_.erase(0, result.second);
@@ -275,7 +275,7 @@ prefix_ void senf::term::BaseEditor::write(std::string const & s)
         write(*i);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ senf::term::LineEditor::LineEditor(AbstractTerminal & terminal, AcceptCallback cb)
     : BaseEditor(terminal), enabled_ (false), prompt_ ("$"), promptWidth_ (1u), editWidth_ (0u),
@@ -556,7 +556,7 @@ prefix_ void senf::term::LineEditor::v_keyReceived(keycode_t key)
         toColumn(point_ - displayPos_ + promptWidth_ + 1);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ void senf::term::bindings::selfInsertCommand(LineEditor & editor)
 {
@@ -710,7 +710,7 @@ prefix_ void senf::term::bindings::complete(LineEditor & editor, Completer compl
     }
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "Editor.mpp"