Merge PR #163: Don't use namespaces in headers in an inheritative way.

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();
 }
+
+}

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)
 {

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);
 }
+
+}

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

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

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

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

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
 

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