From ec727a11659c32deda8b5779ddbed96198256722 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Thu, 9 May 2019 18:33:26 +0200
Subject: [PATCH] Don't use namespaces in headers in an inheritative way.

---
 libnymea-core/cloud/cloudmanager.cpp          | 4 ++++
 libnymea-core/debugserverhandler.cpp          | 6 +++---
 libnymea-core/jsonrpc/tagshandler.cpp         | 4 ++++
 libnymea-core/networkmanager/networkdevice.h  | 7 +++----
 libnymea-core/networkmanager/networkmanager.h | 5 ++---
 libnymea-core/ruleengine.h                    | 3 +--
 libnymea-core/servermanager.h                 | 3 ++-
 libnymea-core/servers/mocktcpserver.h         | 6 ++++--
 tests/auto/nymeatestbase.h                    | 4 +++-
 9 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/libnymea-core/cloud/cloudmanager.cpp b/libnymea-core/cloud/cloudmanager.cpp
index 4da48a77..c1265752 100644
--- a/libnymea-core/cloud/cloudmanager.cpp
+++ b/libnymea-core/cloud/cloudmanager.cpp
@@ -32,6 +32,8 @@
 
 using namespace remoteproxyclient;
 
+namespace nymeaserver {
+
 CloudManager::CloudManager(NymeaConfiguration *configuration, NetworkManager *networkManager, QObject *parent):
     QObject(parent),
     m_configuration(configuration),
@@ -252,3 +254,5 @@ void CloudManager::awsDisconnected()
 {
     emit connectionStateChanged();
 }
+
+}
diff --git a/libnymea-core/debugserverhandler.cpp b/libnymea-core/debugserverhandler.cpp
index e0ceecb5..bb27c2b1 100644
--- a/libnymea-core/debugserverhandler.cpp
+++ b/libnymea-core/debugserverhandler.cpp
@@ -37,12 +37,12 @@
 #include <QFileInfo>
 #include <QWebSocket>
 
-QtMessageHandler DebugServerHandler::s_oldLogMessageHandler = nullptr;
-QList<QWebSocket*> DebugServerHandler::s_websocketClients;
-
 
 namespace nymeaserver {
 
+QtMessageHandler DebugServerHandler::s_oldLogMessageHandler = nullptr;
+QList<QWebSocket*> DebugServerHandler::s_websocketClients;
+
 DebugServerHandler::DebugServerHandler(QObject *parent) :
     QObject(parent)
 {
diff --git a/libnymea-core/jsonrpc/tagshandler.cpp b/libnymea-core/jsonrpc/tagshandler.cpp
index 45ef3576..601b296b 100644
--- a/libnymea-core/jsonrpc/tagshandler.cpp
+++ b/libnymea-core/jsonrpc/tagshandler.cpp
@@ -23,6 +23,8 @@
 #include "nymeacore.h"
 #include "tagging/tagsstorage.h"
 
+namespace nymeaserver {
+
 TagsHandler::TagsHandler(QObject *parent) : JsonHandler(parent)
 {
     QVariantMap params;
@@ -141,3 +143,5 @@ void TagsHandler::onTagValueChanged(const Tag &tag)
     params.insert("tag", JsonTypes::packTag(tag));
     emit TagValueChanged(params);
 }
+
+}
diff --git a/libnymea-core/networkmanager/networkdevice.h b/libnymea-core/networkmanager/networkdevice.h
index 65767021..286e1c0e 100644
--- a/libnymea-core/networkmanager/networkdevice.h
+++ b/libnymea-core/networkmanager/networkdevice.h
@@ -213,9 +213,8 @@ QDebug operator<<(QDebug debug, NetworkDevice *device);
 
 }
 
-using namespace nymeaserver;
-Q_DECLARE_METATYPE(NetworkDevice::NetworkDeviceType)
-Q_DECLARE_METATYPE(NetworkDevice::NetworkDeviceState)
-Q_DECLARE_METATYPE(NetworkDevice::NetworkDeviceStateReason)
+Q_DECLARE_METATYPE(nymeaserver::NetworkDevice::NetworkDeviceType)
+Q_DECLARE_METATYPE(nymeaserver::NetworkDevice::NetworkDeviceState)
+Q_DECLARE_METATYPE(nymeaserver::NetworkDevice::NetworkDeviceStateReason)
 
 #endif // NETWORKDEVICE_H
diff --git a/libnymea-core/networkmanager/networkmanager.h b/libnymea-core/networkmanager/networkmanager.h
index 1ae749d9..2d4de4df 100644
--- a/libnymea-core/networkmanager/networkmanager.h
+++ b/libnymea-core/networkmanager/networkmanager.h
@@ -160,8 +160,7 @@ private slots:
 
 }
 
-using namespace nymeaserver;
-Q_DECLARE_METATYPE(NetworkManager::NetworkManagerState)
-Q_DECLARE_METATYPE(NetworkManager::NetworkManagerError)
+Q_DECLARE_METATYPE(nymeaserver::NetworkManager::NetworkManagerState)
+Q_DECLARE_METATYPE(nymeaserver::NetworkManager::NetworkManagerError)
 
 #endif // NETWORKMANAGER_H
diff --git a/libnymea-core/ruleengine.h b/libnymea-core/ruleengine.h
index 40369712..21c20fdd 100644
--- a/libnymea-core/ruleengine.h
+++ b/libnymea-core/ruleengine.h
@@ -123,8 +123,7 @@ private:
 
 }
 
-using namespace nymeaserver;
-Q_DECLARE_METATYPE(RuleEngine::RuleError)
+Q_DECLARE_METATYPE(nymeaserver::RuleEngine::RuleError)
 
 
 #endif // RULEENGINE_H
diff --git a/libnymea-core/servermanager.h b/libnymea-core/servermanager.h
index 10f3df35..5edd9e02 100644
--- a/libnymea-core/servermanager.h
+++ b/libnymea-core/servermanager.h
@@ -29,7 +29,6 @@
 #include <QSslConfiguration>
 #include <QSslKey>
 
-class MockTcpServer;
 
 namespace nymeaserver {
 
@@ -42,6 +41,8 @@ class BluetoothServer;
 class RestServer;
 class MqttBroker;
 
+class MockTcpServer;
+
 class ServerManager : public QObject
 {
     Q_OBJECT
diff --git a/libnymea-core/servers/mocktcpserver.h b/libnymea-core/servers/mocktcpserver.h
index 9253d719..61328b7f 100644
--- a/libnymea-core/servers/mocktcpserver.h
+++ b/libnymea-core/servers/mocktcpserver.h
@@ -27,10 +27,10 @@
 
 #include "transportinterface.h"
 
-using namespace nymeaserver;
-
 class JsonRPCServer;
 
+namespace nymeaserver {
+
 class MockTcpServer : public TransportInterface
 {
     Q_OBJECT
@@ -61,5 +61,7 @@ private:
     QList<QUuid> m_connectedClients;
 };
 
+}
+
 #endif // TCPSERVER_H
 
diff --git a/tests/auto/nymeatestbase.h b/tests/auto/nymeatestbase.h
index 6da65e08..15d7910a 100644
--- a/tests/auto/nymeatestbase.h
+++ b/tests/auto/nymeatestbase.h
@@ -88,8 +88,8 @@ extern EventTypeId mockParentChildEventId;
 extern ActionTypeId mockParentChildActionId;
 extern StateTypeId mockParentChildStateId;
 
-using namespace nymeaserver;
 
+namespace nymeaserver {
 class MockTcpServer;
 
 class NymeaTestBase : public QObject
@@ -201,4 +201,6 @@ protected:
 
 };
 
+}
+
 #endif // NYMEATESTBASE_H