qa: Don't import whole Protocol namespace

Explicitly specify the Protocol namespace where needed. This avoids
warnings about hidden global symbols.

diff --git a/src/client/clientauthhandler.cpp b/src/client/clientauthhandler.cpp
index 5048554..52bd1e4 100644 (file)
--- a/src/client/clientauthhandler.cpp
+++ b/src/client/clientauthhandler.cpp
@@ -33,8 +33,6 @@
 #include "peerfactory.h"
 #include "util.h"
 
-using namespace Protocol;
-
 ClientAuthHandler::ClientAuthHandler(CoreAccount account, QObject* parent)
     : AuthHandler(parent)
     , _peer(nullptr)
@@ -294,16 +292,16 @@ void ClientAuthHandler::startRegistration()
     useSsl = _account.useSsl();
 #endif
 
-    _peer->dispatch(RegisterClient(Quassel::Features{}, Quassel::buildInfo().fancyVersionString, Quassel::buildInfo().commitDate, useSsl));
+    _peer->dispatch(Protocol::RegisterClient(Quassel::Features{}, Quassel::buildInfo().fancyVersionString, Quassel::buildInfo().commitDate, useSsl));
 }
 
-void ClientAuthHandler::handle(const ClientDenied& msg)
+void ClientAuthHandler::handle(const Protocol::ClientDenied& msg)
 {
     emit errorPopup(msg.errorString);
     requestDisconnect(tr("The core refused connection from this client"));
 }
 
-void ClientAuthHandler::handle(const ClientRegistered& msg)
+void ClientAuthHandler::handle(const Protocol::ClientRegistered& msg)
 {
     _coreConfigured = msg.coreConfigured;
     _backendInfo = msg.backendInfo;
@@ -340,17 +338,17 @@ void ClientAuthHandler::onConnectionReady()
         login();
 }
 
-void ClientAuthHandler::setupCore(const SetupData& setupData)
+void ClientAuthHandler::setupCore(const Protocol::SetupData& setupData)
 {
     _peer->dispatch(setupData);
 }
 
-void ClientAuthHandler::handle(const SetupFailed& msg)
+void ClientAuthHandler::handle(const Protocol::SetupFailed& msg)
 {
     emit coreSetupFailed(msg.errorString);
 }
 
-void ClientAuthHandler::handle(const SetupDone& msg)
+void ClientAuthHandler::handle(const Protocol::SetupDone& msg)
 {
     Q_UNUSED(msg)
 
@@ -377,22 +375,22 @@ void ClientAuthHandler::login(const QString& previousError)
         }
     }
 
-    _peer->dispatch(Login(_account.user(), _account.password()));
+    _peer->dispatch(Protocol::Login(_account.user(), _account.password()));
 }
 
-void ClientAuthHandler::handle(const LoginFailed& msg)
+void ClientAuthHandler::handle(const Protocol::LoginFailed& msg)
 {
     login(msg.errorString);
 }
 
-void ClientAuthHandler::handle(const LoginSuccess& msg)
+void ClientAuthHandler::handle(const Protocol::LoginSuccess& msg)
 {
     Q_UNUSED(msg)
 
     emit loginSuccessful(_account);
 }
 
-void ClientAuthHandler::handle(const SessionState& msg)
+void ClientAuthHandler::handle(const Protocol::SessionState& msg)
 {
     disconnect(socket(), nullptr, this, nullptr);  // this is the last message we shall ever get
 

diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp
index 3514ecd..ee505a7 100644 (file)
--- a/src/core/coreauthhandler.cpp
+++ b/src/core/coreauthhandler.cpp
@@ -26,8 +26,6 @@
 
 #include "core.h"
 
-using namespace Protocol;
-
 CoreAuthHandler::CoreAuthHandler(QTcpSocket* socket, QObject* parent)
     : AuthHandler(parent)
     , _peer(nullptr)
@@ -140,7 +138,7 @@ void CoreAuthHandler::onProtocolVersionMismatch(int actual, int expected)
                              "This core needs at least client/core protocol version %1 (got: %2).<br>"
                              "Please consider upgrading your client.")
                               .arg(expected, actual);
-    _peer->dispatch(ClientDenied(errorString));
+    _peer->dispatch(Protocol::ClientDenied(errorString));
     _peer->close();
 }
 
@@ -150,14 +148,14 @@ bool CoreAuthHandler::checkClientRegistered()
         qWarning() << qPrintable(tr("Client")) << qPrintable(socket()->peerAddress().toString())
                    << qPrintable(tr("did not send a registration message before trying to login, rejecting."));
         _peer->dispatch(
-            ClientDenied(tr("<b>Client not initialized!</b><br>You need to send a registration message before trying to login.")));
+            Protocol::ClientDenied(tr("<b>Client not initialized!</b><br>You need to send a registration message before trying to login.")));
         _peer->close();
         return false;
     }
     return true;
 }
 
-void CoreAuthHandler::handle(const RegisterClient& msg)
+void CoreAuthHandler::handle(const Protocol::RegisterClient& msg)
 {
     bool useSsl;
     if (_legacy)
@@ -167,7 +165,7 @@ void CoreAuthHandler::handle(const RegisterClient& msg)
 
     if (Quassel::isOptionSet("require-ssl") && !useSsl && !_peer->isLocal()) {
         qInfo() << qPrintable(tr("SSL required but non-SSL connection attempt from %1").arg(socket()->peerAddress().toString()));
-        _peer->dispatch(ClientDenied(tr("<b>SSL is required!</b><br>You need to use SSL in order to connect to this core.")));
+        _peer->dispatch(Protocol::ClientDenied(tr("<b>SSL is required!</b><br>You need to use SSL in order to connect to this core.")));
         _peer->close();
         return;
     }
@@ -186,7 +184,7 @@ void CoreAuthHandler::handle(const RegisterClient& msg)
         }
     }
 
-    _peer->dispatch(ClientRegistered(Quassel::Features{}, configured, backends, authenticators, useSsl));
+    _peer->dispatch(Protocol::ClientRegistered(Quassel::Features{}, configured, backends, authenticators, useSsl));
 
     // useSsl is only used for the legacy protocol
     if (_legacy && useSsl)
@@ -195,7 +193,7 @@ void CoreAuthHandler::handle(const RegisterClient& msg)
     _clientRegistered = true;
 }
 
-void CoreAuthHandler::handle(const SetupData& msg)
+void CoreAuthHandler::handle(const Protocol::SetupData& msg)
 {
     if (!checkClientRegistered())
         return;
@@ -210,12 +208,12 @@ void CoreAuthHandler::handle(const SetupData& msg)
 
     QString result = Core::setup(msg.adminUser, msg.adminPassword, msg.backend, msg.setupData, authenticator, msg.authSetupData);
     if (!result.isEmpty())
-        _peer->dispatch(SetupFailed(result));
+        _peer->dispatch(Protocol::SetupFailed(result));
     else
-        _peer->dispatch(SetupDone());
+        _peer->dispatch(Protocol::SetupDone());
 }
 
-void CoreAuthHandler::handle(const Login& msg)
+void CoreAuthHandler::handle(const Protocol::Login& msg)
 {
     if (!checkClientRegistered())
         return;
@@ -223,7 +221,7 @@ void CoreAuthHandler::handle(const Login& msg)
     if (!Core::isConfigured()) {
         qWarning() << qPrintable(tr("Client")) << qPrintable(socket()->peerAddress().toString())
                    << qPrintable(tr("attempted to login before the core was configured, rejecting."));
-        _peer->dispatch(ClientDenied(
+        _peer->dispatch(Protocol::ClientDenied(
             tr("<b>Attempted to login before core was configured!</b><br>The core must be configured before attempting to login.")));
         return;
     }
@@ -237,11 +235,11 @@ void CoreAuthHandler::handle(const Login& msg)
 
     if (uid == 0) {
         qInfo() << qPrintable(tr("Invalid login attempt from %1 as \"%2\"").arg(socket()->peerAddress().toString(), msg.user));
-        _peer->dispatch(LoginFailed(tr(
+        _peer->dispatch(Protocol::LoginFailed(tr(
             "<b>Invalid username or password!</b><br>The username/password combination you supplied could not be found in the database.")));
         return;
     }
-    _peer->dispatch(LoginSuccess());
+    _peer->dispatch(Protocol::LoginSuccess());
 
     qInfo() << qPrintable(tr("Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3).")
                           .arg(socket()->peerAddress().toString(), msg.user, QString::number(uid.toInt())));