1 files changed, 6 insertions, 12 deletions
diff --git a/src/operator-namespace.cc b/src/operator-namespace.cc
index f03f0c7..96a3ee8 100644
--- a/src/operator-namespace.cc
+++ b/src/operator-namespace.cc
@@ -1,9 +1,10 @@
-/**  --------------------------------------------------------------------
+/**
  *  @file  operator-namespace.cc
  *  @brief  Operator for the NAMESPACE command.
  *  @author Andreas Aardal Hanssen
  *  @date 2002-2005
- *  -----------------------------------------------------------------  **/
+ */
+
 #include "depot.h"
 #include "iodevice.h"
 #include "iofactory.h"
@@ -14,28 +15,22 @@
 #include <iostream>
 #include <string>
 
-using namespace ::std;
 using namespace Binc;
 
-//----------------------------------------------------------------------
 NamespaceOperator::NamespaceOperator(void) {}
 
-//----------------------------------------------------------------------
 NamespaceOperator::~NamespaceOperator(void) {}
 
-//----------------------------------------------------------------------
-const string NamespaceOperator::getName(void) const
+const std::string NamespaceOperator::getName(void) const
 {
   return "NAMESPACE";
 }
 
-//----------------------------------------------------------------------
 int NamespaceOperator::getState(void) const
 {
   return Session::AUTHENTICATED | Session::SELECTED;
 }
 
-//----------------------------------------------------------------------
 Operator::ProcessResult NamespaceOperator::process(Depot &depot, Request &command)
 {
   bincClient << "* NAMESPACE ";
@@ -44,17 +39,16 @@ Operator::ProcessResult NamespaceOperator::process(Depot &depot, Request &comman
   bincClient << toImapString(depot.getPersonalNamespace());
   bincClient << " ";
   char c = depot.getDelimiter();
-  bincClient << toImapString(string(&c, 1));
+  bincClient << toImapString(std::string(&c, 1));
   bincClient << "))";
 
   bincClient << " NIL";  // others' namespaces
   bincClient << " NIL";  // shared namespaces
-  bincClient << endl;
+  bincClient << std::endl;
 
   return OK;
 }
 
-//----------------------------------------------------------------------
 Operator::ParseResult NamespaceOperator::parse(Request &c_in) const
 {
   Session &session = Session::getInstance();