switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Utils / Termlib / Editor.cc

diff --git a/senf/Utils/Termlib/Editor.cc b/senf/Utils/Termlib/Editor.cc
index e710160..6733d27 100644 (file)
--- a/senf/Utils/Termlib/Editor.cc
+++ b/senf/Utils/Termlib/Editor.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief Editor non-inline non-template implementation */
@@ -36,9 +41,9 @@
 
 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 +225,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 +247,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);