X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FUtility.ct;fp=senf%2FUtils%2FConsole%2FUtility.ct;h=bc771dccffcf158cf5b3407189005e608ed2c4a7;hb=3aced0177a1c69c7af338b4e66db8694a71873ae;hp=603bbc7b0f7ace185f4cd13bc4c7dae99b7bb56a;hpb=5b2e9a63a43027c71ac470ac9bdecb72e8974951;p=senf.git

diff --git a/senf/Utils/Console/Utility.ct b/senf/Utils/Console/Utility.ct
index 603bbc7..bc771dc 100644
--- a/senf/Utils/Console/Utility.ct
+++ b/senf/Utils/Console/Utility.ct
@@ -42,7 +42,7 @@ prefix_ void senf::console::ArgumentTraits< senf::console::CharAsString<CharT> >
 parse(ParseCommandInfo::TokensRange const & tokens, CharAsString<CharT> & out)
 {
     std::string v;
-    senf::console::parse(tokens,v);
+    console::parse(tokens,v);
     if (v.size() != 1)
         throw SyntaxErrorException("Invalid size of character constant");
     out.value = static_cast<CharT>(v[0]);
@@ -59,14 +59,14 @@ template <class CharT>
 prefix_ std::string senf::console::ArgumentTraits< senf::console::CharAsString<CharT> >::
 str(CharAsString<CharT> value)
 {
-    return senf::console::str(std::string(1,value.value));
+    return console::str(std::string(1,value.value));
 }
 
 template <class CharT>
 prefix_ void senf::console::ReturnValueTraits< senf::console::CharAsString<CharT> >::
 format(CharAsString<CharT> value, std::ostream & os)
 {
-    return senf::console::format(std::string(1,value.value),os);
+    console::format(std::string(1,value.value),os);
 }
 
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
@@ -77,7 +77,7 @@ prefix_ void senf::console::ArgumentTraits< senf::console::ValueRange<T> >::
 parse(ParseCommandInfo::TokensRange const & tokens, type & out)
 {
     if (tokens.size() != 1)
-        throw senf::console::SyntaxErrorException("parameter syntax error");
+        throw SyntaxErrorException("parameter syntax error");
     std::string v (tokens.begin()[0].value());
     std::string::size_type i (v.find(':'));
     try {
@@ -89,7 +89,7 @@ parse(ParseCommandInfo::TokensRange const & tokens, type & out)
         }
     }
     catch (std::bad_cast & ex) {
-        throw senf::console::SyntaxErrorException("parameter syntax error");
+        throw SyntaxErrorException("parameter syntax error");
     }
 }
 
@@ -132,7 +132,7 @@ parse(ParseCommandInfo::TokensRange const & tokens, type & out)
     out.value = 0;
     while (arg) {
         Enum v;
-        senf::console::parse( *(arg++), v);
+        console::parse( *(arg++), v);
         out.value |= v;
     }
 }
@@ -149,7 +149,7 @@ prefix_ std::string
 senf::console::ArgumentTraits< senf::console::FlagCollection<Enum> >::str(type const & value)
 {
     std::stringstream ss;
-    senf::console::format(value, ss);
+    console::format(value, ss);
     return ss.str();
 }
 
@@ -166,7 +166,7 @@ format(type const & value, std::ostream & os)
     for (unsigned bit (0); bit<sizeof(value.value)*CHAR_BIT; ++bit, flag<<=1) {
         if (value.value & flag) {
             if (n++) ss << " ";
-            senf::console::format(static_cast<Enum>(flag), ss);
+            console::format(static_cast<Enum>(flag), ss);
         }
     }
     os << (n != 1 ? "(" + ss.str() + ")" : ss.str());