Avoid using excessive namespaces

Try to be more clear about what things are external to the current
context, and what aren't.

diff --git a/common/rfb/CSecurityVeNCrypt.cxx b/common/rfb/CSecurityVeNCrypt.cxx
index d63549762bbe0af26ac384b330a1ad351615dc17..3ebb38552c2f3a45404dec8da85e8466788300a3 100644 (file)
--- a/common/rfb/CSecurityVeNCrypt.cxx
+++ b/common/rfb/CSecurityVeNCrypt.cxx
@@ -37,8 +37,6 @@
 #include <rfb/LogWriter.h>
 
 using namespace rfb;
-using namespace rdr;
-using namespace std;
 
 static LogWriter vlog("CVeNCrypt");
 
@@ -68,8 +66,8 @@ CSecurityVeNCrypt::~CSecurityVeNCrypt()
 
 bool CSecurityVeNCrypt::processMsg()
 {
-  InStream* is = cc->getInStream();
-  OutStream* os = cc->getOutStream();
+  rdr::InStream* is = cc->getInStream();
+  rdr::OutStream* os = cc->getOutStream();
 
   /* get major, minor versions, send what we can support (or 0.0 for can't support it) */
   if (!haveRecvdMajorVersion) {
@@ -159,7 +157,7 @@ bool CSecurityVeNCrypt::processMsg()
     if (!haveChosenType) {
       chosenType = secTypeInvalid;
       uint8_t i;
-      list<uint32_t> secTypes;
+      std::list<uint32_t> secTypes;
 
       secTypes = security->GetEnabledExtSecTypes();
 

diff --git a/common/rfb/PixelBuffer.cxx b/common/rfb/PixelBuffer.cxx
index f1354a437c1b02627ae0914b28910008015cc2ee..0a287544bc9d35955e7d31470d380e4373a8a62a 100644 (file)
--- a/common/rfb/PixelBuffer.cxx
+++ b/common/rfb/PixelBuffer.cxx
@@ -33,7 +33,6 @@
 #include <rfb/PixelBuffer.h>
 
 using namespace rfb;
-using namespace rdr;
 
 static LogWriter vlog("PixelBuffer");
 

diff --git a/common/rfb/SSecurityVeNCrypt.cxx b/common/rfb/SSecurityVeNCrypt.cxx
index 27ee1fe229a3447b8d2a34c311ff5fd53f430bb2..164ea927b990534d4b47e94892037b92809927b0 100644 (file)
--- a/common/rfb/SSecurityVeNCrypt.cxx
+++ b/common/rfb/SSecurityVeNCrypt.cxx
@@ -33,8 +33,6 @@
 #include <rdr/OutStream.h>
 
 using namespace rfb;
-using namespace rdr;
-using namespace std;
 
 static LogWriter vlog("SVeNCrypt");
 
@@ -120,7 +118,7 @@ bool SSecurityVeNCrypt::processMsg()
    * followed by authentication types (uint32_t:s)
    */
   if (!haveSentTypes) {
-    list<uint32_t> listSubTypes;
+    std::list<uint32_t> listSubTypes;
 
     listSubTypes = security->GetEnabledExtSecTypes();
 

diff --git a/common/rfb/Security.cxx b/common/rfb/Security.cxx
index 01191c6537b273efb6e9d4aad1593bd65859e141..3b0d95bf0f98db2e4346ea7f3e4dc3f1362b82d9 100644 (file)
--- a/common/rfb/Security.cxx
+++ b/common/rfb/Security.cxx
@@ -30,7 +30,6 @@
 #include <rfb/util.h>
 
 using namespace rfb;
-using namespace std;
 
 static LogWriter vlog("Security");
 
@@ -51,7 +50,7 @@ Security::Security(StringParameter &secTypes)
 
 const std::list<uint8_t> Security::GetEnabledSecTypes(void)
 {
-  list<uint8_t> result;
+  std::list<uint8_t> result;
 
   /* Partial workaround for Vino's stupid behaviour. It doesn't allow
    * the basic authentication types as part of the VeNCrypt handshake,
@@ -74,7 +73,7 @@ const std::list<uint8_t> Security::GetEnabledSecTypes(void)
 
 const std::list<uint32_t> Security::GetEnabledExtSecTypes(void)
 {
-  list<uint32_t> result;
+  std::list<uint32_t> result;
 
   for (uint32_t type : enabledSecTypes)
     if (type != secTypeVeNCrypt) /* Do not include VeNCrypt type to avoid loops */

diff --git a/common/rfb/SecurityClient.cxx b/common/rfb/SecurityClient.cxx
index 63e0cadc0f741f251398469480babf70c1c1a0ad..d1507eb5c3afd506d4579e819d620ba1440b6a91 100644 (file)
--- a/common/rfb/SecurityClient.cxx
+++ b/common/rfb/SecurityClient.cxx
@@ -27,7 +27,7 @@
 #include <rfb/CSecurityVeNCrypt.h>
 #include <rfb/CSecurityVncAuth.h>
 #include <rfb/CSecurityPlain.h>
-#include <rdr/Exception.h>
+#include <rfb/Exception.h>
 #include <rfb/Security.h>
 #ifdef HAVE_GNUTLS
 #include <rfb/CSecurityTLS.h>
@@ -38,7 +38,6 @@
 #include <rfb/CSecurityMSLogonII.h>
 #endif
 
-using namespace rdr;
 using namespace rfb;
 
 UserPasswdGetter *CSecurity::upg = nullptr;

diff --git a/common/rfb/SecurityServer.cxx b/common/rfb/SecurityServer.cxx
index 3e23a89ddde25fdbeef283b60401f3d45480fe56..b52977366ef44ec54fb01dc17568c2bc58f3d34f 100644 (file)
--- a/common/rfb/SecurityServer.cxx
+++ b/common/rfb/SecurityServer.cxx
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <rdr/Exception.h>
+#include <rfb/Exception.h>
 #include <rfb/Security.h>
 #include <rfb/SSecurityNone.h>
 #include <rfb/SSecurityStack.h>
@@ -35,7 +35,6 @@
 #include <rfb/SSecurityRSAAES.h>
 #endif
 
-using namespace rdr;
 using namespace rfb;
 
 StringParameter SecurityServer::secTypes