diff --git a/libnymea-core/bluetoothserver.cpp b/libnymea-core/bluetoothserver.cpp index 7b7c1a7d..4cc1e272 100644 --- a/libnymea-core/bluetoothserver.cpp +++ b/libnymea-core/bluetoothserver.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::BluetoothServer + \class nymeaserver::BluetoothServer \brief This class represents the bluetooth server for nymead. \ingroup server @@ -40,7 +40,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { static const QBluetoothUuid serviceUuid(QUuid("997936b5-d2cd-4c57-b41b-c6048320cd2b")); /*! Constructs a \l{BluetoothServer} with the given \a parent. */ diff --git a/libnymea-core/bluetoothserver.h b/libnymea-core/bluetoothserver.h index 5c02a58f..d01f0d0b 100644 --- a/libnymea-core/bluetoothserver.h +++ b/libnymea-core/bluetoothserver.h @@ -27,7 +27,7 @@ #include "transportinterface.h" -namespace guhserver { +namespace nymeaserver { class BluetoothServer : public TransportInterface { diff --git a/libnymea-core/certificategenerator.cpp b/libnymea-core/certificategenerator.cpp index 4e3d7006..f5c509b9 100644 --- a/libnymea-core/certificategenerator.cpp +++ b/libnymea-core/certificategenerator.cpp @@ -28,7 +28,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { void CertificateGenerator::generate(const QString &certificateFilename, const QString &keyFilename) { diff --git a/libnymea-core/certificategenerator.h b/libnymea-core/certificategenerator.h index 32a25274..2c1c7163 100644 --- a/libnymea-core/certificategenerator.h +++ b/libnymea-core/certificategenerator.h @@ -23,7 +23,7 @@ #include -namespace guhserver { +namespace nymeaserver { class CertificateGenerator { diff --git a/libnymea-core/debugserverhandler.cpp b/libnymea-core/debugserverhandler.cpp index f3dd9193..8a61140e 100644 --- a/libnymea-core/debugserverhandler.cpp +++ b/libnymea-core/debugserverhandler.cpp @@ -28,7 +28,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { DebugServerHandler::DebugServerHandler(QObject *parent) : QObject(parent) { diff --git a/libnymea-core/debugserverhandler.h b/libnymea-core/debugserverhandler.h index 7073d437..9ec0446a 100644 --- a/libnymea-core/debugserverhandler.h +++ b/libnymea-core/debugserverhandler.h @@ -25,7 +25,7 @@ #include "httpreply.h" -namespace guhserver { +namespace nymeaserver { class DebugServerHandler : public QObject { diff --git a/libnymea-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.cpp b/libnymea-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.cpp index 1ecd2cf8..a8bd101f 100644 --- a/libnymea-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.cpp +++ b/libnymea-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.cpp @@ -24,7 +24,7 @@ #include -namespace guhserver { +namespace nymeaserver { BluetoothDiscoveryReplyImplementation::BluetoothDiscoveryReplyImplementation(QObject *parent) : BluetoothDiscoveryReply(parent) diff --git a/libnymea-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.h b/libnymea-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.h index c02045ca..822527a3 100644 --- a/libnymea-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.h +++ b/libnymea-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.h @@ -28,7 +28,7 @@ #include "hardware/bluetoothlowenergy/bluetoothdiscoveryreply.h" -namespace guhserver { +namespace nymeaserver { class BluetoothDiscoveryReplyImplementation : public BluetoothDiscoveryReply { diff --git a/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.cpp b/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.cpp index 23be6d0f..7003e557 100644 --- a/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.cpp +++ b/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.cpp @@ -23,7 +23,7 @@ #include "bluetoothlowenergydeviceimplementation.h" #include "loggingcategories.h" -namespace guhserver { +namespace nymeaserver { QString BluetoothLowEnergyDeviceImplementation::name() const { diff --git a/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.h b/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.h index e9c24f10..5768b232 100644 --- a/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.h +++ b/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.h @@ -31,7 +31,7 @@ #include "hardware/bluetoothlowenergy/bluetoothlowenergydevice.h" -namespace guhserver { +namespace nymeaserver { class BluetoothLowEnergyDeviceImplementation : public BluetoothLowEnergyDevice { diff --git a/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.cpp b/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.cpp index eddcf819..bb980eb1 100644 --- a/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.cpp +++ b/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.cpp @@ -23,7 +23,7 @@ #include "bluetoothlowenergymanagerimplementation.h" #include "loggingcategories.h" -namespace guhserver { +namespace nymeaserver { BluetoothLowEnergyManagerImplementation::BluetoothLowEnergyManagerImplementation(PluginTimer *reconnectTimer, QObject *parent) : BluetoothLowEnergyManager(parent), diff --git a/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.h b/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.h index d3f443ae..db1fd7ec 100644 --- a/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.h +++ b/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.h @@ -36,7 +36,7 @@ #include "hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.h" #include "hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.h" -namespace guhserver { +namespace nymeaserver { class BluetoothLowEnergyManagerImplementation : public BluetoothLowEnergyManager { diff --git a/libnymea-core/hardware/network/avahi/qtavahiclient.cpp b/libnymea-core/hardware/network/avahi/qtavahiclient.cpp index dcf2b3a2..5a0e7128 100644 --- a/libnymea-core/hardware/network/avahi/qtavahiclient.cpp +++ b/libnymea-core/hardware/network/avahi/qtavahiclient.cpp @@ -29,7 +29,7 @@ #include -namespace guhserver { +namespace nymeaserver { QtAvahiClient::QtAvahiClient(QObject *parent) : QObject(parent), diff --git a/libnymea-core/hardware/network/avahi/qtavahiclient.h b/libnymea-core/hardware/network/avahi/qtavahiclient.h index 2d35c22a..00855f49 100644 --- a/libnymea-core/hardware/network/avahi/qtavahiclient.h +++ b/libnymea-core/hardware/network/avahi/qtavahiclient.h @@ -26,7 +26,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { class QtAvahiClient : public QObject { diff --git a/libnymea-core/hardware/network/avahi/qtavahiservice.cpp b/libnymea-core/hardware/network/avahi/qtavahiservice.cpp index cb4c21c6..26900d3d 100644 --- a/libnymea-core/hardware/network/avahi/qtavahiservice.cpp +++ b/libnymea-core/hardware/network/avahi/qtavahiservice.cpp @@ -52,7 +52,7 @@ #include "qtavahiservice_p.h" #include "loggingcategories.h" -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l{QtAvahiService} with the given \a parent. */ QtAvahiService::QtAvahiService(QObject *parent) : diff --git a/libnymea-core/hardware/network/avahi/qtavahiservice.h b/libnymea-core/hardware/network/avahi/qtavahiservice.h index 0dc977cb..9daea45c 100644 --- a/libnymea-core/hardware/network/avahi/qtavahiservice.h +++ b/libnymea-core/hardware/network/avahi/qtavahiservice.h @@ -28,7 +28,7 @@ #include -namespace guhserver { +namespace nymeaserver { class QtAvahiServicePrivate; diff --git a/libnymea-core/hardware/network/avahi/qtavahiservice_p.cpp b/libnymea-core/hardware/network/avahi/qtavahiservice_p.cpp index 7adef693..7e480145 100644 --- a/libnymea-core/hardware/network/avahi/qtavahiservice_p.cpp +++ b/libnymea-core/hardware/network/avahi/qtavahiservice_p.cpp @@ -27,7 +27,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { QtAvahiServicePrivate::QtAvahiServicePrivate() : client(0), diff --git a/libnymea-core/hardware/network/avahi/qtavahiservice_p.h b/libnymea-core/hardware/network/avahi/qtavahiservice_p.h index 83e9bfbf..654f3809 100644 --- a/libnymea-core/hardware/network/avahi/qtavahiservice_p.h +++ b/libnymea-core/hardware/network/avahi/qtavahiservice_p.h @@ -33,7 +33,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { class QtAvahiServicePrivate { diff --git a/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation.cpp b/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation.cpp index f2a970fb..c523a7dd 100644 --- a/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation.cpp +++ b/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation.cpp @@ -42,7 +42,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l{QtAvahiServiceBrowserImplementation} with the given \a parent. */ QtAvahiServiceBrowserImplementation::QtAvahiServiceBrowserImplementation(QObject *parent) : diff --git a/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation.h b/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation.h index 1cb5fd25..fba0af8d 100644 --- a/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation.h +++ b/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation.h @@ -32,7 +32,7 @@ #include "network/avahi/qtavahiservicebrowser.h" -namespace guhserver { +namespace nymeaserver { class QtAvahiServiceBrowserImplementationPrivate; diff --git a/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation_p.cpp b/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation_p.cpp index f126a3c6..10f5c6f5 100644 --- a/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation_p.cpp +++ b/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation_p.cpp @@ -28,7 +28,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { QtAvahiServiceBrowserImplementationPrivate::QtAvahiServiceBrowserImplementationPrivate(QtAvahiClient *client) : client(client), diff --git a/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation_p.h b/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation_p.h index 07e22ad3..f8786e23 100644 --- a/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation_p.h +++ b/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation_p.h @@ -31,7 +31,7 @@ #include "qtavahiservice.h" -namespace guhserver { +namespace nymeaserver { class QtAvahiServiceTypeBrowserImplementation; diff --git a/libnymea-core/hardware/network/networkaccessmanagerimpl.cpp b/libnymea-core/hardware/network/networkaccessmanagerimpl.cpp index 45d259af..9628b4e7 100644 --- a/libnymea-core/hardware/network/networkaccessmanagerimpl.cpp +++ b/libnymea-core/hardware/network/networkaccessmanagerimpl.cpp @@ -35,7 +35,7 @@ #include "networkaccessmanagerimpl.h" #include "loggingcategories.h" -namespace guhserver { +namespace nymeaserver { /*! Construct the hardware resource NetworkAccessManagerImpl with the given \a parent. */ NetworkAccessManagerImpl::NetworkAccessManagerImpl(QNetworkAccessManager *networkManager, QObject *parent) : diff --git a/libnymea-core/hardware/network/networkaccessmanagerimpl.h b/libnymea-core/hardware/network/networkaccessmanagerimpl.h index 9c15cc52..d9c4457a 100644 --- a/libnymea-core/hardware/network/networkaccessmanagerimpl.h +++ b/libnymea-core/hardware/network/networkaccessmanagerimpl.h @@ -34,7 +34,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { class NetworkAccessManagerImpl : public NetworkAccessManager { diff --git a/libnymea-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp b/libnymea-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp index cf49dfa9..77777ab0 100644 --- a/libnymea-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp +++ b/libnymea-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp @@ -53,7 +53,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { /*! Construct the hardware resource UpnpDiscoveryImplementation with the given \a parent. */ UpnpDiscoveryImplementation::UpnpDiscoveryImplementation(QNetworkAccessManager *networkAccessManager, QObject *parent) : diff --git a/libnymea-core/hardware/network/upnp/upnpdiscoveryimplementation.h b/libnymea-core/hardware/network/upnp/upnpdiscoveryimplementation.h index 1169c387..29b54e03 100644 --- a/libnymea-core/hardware/network/upnp/upnpdiscoveryimplementation.h +++ b/libnymea-core/hardware/network/upnp/upnpdiscoveryimplementation.h @@ -40,7 +40,7 @@ // Discovering UPnP devices reference: http://upnp.org/specs/arch/UPnP-arch-DeviceArchitecture-v1.1.pdf // guh basic device reference: http://upnp.org/specs/basic/UPnP-basic-Basic-v1-Device.pdf -namespace guhserver { +namespace nymeaserver { class UpnpDiscoveryImplementation : public UpnpDiscovery { diff --git a/libnymea-core/hardware/network/upnp/upnpdiscoveryreplyimplementation.cpp b/libnymea-core/hardware/network/upnp/upnpdiscoveryreplyimplementation.cpp index 99054e7c..0d122369 100644 --- a/libnymea-core/hardware/network/upnp/upnpdiscoveryreplyimplementation.cpp +++ b/libnymea-core/hardware/network/upnp/upnpdiscoveryreplyimplementation.cpp @@ -24,7 +24,7 @@ #include -namespace guhserver { +namespace nymeaserver { UpnpDiscoveryReplyImplementation::UpnpDiscoveryReplyImplementation(const QString &searchTarget, const QString &userAgent, QObject *parent) : UpnpDiscoveryReply(parent), diff --git a/libnymea-core/hardware/network/upnp/upnpdiscoveryreplyimplementation.h b/libnymea-core/hardware/network/upnp/upnpdiscoveryreplyimplementation.h index 113e9285..fe33942a 100644 --- a/libnymea-core/hardware/network/upnp/upnpdiscoveryreplyimplementation.h +++ b/libnymea-core/hardware/network/upnp/upnpdiscoveryreplyimplementation.h @@ -28,7 +28,7 @@ #include "network/upnp/upnpdiscoveryreply.h" #include "network/upnp/upnpdevicedescriptor.h" -namespace guhserver { +namespace nymeaserver { class UpnpDiscoveryReplyImplementation : public UpnpDiscoveryReply { diff --git a/libnymea-core/hardware/network/upnp/upnpdiscoveryrequest.cpp b/libnymea-core/hardware/network/upnp/upnpdiscoveryrequest.cpp index b7675e00..6d6747a1 100644 --- a/libnymea-core/hardware/network/upnp/upnpdiscoveryrequest.cpp +++ b/libnymea-core/hardware/network/upnp/upnpdiscoveryrequest.cpp @@ -23,7 +23,7 @@ #include "upnpdiscoveryrequest.h" #include "loggingcategories.h" -namespace guhserver { +namespace nymeaserver { UpnpDiscoveryRequest::UpnpDiscoveryRequest(UpnpDiscovery *upnpDiscovery, QPointer reply): QObject(upnpDiscovery), diff --git a/libnymea-core/hardware/network/upnp/upnpdiscoveryrequest.h b/libnymea-core/hardware/network/upnp/upnpdiscoveryrequest.h index 0782a711..e9ca49cd 100644 --- a/libnymea-core/hardware/network/upnp/upnpdiscoveryrequest.h +++ b/libnymea-core/hardware/network/upnp/upnpdiscoveryrequest.h @@ -36,7 +36,7 @@ class UpnpDiscovery; -namespace guhserver { +namespace nymeaserver { class UpnpDiscoveryRequest : public QObject { diff --git a/libnymea-core/hardware/plugintimermanagerimplementation.cpp b/libnymea-core/hardware/plugintimermanagerimplementation.cpp index 8d1e100a..11f2c65d 100644 --- a/libnymea-core/hardware/plugintimermanagerimplementation.cpp +++ b/libnymea-core/hardware/plugintimermanagerimplementation.cpp @@ -24,7 +24,7 @@ #include "loggingcategories.h" #include "nymeacore.h" -namespace guhserver { +namespace nymeaserver { PluginTimerImplementation::PluginTimerImplementation(int intervall, QObject *parent) : PluginTimer(parent), diff --git a/libnymea-core/hardware/plugintimermanagerimplementation.h b/libnymea-core/hardware/plugintimermanagerimplementation.h index b06cc3db..9d9db584 100644 --- a/libnymea-core/hardware/plugintimermanagerimplementation.h +++ b/libnymea-core/hardware/plugintimermanagerimplementation.h @@ -29,7 +29,7 @@ #include "plugintimer.h" -namespace guhserver { +namespace nymeaserver { class PluginTimerImplementation : public PluginTimer { diff --git a/libnymea-core/hardware/radio433/radio433brennenstuhl.cpp b/libnymea-core/hardware/radio433/radio433brennenstuhl.cpp index 4323001d..91587c36 100644 --- a/libnymea-core/hardware/radio433/radio433brennenstuhl.cpp +++ b/libnymea-core/hardware/radio433/radio433brennenstuhl.cpp @@ -53,7 +53,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Construct the hardware resource Radio433 with the given \a parent. Each possible 433 MHz hardware will be initialized here. */ Radio433Brennenstuhl::Radio433Brennenstuhl(QObject *parent) : diff --git a/libnymea-core/hardware/radio433/radio433brennenstuhl.h b/libnymea-core/hardware/radio433/radio433brennenstuhl.h index 6dcc4b71..7a34595c 100644 --- a/libnymea-core/hardware/radio433/radio433brennenstuhl.h +++ b/libnymea-core/hardware/radio433/radio433brennenstuhl.h @@ -30,7 +30,7 @@ #include "hardware/radio433/radio433.h" #include "radio433brennenstuhlgateway.h" -namespace guhserver { +namespace nymeaserver { class Radio433Brennenstuhl : public Radio433 { diff --git a/libnymea-core/hardware/radio433/radio433brennenstuhlgateway.cpp b/libnymea-core/hardware/radio433/radio433brennenstuhlgateway.cpp index 1f718494..be238abc 100644 --- a/libnymea-core/hardware/radio433/radio433brennenstuhlgateway.cpp +++ b/libnymea-core/hardware/radio433/radio433brennenstuhlgateway.cpp @@ -23,7 +23,7 @@ #include "radio433brennenstuhlgateway.h" #include "loggingcategories.h" -namespace guhserver { +namespace nymeaserver { Radio433BrennenstuhlGateway::Radio433BrennenstuhlGateway(QObject *parent) : QObject(parent) diff --git a/libnymea-core/hardware/radio433/radio433brennenstuhlgateway.h b/libnymea-core/hardware/radio433/radio433brennenstuhlgateway.h index c692168b..858e8e8e 100644 --- a/libnymea-core/hardware/radio433/radio433brennenstuhlgateway.h +++ b/libnymea-core/hardware/radio433/radio433brennenstuhlgateway.h @@ -30,7 +30,7 @@ #include "libnymea.h" -namespace guhserver { +namespace nymeaserver { class Radio433BrennenstuhlGateway : public QObject { diff --git a/libnymea-core/hardware/radio433/radio433transmitter.cpp b/libnymea-core/hardware/radio433/radio433transmitter.cpp index c09edcc3..8218a2ce 100644 --- a/libnymea-core/hardware/radio433/radio433transmitter.cpp +++ b/libnymea-core/hardware/radio433/radio433transmitter.cpp @@ -22,7 +22,7 @@ #include "radio433transmitter.h" -namespace guhserver { +namespace nymeaserver { Radio433Trasmitter::Radio433Trasmitter(QObject *parent, int gpio) : QThread(parent),m_gpioPin(gpio) diff --git a/libnymea-core/hardware/radio433/radio433transmitter.h b/libnymea-core/hardware/radio433/radio433transmitter.h index 75f0a4f3..2c53e344 100644 --- a/libnymea-core/hardware/radio433/radio433transmitter.h +++ b/libnymea-core/hardware/radio433/radio433transmitter.h @@ -32,7 +32,7 @@ #include "libnymea.h" #include "hardware/gpio.h" -namespace guhserver { +namespace nymeaserver { class Radio433Trasmitter : public QThread { diff --git a/libnymea-core/hardwaremanagerimplementation.cpp b/libnymea-core/hardwaremanagerimplementation.cpp index 6236a9b0..68e44a2d 100644 --- a/libnymea-core/hardwaremanagerimplementation.cpp +++ b/libnymea-core/hardwaremanagerimplementation.cpp @@ -30,7 +30,7 @@ #include "hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.h" #include "hardware/network/avahi/qtavahiservicebrowserimplementation.h" -namespace guhserver { +namespace nymeaserver { HardwareManagerImplementation::HardwareManagerImplementation(QObject *parent) : HardwareManager(parent) diff --git a/libnymea-core/hardwaremanagerimplementation.h b/libnymea-core/hardwaremanagerimplementation.h index 2f1adb0c..497bfee5 100644 --- a/libnymea-core/hardwaremanagerimplementation.h +++ b/libnymea-core/hardwaremanagerimplementation.h @@ -38,7 +38,7 @@ class QtAvahiServiceBrowser; class BluetoothLowEnergyManager; -namespace guhserver { +namespace nymeaserver { class HardwareManagerImplementation : public HardwareManager { diff --git a/libnymea-core/httpreply.cpp b/libnymea-core/httpreply.cpp index 040290b8..0b61ab55 100644 --- a/libnymea-core/httpreply.cpp +++ b/libnymea-core/httpreply.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::HttpReply + \class nymeaserver::HttpReply \brief Represents a reply of the guh webserver to a \l{HttpRequest}. \ingroup api @@ -31,7 +31,7 @@ \note RFC 7231 HTTP/1.1 Semantics and Content -> \l{http://tools.ietf.org/html/rfc7231}{http://tools.ietf.org/html/rfc7231} */ -/*! \enum guhserver::HttpReply::HttpStatusCode +/*! \enum nymeaserver::HttpReply::HttpStatusCode This enum type specifies the status code of a HTTP webserver reply. @@ -75,7 +75,7 @@ The HTTP version is not supported. The only supported version is HTTP/1.1. */ -/*! \enum guhserver::HttpReply::HttpHeaderType +/*! \enum nymeaserver::HttpReply::HttpHeaderType This enum type specifies the known type of a header in a HTTP webserver reply. You can find more information here: \l{http://tools.ietf.org/html/rfc7231#section-5} @@ -99,7 +99,7 @@ The name of the server i.e. "Server: guh/0.6.0" */ -/*! \enum guhserver::HttpReply::Type +/*! \enum nymeaserver::HttpReply::Type This enum type describes the type of this \l{HttpReply}. There are two types: @@ -109,23 +109,23 @@ The \l{HttpReply} is asynchron and has to be responded later. */ -/*! \fn void guhserver::HttpReply::finished(); +/*! \fn void nymeaserver::HttpReply::finished(); This signal is emitted when this async \l{HttpReply} is finished. */ -/*! \fn guhserver::HttpReply::HttpReply(QObject *parent); +/*! \fn nymeaserver::HttpReply::HttpReply(QObject *parent); Construct an empty \l{HttpReply} with the given \a parent. */ -/*! \fn guhserver::HttpReply::HttpReply(const HttpStatusCode &statusCode, const Type &type, QObject *parent); +/*! \fn nymeaserver::HttpReply::HttpReply(const HttpStatusCode &statusCode, const Type &type, QObject *parent); Construct a \l{HttpReply} with the given \a statusCode, \a type and \a parent. */ -/*! \fn void guhserver::HttpReply::setHttpStatusCode(const HttpStatusCode &statusCode); +/*! \fn void nymeaserver::HttpReply::setHttpStatusCode(const HttpStatusCode &statusCode); Set the \l{HttpStatusCode} of this \l{HttpReply} to the given \a statusCode. */ -/*! \fn QDebug guhserver::operator<< (QDebug debug, const HttpReply &httpReply); +/*! \fn QDebug nymeaserver::operator<< (QDebug debug, const HttpReply &httpReply); Writes the given \l{HttpReply} \a httpReply to the given \a debug. This method gets used just for debugging. */ @@ -139,7 +139,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { HttpReply::HttpReply(QObject *parent) : QObject(parent), diff --git a/libnymea-core/httpreply.h b/libnymea-core/httpreply.h index d6cca201..8523563c 100644 --- a/libnymea-core/httpreply.h +++ b/libnymea-core/httpreply.h @@ -29,7 +29,7 @@ // Note: RFC 7231 HTTP/1.1 Semantics and Content -> http://tools.ietf.org/html/rfc7231 -namespace guhserver { +namespace nymeaserver { class HttpReply: public QObject { diff --git a/libnymea-core/httprequest.cpp b/libnymea-core/httprequest.cpp index bc32fc5a..2f7ec9c3 100644 --- a/libnymea-core/httprequest.cpp +++ b/libnymea-core/httprequest.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::HttpRequest + \class nymeaserver::HttpRequest \brief Represents a HTTP request from a client to the guh \l{WebServer}. \ingroup api @@ -31,7 +31,7 @@ */ -/*! \enum guhserver::HttpRequest::RequestMethod +/*! \enum nymeaserver::HttpRequest::RequestMethod This enum type describes the method of a \l{HttpRequest}. Following methods are allowed/handled: @@ -49,7 +49,7 @@ Represents every other method which is not handled. */ -/*! \fn QDebug guhserver::operator<< (QDebug debug, const HttpRequest &httpRequest); +/*! \fn QDebug nymeaserver::operator<< (QDebug debug, const HttpRequest &httpRequest); Writes the \l{HttpRequest} \a httpRequest to the given \a debug. This method gets used just for debugging. */ @@ -58,7 +58,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Construct an empty \l{HttpRequest}. */ HttpRequest::HttpRequest() : diff --git a/libnymea-core/httprequest.h b/libnymea-core/httprequest.h index 1df74ced..4d341579 100644 --- a/libnymea-core/httprequest.h +++ b/libnymea-core/httprequest.h @@ -26,7 +26,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { class HttpRequest { diff --git a/libnymea-core/jsonrpc/actionhandler.cpp b/libnymea-core/jsonrpc/actionhandler.cpp index 64870de8..3730a1ef 100644 --- a/libnymea-core/jsonrpc/actionhandler.cpp +++ b/libnymea-core/jsonrpc/actionhandler.cpp @@ -20,7 +20,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::ActionHandler + \class nymeaserver::ActionHandler \brief This subclass of \l{JsonHandler} processes the JSON requests for the \tt Actions namespace. \ingroup json @@ -39,7 +39,7 @@ #include "types/action.h" #include "loggingcategories.h" -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l ActionHandler with the given \a parent. */ ActionHandler::ActionHandler(QObject *parent) : diff --git a/libnymea-core/jsonrpc/actionhandler.h b/libnymea-core/jsonrpc/actionhandler.h index 1db6ab29..37fc9abd 100644 --- a/libnymea-core/jsonrpc/actionhandler.h +++ b/libnymea-core/jsonrpc/actionhandler.h @@ -25,7 +25,7 @@ #include "jsonhandler.h" #include "devicemanager.h" -namespace guhserver { +namespace nymeaserver { class ActionHandler : public JsonHandler { diff --git a/libnymea-core/jsonrpc/configurationhandler.cpp b/libnymea-core/jsonrpc/configurationhandler.cpp index b931f7fd..d80eecbb 100644 --- a/libnymea-core/jsonrpc/configurationhandler.cpp +++ b/libnymea-core/jsonrpc/configurationhandler.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::ConfigurationHandler + \class nymeaserver::ConfigurationHandler \brief This subclass of \l{JsonHandler} processes the JSON requests for the \tt Configuration namespace. \ingroup json @@ -31,27 +31,27 @@ \sa JsonHandler, JsonRPCServer */ -/*! \fn void guhserver::ConfigurationHandler::BasicConfigurationChanged(const QVariantMap ¶ms); +/*! \fn void nymeaserver::ConfigurationHandler::BasicConfigurationChanged(const QVariantMap ¶ms); This signal is emitted to the API notifications when the configurations of the server have been changed. The \a params contains the map for the notification. */ -/*! \fn void guhserver::ConfigurationHandler::TcpServerConfigurationChanged(const QVariantMap ¶ms); +/*! \fn void nymeaserver::ConfigurationHandler::TcpServerConfigurationChanged(const QVariantMap ¶ms); This signal is emitted to the API notifications when the configurations of the \l{TcpServer} have been changed. The \a params contains the map for the notification. */ -/*! \fn void guhserver::ConfigurationHandler::WebServerConfigurationChanged(const QVariantMap ¶ms); +/*! \fn void nymeaserver::ConfigurationHandler::WebServerConfigurationChanged(const QVariantMap ¶ms); This signal is emitted to the API notifications when the configurations of the \l{WebServer} have been changed. The \a params contains the map for the notification. */ -/*! \fn void guhserver::ConfigurationHandler::WebSocketServerConfigurationChanged(const QVariantMap ¶ms); +/*! \fn void nymeaserver::ConfigurationHandler::WebSocketServerConfigurationChanged(const QVariantMap ¶ms); This signal is emitted to the API notifications when the configurations of the \l{WebSocketServer} have been changed. The \a params contains the map for the notification. */ -/*! \fn void guhserver::ConfigurationHandler::LanguageChanged(const QVariantMap ¶ms); +/*! \fn void nymeaserver::ConfigurationHandler::LanguageChanged(const QVariantMap ¶ms); This signal is emitted to the API notifications when the language of the system has changed. The \a params contains the map for the notification. */ @@ -61,7 +61,7 @@ #include "configurationhandler.h" #include "nymeacore.h" -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l ConfigurationHandler with the given \a parent. */ ConfigurationHandler::ConfigurationHandler(QObject *parent): diff --git a/libnymea-core/jsonrpc/configurationhandler.h b/libnymea-core/jsonrpc/configurationhandler.h index 0e1d113f..87b10c47 100644 --- a/libnymea-core/jsonrpc/configurationhandler.h +++ b/libnymea-core/jsonrpc/configurationhandler.h @@ -25,7 +25,7 @@ #include "jsonhandler.h" -namespace guhserver { +namespace nymeaserver { class ConfigurationHandler : public JsonHandler { diff --git a/libnymea-core/jsonrpc/devicehandler.cpp b/libnymea-core/jsonrpc/devicehandler.cpp index 76f0c7fb..d231dfc2 100644 --- a/libnymea-core/jsonrpc/devicehandler.cpp +++ b/libnymea-core/jsonrpc/devicehandler.cpp @@ -20,7 +20,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::DeviceHandler + \class nymeaserver::DeviceHandler \brief This subclass of \l{JsonHandler} processes the JSON requests for the \tt Devices namespace of the JSON-RPC API. \ingroup json @@ -33,22 +33,22 @@ */ -/*! \fn void guhserver::DeviceHandler::StateChanged(const QVariantMap ¶ms); +/*! \fn void nymeaserver::DeviceHandler::StateChanged(const QVariantMap ¶ms); This signal is emitted to the API notifications when a \l{State} has changed. The \a params contain the map for the notification. */ -/*! \fn void guhserver::DeviceHandler::DeviceRemoved(const QVariantMap ¶ms); +/*! \fn void nymeaserver::DeviceHandler::DeviceRemoved(const QVariantMap ¶ms); This signal is emitted to the API notifications when a \l{Device} has been removed. The \a params contain the map for the notification. */ -/*! \fn void guhserver::DeviceHandler::DeviceAdded(const QVariantMap ¶ms); +/*! \fn void nymeaserver::DeviceHandler::DeviceAdded(const QVariantMap ¶ms); This signal is emitted to the API notifications when a \l{Device} has been added. The \a params contain the map for the notification. */ -/*! \fn void guhserver::DeviceHandler::DeviceChanged(const QVariantMap ¶ms); +/*! \fn void nymeaserver::DeviceHandler::DeviceChanged(const QVariantMap ¶ms); This signal is emitted to the API notifications when a \l{Device} has been changed or reconfigured. The \a params contain the map for the notification. */ @@ -63,7 +63,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l DeviceHandler with the given \a parent. */ DeviceHandler::DeviceHandler(QObject *parent) : diff --git a/libnymea-core/jsonrpc/devicehandler.h b/libnymea-core/jsonrpc/devicehandler.h index a3631702..8dd36307 100644 --- a/libnymea-core/jsonrpc/devicehandler.h +++ b/libnymea-core/jsonrpc/devicehandler.h @@ -25,7 +25,7 @@ #include "jsonhandler.h" #include "devicemanager.h" -namespace guhserver { +namespace nymeaserver { class DeviceHandler : public JsonHandler { diff --git a/libnymea-core/jsonrpc/eventhandler.cpp b/libnymea-core/jsonrpc/eventhandler.cpp index f2afc32f..3bc335ac 100644 --- a/libnymea-core/jsonrpc/eventhandler.cpp +++ b/libnymea-core/jsonrpc/eventhandler.cpp @@ -20,7 +20,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::EventHandler + \class nymeaserver::EventHandler \brief This subclass of \l{JsonHandler} processes the JSON requests for the \tt Events namespace. \ingroup json @@ -32,7 +32,7 @@ \sa Event, JsonHandler, JsonRPCServer */ -/*! \fn void guhserver::EventHandler::EventTriggered(const QVariantMap ¶ms); +/*! \fn void nymeaserver::EventHandler::EventTriggered(const QVariantMap ¶ms); This signal is emitted to the API notifications when an \l{Event} triggered. The \a params contain the map for the notification. */ @@ -41,7 +41,7 @@ #include "nymeacore.h" #include "loggingcategories.h" -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l EventHandler with the given \a parent. */ EventHandler::EventHandler(QObject *parent) : diff --git a/libnymea-core/jsonrpc/eventhandler.h b/libnymea-core/jsonrpc/eventhandler.h index fc6f60d9..53ee5d4c 100644 --- a/libnymea-core/jsonrpc/eventhandler.h +++ b/libnymea-core/jsonrpc/eventhandler.h @@ -24,7 +24,7 @@ #include "jsonhandler.h" -namespace guhserver { +namespace nymeaserver { class EventHandler : public JsonHandler { diff --git a/libnymea-core/jsonrpc/jsonhandler.cpp b/libnymea-core/jsonrpc/jsonhandler.cpp index 05c1a086..56f95e99 100644 --- a/libnymea-core/jsonrpc/jsonhandler.cpp +++ b/libnymea-core/jsonrpc/jsonhandler.cpp @@ -20,7 +20,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::JsonHandler + \class nymeaserver::JsonHandler \brief This class represents an interface for developing a handler for the JSON-RPC API. \ingroup json @@ -29,11 +29,11 @@ \sa JsonRPCServer, JsonReply */ -/*! \fn QString guhserver::JsonHandler::name() const; +/*! \fn QString nymeaserver::JsonHandler::name() const; Pure virtual method for a JSON RPC handler. Returns the namespace of the handler. */ -/*! \fn void guhserver::JsonHandler::asyncReply(int id, const QVariantMap ¶ms); +/*! \fn void nymeaserver::JsonHandler::asyncReply(int id, const QVariantMap ¶ms); This signal will be emitted when a reply with the given \a id and \a params is finished. */ @@ -45,7 +45,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l JsonHandler with the given \a parent. */ JsonHandler::JsonHandler(QObject *parent) : @@ -222,7 +222,7 @@ QVariantMap JsonHandler::statusToReply(NetworkManager::NetworkManagerError statu /*! - \class guhserver::JsonReply + \class nymeaserver::JsonReply \brief This class represents a reply for the JSON-RPC API request. \ingroup json @@ -231,7 +231,7 @@ QVariantMap JsonHandler::statusToReply(NetworkManager::NetworkManagerError statu \sa JsonHandler, JsonRPCServer */ -/*! \enum guhserver::JsonReply::Type +/*! \enum nymeaserver::JsonReply::Type This enum type specifies the type of a JsonReply. @@ -241,7 +241,7 @@ QVariantMap JsonHandler::statusToReply(NetworkManager::NetworkManagerError statu The response is asynchronous. */ -/*! \fn void guhserver::JsonReply::finished(); +/*! \fn void nymeaserver::JsonReply::finished(); This signal will be emitted when a JsonReply is finished. A JsonReply is finished when the response is ready or then the reply timed out. */ diff --git a/libnymea-core/jsonrpc/jsonhandler.h b/libnymea-core/jsonrpc/jsonhandler.h index eedba120..6fd9fa9b 100644 --- a/libnymea-core/jsonrpc/jsonhandler.h +++ b/libnymea-core/jsonrpc/jsonhandler.h @@ -29,7 +29,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { class JsonHandler; diff --git a/libnymea-core/jsonrpc/jsonrpcserver.cpp b/libnymea-core/jsonrpc/jsonrpcserver.cpp index ad93cd53..6b3f35c5 100644 --- a/libnymea-core/jsonrpc/jsonrpcserver.cpp +++ b/libnymea-core/jsonrpc/jsonrpcserver.cpp @@ -20,7 +20,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::JsonRPCServer + \class nymeaserver::JsonRPCServer \brief This class provides a JSON-RPC API interface to the \l{TransportInterface}{TransportInterfaces}. \ingroup server @@ -62,7 +62,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a \l{JsonRPCServer} with the given \a sslConfiguration and \a parent. */ JsonRPCServer::JsonRPCServer(const QSslConfiguration &sslConfiguration, QObject *parent): diff --git a/libnymea-core/jsonrpc/jsonrpcserver.h b/libnymea-core/jsonrpc/jsonrpcserver.h index 95dcb2c9..1c9ac547 100644 --- a/libnymea-core/jsonrpc/jsonrpcserver.h +++ b/libnymea-core/jsonrpc/jsonrpcserver.h @@ -37,7 +37,7 @@ class Device; -namespace guhserver { +namespace nymeaserver { class JsonRPCServer: public JsonHandler { diff --git a/libnymea-core/jsonrpc/jsontypes.cpp b/libnymea-core/jsonrpc/jsontypes.cpp index 9f3bb5a6..72729ed3 100644 --- a/libnymea-core/jsonrpc/jsontypes.cpp +++ b/libnymea-core/jsonrpc/jsontypes.cpp @@ -21,7 +21,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::JsonTypes + \class nymeaserver::JsonTypes \brief This class represents the types for the JSON-RPC API. \ingroup json @@ -32,7 +32,7 @@ */ -/*! \enum guhserver::JsonTypes::BasicType +/*! \enum nymeaserver::JsonTypes::BasicType This enum type specifies the basic types of a JSON RPC API. @@ -62,7 +62,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { bool JsonTypes::s_initialized = false; QString JsonTypes::s_lastError; diff --git a/libnymea-core/jsonrpc/jsontypes.h b/libnymea-core/jsonrpc/jsontypes.h index d3d60ce1..a7800354 100644 --- a/libnymea-core/jsonrpc/jsontypes.h +++ b/libnymea-core/jsonrpc/jsontypes.h @@ -62,7 +62,7 @@ class DevicePlugin; class Device; -namespace guhserver { +namespace nymeaserver { #define DECLARE_OBJECT(typeName, jsonName) \ public: \ diff --git a/libnymea-core/jsonrpc/logginghandler.cpp b/libnymea-core/jsonrpc/logginghandler.cpp index d2fc97c1..a9cd41b3 100644 --- a/libnymea-core/jsonrpc/logginghandler.cpp +++ b/libnymea-core/jsonrpc/logginghandler.cpp @@ -20,7 +20,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::LoggingHandler + \class nymeaserver::LoggingHandler \brief This subclass of \l{JsonHandler} processes the JSON requests for the \tt Logging namespace of the JSON-RPC API. \ingroup json @@ -32,12 +32,12 @@ \sa LogEngine, JsonHandler, JsonRPCServer */ -/*! \fn void guhserver::LoggingHandler::LogEntryAdded(const QVariantMap ¶ms); +/*! \fn void nymeaserver::LoggingHandler::LogEntryAdded(const QVariantMap ¶ms); This signal is emitted to the API notifications when a \l{LogEntry} was added to the database. The \a params contain the map for the notification. */ -/*! \fn void guhserver::LoggingHandler::LogDatabaseUpdated(const QVariantMap ¶ms); +/*! \fn void nymeaserver::LoggingHandler::LogDatabaseUpdated(const QVariantMap ¶ms); This signal is emitted to the API notifications when the logging aatabase has been updated (i.e. \l{Device} or \l{Rule} removed). The \a params contain the map for the notification. */ @@ -48,7 +48,7 @@ #include "loggingcategories.h" #include "nymeacore.h" -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l LoggingHandler with the given \a parent. */ LoggingHandler::LoggingHandler(QObject *parent) : diff --git a/libnymea-core/jsonrpc/logginghandler.h b/libnymea-core/jsonrpc/logginghandler.h index 386a5527..2fe5067e 100644 --- a/libnymea-core/jsonrpc/logginghandler.h +++ b/libnymea-core/jsonrpc/logginghandler.h @@ -25,7 +25,7 @@ #include "jsonhandler.h" #include "logging/logentry.h" -namespace guhserver { +namespace nymeaserver { class LoggingHandler : public JsonHandler { diff --git a/libnymea-core/jsonrpc/networkmanagerhandler.cpp b/libnymea-core/jsonrpc/networkmanagerhandler.cpp index f276d56a..c7793b6e 100644 --- a/libnymea-core/jsonrpc/networkmanagerhandler.cpp +++ b/libnymea-core/jsonrpc/networkmanagerhandler.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::NetworkManagerHandler + \class nymeaserver::NetworkManagerHandler \brief This subclass of \l{JsonHandler} processes the JSON requests for the \tt NetworkManager namespace of the JSON-RPC API. \ingroup json @@ -31,37 +31,37 @@ \sa NetworkManager, JsonHandler, JsonRPCServer */ -/*! \fn void guhserver::NetworkManagerHandler::NetworkStatusChanged(const QVariantMap ¶ms); +/*! \fn void nymeaserver::NetworkManagerHandler::NetworkStatusChanged(const QVariantMap ¶ms); This signal is emitted to the API notifications when the state of the \l{NetworkManager} has changed. The \a params contains the map for the notification. */ -/*! \fn void guhserver::NetworkManagerHandler::WiredNetworkDeviceAdded(const QVariantMap ¶ms); +/*! \fn void nymeaserver::NetworkManagerHandler::WiredNetworkDeviceAdded(const QVariantMap ¶ms); This signal is emitted to the API notifications when a \l{WiredNetworkDevice} has been added to the \l{NetworkManager}. The \a params contains the map for the notification. */ -/*! \fn void guhserver::NetworkManagerHandler::WiredNetworkDeviceRemoved(const QVariantMap ¶ms); +/*! \fn void nymeaserver::NetworkManagerHandler::WiredNetworkDeviceRemoved(const QVariantMap ¶ms); This signal is emitted to the API notifications when a \l{WiredNetworkDevice} has been removed from the \l{NetworkManager}. The \a params contains the map for the notification. */ -/*! \fn void guhserver::NetworkManagerHandler::WiredNetworkDeviceChanged(const QVariantMap ¶ms); +/*! \fn void nymeaserver::NetworkManagerHandler::WiredNetworkDeviceChanged(const QVariantMap ¶ms); This signal is emitted to the API notifications when a \l{WiredNetworkDevice} has changed in the \l{NetworkManager}. The \a params contains the map for the notification. */ -/*! \fn void guhserver::NetworkManagerHandler::WirelessNetworkDeviceAdded(const QVariantMap ¶ms); +/*! \fn void nymeaserver::NetworkManagerHandler::WirelessNetworkDeviceAdded(const QVariantMap ¶ms); This signal is emitted to the API notifications when a \l{WirelessNetworkDevice} has been added to the \l{NetworkManager}. The \a params contains the map for the notification. */ -/*! \fn void guhserver::NetworkManagerHandler::WirelessNetworkDeviceRemoved(const QVariantMap ¶ms); +/*! \fn void nymeaserver::NetworkManagerHandler::WirelessNetworkDeviceRemoved(const QVariantMap ¶ms); This signal is emitted to the API notifications when a \l{WirelessNetworkDevice} has been removed from the \l{NetworkManager}. The \a params contains the map for the notification. */ -/*! \fn void guhserver::NetworkManagerHandler::WirelessNetworkDeviceChanged(const QVariantMap ¶ms); +/*! \fn void nymeaserver::NetworkManagerHandler::WirelessNetworkDeviceChanged(const QVariantMap ¶ms); This signal is emitted to the API notifications when a \l{WirelessNetworkDevice} has changed in the \l{NetworkManager}. The \a params contains the map for the notification. */ @@ -74,7 +74,7 @@ #include "networkmanager/networkmanager.h" -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l{NetworkManagerHandler} with the given \a parent. */ NetworkManagerHandler::NetworkManagerHandler(QObject *parent) : diff --git a/libnymea-core/jsonrpc/networkmanagerhandler.h b/libnymea-core/jsonrpc/networkmanagerhandler.h index 74b6dd66..54074dee 100644 --- a/libnymea-core/jsonrpc/networkmanagerhandler.h +++ b/libnymea-core/jsonrpc/networkmanagerhandler.h @@ -25,7 +25,7 @@ #include "jsonhandler.h" -namespace guhserver { +namespace nymeaserver { class NetworkManagerHandler : public JsonHandler { diff --git a/libnymea-core/jsonrpc/ruleshandler.cpp b/libnymea-core/jsonrpc/ruleshandler.cpp index e9f55015..6cad640f 100644 --- a/libnymea-core/jsonrpc/ruleshandler.cpp +++ b/libnymea-core/jsonrpc/ruleshandler.cpp @@ -20,7 +20,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::RulesHandler + \class nymeaserver::RulesHandler \brief This subclass of \l{JsonHandler} processes the JSON requests for the \tt Rules namespace of the JSON-RPC API. \ingroup json @@ -32,22 +32,22 @@ \sa RuleEngine, JsonHandler, JsonRPCServer */ -/*! \fn void guhserver::RulesHandler::RuleRemoved(const QVariantMap ¶ms); +/*! \fn void nymeaserver::RulesHandler::RuleRemoved(const QVariantMap ¶ms); This signal is emitted to the API notifications when a \l{Rule} was removed. The \a params contain the map for the notification. */ -/*! \fn void guhserver::RulesHandler::RuleAdded(const QVariantMap ¶ms); +/*! \fn void nymeaserver::RulesHandler::RuleAdded(const QVariantMap ¶ms); This signal is emitted to the API notifications when a \l{Rule} was added. The \a params contain the map for the notification. */ -/*! \fn void guhserver::RulesHandler::RuleActiveChanged(const QVariantMap ¶ms); +/*! \fn void nymeaserver::RulesHandler::RuleActiveChanged(const QVariantMap ¶ms); This signal is emitted to the API notifications when a \l{Rule} has changed the active status. The \a params contain the map for the notification. */ -/*! \fn void guhserver::RulesHandler::RuleConfigurationChanged(const QVariantMap ¶ms); +/*! \fn void nymeaserver::RulesHandler::RuleConfigurationChanged(const QVariantMap ¶ms); This signal is emitted to the API notifications when a \l{Rule} has changed the configuration. The \a params contain the map for the notification. */ @@ -59,7 +59,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l{RulesHandler} with the given \a parent. */ RulesHandler::RulesHandler(QObject *parent) : diff --git a/libnymea-core/jsonrpc/ruleshandler.h b/libnymea-core/jsonrpc/ruleshandler.h index 971af84a..fd296960 100644 --- a/libnymea-core/jsonrpc/ruleshandler.h +++ b/libnymea-core/jsonrpc/ruleshandler.h @@ -24,7 +24,7 @@ #include "jsonhandler.h" -namespace guhserver { +namespace nymeaserver { class RulesHandler : public JsonHandler { diff --git a/libnymea-core/jsonrpc/statehandler.cpp b/libnymea-core/jsonrpc/statehandler.cpp index e980841c..886b8a71 100644 --- a/libnymea-core/jsonrpc/statehandler.cpp +++ b/libnymea-core/jsonrpc/statehandler.cpp @@ -20,7 +20,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::StateHandler + \class nymeaserver::StateHandler \brief This subclass of \l{JsonHandler} processes the JSON requests for the \tt States namespace of the JSON-RPC API. \ingroup json @@ -36,7 +36,7 @@ #include "nymeacore.h" #include "loggingcategories.h" -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l{StateHandler} with the given \a parent. */ StateHandler::StateHandler(QObject *parent) : diff --git a/libnymea-core/jsonrpc/statehandler.h b/libnymea-core/jsonrpc/statehandler.h index ebe1cf1f..9e72277d 100644 --- a/libnymea-core/jsonrpc/statehandler.h +++ b/libnymea-core/jsonrpc/statehandler.h @@ -24,7 +24,7 @@ #include "jsonhandler.h" -namespace guhserver { +namespace nymeaserver { class StateHandler : public JsonHandler { diff --git a/libnymea-core/logging/logengine.cpp b/libnymea-core/logging/logengine.cpp index 001be965..cc0f43e8 100644 --- a/libnymea-core/logging/logengine.cpp +++ b/libnymea-core/logging/logengine.cpp @@ -20,7 +20,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::LogEngine + \class nymeaserver::LogEngine \brief The engine which creates the log databse and provides access to it. \ingroup logs @@ -34,20 +34,20 @@ \sa LogEntry, LogFilter, LogsResource, LoggingHandler */ -/*! \fn void guhserver::LogEngine::logEntryAdded(const LogEntry &logEntry); +/*! \fn void nymeaserver::LogEngine::logEntryAdded(const LogEntry &logEntry); This signal is emitted when an \a logEntry was added to the database. \sa LogEntry */ -/*! \fn void guhserver::LogEngine::logDatabaseUpdated(); +/*! \fn void nymeaserver::LogEngine::logDatabaseUpdated(); This signal is emitted when the log database was updated. The log database will be updated when a \l{LogEntry} was added or when a device was removed and all corresponding \l{LogEntry}{LogEntries} were removed from the database. */ /*! - \class guhserver::Logging + \class nymeaserver::Logging \brief The logging class provides enums and flags for the LogEngine. \ingroup logs @@ -56,11 +56,11 @@ \sa LogEngine, LogEntry, LogFilter */ -/*! \fn guhserver::Logging::Logging(QObject *parent) +/*! \fn nymeaserver::Logging::Logging(QObject *parent) Constructs the \l{Logging} object with the given \a parent. */ -/*! \enum guhserver::Logging::LoggingError +/*! \enum nymeaserver::Logging::LoggingError Represents the possible errors from the \l{LogEngine}. \value LoggingErrorNoError @@ -71,7 +71,7 @@ The given \l{LogFilter} contains an invalid paramter. */ -/*! \enum guhserver::Logging::LoggingEventType +/*! \enum nymeaserver::Logging::LoggingEventType Represents the event type of this \l{LogEntry}. \value LoggingEventTypeTrigger @@ -86,7 +86,7 @@ */ -/*! \enum guhserver::Logging::LoggingLevel +/*! \enum nymeaserver::Logging::LoggingLevel Indicates if the corresponding \l{LogEntry} is an information or an alert. \value LoggingLevelInfo @@ -95,7 +95,7 @@ This \l{LogEntry} represents an alert. Something is not ok. */ -/*! \enum guhserver::Logging::LoggingSource +/*! \enum nymeaserver::Logging::LoggingSource Indicates from where the \l{LogEntry} was created. Can be used as flag. \value LoggingSourceSystem @@ -129,7 +129,7 @@ #define DB_SCHEMA_VERSION 3 -namespace guhserver { +namespace nymeaserver { /*! Constructs the log engine with the given \a parent. */ LogEngine::LogEngine(const QString &logPath, QObject *parent): diff --git a/libnymea-core/logging/logengine.h b/libnymea-core/logging/logengine.h index 8020b055..a19d4496 100644 --- a/libnymea-core/logging/logengine.h +++ b/libnymea-core/logging/logengine.h @@ -33,7 +33,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { class LogEngine: public QObject { diff --git a/libnymea-core/logging/logentry.cpp b/libnymea-core/logging/logentry.cpp index 77fa573d..1b7da00d 100644 --- a/libnymea-core/logging/logentry.cpp +++ b/libnymea-core/logging/logentry.cpp @@ -20,7 +20,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::LogEntry + \class nymeaserver::LogEntry \brief Represents an entry of the log database. \ingroup logs @@ -32,7 +32,7 @@ \sa LogEngine, LogFilter, LogsResource, LoggingHandler */ -/*! \fn QDebug guhserver::operator<< (QDebug dbg, const LogEntry &entry);; +/*! \fn QDebug nymeaserver::operator<< (QDebug dbg, const LogEntry &entry);; Writes the \l{LogEntry} \a entry to the given \a dbg. This method gets used just for debugging. */ @@ -42,7 +42,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a \l{LogEntry} with the given \a timestamp, \a level, \a source and \a errorCode.*/ LogEntry::LogEntry(QDateTime timestamp, Logging::LoggingLevel level, Logging::LoggingSource source, int errorCode): diff --git a/libnymea-core/logging/logentry.h b/libnymea-core/logging/logentry.h index 89db5fef..0d105e24 100644 --- a/libnymea-core/logging/logentry.h +++ b/libnymea-core/logging/logentry.h @@ -29,7 +29,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { class LogEntry { diff --git a/libnymea-core/logging/logfilter.cpp b/libnymea-core/logging/logfilter.cpp index 9eb5e219..bf522784 100644 --- a/libnymea-core/logging/logfilter.cpp +++ b/libnymea-core/logging/logfilter.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::LogFilter + \class nymeaserver::LogFilter \brief Represents a filter to access the logging databse. \ingroup logs @@ -34,7 +34,7 @@ #include "logfilter.h" #include "loggingcategories.h" -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l{LogFilter}.*/ LogFilter::LogFilter() diff --git a/libnymea-core/logging/logfilter.h b/libnymea-core/logging/logfilter.h index bc85c2b3..23fbced7 100644 --- a/libnymea-core/logging/logfilter.h +++ b/libnymea-core/logging/logfilter.h @@ -28,7 +28,7 @@ #include "logging.h" #include "typeutils.h" -namespace guhserver { +namespace nymeaserver { class LogFilter { diff --git a/libnymea-core/logging/logging.h b/libnymea-core/logging/logging.h index 390a40ee..dfdc6186 100644 --- a/libnymea-core/logging/logging.h +++ b/libnymea-core/logging/logging.h @@ -23,7 +23,7 @@ #include -namespace guhserver { +namespace nymeaserver { class Logging { diff --git a/libnymea-core/mocktcpserver.cpp b/libnymea-core/mocktcpserver.cpp index 1663cb36..27c4e834 100644 --- a/libnymea-core/mocktcpserver.cpp +++ b/libnymea-core/mocktcpserver.cpp @@ -25,7 +25,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; QList MockTcpServer::s_allServers; diff --git a/libnymea-core/mocktcpserver.h b/libnymea-core/mocktcpserver.h index f895851e..5f74c8d4 100644 --- a/libnymea-core/mocktcpserver.h +++ b/libnymea-core/mocktcpserver.h @@ -27,7 +27,7 @@ #include "transportinterface.h" -using namespace guhserver; +using namespace nymeaserver; class JsonRPCServer; diff --git a/libnymea-core/networkmanager/dbus-interfaces.h b/libnymea-core/networkmanager/dbus-interfaces.h index 40b046f5..c4df069d 100644 --- a/libnymea-core/networkmanager/dbus-interfaces.h +++ b/libnymea-core/networkmanager/dbus-interfaces.h @@ -23,7 +23,7 @@ #include -namespace guhserver { +namespace nymeaserver { static const QString serviceString("org.freedesktop.NetworkManager"); diff --git a/libnymea-core/networkmanager/networkconnection.cpp b/libnymea-core/networkmanager/networkconnection.cpp index eb25d9f9..23fbb7d2 100644 --- a/libnymea-core/networkmanager/networkconnection.cpp +++ b/libnymea-core/networkmanager/networkconnection.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::NetworkConnection + \class nymeaserver::NetworkConnection \brief Represents a saved network connection of the \l{NetworkManager}. \ingroup networkmanager @@ -34,7 +34,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l{NetworkConnection} with the given dbus \a objectPath and \a parent. */ NetworkConnection::NetworkConnection(const QDBusObjectPath &objectPath, QObject *parent) : diff --git a/libnymea-core/networkmanager/networkconnection.h b/libnymea-core/networkmanager/networkconnection.h index 87581923..32023095 100644 --- a/libnymea-core/networkmanager/networkconnection.h +++ b/libnymea-core/networkmanager/networkconnection.h @@ -31,7 +31,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { typedef QMap ConnectionSettings; @@ -66,7 +66,7 @@ QDebug operator<<(QDebug debug, NetworkConnection *networkConnection); } -Q_DECLARE_METATYPE(guhserver::ConnectionSettings) +Q_DECLARE_METATYPE(nymeaserver::ConnectionSettings) #endif // NETWORKCONNECTION_H diff --git a/libnymea-core/networkmanager/networkdevice.cpp b/libnymea-core/networkmanager/networkdevice.cpp index 9377d197..e7b96228 100644 --- a/libnymea-core/networkmanager/networkdevice.cpp +++ b/libnymea-core/networkmanager/networkdevice.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::NetworkDevice + \class nymeaserver::NetworkDevice \brief Represents a generic network device the \l{NetworkManager}. \ingroup networkmanager @@ -28,7 +28,7 @@ \sa WiredNetworkDevice, WirelessNetworkDevice */ -/*! \enum guhserver::NetworkDevice::NetworkDeviceState +/*! \enum nymeaserver::NetworkDevice::NetworkDeviceState \value NetworkDeviceStateUnknown \value NetworkDeviceStateUnmanaged \value NetworkDeviceStateUnavailable @@ -44,7 +44,7 @@ \value NetworkDeviceStateFailed */ -/*! \enum guhserver::NetworkDevice::NetworkDeviceStateReason +/*! \enum nymeaserver::NetworkDevice::NetworkDeviceStateReason \value NetworkDeviceStateReasonNone \value NetworkDeviceStateReasonUnknown \value NetworkDeviceStateReasonNowManaged @@ -111,7 +111,7 @@ */ -/*! \enum guhserver::NetworkDevice::NetworkDeviceType +/*! \enum nymeaserver::NetworkDevice::NetworkDeviceType \value NetworkDeviceTypeUnknown \value NetworkDeviceTypeEthernet \value NetworkDeviceTypeWifi @@ -144,7 +144,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l{NetworkDevice} with the given dbus \a objectPath and \a parent. */ NetworkDevice::NetworkDevice(const QDBusObjectPath &objectPath, QObject *parent) : diff --git a/libnymea-core/networkmanager/networkdevice.h b/libnymea-core/networkmanager/networkdevice.h index 91880c48..2a6e02a0 100644 --- a/libnymea-core/networkmanager/networkdevice.h +++ b/libnymea-core/networkmanager/networkdevice.h @@ -30,7 +30,7 @@ #include "dbus-interfaces.h" -namespace guhserver { +namespace nymeaserver { class NetworkDevice : public QObject { @@ -213,7 +213,7 @@ QDebug operator<<(QDebug debug, NetworkDevice *device); } -using namespace guhserver; +using namespace nymeaserver; Q_DECLARE_METATYPE(NetworkDevice::NetworkDeviceType) Q_DECLARE_METATYPE(NetworkDevice::NetworkDeviceState) Q_DECLARE_METATYPE(NetworkDevice::NetworkDeviceStateReason) diff --git a/libnymea-core/networkmanager/networkmanager.cpp b/libnymea-core/networkmanager/networkmanager.cpp index 0c15a675..c9cdf42f 100644 --- a/libnymea-core/networkmanager/networkmanager.cpp +++ b/libnymea-core/networkmanager/networkmanager.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::NetworkManager + \class nymeaserver::NetworkManager \brief Represents the dbus network-manager. \ingroup networkmanager @@ -70,7 +70,7 @@ This signal will be emitted when the given \a wiredDevice has changed. \sa WiredNetworkDevice */ -/*! \enum guhserver::NetworkManager::NetworkManagerState +/*! \enum nymeaserver::NetworkManager::NetworkManagerState \value NetworkManagerStateUnknown \value NetworkManagerStateAsleep \value NetworkManagerStateDisconnected @@ -81,7 +81,7 @@ \value NetworkManagerStateConnectedGlobal */ -/*! \enum guhserver::NetworkManager::NetworkManagerConnectivityState +/*! \enum nymeaserver::NetworkManager::NetworkManagerConnectivityState \value NetworkManagerConnectivityStateUnknown \value NetworkManagerConnectivityStateNone \value NetworkManagerConnectivityStatePortal @@ -89,7 +89,7 @@ \value NetworkManagerConnectivityStateFull */ -/*! \enum guhserver::NetworkManager::NetworkManagerError +/*! \enum nymeaserver::NetworkManager::NetworkManagerError \value NetworkManagerErrorNoError \value NetworkManagerErrorUnknownError \value NetworkManagerErrorWirelessNotAvailable @@ -111,7 +111,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l{NetworkManager} object with the given \a parent. */ NetworkManager::NetworkManager(QObject *parent) : diff --git a/libnymea-core/networkmanager/networkmanager.h b/libnymea-core/networkmanager/networkmanager.h index c1920944..9482af8e 100644 --- a/libnymea-core/networkmanager/networkmanager.h +++ b/libnymea-core/networkmanager/networkmanager.h @@ -35,7 +35,7 @@ // Docs: https://developer.gnome.org/NetworkManager/unstable/spec.html -namespace guhserver { +namespace nymeaserver { class NetworkManager : public QObject { @@ -160,7 +160,7 @@ private slots: } -using namespace guhserver; +using namespace nymeaserver; Q_DECLARE_METATYPE(NetworkManager::NetworkManagerState) Q_DECLARE_METATYPE(NetworkManager::NetworkManagerError) diff --git a/libnymea-core/networkmanager/networksettings.cpp b/libnymea-core/networkmanager/networksettings.cpp index f9016f2a..db48c48e 100644 --- a/libnymea-core/networkmanager/networksettings.cpp +++ b/libnymea-core/networkmanager/networksettings.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::NetworkSettings + \class nymeaserver::NetworkSettings \brief Represents the network settings in the \l{NetworkManager}. \ingroup networkmanager @@ -30,7 +30,7 @@ #include "dbus-interfaces.h" #include "loggingcategories.h" -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l{NetworkSettings} object with the given \a parent. */ NetworkSettings::NetworkSettings(QObject *parent) : QObject(parent) diff --git a/libnymea-core/networkmanager/networksettings.h b/libnymea-core/networkmanager/networksettings.h index a6ef61f1..2b223053 100644 --- a/libnymea-core/networkmanager/networksettings.h +++ b/libnymea-core/networkmanager/networksettings.h @@ -29,7 +29,7 @@ #include "networkconnection.h" -namespace guhserver { +namespace nymeaserver { class NetworkConnection; diff --git a/libnymea-core/networkmanager/wirednetworkdevice.cpp b/libnymea-core/networkmanager/wirednetworkdevice.cpp index 8eb97e07..8cd79ca3 100644 --- a/libnymea-core/networkmanager/wirednetworkdevice.cpp +++ b/libnymea-core/networkmanager/wirednetworkdevice.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::WiredNetworkDevice + \class nymeaserver::WiredNetworkDevice \brief Represents an ethernet device in the \l{NetworkManager}. \ingroup networkmanager @@ -33,7 +33,7 @@ #include "wirednetworkdevice.h" #include "loggingcategories.h" -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l{WiredNetworkDevice} with the given dbus \a objectPath and \a parent. */ WiredNetworkDevice::WiredNetworkDevice(const QDBusObjectPath &objectPath, QObject *parent) : diff --git a/libnymea-core/networkmanager/wirednetworkdevice.h b/libnymea-core/networkmanager/wirednetworkdevice.h index cd846c48..f4724a15 100644 --- a/libnymea-core/networkmanager/wirednetworkdevice.h +++ b/libnymea-core/networkmanager/wirednetworkdevice.h @@ -26,7 +26,7 @@ #include "networkdevice.h" -namespace guhserver { +namespace nymeaserver { class WiredNetworkDevice : public NetworkDevice { diff --git a/libnymea-core/networkmanager/wirelessaccesspoint.cpp b/libnymea-core/networkmanager/wirelessaccesspoint.cpp index 8cd25bfd..dc62f17c 100644 --- a/libnymea-core/networkmanager/wirelessaccesspoint.cpp +++ b/libnymea-core/networkmanager/wirelessaccesspoint.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::WirelessAccessPoint + \class nymeaserver::WirelessAccessPoint \brief Represents a wireless access point from a \l{WirelessNetworkDevice}. \ingroup networkmanager @@ -28,7 +28,7 @@ \sa WirelessNetworkDevice */ -/*! \enum guhserver::WirelessAccessPoint::ApSecurityMode +/*! \enum nymeaserver::WirelessAccessPoint::ApSecurityMode \value ApSecurityModeNone \value ApSecurityModePairWep40 \value ApSecurityModePairWep104 @@ -50,7 +50,7 @@ #include "loggingcategories.h" #include "dbus-interfaces.h" -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l{WirelessAccessPoint} with the given dbus \a objectPath and \a parent. */ WirelessAccessPoint::WirelessAccessPoint(const QDBusObjectPath &objectPath, QObject *parent) : diff --git a/libnymea-core/networkmanager/wirelessaccesspoint.h b/libnymea-core/networkmanager/wirelessaccesspoint.h index b7dce4ce..d1b5dfec 100644 --- a/libnymea-core/networkmanager/wirelessaccesspoint.h +++ b/libnymea-core/networkmanager/wirelessaccesspoint.h @@ -29,7 +29,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { class WirelessAccessPoint : public QObject { @@ -93,7 +93,7 @@ QDebug operator<<(QDebug debug, WirelessAccessPoint *accessPoint); } -Q_DECLARE_OPERATORS_FOR_FLAGS(guhserver::WirelessAccessPoint::ApSecurityModes) -Q_DECLARE_METATYPE(guhserver::WirelessAccessPoint::ApSecurityMode) +Q_DECLARE_OPERATORS_FOR_FLAGS(nymeaserver::WirelessAccessPoint::ApSecurityModes) +Q_DECLARE_METATYPE(nymeaserver::WirelessAccessPoint::ApSecurityMode) #endif // WIRELESSACCESSPOINT_H diff --git a/libnymea-core/networkmanager/wirelessnetworkdevice.cpp b/libnymea-core/networkmanager/wirelessnetworkdevice.cpp index 5d7e9960..e40a3d3e 100644 --- a/libnymea-core/networkmanager/wirelessnetworkdevice.cpp +++ b/libnymea-core/networkmanager/wirelessnetworkdevice.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::WirelessNetworkDevice + \class nymeaserver::WirelessNetworkDevice \brief Represents a wireless device (adapter) in the networkmanager. \ingroup networkmanager @@ -46,7 +46,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l{WirelessNetworkDevice} with the given dbus \a objectPath and \a parent. */ WirelessNetworkDevice::WirelessNetworkDevice(const QDBusObjectPath &objectPath, QObject *parent) : diff --git a/libnymea-core/networkmanager/wirelessnetworkdevice.h b/libnymea-core/networkmanager/wirelessnetworkdevice.h index 35f5eddc..b823f514 100644 --- a/libnymea-core/networkmanager/wirelessnetworkdevice.h +++ b/libnymea-core/networkmanager/wirelessnetworkdevice.h @@ -32,7 +32,7 @@ #include "networkdevice.h" #include "wirelessaccesspoint.h" -namespace guhserver { +namespace nymeaserver { class WirelessNetworkDevice : public NetworkDevice { diff --git a/libnymea-core/nymeaconfiguration.cpp b/libnymea-core/nymeaconfiguration.cpp index ea0e2015..9e165f15 100644 --- a/libnymea-core/nymeaconfiguration.cpp +++ b/libnymea-core/nymeaconfiguration.cpp @@ -26,7 +26,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { NymeaConfiguration::NymeaConfiguration(QObject *parent) : QObject(parent) diff --git a/libnymea-core/nymeaconfiguration.h b/libnymea-core/nymeaconfiguration.h index e3d6c4f2..1ced10be 100644 --- a/libnymea-core/nymeaconfiguration.h +++ b/libnymea-core/nymeaconfiguration.h @@ -27,7 +27,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { class ServerConfiguration { public: diff --git a/libnymea-core/nymeacore.cpp b/libnymea-core/nymeacore.cpp index f315dd6e..d6455722 100644 --- a/libnymea-core/nymeacore.cpp +++ b/libnymea-core/nymeacore.cpp @@ -20,7 +20,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::NymeaCore + \class nymeaserver::NymeaCore \brief The main entry point for the nymea Server and the place where all the messages are dispatched. \inmodule core @@ -29,62 +29,62 @@ instantiate, set up and connect all the other components. */ -/*! \fn void guhserver::NymeaCore::eventTriggered(const Event &event); +/*! \fn void nymeaserver::NymeaCore::eventTriggered(const Event &event); This signal is emitted when an \a event happend. */ -/*! \fn void guhserver::NymeaCore::deviceStateChanged(Device *device, const QUuid &stateTypeId, const QVariant &value); +/*! \fn void nymeaserver::NymeaCore::deviceStateChanged(Device *device, const QUuid &stateTypeId, const QVariant &value); This signal is emitted when the \l{State} of a \a device changed. The \a stateTypeId parameter describes the \l{StateType} and the \a value parameter holds the new value. */ -/*! \fn void guhserver::NymeaCore::deviceRemoved(const DeviceId &deviceId); +/*! \fn void nymeaserver::NymeaCore::deviceRemoved(const DeviceId &deviceId); This signal is emitted when a \l{Device} with the given \a deviceId was removed. */ -/*! \fn void guhserver::NymeaCore::deviceAdded(Device *device); +/*! \fn void nymeaserver::NymeaCore::deviceAdded(Device *device); This signal is emitted when a \a device was added to the system. */ -/*! \fn void guhserver::NymeaCore::deviceChanged(Device *device); +/*! \fn void nymeaserver::NymeaCore::deviceChanged(Device *device); This signal is emitted when the \l{ParamList}{Params} of a \a device have been changed. */ -/*! \fn void guhserver::NymeaCore::actionExecuted(const ActionId &id, DeviceManager::DeviceError status); +/*! \fn void nymeaserver::NymeaCore::actionExecuted(const ActionId &id, DeviceManager::DeviceError status); This signal is emitted when the \l{Action} with the given \a id is finished. The \a status of the \l{Action} execution will be described as \l{DeviceManager::DeviceError}{DeviceError}. */ -/*! \fn void guhserver::NymeaCore::devicesDiscovered(const DeviceClassId &deviceClassId, const QList deviceDescriptors); +/*! \fn void nymeaserver::NymeaCore::devicesDiscovered(const DeviceClassId &deviceClassId, const QList deviceDescriptors); This signal is emitted when the discovery of a \a deviceClassId is finished. The \a deviceDescriptors parameter describes the list of \l{DeviceDescriptor}{DeviceDescriptors} of all discovered \l{Device}{Devices}. \sa DeviceManager::discoverDevices() */ -/*! \fn void guhserver::NymeaCore::deviceSetupFinished(Device *device, DeviceManager::DeviceError status); +/*! \fn void nymeaserver::NymeaCore::deviceSetupFinished(Device *device, DeviceManager::DeviceError status); This signal is emitted when the setup of a \a device is finished. The \a status parameter describes the \l{DeviceManager::DeviceError}{DeviceError} that occurred. */ -/*! \fn void guhserver::NymeaCore::deviceReconfigurationFinished(Device *device, DeviceManager::DeviceError status); +/*! \fn void nymeaserver::NymeaCore::deviceReconfigurationFinished(Device *device, DeviceManager::DeviceError status); This signal is emitted when the edit request of a \a device is finished. The \a status of the edit request will be described as \l{DeviceManager::DeviceError}{DeviceError}. */ -/*! \fn void guhserver::NymeaCore::pairingFinished(const PairingTransactionId &pairingTransactionId, DeviceManager::DeviceError status, const DeviceId &deviceId); +/*! \fn void nymeaserver::NymeaCore::pairingFinished(const PairingTransactionId &pairingTransactionId, DeviceManager::DeviceError status, const DeviceId &deviceId); The DeviceManager will emit a this Signal when the pairing of a \l{Device} with the \a deviceId and \a pairingTransactionId is finished. The \a status of the pairing will be described as \l{DeviceManager::DeviceError}{DeviceError}. */ -/*! \fn void guhserver::NymeaCore::ruleRemoved(const RuleId &ruleId); +/*! \fn void nymeaserver::NymeaCore::ruleRemoved(const RuleId &ruleId); This signal is emitted when a \l{Rule} with the given \a ruleId was removed. */ -/*! \fn void guhserver::NymeaCore::ruleAdded(const Rule &rule); +/*! \fn void nymeaserver::NymeaCore::ruleAdded(const Rule &rule); This signal is emitted when a \a rule was added to the system. */ -/*! \fn void guhserver::NymeaCore::ruleConfigurationChanged(const Rule &rule); +/*! \fn void nymeaserver::NymeaCore::ruleConfigurationChanged(const Rule &rule); This signal is emitted when the configuration of \a rule changed. */ @@ -106,7 +106,7 @@ #include "plugin/device.h" #include "cloudnotifications.h" -namespace guhserver { +namespace nymeaserver { NymeaCore* NymeaCore::s_instance = 0; diff --git a/libnymea-core/nymeacore.h b/libnymea-core/nymeacore.h index 85c6875e..038916fc 100644 --- a/libnymea-core/nymeacore.h +++ b/libnymea-core/nymeacore.h @@ -43,7 +43,7 @@ class Device; -namespace guhserver { +namespace nymeaserver { class JsonRPCServer; class LogEngine; diff --git a/libnymea-core/nymeadbusservice.cpp b/libnymea-core/nymeadbusservice.cpp index e077ad96..97b28a22 100644 --- a/libnymea-core/nymeadbusservice.cpp +++ b/libnymea-core/nymeadbusservice.cpp @@ -23,7 +23,7 @@ #include "usermanager.h" #include "loggingcategories.h" -namespace guhserver { +namespace nymeaserver { QDBusConnection NymeaDBusService::s_connection = QDBusConnection::systemBus(); diff --git a/libnymea-core/nymeadbusservice.h b/libnymea-core/nymeadbusservice.h index 256260ae..5f51cc54 100644 --- a/libnymea-core/nymeadbusservice.h +++ b/libnymea-core/nymeadbusservice.h @@ -27,7 +27,7 @@ #include -namespace guhserver { +namespace nymeaserver { class UserManager; diff --git a/libnymea-core/pushbuttondbusservice.cpp b/libnymea-core/pushbuttondbusservice.cpp index ba30621f..30d0852b 100644 --- a/libnymea-core/pushbuttondbusservice.cpp +++ b/libnymea-core/pushbuttondbusservice.cpp @@ -26,7 +26,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { PushButtonDBusService::PushButtonDBusService(const QString &objectPath, UserManager *parent) : NymeaDBusService(objectPath, parent), m_userManager(parent) diff --git a/libnymea-core/pushbuttondbusservice.h b/libnymea-core/pushbuttondbusservice.h index d7218c9d..f76c099e 100644 --- a/libnymea-core/pushbuttondbusservice.h +++ b/libnymea-core/pushbuttondbusservice.h @@ -27,7 +27,7 @@ #include "usermanager.h" #include "nymeadbusservice.h" -namespace guhserver { +namespace nymeaserver { class PushButtonDBusService : public NymeaDBusService { diff --git a/libnymea-core/rest/deviceclassesresource.cpp b/libnymea-core/rest/deviceclassesresource.cpp index 4ee2242a..f8f60ee8 100644 --- a/libnymea-core/rest/deviceclassesresource.cpp +++ b/libnymea-core/rest/deviceclassesresource.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::DeviceClassesResource + \class nymeaserver::DeviceClassesResource \brief This subclass of \l{RestResource} processes the REST requests for the \tt DeviceClasses namespace. \ingroup json @@ -41,7 +41,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a \l DeviceClassesResource with the given \a parent. */ DeviceClassesResource::DeviceClassesResource(QObject *parent) : diff --git a/libnymea-core/rest/deviceclassesresource.h b/libnymea-core/rest/deviceclassesresource.h index d25ac9da..44a4d0cd 100644 --- a/libnymea-core/rest/deviceclassesresource.h +++ b/libnymea-core/rest/deviceclassesresource.h @@ -29,7 +29,7 @@ #include "httpreply.h" -namespace guhserver { +namespace nymeaserver { class HttpRequest; diff --git a/libnymea-core/rest/devicesresource.cpp b/libnymea-core/rest/devicesresource.cpp index 6abe929a..844693c0 100644 --- a/libnymea-core/rest/devicesresource.cpp +++ b/libnymea-core/rest/devicesresource.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::DevicesResource + \class nymeaserver::DevicesResource \brief This subclass of \l{RestResource} processes the REST requests for the \tt Devices namespace. \ingroup json @@ -44,7 +44,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a \l DevicesResource with the given \a parent. */ DevicesResource::DevicesResource(QObject *parent) : diff --git a/libnymea-core/rest/devicesresource.h b/libnymea-core/rest/devicesresource.h index 2895e4a7..f9ed8ce7 100644 --- a/libnymea-core/rest/devicesresource.h +++ b/libnymea-core/rest/devicesresource.h @@ -28,7 +28,7 @@ #include "restresource.h" #include "httpreply.h" -namespace guhserver { +namespace nymeaserver { class HttpRequest; diff --git a/libnymea-core/rest/logsresource.cpp b/libnymea-core/rest/logsresource.cpp index 3a3b6ba1..ff9b00f4 100644 --- a/libnymea-core/rest/logsresource.cpp +++ b/libnymea-core/rest/logsresource.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::LogsResource + \class nymeaserver::LogsResource \brief This subclass of \l{RestResource} processes the REST requests for the \tt Logs namespace. \ingroup json @@ -43,7 +43,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a \l LogsResource with the given \a parent. */ LogsResource::LogsResource(QObject *parent) : diff --git a/libnymea-core/rest/logsresource.h b/libnymea-core/rest/logsresource.h index 58749794..ef2d9e21 100644 --- a/libnymea-core/rest/logsresource.h +++ b/libnymea-core/rest/logsresource.h @@ -28,7 +28,7 @@ #include "restresource.h" #include "httpreply.h" -namespace guhserver { +namespace nymeaserver { class HttpRequest; diff --git a/libnymea-core/rest/pluginsresource.cpp b/libnymea-core/rest/pluginsresource.cpp index 353eeab9..2c3518fc 100644 --- a/libnymea-core/rest/pluginsresource.cpp +++ b/libnymea-core/rest/pluginsresource.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::PluginsResource + \class nymeaserver::PluginsResource \brief This subclass of \l{RestResource} processes the REST requests for the \tt Plugins namespace. \ingroup json @@ -42,7 +42,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a \l PluginsResource with the given \a parent. */ PluginsResource::PluginsResource(QObject *parent) : diff --git a/libnymea-core/rest/pluginsresource.h b/libnymea-core/rest/pluginsresource.h index b0effd4f..4ec0042b 100644 --- a/libnymea-core/rest/pluginsresource.h +++ b/libnymea-core/rest/pluginsresource.h @@ -28,7 +28,7 @@ #include "restresource.h" #include "httpreply.h" -namespace guhserver { +namespace nymeaserver { class HttpRequest; diff --git a/libnymea-core/rest/restresource.cpp b/libnymea-core/rest/restresource.cpp index e5b56cd1..09b75342 100644 --- a/libnymea-core/rest/restresource.cpp +++ b/libnymea-core/rest/restresource.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::RestResource + \class nymeaserver::RestResource \brief This class provides an interface for REST API resources. \ingroup api @@ -41,7 +41,7 @@ \sa RestServer */ -/*! \fn QString guhserver::RestResource::name() const; +/*! \fn QString nymeaserver::RestResource::name() const; This method must be implemented in a subclass of \l{RestResource}. It returns the endpoint name of this \l{RestResource} i.e. if this method returns \tt "example" the API resource will be accessable with the URL: @@ -52,7 +52,7 @@ */ -/*! \fn HttpReply *guhserver::RestResource::proccessRequest(const HttpRequest &request, const QStringList &urlTokens) +/*! \fn HttpReply *nymeaserver::RestResource::proccessRequest(const HttpRequest &request, const QStringList &urlTokens) This method will be called from the \l{RestServer} once a \l{HttpRequest} \a request was identified to belong to this \l{RestResource}. The given \a urlTokens contain the full list of URL tokens from this request. */ @@ -65,7 +65,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a \l{RestResource} with the given \a parent. */ RestResource::RestResource(QObject *parent) : @@ -118,7 +118,7 @@ HttpReply *RestResource::createDeviceErrorReply(const HttpReply::HttpStatusCode } /*! Returns the pointer to a new created \l{HttpReply} with the given \a statusCode and \a ruleError. This method will - * be used to create an error response for the \l{guhserver::RulesResource}{RulesResource}. The \a ruleError will be written in the payload of this reply.*/ + * be used to create an error response for the \l{nymeaserver::RulesResource}{RulesResource}. The \a ruleError will be written in the payload of this reply.*/ HttpReply *RestResource::createRuleErrorReply(const HttpReply::HttpStatusCode &statusCode, const RuleEngine::RuleError &ruleError) { HttpReply *reply = new HttpReply(statusCode, HttpReply::TypeSync); @@ -130,7 +130,7 @@ HttpReply *RestResource::createRuleErrorReply(const HttpReply::HttpStatusCode &s } /*! Returns the pointer to a new created \l{HttpReply} with the given \a statusCode and \a loggingError. This method will - * be used to create an error response for the \l{guhserver::LogsResource}{LogsResource}. The \a loggingError will be written in the payload of this reply.*/ + * be used to create an error response for the \l{nymeaserver::LogsResource}{LogsResource}. The \a loggingError will be written in the payload of this reply.*/ HttpReply *RestResource::createLoggingErrorReply(const HttpReply::HttpStatusCode &statusCode, const Logging::LoggingError &loggingError) { HttpReply *reply = new HttpReply(statusCode, HttpReply::TypeSync); diff --git a/libnymea-core/rest/restresource.h b/libnymea-core/rest/restresource.h index 14ee80c8..fcf265d2 100644 --- a/libnymea-core/rest/restresource.h +++ b/libnymea-core/rest/restresource.h @@ -30,7 +30,7 @@ class QVariant; -namespace guhserver { +namespace nymeaserver { class RestResource : public QObject { diff --git a/libnymea-core/rest/restserver.cpp b/libnymea-core/rest/restserver.cpp index 2c6ab8cd..ae47bb5b 100644 --- a/libnymea-core/rest/restserver.cpp +++ b/libnymea-core/rest/restserver.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::RestServer + \class nymeaserver::RestServer \brief This class provides the REST API interface to the \l{WebServer}{WebServers}. \ingroup server @@ -42,7 +42,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a \l{RestServer} with the given \a sslConfiguration and \a parent. */ RestServer::RestServer(const QSslConfiguration &sslConfiguration, QObject *parent) : diff --git a/libnymea-core/rest/restserver.h b/libnymea-core/rest/restserver.h index 15730a0a..b6174184 100644 --- a/libnymea-core/rest/restserver.h +++ b/libnymea-core/rest/restserver.h @@ -34,7 +34,7 @@ class QSslConfiguration; -namespace guhserver { +namespace nymeaserver { class HttpRequest; class HttpReply; diff --git a/libnymea-core/rest/rulesresource.cpp b/libnymea-core/rest/rulesresource.cpp index 1cad859b..c734591c 100644 --- a/libnymea-core/rest/rulesresource.cpp +++ b/libnymea-core/rest/rulesresource.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::RulesResource + \class nymeaserver::RulesResource \brief This subclass of \l{RestResource} processes the REST requests for the \tt Rules namespace. \ingroup json @@ -43,7 +43,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a \l RulesResource with the given \a parent. */ RulesResource::RulesResource(QObject *parent) : diff --git a/libnymea-core/rest/rulesresource.h b/libnymea-core/rest/rulesresource.h index 2e4bab7f..7a877cb2 100644 --- a/libnymea-core/rest/rulesresource.h +++ b/libnymea-core/rest/rulesresource.h @@ -29,7 +29,7 @@ #include "httpreply.h" -namespace guhserver { +namespace nymeaserver { class HttpRequest; diff --git a/libnymea-core/rest/vendorsresource.cpp b/libnymea-core/rest/vendorsresource.cpp index fcf096ae..59a03133 100644 --- a/libnymea-core/rest/vendorsresource.cpp +++ b/libnymea-core/rest/vendorsresource.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::VendorsResource + \class nymeaserver::VendorsResource \brief This subclass of \l{RestResource} processes the REST requests for the \tt Vendors namespace. \ingroup json @@ -43,7 +43,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a \l VendorsResource with the given \a parent. */ VendorsResource::VendorsResource(QObject *parent) : diff --git a/libnymea-core/rest/vendorsresource.h b/libnymea-core/rest/vendorsresource.h index a571c77c..ddf86834 100644 --- a/libnymea-core/rest/vendorsresource.h +++ b/libnymea-core/rest/vendorsresource.h @@ -28,7 +28,7 @@ #include "restresource.h" #include "httpreply.h" -namespace guhserver { +namespace nymeaserver { class HttpRequest; diff --git a/libnymea-core/rule.cpp b/libnymea-core/rule.cpp index b5c795be..ca995cd4 100644 --- a/libnymea-core/rule.cpp +++ b/libnymea-core/rule.cpp @@ -20,7 +20,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::Rule + \class nymeaserver::Rule \brief This class represents a rule. \ingroup rules @@ -38,7 +38,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Constructs an empty, invalid \l{Rule}. */ Rule::Rule(): diff --git a/libnymea-core/rule.h b/libnymea-core/rule.h index 74f78c18..afc16d75 100644 --- a/libnymea-core/rule.h +++ b/libnymea-core/rule.h @@ -30,7 +30,7 @@ #include -namespace guhserver { +namespace nymeaserver { class Rule { diff --git a/libnymea-core/ruleengine.cpp b/libnymea-core/ruleengine.cpp index cbe23959..0796b61b 100644 --- a/libnymea-core/ruleengine.cpp +++ b/libnymea-core/ruleengine.cpp @@ -20,7 +20,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::RuleEngine + \class nymeaserver::RuleEngine \brief The Engine that evaluates \l{Rule}{Rules} and finds \l{Action}{Actions} to be executed. \ingroup rules @@ -32,20 +32,20 @@ \sa Event, EventDescriptor, Rule, RuleAction */ -/*! \fn void guhserver::RuleEngine::ruleAdded(const Rule &rule) +/*! \fn void nymeaserver::RuleEngine::ruleAdded(const Rule &rule) Will be emitted whenever a new \l{Rule} is added to this Engine. The \a rule parameter holds the entire new rule.*/ -/*! \fn void guhserver::RuleEngine::ruleRemoved(const RuleId &ruleId) +/*! \fn void nymeaserver::RuleEngine::ruleRemoved(const RuleId &ruleId) Will be emitted whenever a \l{Rule} is removed from this Engine. \a ruleId holds the id of the removed rule. You should remove any references or copies you hold for this rule.*/ -/*! \fn void guhserver::RuleEngine::ruleConfigurationChanged(const Rule &rule) +/*! \fn void nymeaserver::RuleEngine::ruleConfigurationChanged(const Rule &rule) Will be emitted whenever a \l{Rule} changed his enable/disable status. The parameter \a rule holds the changed rule.*/ -/*! \enum guhserver::RuleEngine::RuleError +/*! \enum nymeaserver::RuleEngine::RuleError \value RuleErrorNoError No error happened. Everything is fine. \value RuleErrorInvalidRuleId @@ -89,7 +89,7 @@ This rule does not have any ExitActions which means they cannot be executed. */ -/*! \enum guhserver::RuleEngine::RemovePolicy +/*! \enum nymeaserver::RuleEngine::RemovePolicy \value RemovePolicyCascade Remove the whole \l{Rule}. @@ -116,7 +116,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { /*! Constructs the RuleEngine with the given \a parent. Although it wouldn't harm to have multiple RuleEngines, there is one instance available from \l{NymeaCore}. This one should be used instead of creating multiple ones. diff --git a/libnymea-core/ruleengine.h b/libnymea-core/ruleengine.h index c40b76a3..51cd5e6c 100644 --- a/libnymea-core/ruleengine.h +++ b/libnymea-core/ruleengine.h @@ -31,7 +31,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { class RuleEngine : public QObject { @@ -120,7 +120,7 @@ private: } -using namespace guhserver; +using namespace nymeaserver; Q_DECLARE_METATYPE(RuleEngine::RuleError) diff --git a/libnymea-core/servermanager.cpp b/libnymea-core/servermanager.cpp index cf7504a5..b8cdfa31 100644 --- a/libnymea-core/servermanager.cpp +++ b/libnymea-core/servermanager.cpp @@ -20,7 +20,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::ServerManager + \class nymeaserver::ServerManager \brief This class represents the manager of all server interfaces of the guh server. \ingroup server @@ -41,7 +41,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a \l{ServerManager} with the given \a parent. */ ServerManager::ServerManager(NymeaConfiguration *configuration, QObject *parent) : diff --git a/libnymea-core/servermanager.h b/libnymea-core/servermanager.h index 51e0073c..38495172 100644 --- a/libnymea-core/servermanager.h +++ b/libnymea-core/servermanager.h @@ -35,7 +35,7 @@ class QSslConfiguration; class QSslCertificate; class QSslKey; -namespace guhserver { +namespace nymeaserver { class ServerManager : public QObject { diff --git a/libnymea-core/stateevaluator.cpp b/libnymea-core/stateevaluator.cpp index 3eb08e34..acd740c3 100644 --- a/libnymea-core/stateevaluator.cpp +++ b/libnymea-core/stateevaluator.cpp @@ -20,7 +20,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::StateEvaluator + \class nymeaserver::StateEvaluator \brief This class helps to evaluate a \l{State} and . \ingroup rules @@ -40,7 +40,7 @@ #include "loggingcategories.h" #include "nymeasettings.h" -namespace guhserver { +namespace nymeaserver { /*! Constructs a new StateEvaluator for the given \a stateDescriptor. */ StateEvaluator::StateEvaluator(const StateDescriptor &stateDescriptor): diff --git a/libnymea-core/stateevaluator.h b/libnymea-core/stateevaluator.h index 79ad6dba..2dad1a79 100644 --- a/libnymea-core/stateevaluator.h +++ b/libnymea-core/stateevaluator.h @@ -29,7 +29,7 @@ class NymeaSettings; -namespace guhserver { +namespace nymeaserver { class StateEvaluator { diff --git a/libnymea-core/tcpserver.cpp b/libnymea-core/tcpserver.cpp index 1f744a38..772827b6 100644 --- a/libnymea-core/tcpserver.cpp +++ b/libnymea-core/tcpserver.cpp @@ -20,7 +20,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::TcpServer + \class nymeaserver::TcpServer \brief This class represents the tcp server for nymead. \ingroup server @@ -38,7 +38,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a \l{TcpServer} with the given \a host, \a port and \a parent. * diff --git a/libnymea-core/tcpserver.h b/libnymea-core/tcpserver.h index a009df34..3f4c20a4 100644 --- a/libnymea-core/tcpserver.h +++ b/libnymea-core/tcpserver.h @@ -36,7 +36,7 @@ #include "loggingcategories.h" -namespace guhserver { +namespace nymeaserver { class SslServer: public QTcpServer { diff --git a/libnymea-core/time/calendaritem.cpp b/libnymea-core/time/calendaritem.cpp index 906c123f..ff9825cb 100644 --- a/libnymea-core/time/calendaritem.cpp +++ b/libnymea-core/time/calendaritem.cpp @@ -19,8 +19,8 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::CalendarItem - \brief Describes a clendar item for a time based \l{guhserver::Rule}{Rule}. + \class nymeaserver::CalendarItem + \brief Describes a clendar item for a time based \l{nymeaserver::Rule}{Rule}. \ingroup rules \inmodule core @@ -31,7 +31,7 @@ #include "calendaritem.h" #include "loggingcategories.h" -namespace guhserver { +namespace nymeaserver { /*! Construct a invalid \l{CalendarItem}. */ CalendarItem::CalendarItem(): diff --git a/libnymea-core/time/calendaritem.h b/libnymea-core/time/calendaritem.h index 6c40ebd6..c3e7cd1f 100644 --- a/libnymea-core/time/calendaritem.h +++ b/libnymea-core/time/calendaritem.h @@ -25,7 +25,7 @@ #include "repeatingoption.h" -namespace guhserver { +namespace nymeaserver { class CalendarItem { diff --git a/libnymea-core/time/repeatingoption.cpp b/libnymea-core/time/repeatingoption.cpp index 8c6be238..dcdac090 100644 --- a/libnymea-core/time/repeatingoption.cpp +++ b/libnymea-core/time/repeatingoption.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::RepeatingOption + \class nymeaserver::RepeatingOption \brief Describes the repeating option of a time item. \ingroup rules @@ -57,7 +57,7 @@ \sa Rule, TimeDescriptor */ -/*! \enum guhserver::RepeatingOption::RepeatingMode +/*! \enum nymeaserver::RepeatingOption::RepeatingMode This enum type specifies the mode of a \l{RepeatingOption}. @@ -83,7 +83,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Constructs an empty \l{RepeatingOption}. */ RepeatingOption::RepeatingOption() : diff --git a/libnymea-core/time/repeatingoption.h b/libnymea-core/time/repeatingoption.h index dce7ad8a..0e0cc41d 100644 --- a/libnymea-core/time/repeatingoption.h +++ b/libnymea-core/time/repeatingoption.h @@ -26,7 +26,7 @@ class QDateTime; -namespace guhserver { +namespace nymeaserver { class RepeatingOption { diff --git a/libnymea-core/time/timedescriptor.cpp b/libnymea-core/time/timedescriptor.cpp index d50039b9..5abed087 100644 --- a/libnymea-core/time/timedescriptor.cpp +++ b/libnymea-core/time/timedescriptor.cpp @@ -19,8 +19,8 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::TimeDescriptor - \brief Describes the time elements of a time based \l{guhserver::Rule}{Rule}. + \class nymeaserver::TimeDescriptor + \brief Describes the time elements of a time based \l{nymeaserver::Rule}{Rule}. \ingroup rules \inmodule core @@ -34,7 +34,7 @@ #include "timedescriptor.h" -namespace guhserver { +namespace nymeaserver { /*! Constructs an invalid \l{TimeDescriptor}.*/ TimeDescriptor::TimeDescriptor() diff --git a/libnymea-core/time/timedescriptor.h b/libnymea-core/time/timedescriptor.h index 816bec2f..ff9b20e4 100644 --- a/libnymea-core/time/timedescriptor.h +++ b/libnymea-core/time/timedescriptor.h @@ -24,7 +24,7 @@ #include "timeeventitem.h" #include "calendaritem.h" -namespace guhserver { +namespace nymeaserver { class TimeDescriptor { diff --git a/libnymea-core/time/timeeventitem.cpp b/libnymea-core/time/timeeventitem.cpp index 0f3016bb..10497118 100644 --- a/libnymea-core/time/timeeventitem.cpp +++ b/libnymea-core/time/timeeventitem.cpp @@ -19,8 +19,8 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::TimeEventItem - \brief Describes a time event of a time based \l{guhserver::Rule}{Rule}. + \class nymeaserver::TimeEventItem + \brief Describes a time event of a time based \l{nymeaserver::Rule}{Rule}. \ingroup rules \inmodule core @@ -31,7 +31,7 @@ #include "timeeventitem.h" -namespace guhserver { +namespace nymeaserver { /*! Constructs an invalid \l{TimeEventItem}. */ TimeEventItem::TimeEventItem() diff --git a/libnymea-core/time/timeeventitem.h b/libnymea-core/time/timeeventitem.h index 70a6405f..942af393 100644 --- a/libnymea-core/time/timeeventitem.h +++ b/libnymea-core/time/timeeventitem.h @@ -25,7 +25,7 @@ #include "repeatingoption.h" -namespace guhserver { +namespace nymeaserver { class TimeEventItem { diff --git a/libnymea-core/time/timemanager.cpp b/libnymea-core/time/timemanager.cpp index c58001e3..e71dc3cd 100644 --- a/libnymea-core/time/timemanager.cpp +++ b/libnymea-core/time/timemanager.cpp @@ -19,25 +19,25 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::TimeManager + \class nymeaserver::TimeManager \brief Describes the centralized time manager of guh. \ingroup rules \inmodule core */ -/*! \fn void guhserver::TimeManager::tick() +/*! \fn void nymeaserver::TimeManager::tick() Represents the central time tick. Will be emitted every second. */ -/*! \fn void guhserver::TimeManager::dateTimeChanged(const QDateTime &dateTime); +/*! \fn void nymeaserver::TimeManager::dateTimeChanged(const QDateTime &dateTime); Will be emitted when the \a dateTime has changed. */ #include "timemanager.h" #include "loggingcategories.h" -namespace guhserver { +namespace nymeaserver { /*! Constructs a new \l{TimeManager} with the given \a timeZone and \a parent. */ TimeManager::TimeManager(const QByteArray &timeZone, QObject *parent) : diff --git a/libnymea-core/time/timemanager.h b/libnymea-core/time/timemanager.h index 474d7410..be6657f4 100644 --- a/libnymea-core/time/timemanager.h +++ b/libnymea-core/time/timemanager.h @@ -26,7 +26,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { class TimeManager : public QObject { diff --git a/libnymea-core/tokeninfo.cpp b/libnymea-core/tokeninfo.cpp index 8153374a..e4cbd2b4 100644 --- a/libnymea-core/tokeninfo.cpp +++ b/libnymea-core/tokeninfo.cpp @@ -20,7 +20,7 @@ #include "tokeninfo.h" -namespace guhserver { +namespace nymeaserver { TokenInfo::TokenInfo(const QUuid &id, const QString &username, const QDateTime &creationTime, const QString &deviceName): m_id(id), diff --git a/libnymea-core/tokeninfo.h b/libnymea-core/tokeninfo.h index c207b6b6..cb4b9542 100644 --- a/libnymea-core/tokeninfo.h +++ b/libnymea-core/tokeninfo.h @@ -24,7 +24,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { class TokenInfo { diff --git a/libnymea-core/transportinterface.cpp b/libnymea-core/transportinterface.cpp index 1fdf82c7..c5f21399 100644 --- a/libnymea-core/transportinterface.cpp +++ b/libnymea-core/transportinterface.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::TransportInterface + \class nymeaserver::TransportInterface \brief This class provides an interface for the JSON servers. \ingroup server @@ -28,41 +28,41 @@ \sa WebSocketServer, TcpServer */ -/*! \fn void guhserver::TransportInterface::clientConnected(const QUuid &clientId); +/*! \fn void nymeaserver::TransportInterface::clientConnected(const QUuid &clientId); This signal is emitted when a new client with the given \a clientId has been connected. \sa WebSocketServer, TcpServer */ -/*! \fn void guhserver::TransportInterface::clientDisconnected(const QUuid &clientId); +/*! \fn void nymeaserver::TransportInterface::clientDisconnected(const QUuid &clientId); This signal is emitted when a new client with the given \a clientId has been disconnected. \sa WebSocketServer, TcpServer */ -/*! \fn bool guhserver::TransportInterface::startServer(); +/*! \fn bool nymeaserver::TransportInterface::startServer(); Pure virtual public slot for starting the corresponding \l{TransportInterface}. Returns true if started successfully. \sa WebSocketServer::startServer(), TcpServer::startServer() */ -/*! \fn bool guhserver::TransportInterface::stopServer(); +/*! \fn bool nymeaserver::TransportInterface::stopServer(); Pure virtual public slot for stopping the corresponding \l{TransportInterface}. Returns true if stopped successfully. \sa WebSocketServer::stopServer(), TcpServer::stopServer() */ -/*! \fn void guhserver::TransportInterface::sendData(const QUuid &clientId, const QVariantMap &data); +/*! \fn void nymeaserver::TransportInterface::sendData(const QUuid &clientId, const QVariantMap &data); Pure virtual method for sending \a data to the client with the id \a clientId over the corresponding \l{TransportInterface}. */ -/*! \fn void guhserver::TransportInterface::sendData(const QList &clients, const QVariantMap &data); +/*! \fn void nymeaserver::TransportInterface::sendData(const QList &clients, const QVariantMap &data); Pure virtual method for sending \a data to \a clients over the corresponding \l{TransportInterface}. */ -/*! \fn void guhserver::TransportInterface::dataAvailable(const QUuid &clientId, const QString &targetNamespace, const QString &method, const QVariantMap &message); +/*! \fn void nymeaserver::TransportInterface::dataAvailable(const QUuid &clientId, const QString &targetNamespace, const QString &method, const QVariantMap &message); This signal is emitted when valid data from the client with the given \a clientId are available. Data are valid if the corresponding \l{TransportInterface} has parsed successfully the given \a targetNamespace, \a method and \a message. @@ -75,7 +75,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a \l{TransportInterface} with the given \a parent. */ TransportInterface::TransportInterface(const ServerConfiguration &config, QObject *parent) : diff --git a/libnymea-core/transportinterface.h b/libnymea-core/transportinterface.h index 86c477c6..a564a280 100644 --- a/libnymea-core/transportinterface.h +++ b/libnymea-core/transportinterface.h @@ -28,7 +28,7 @@ #include "nymeaconfiguration.h" -namespace guhserver { +namespace nymeaserver { class TransportInterface : public QObject { diff --git a/libnymea-core/usermanager.cpp b/libnymea-core/usermanager.cpp index 626ef4f6..42f60b3c 100644 --- a/libnymea-core/usermanager.cpp +++ b/libnymea-core/usermanager.cpp @@ -33,7 +33,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { UserManager::UserManager(QObject *parent) : QObject(parent) { diff --git a/libnymea-core/usermanager.h b/libnymea-core/usermanager.h index 01a9f452..afd4031e 100644 --- a/libnymea-core/usermanager.h +++ b/libnymea-core/usermanager.h @@ -26,7 +26,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { class PushButtonDBusService; @@ -59,7 +59,7 @@ public: void cancelPushButtonAuth(int transactionId); QString userForToken(const QByteArray &token) const; QList tokens(const QString &username) const; - guhserver::UserManager::UserError removeToken(const QUuid &tokenId); + nymeaserver::UserManager::UserError removeToken(const QUuid &tokenId); bool verifyToken(const QByteArray &token); diff --git a/libnymea-core/webserver.cpp b/libnymea-core/webserver.cpp index 98751b7c..38958df5 100644 --- a/libnymea-core/webserver.cpp +++ b/libnymea-core/webserver.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::WebServer + \class nymeaserver::WebServer \brief This class represents the web server for nymead. \ingroup server @@ -52,21 +52,21 @@ \sa WebServerClient, WebSocketServer, TcpServer */ -/*! \fn void guhserver::WebServer::httpRequestReady(const QUuid &clientId, const HttpRequest &httpRequest); +/*! \fn void nymeaserver::WebServer::httpRequestReady(const QUuid &clientId, const HttpRequest &httpRequest); This signal is emitted when a \a httpRequest from a client with the given \a clientId is ready. \sa RestServer, HttpRequest */ -/*! \fn void guhserver::WebServer::clientConnected(const QUuid &clientId); +/*! \fn void nymeaserver::WebServer::clientConnected(const QUuid &clientId); This signal is emitted when a new client with the given \a clientId has been connected. */ -/*! \fn void guhserver::WebServer::clientDisconnected(const QUuid &clientId); +/*! \fn void nymeaserver::WebServer::clientDisconnected(const QUuid &clientId); This signal is emitted when a client with the given \a clientId has been disconnected. */ -/*! \fn void guhserver::WebServer::incomingConnection(qintptr socketDescriptor); +/*! \fn void nymeaserver::WebServer::incomingConnection(qintptr socketDescriptor); Overwritten virtual method from \l{http://doc.qt.io/qt-5/qtcpserver.html#incomingConnection}{QTcpServer::incomingConnection( \a socketDescriptor)}. */ @@ -91,7 +91,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a \l{WebServer} with the given \a host, \a port, \a publicFolder and \a parent. * @@ -763,7 +763,7 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address) } /*! - \class guhserver::WebServerClient + \class nymeaserver::WebServerClient \brief This class represents a client the web server for nymead. \ingroup server diff --git a/libnymea-core/webserver.h b/libnymea-core/webserver.h index 5fbe3550..b4f0a606 100644 --- a/libnymea-core/webserver.h +++ b/libnymea-core/webserver.h @@ -41,7 +41,7 @@ // Note: Hypertext Transfer Protocol (HTTP/1.1) from the Internet Engineering Task Force (IETF): // https://tools.ietf.org/html/rfc7231 -namespace guhserver { +namespace nymeaserver { class HttpReply; class HttpRequest; diff --git a/libnymea-core/websocketserver.cpp b/libnymea-core/websocketserver.cpp index 1bcdef2c..964501fd 100644 --- a/libnymea-core/websocketserver.cpp +++ b/libnymea-core/websocketserver.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::WebSocketServer + \class nymeaserver::WebSocketServer \brief This class represents the websocket server for nymead. \ingroup server @@ -54,7 +54,7 @@ #include -namespace guhserver { +namespace nymeaserver { /*! Constructs a \l{WebSocketServer} with the given \a address, \a port \a sslEnabled and \a parent. * diff --git a/libnymea-core/websocketserver.h b/libnymea-core/websocketserver.h index 220ce51e..981aca72 100644 --- a/libnymea-core/websocketserver.h +++ b/libnymea-core/websocketserver.h @@ -36,7 +36,7 @@ class QSslConfiguration; -namespace guhserver { +namespace nymeaserver { class WebSocketServer : public TransportInterface { diff --git a/libnymea/devicemanager.cpp b/libnymea/devicemanager.cpp index 3b516ade..c1545390 100644 --- a/libnymea/devicemanager.cpp +++ b/libnymea/devicemanager.cpp @@ -83,7 +83,7 @@ \value DeviceErrorDeviceIsChild The device is a child device and can not be deleted directly. \value DeviceErrorDeviceInRule - The device is in a rule and can not be deleted withou \l{guhserver::RuleEngine::RemovePolicy}. + The device is in a rule and can not be deleted withou \l{nymeaserver::RuleEngine::RemovePolicy}. \value DeviceErrorParameterNotWritable One of the given device params is not writable. */ @@ -152,8 +152,8 @@ /*! \fn void DeviceManager::eventTriggered(const Event &event) The DeviceManager will emit a \l{Event} described in \a event whenever a Device - creates one. Normally only \l{guhserver::NymeaCore} should connect to this and execute actions - after checking back with the \{guhserver::RulesEngine}. Exceptions might be monitoring interfaces + creates one. Normally only \l{nymeaserver::NymeaCore} should connect to this and execute actions + after checking back with the \{nymeaserver::RulesEngine}. Exceptions might be monitoring interfaces or similar, but you should never directly react to this in a \l{DevicePlugin}. */ @@ -177,8 +177,8 @@ #include #include -/*! Constructs the DeviceManager with the given \a locale and \a parent. There should only be one DeviceManager in the system created by \l{guhserver::NymeaCore}. - * Use \c guhserver::NymeaCore::instance()->deviceManager() instead to access the DeviceManager. */ +/*! Constructs the DeviceManager with the given \a locale and \a parent. There should only be one DeviceManager in the system created by \l{nymeaserver::NymeaCore}. + * Use \c nymeaserver::NymeaCore::instance()->deviceManager() instead to access the DeviceManager. */ DeviceManager::DeviceManager(HardwareManager *hardwareManager, const QLocale &locale, QObject *parent) : QObject(parent), m_hardwareManager(hardwareManager), diff --git a/libnymea/nymeasettings.cpp b/libnymea/nymeasettings.cpp index 2964a7c0..6a1a090d 100644 --- a/libnymea/nymeasettings.cpp +++ b/libnymea/nymeasettings.cpp @@ -42,7 +42,7 @@ \value SettingsRoleDevices This role will create the \b{devices.conf} file and is used to store the configured \l{Device}{Devices}. \value SettingsRoleRules - This role will create the \b{rules.conf} file and is used to store the configured \l{guhserver::Rule}{Rules}. + This role will create the \b{rules.conf} file and is used to store the configured \l{nymeaserver::Rule}{Rules}. \value SettingsRolePlugins This role will create the \b{plugins.conf} file and is used to store the \l{DevicePlugin}{Plugin} configurations. \value SettingsRoleGlobal @@ -124,7 +124,7 @@ bool NymeaSettings::isRoot() /*! Returns the path where the logging database will be stored. - \sa guhserver::LogEngine + \sa nymeaserver::LogEngine */ QString NymeaSettings::logPath() { diff --git a/libnymea/plugin/devicedescriptor.cpp b/libnymea/plugin/devicedescriptor.cpp index e2763fdf..837f14b2 100644 --- a/libnymea/plugin/devicedescriptor.cpp +++ b/libnymea/plugin/devicedescriptor.cpp @@ -28,7 +28,7 @@ \ingroup devices \inmodule libnymea - An DeviceDescriptor describes an \l{Device} in order to match it with a \l{guhserver::Rule}. + An DeviceDescriptor describes an \l{Device} in order to match it with a \l{nymeaserver::Rule}. \sa Device */ diff --git a/libnymea/types/eventdescriptor.cpp b/libnymea/types/eventdescriptor.cpp index 528a68e5..741c9656 100644 --- a/libnymea/types/eventdescriptor.cpp +++ b/libnymea/types/eventdescriptor.cpp @@ -29,14 +29,14 @@ \ingroup rules \inmodule libnymea - An EventDescriptor describes an \l{Event} in order to match it with a \l{guhserver::Rule}. + An EventDescriptor describes an \l{Event} in order to match it with a \l{nymeaserver::Rule}. An EventDescriptor can either be bound to a certain device/eventtype, or to an interface. If an event is bound to a device, it will only match when the given device fires the given event. If an event is bound to an interface, it will match the given event for all the devices implementing the given interface. - \sa Event, EventType, guhserver::Rule + \sa Event, EventType, nymeaserver::Rule */ #include "eventdescriptor.h" diff --git a/libnymea/types/paramdescriptor.cpp b/libnymea/types/paramdescriptor.cpp index 7ae73d93..98961162 100644 --- a/libnymea/types/paramdescriptor.cpp +++ b/libnymea/types/paramdescriptor.cpp @@ -29,7 +29,7 @@ \ingroup rules \inmodule libnymea - An ParamDescriptor describes a \l{Param} in order to match it with a \l{guhserver::Rule}. + An ParamDescriptor describes a \l{Param} in order to match it with a \l{nymeaserver::Rule}. \sa Param, ParamType */ diff --git a/libnymea/types/ruleaction.cpp b/libnymea/types/ruleaction.cpp index a3a30e73..3828d64d 100644 --- a/libnymea/types/ruleaction.cpp +++ b/libnymea/types/ruleaction.cpp @@ -23,16 +23,16 @@ /*! \class RuleAction - \brief Describes an action for a \l{guhserver::Rule}. + \brief Describes an action for a \l{nymeaserver::Rule}. \ingroup guh-types \ingroup rules \inmodule libnymea - A RuleAction describes a special form of an \l{Action} for a \l{guhserver::Rule}. The main difference is - the \l{RuleActionParam}, which allows to use an EventTypeId within a \l{guhserver::Rule} to execute this \l{RuleAction}. + A RuleAction describes a special form of an \l{Action} for a \l{nymeaserver::Rule}. The main difference is + the \l{RuleActionParam}, which allows to use an EventTypeId within a \l{nymeaserver::Rule} to execute this \l{RuleAction}. - \sa guhserver::Rule, RuleActionParam, + \sa nymeaserver::Rule, RuleActionParam, */ #include "ruleaction.h" diff --git a/libnymea/types/ruleactionparam.cpp b/libnymea/types/ruleactionparam.cpp index 04865677..557329c8 100644 --- a/libnymea/types/ruleactionparam.cpp +++ b/libnymea/types/ruleactionparam.cpp @@ -32,7 +32,7 @@ A RuleActionParam allows rules to take over an \l{Event} parameter into a rule \l{RuleAction}. - \sa guhserver::Rule, RuleAction, + \sa nymeaserver::Rule, RuleAction, */ #include "ruleactionparam.h" diff --git a/libnymea/types/statedescriptor.cpp b/libnymea/types/statedescriptor.cpp index fcc14330..f77382a6 100644 --- a/libnymea/types/statedescriptor.cpp +++ b/libnymea/types/statedescriptor.cpp @@ -29,9 +29,9 @@ \ingroup rules \inmodule libnymea - An StateDescriptor describes a \l{State} in order to match it with a \l{guhserver::Rule}. + An StateDescriptor describes a \l{State} in order to match it with a \l{nymeaserver::Rule}. - \sa State, guhserver::Rule + \sa State, nymeaserver::Rule */ diff --git a/server/main.cpp b/server/main.cpp index 92ac3330..b8803533 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -49,7 +49,7 @@ static const char *const normal = "\033[0m"; static const char *const warning = "\e[33m"; static const char *const error = "\e[31m"; -using namespace guhserver; +using namespace nymeaserver; static void loggingCategoryFilter(QLoggingCategory *category) { diff --git a/server/nymeaapplication.cpp b/server/nymeaapplication.cpp index ee8d5c9e..359c331e 100644 --- a/server/nymeaapplication.cpp +++ b/server/nymeaapplication.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*! - \class guhserver::NymeaApplication + \class nymeaserver::NymeaApplication \brief Application class of the guh server. \ingroup core @@ -46,7 +46,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { static bool s_aboutToShutdown = false; static bool s_multipleShutdownDetected = false; diff --git a/server/nymeaapplication.h b/server/nymeaapplication.h index 0263d5b1..ad075354 100644 --- a/server/nymeaapplication.h +++ b/server/nymeaapplication.h @@ -25,7 +25,7 @@ #include #include -namespace guhserver { +namespace nymeaserver { class NymeaApplication : public QCoreApplication { diff --git a/server/nymeaservice.cpp b/server/nymeaservice.cpp index 633ee7ac..5364dcf1 100644 --- a/server/nymeaservice.cpp +++ b/server/nymeaservice.cpp @@ -20,7 +20,7 @@ /*! - \class guhserver::NymeaService + \class nymeaserver::NymeaService \brief The daemon service reprenetation of the guh server. \ingroup core @@ -42,7 +42,7 @@ #include "loggingcategories.h" -namespace guhserver { +namespace nymeaserver { /*! Constructs the forked nymead application with the given argument count \a argc and argument vector \a argv. */ NymeaService::NymeaService(int argc, char **argv): diff --git a/server/nymeaservice.h b/server/nymeaservice.h index 94a7094f..2ec74773 100644 --- a/server/nymeaservice.h +++ b/server/nymeaservice.h @@ -24,7 +24,7 @@ #include #include "qtservice/qtservice.h" -namespace guhserver { +namespace nymeaserver { class NymeaService : public QtService { diff --git a/tests/auto/actions/testactions.cpp b/tests/auto/actions/testactions.cpp index a9c38b78..ce89287b 100644 --- a/tests/auto/actions/testactions.cpp +++ b/tests/auto/actions/testactions.cpp @@ -31,7 +31,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestActions: public NymeaTestBase { diff --git a/tests/auto/configurations/testconfigurations.cpp b/tests/auto/configurations/testconfigurations.cpp index a30dd009..3a35faaf 100644 --- a/tests/auto/configurations/testconfigurations.cpp +++ b/tests/auto/configurations/testconfigurations.cpp @@ -32,7 +32,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestConfigurations: public NymeaTestBase { diff --git a/tests/auto/devices/testdevices.cpp b/tests/auto/devices/testdevices.cpp index 2e0dd56f..4b7cb7db 100644 --- a/tests/auto/devices/testdevices.cpp +++ b/tests/auto/devices/testdevices.cpp @@ -31,7 +31,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestDevices : public NymeaTestBase { diff --git a/tests/auto/events/testevents.cpp b/tests/auto/events/testevents.cpp index 510d60b2..2488f668 100644 --- a/tests/auto/events/testevents.cpp +++ b/tests/auto/events/testevents.cpp @@ -32,7 +32,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestEvents: public NymeaTestBase { diff --git a/tests/auto/jsonrpc/testjsonrpc.cpp b/tests/auto/jsonrpc/testjsonrpc.cpp index 20db0e6e..a937c1d8 100644 --- a/tests/auto/jsonrpc/testjsonrpc.cpp +++ b/tests/auto/jsonrpc/testjsonrpc.cpp @@ -34,7 +34,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestJSONRPC: public NymeaTestBase { diff --git a/tests/auto/logging/testlogging.cpp b/tests/auto/logging/testlogging.cpp index 85cec700..84e60d9e 100644 --- a/tests/auto/logging/testlogging.cpp +++ b/tests/auto/logging/testlogging.cpp @@ -33,7 +33,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestLogging : public NymeaTestBase { diff --git a/tests/auto/loggingdirect/testloggingdirect.cpp b/tests/auto/loggingdirect/testloggingdirect.cpp index e93e4877..344efa5d 100644 --- a/tests/auto/loggingdirect/testloggingdirect.cpp +++ b/tests/auto/loggingdirect/testloggingdirect.cpp @@ -22,7 +22,7 @@ #include "logging/logengine.h" -using namespace guhserver; +using namespace nymeaserver; class TestLoggingDirect: public QObject { diff --git a/tests/auto/loggingloading/testloggingloading.cpp b/tests/auto/loggingloading/testloggingloading.cpp index da93b683..5c60b4d7 100644 --- a/tests/auto/loggingloading/testloggingloading.cpp +++ b/tests/auto/loggingloading/testloggingloading.cpp @@ -23,7 +23,7 @@ #include "logging/logengine.h" #include "logging/logvaluetool.h" -using namespace guhserver; +using namespace nymeaserver; class TestLoggingLoading: public QObject { diff --git a/tests/auto/nymeatestbase.cpp b/tests/auto/nymeatestbase.cpp index 89209a40..6578c1fa 100644 --- a/tests/auto/nymeatestbase.cpp +++ b/tests/auto/nymeatestbase.cpp @@ -38,7 +38,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; PluginId mockPluginId = PluginId("727a4a9a-c187-446f-aadf-f1b2220607d1"); VendorId guhVendorId = VendorId("2062d64d-3232-433c-88bc-0d33c0ba2ba6"); diff --git a/tests/auto/nymeatestbase.h b/tests/auto/nymeatestbase.h index 15f5ceab..e42d7703 100644 --- a/tests/auto/nymeatestbase.h +++ b/tests/auto/nymeatestbase.h @@ -92,7 +92,7 @@ extern EventTypeId mockParentChildEventId; extern ActionTypeId mockParentChildActionId; extern StateTypeId mockParentChildStateId; -using namespace guhserver; +using namespace nymeaserver; class MockTcpServer; diff --git a/tests/auto/plugins/testplugins.cpp b/tests/auto/plugins/testplugins.cpp index c92762e4..bc6f5041 100644 --- a/tests/auto/plugins/testplugins.cpp +++ b/tests/auto/plugins/testplugins.cpp @@ -31,7 +31,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestPlugins: public NymeaTestBase { diff --git a/tests/auto/restdeviceclasses/testrestdeviceclasses.cpp b/tests/auto/restdeviceclasses/testrestdeviceclasses.cpp index 40d6ecaa..bd5060c3 100644 --- a/tests/auto/restdeviceclasses/testrestdeviceclasses.cpp +++ b/tests/auto/restdeviceclasses/testrestdeviceclasses.cpp @@ -35,7 +35,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestRestDeviceClasses: public NymeaTestBase { diff --git a/tests/auto/restdevices/testrestdevices.cpp b/tests/auto/restdevices/testrestdevices.cpp index 1f7ece13..0cd6905e 100644 --- a/tests/auto/restdevices/testrestdevices.cpp +++ b/tests/auto/restdevices/testrestdevices.cpp @@ -35,7 +35,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestRestDevices: public NymeaTestBase { diff --git a/tests/auto/restlogging/testrestlogging.cpp b/tests/auto/restlogging/testrestlogging.cpp index 59741add..6381cab3 100644 --- a/tests/auto/restlogging/testrestlogging.cpp +++ b/tests/auto/restlogging/testrestlogging.cpp @@ -30,7 +30,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestRestLogging : public NymeaTestBase { diff --git a/tests/auto/restplugins/testrestplugins.cpp b/tests/auto/restplugins/testrestplugins.cpp index c4ca782e..c563efc6 100644 --- a/tests/auto/restplugins/testrestplugins.cpp +++ b/tests/auto/restplugins/testrestplugins.cpp @@ -35,7 +35,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestRestPlugins: public NymeaTestBase { diff --git a/tests/auto/restrules/testrestrules.cpp b/tests/auto/restrules/testrestrules.cpp index 938caf23..d020d452 100644 --- a/tests/auto/restrules/testrestrules.cpp +++ b/tests/auto/restrules/testrestrules.cpp @@ -35,7 +35,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestRestRules: public NymeaTestBase { diff --git a/tests/auto/restvendors/testrestvendors.cpp b/tests/auto/restvendors/testrestvendors.cpp index dc42aea5..31d83a7d 100644 --- a/tests/auto/restvendors/testrestvendors.cpp +++ b/tests/auto/restvendors/testrestvendors.cpp @@ -35,7 +35,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestRestVendors: public NymeaTestBase { diff --git a/tests/auto/rules/testrules.cpp b/tests/auto/rules/testrules.cpp index 34097dca..05d6cc33 100644 --- a/tests/auto/rules/testrules.cpp +++ b/tests/auto/rules/testrules.cpp @@ -32,7 +32,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestRules: public NymeaTestBase { diff --git a/tests/auto/states/teststates.cpp b/tests/auto/states/teststates.cpp index 8eee8aac..6e5e6aa6 100644 --- a/tests/auto/states/teststates.cpp +++ b/tests/auto/states/teststates.cpp @@ -32,7 +32,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestStates: public NymeaTestBase { diff --git a/tests/auto/timemanager/testtimemanager.cpp b/tests/auto/timemanager/testtimemanager.cpp index 514f51db..74ce5132 100644 --- a/tests/auto/timemanager/testtimemanager.cpp +++ b/tests/auto/timemanager/testtimemanager.cpp @@ -34,7 +34,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestTimeManager: public NymeaTestBase { diff --git a/tests/auto/versioning/testversioning.cpp b/tests/auto/versioning/testversioning.cpp index d3cde252..6ad9cf81 100644 --- a/tests/auto/versioning/testversioning.cpp +++ b/tests/auto/versioning/testversioning.cpp @@ -30,7 +30,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestVersioning: public NymeaTestBase { diff --git a/tests/auto/webserver/testwebserver.cpp b/tests/auto/webserver/testwebserver.cpp index 378b91da..0d7ed404 100644 --- a/tests/auto/webserver/testwebserver.cpp +++ b/tests/auto/webserver/testwebserver.cpp @@ -36,7 +36,7 @@ #include #include -using namespace guhserver; +using namespace nymeaserver; class TestWebserver: public NymeaTestBase { diff --git a/tests/auto/websocketserver/testwebsocketserver.cpp b/tests/auto/websocketserver/testwebsocketserver.cpp index b489582f..292300d7 100644 --- a/tests/auto/websocketserver/testwebsocketserver.cpp +++ b/tests/auto/websocketserver/testwebsocketserver.cpp @@ -33,7 +33,7 @@ #include -using namespace guhserver; +using namespace nymeaserver; class TestWebSocketServer: public NymeaTestBase {