Remove "using namespace std;".

13 files changed, 16 insertions, 24 deletions

diff --git a/src/crypto/crypto.cc b/src/crypto/crypto.cc
index 856d6ef..005cfcc 100644
--- a/src/crypto/crypto.cc
+++ b/src/crypto/crypto.cc
@@ -44,7 +44,6 @@
 #include "fatal_assert.h"
 #include "prng.h"
 
-using namespace std;
 using namespace Crypto;
 
 long int myatoi( const char *str )
diff --git a/src/examples/decrypt.cc b/src/examples/decrypt.cc
index f9868c5..b3b6cae 100644
--- a/src/examples/decrypt.cc
+++ b/src/examples/decrypt.cc
@@ -37,7 +37,6 @@
 #include "crypto.h"
 
 using namespace Crypto;
-using namespace std;
 
 int main( int argc, char *argv[] )
 {
@@ -51,8 +50,8 @@ int main( int argc, char *argv[] )
     Session session( key );
 
     /* Read input */
-    ostringstream input;
-    input << cin.rdbuf();
+    std::ostringstream input;
+    input << std::cin.rdbuf();
 
     /* Decrypt message */
 
@@ -60,9 +59,9 @@ int main( int argc, char *argv[] )
 
     fprintf( stderr, "Nonce = %ld\n",
 	     (long)message.nonce.val() );
-    cout << message.text;
+    std::cout << message.text;
   } catch ( const CryptoException &e ) {
-    cerr << e.what() << endl;
+    std::cerr << e.what() << std::endl;
     exit( 1 );
   }
 
diff --git a/src/examples/encrypt.cc b/src/examples/encrypt.cc
index b71cac5..da454bd 100644
--- a/src/examples/encrypt.cc
+++ b/src/examples/encrypt.cc
@@ -37,7 +37,6 @@
 #include "crypto.h"
 
 using namespace Crypto;
-using namespace std;
 
 int main( int argc, char *argv[] )
 {
@@ -52,18 +51,18 @@ int main( int argc, char *argv[] )
     Nonce nonce( myatoi( argv[ 1 ] ) );
 
     /* Read input */
-    ostringstream input;
-    input << cin.rdbuf();
+    std::ostringstream input;
+    input << std::cin.rdbuf();
 
     /* Encrypt message */
 
     string ciphertext = session.encrypt( Message( nonce, input.str() ) );
 
-    cerr << "Key: " << key.printable_key() << endl;
+    std::cerr << "Key: " << key.printable_key() << std::endl;
 
-    cout << ciphertext;
+    std::cout << ciphertext;
   } catch ( const CryptoException &e ) {
-    cerr << e.what() << endl;
+    std::cerr << e.what() << std::endl;
     exit( 1 );
   }
 
diff --git a/src/frontend/mosh-server.cc b/src/frontend/mosh-server.cc
index cc938de..21057e8 100644
--- a/src/frontend/mosh-server.cc
+++ b/src/frontend/mosh-server.cc
@@ -107,7 +107,6 @@ static int run_server( const char *desired_ip, const char *desired_port,
 		       const string &command_path, char *command_argv[],
 		       const int colors, unsigned int verbose, bool with_motd );
 
-using namespace std;
 
 static void print_version( FILE *file )
 {
@@ -150,7 +149,7 @@ static string get_SSH_IP( void )
     fputs( "Warning: SSH_CONNECTION not found; binding to any interface.\n", stderr );
     return string( "" );
   }
-  istringstream ss( SSH_CONNECTION );
+  std::istringstream ss( SSH_CONNECTION );
   string dummy, local_interface_IP;
   ss >> dummy >> dummy >> local_interface_IP;
   if ( !ss ) {
diff --git a/src/frontend/stmclient.cc b/src/frontend/stmclient.cc
index 8522ecd..e6e9b3a 100644
--- a/src/frontend/stmclient.cc
+++ b/src/frontend/stmclient.cc
@@ -63,6 +63,8 @@
 
 #include "networktransport-impl.h"
 
+using std::wstring;
+
 void STMClient::resume( void )
 {
   /* Restore termios state */
diff --git a/src/network/compressor.cc b/src/network/compressor.cc
index da93d76..d34b7cd 100644
--- a/src/network/compressor.cc
+++ b/src/network/compressor.cc
@@ -36,7 +36,6 @@
 #include "dos_assert.h"
 
 using namespace Network;
-using namespace std;
 
 string Compressor::compress_str( const string &input )
 {
diff --git a/src/network/network.cc b/src/network/network.cc
index ce3e760..bb05986 100644
--- a/src/network/network.cc
+++ b/src/network/network.cc
@@ -60,7 +60,6 @@
 #define AI_NUMERICSERV 0
 #endif
 
-using namespace std;
 using namespace Network;
 using namespace Crypto;
 
diff --git a/src/network/networktransport-impl.h b/src/network/networktransport-impl.h
index f6ec378..e632509 100644
--- a/src/network/networktransport-impl.h
+++ b/src/network/networktransport-impl.h
@@ -38,7 +38,6 @@
 #include "transportsender-impl.h"
 
 using namespace Network;
-using namespace std;
 
 template <class MyState, class RemoteState>
 Transport<MyState, RemoteState>::Transport( MyState &initial_state, RemoteState &initial_remote,
diff --git a/src/network/transportsender-impl.h b/src/network/transportsender-impl.h
index 2f9969b..518f176 100644
--- a/src/network/transportsender-impl.h
+++ b/src/network/transportsender-impl.h
@@ -45,7 +45,6 @@
 #include <limits.h>
 
 using namespace Network;
-using namespace std;
 
 template <class MyState>
 TransportSender<MyState>::TransportSender( Connection *s_connection, MyState &initial_state )
diff --git a/src/statesync/completeterminal.cc b/src/statesync/completeterminal.cc
index 94bcc14..c634693 100644
--- a/src/statesync/completeterminal.cc
+++ b/src/statesync/completeterminal.cc
@@ -161,7 +161,7 @@ bool Complete::set_echo_ack( uint64_t now )
 
 void Complete::register_input_frame( uint64_t n, uint64_t now )
 {
-  input_history.push_back( make_pair( n, now ) );
+  input_history.push_back( std::make_pair( n, now ) );
 }
 
 int Complete::wait_time( uint64_t now ) const
diff --git a/src/terminal/terminalfunctions.cc b/src/terminal/terminalfunctions.cc
index 03c384d..ca141dd 100644
--- a/src/terminal/terminalfunctions.cc
+++ b/src/terminal/terminalfunctions.cc
@@ -40,7 +40,6 @@
 #include "parseraction.h"
 
 using namespace Terminal;
-using namespace std;
 
 /* Terminal functions -- routines activated by CSI, escape or a control char */
 
diff --git a/src/terminal/terminaluserinput.cc b/src/terminal/terminaluserinput.cc
index 4161334..f811900 100644
--- a/src/terminal/terminaluserinput.cc
+++ b/src/terminal/terminaluserinput.cc
@@ -34,7 +34,7 @@
 #include "terminaluserinput.h"
 
 using namespace Terminal;
-using namespace std;
+using std::string;
 
 string UserInput::input( const Parser::UserByte *act,
 			 bool application_mode_cursor_keys )
diff --git a/src/util/locale_utils.cc b/src/util/locale_utils.cc
index 46697bd..469498e 100644
--- a/src/util/locale_utils.cc
+++ b/src/util/locale_utils.cc
@@ -45,12 +45,11 @@
 
 #include "locale_utils.h"
 
-using namespace std;
 
-const string LocaleVar::str( void ) const
+const std::string LocaleVar::str( void ) const
 {
   if ( name.empty() ) {
-    return string( "[no charset variables]" );
+    return std::string( "[no charset variables]" );
   }
   return name + "=" + value;
 }