ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jenkins 2019-06-19 23:52:18 +02:00
commit 13766e865f
9 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnymea-core/cloud/cloudmanager.cpp
View File

@ -32,6 +32,8 @@
using namespace remoteproxyclient; using namespace remoteproxyclient;
namespace nymeaserver {
CloudManager::CloudManager(NymeaConfiguration *configuration, NetworkManager *networkManager, QObject *parent): CloudManager::CloudManager(NymeaConfiguration *configuration, NetworkManager *networkManager, QObject *parent):
QObject(parent), QObject(parent),
m_configuration(configuration), m_configuration(configuration),
@ -252,3 +254,5 @@ void CloudManager::awsDisconnected()
{ {
emit connectionStateChanged(); emit connectionStateChanged();
} }
}

6
libnymea-core/debugserverhandler.cpp
View File

@ -37,12 +37,12 @@
#include <QFileInfo> #include <QFileInfo>
#include <QWebSocket> #include <QWebSocket>
QtMessageHandler DebugServerHandler::s_oldLogMessageHandler = nullptr;
QList<QWebSocket*> DebugServerHandler::s_websocketClients;
namespace nymeaserver { namespace nymeaserver {
QtMessageHandler DebugServerHandler::s_oldLogMessageHandler = nullptr;
QList<QWebSocket*> DebugServerHandler::s_websocketClients;
DebugServerHandler::DebugServerHandler(QObject *parent) : DebugServerHandler::DebugServerHandler(QObject *parent) :
QObject(parent) QObject(parent)
{ {

4
libnymea-core/jsonrpc/tagshandler.cpp
View File

@ -23,6 +23,8 @@
#include "nymeacore.h" #include "nymeacore.h"
#include "tagging/tagsstorage.h" #include "tagging/tagsstorage.h"
namespace nymeaserver {
TagsHandler::TagsHandler(QObject *parent) : JsonHandler(parent) TagsHandler::TagsHandler(QObject *parent) : JsonHandler(parent)
{ {
QVariantMap params; QVariantMap params;
@ -141,3 +143,5 @@ void TagsHandler::onTagValueChanged(const Tag &tag)
params.insert("tag", JsonTypes::packTag(tag)); params.insert("tag", JsonTypes::packTag(tag));
emit TagValueChanged(params); emit TagValueChanged(params);
} }
}

7
libnymea-core/networkmanager/networkdevice.h
View File

@ -213,9 +213,8 @@ QDebug operator<<(QDebug debug, NetworkDevice *device);
} }
using namespace nymeaserver; Q_DECLARE_METATYPE(nymeaserver::NetworkDevice::NetworkDeviceType)
Q_DECLARE_METATYPE(NetworkDevice::NetworkDeviceType) Q_DECLARE_METATYPE(nymeaserver::NetworkDevice::NetworkDeviceState)
Q_DECLARE_METATYPE(NetworkDevice::NetworkDeviceState) Q_DECLARE_METATYPE(nymeaserver::NetworkDevice::NetworkDeviceStateReason)
Q_DECLARE_METATYPE(NetworkDevice::NetworkDeviceStateReason)
#endif // NETWORKDEVICE_H #endif // NETWORKDEVICE_H

5
libnymea-core/networkmanager/networkmanager.h
View File

@ -160,8 +160,7 @@ private slots:
} }
using namespace nymeaserver; Q_DECLARE_METATYPE(nymeaserver::NetworkManager::NetworkManagerState)
Q_DECLARE_METATYPE(NetworkManager::NetworkManagerState) Q_DECLARE_METATYPE(nymeaserver::NetworkManager::NetworkManagerError)
Q_DECLARE_METATYPE(NetworkManager::NetworkManagerError)
#endif // NETWORKMANAGER_H #endif // NETWORKMANAGER_H

3
libnymea-core/ruleengine.h
View File

@ -123,8 +123,7 @@ private:
} }
using namespace nymeaserver; Q_DECLARE_METATYPE(nymeaserver::RuleEngine::RuleError)
Q_DECLARE_METATYPE(RuleEngine::RuleError)
#endif // RULEENGINE_H #endif // RULEENGINE_H

3
libnymea-core/servermanager.h
View File

@ -29,7 +29,6 @@
#include <QSslConfiguration> #include <QSslConfiguration>
#include <QSslKey> #include <QSslKey>
class MockTcpServer;
namespace nymeaserver { namespace nymeaserver {
@ -42,6 +41,8 @@ class BluetoothServer;
class RestServer; class RestServer;
class MqttBroker; class MqttBroker;
class MockTcpServer;
class ServerManager : public QObject class ServerManager : public QObject
{ {
Q_OBJECT Q_OBJECT

6
libnymea-core/servers/mocktcpserver.h
View File

@ -27,10 +27,10 @@
#include "transportinterface.h" #include "transportinterface.h"
using namespace nymeaserver;
class JsonRPCServer; class JsonRPCServer;
namespace nymeaserver {
class MockTcpServer : public TransportInterface class MockTcpServer : public TransportInterface
{ {
Q_OBJECT Q_OBJECT
@ -61,5 +61,7 @@ private:
QList<QUuid> m_connectedClients; QList<QUuid> m_connectedClients;
}; };
}
#endif // TCPSERVER_H #endif // TCPSERVER_H

4
tests/auto/nymeatestbase.h
View File

@ -88,8 +88,8 @@ extern EventTypeId mockParentChildEventId;
extern ActionTypeId mockParentChildActionId; extern ActionTypeId mockParentChildActionId;
extern StateTypeId mockParentChildStateId; extern StateTypeId mockParentChildStateId;
using namespace nymeaserver;
namespace nymeaserver {
class MockTcpServer; class MockTcpServer;
class NymeaTestBase : public QObject class NymeaTestBase : public QObject
@ -201,4 +201,6 @@ protected:
}; };
}
#endif // NYMEATESTBASE_H #endif // NYMEATESTBASE_H