X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FTermlib%2FTelnet.cci;h=de2cbe43bf5e4e97491dd9527f744dd0fce41b19;hb=f08685d9795a3be20ce5c7a337087358ccd77eb5;hp=9804e995a441bd19382a4d2832dc8710cdae31f4;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Termlib/Telnet.cci b/senf/Utils/Termlib/Telnet.cci
index 9804e99..de2cbe4 100644
--- a/senf/Utils/Termlib/Telnet.cci
+++ b/senf/Utils/Termlib/Telnet.cci
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // 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 Telnet inline non-template implementation */
@@ -28,9 +33,9 @@
 // Custom includes
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::term::BaseTelnetProtocol::OptInfo
 
 prefix_ senf::term::BaseTelnetProtocol::OptInfo::OptInfo()
@@ -41,7 +46,7 @@ prefix_ senf::term::BaseTelnetProtocol::OptInfo::OptInfo(bool l, option_type o)
     : local (l), option (o), wantState (DISABLED), optionState (NONE), enabled (false)
 {}
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::term::BaseTelnetProtocol::TelnetHandler
 
 prefix_ senf::term::BaseTelnetProtocol::TelnetHandler::~TelnetHandler()
@@ -53,7 +58,7 @@ prefix_ std::string const & senf::term::telnethandler::TerminalType::terminalTyp
     return type_;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::term::telnethandler::NAWS
 
 prefix_ unsigned senf::term::telnethandler::NAWS::width()
@@ -68,7 +73,7 @@ prefix_ unsigned senf::term::telnethandler::NAWS::height()
     return height_;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::term::BaseTelnetProtocol
 
 prefix_ senf::term::BaseTelnetProtocol::~BaseTelnetProtocol()
@@ -82,7 +87,7 @@ prefix_ senf::term::BaseTelnetProtocol::Handle senf::term::BaseTelnetProtocol::h
 prefix_ void senf::term::BaseTelnetProtocol::incrementRequestCounter()
 {
     ++ pendingRequests_;
-    timeout_.timeout(senf::scheduler::eventTime() + requestTimeout_);
+    timeout_.timeout(scheduler::eventTime() + requestTimeout_);
 }
 
 prefix_ bool senf::term::BaseTelnetProtocol::requestsPending()
@@ -177,7 +182,7 @@ prefix_ void senf::term::BaseTelnetProtocol::emit(char c)
     v_charReceived(c);
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_