libguh -> libnymea

libguh-core/guhcore.cpp

@@ -97,7 +97,7 @@
 
 #include "guhcore.h"
 #include "loggingcategories.h"
-#include "jsonrpcserver.h"
+#include "jsonrpc/jsonrpcserver.h"
 #include "ruleengine.h"
 #include "networkmanager/networkmanager.h"
 

libguh-core/hardware/network/avahi/qtavahiservice.cpp

@@ -24,7 +24,7 @@
     \class QtAvahiService
     \brief Allows to publish an avahi service to the network.
 
-    \inmodule libguh
+    \inmodule libnymea
 */
 
 /*! \enum QtAvahiService::QtAvahiServiceState

libguh-core/hardware/network/avahi/qtavahiservicebrowserimplementation.cpp

@@ -25,7 +25,7 @@
     \brief Allows to browse avahi services in the local network.
 
     \ingroup hardware
-    \inmodule libguh
+    \inmodule libnymea
 */
 
 /*! \fn void QtAvahiServiceBrowserImplementation::serviceEntryAdded(const AvahiServiceEntry &entry);

libguh-core/hardware/network/networkaccessmanagerimpl.cpp

@@ -25,7 +25,7 @@
   \brief Allows to send network requests and receive replies.
 
   \ingroup hardware
-  \inmodule libguh
+  \inmodule libnymea
 
   The network manager class is a reimplementation of the \l{http://doc-snapshot.qt-project.org/qt5-5.4/qnetworkaccessmanager.html}{QNetworkAccessManager}
   and allows plugins to send network requests and receive replies.

libguh-core/hardware/network/networkaccessmanagerimpl.h

@@ -25,7 +25,7 @@
 
 #include "libguh.h"
 #include "typeutils.h"
-#include "libguh/network/networkaccessmanager.h"
+#include "network/networkaccessmanager.h"
 
 #include <QObject>
 #include <QNetworkAccessManager>

libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp

@@ -25,7 +25,7 @@
   \brief Allows to detect UPnP devices in the network.
 
   \ingroup hardware
-  \inmodule libguh
+  \inmodule libnymea
 
   This resource allows plugins to discover UPnP devices in the network and receive notification messages. The resource
   will bind a UDP socket to the multicast 239.255.255.250 on port 1900.

libguh-core/hardware/radio433/radio433brennenstuhl.cpp

@@ -25,7 +25,7 @@
   \brief The Radio433 class helps to interact with the 433 MHz receiver and transmitter.
 
   \ingroup hardware
-  \inmodule libguh
+  \inmodule libnymea
 
   This class handles all supported radio 433 MHz transmitter. Receiving data on the 433.92 MHz frequency
   is only supported, if there are \l{Gpio}{GPIO's} available and a suitable receiver is connected to GPIO 27. Examples for receiver

libguh-core/libguh-core.pro

@@ -1,11 +1,11 @@
 TEMPLATE = lib
 TARGET = guh-core
 
-include(../guh.pri)
+include(../nymea.pri)
 
 QT += sql
-INCLUDEPATH += $$top_srcdir/libguh $$top_srcdir jsonrpc
+INCLUDEPATH += $$top_srcdir/libnymea
-LIBS += -L$$top_builddir/libguh/ -lguh -lssl -lcrypto -lavahi-common -lavahi-client
+LIBS += -L$$top_builddir/libnymea/ -lnymea -lssl -lcrypto -lavahi-common -lavahi-client
 
 target.path = /usr/lib/$$system('dpkg-architecture -q DEB_HOST_MULTIARCH')
 INSTALLS += target

libguh-core/mocktcpserver.cpp

@@ -20,7 +20,6 @@
 
 #include "mocktcpserver.h"
 #include "loggingcategories.h"
-#include "jsonrpcserver.h"
 #include "guhcore.h"
 
 #include <QUuid>

libguh-core/rest/deviceclassesresource.h

@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QHash>
 
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 #include "restresource.h"
 #include "httpreply.h"
 

libguh-core/rest/devicesresource.cpp

@@ -39,7 +39,7 @@
 #include "devicesresource.h"
 #include "httpreply.h"
 #include "httprequest.h"
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 #include "guhcore.h"
 
 #include <QJsonDocument>

libguh-core/rest/devicesresource.h

@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QHash>
 
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 #include "restresource.h"
 #include "httpreply.h"
 

libguh-core/rest/logsresource.h

@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QHash>
 
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 #include "restresource.h"
 #include "httpreply.h"
 

libguh-core/rest/pluginsresource.h

@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QHash>
 
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 #include "restresource.h"
 #include "httpreply.h"
 

libguh-core/rest/restresource.h

@@ -26,7 +26,7 @@
 
 #include "httpreply.h"
 #include "httprequest.h"
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 
 class QVariant;
 

libguh-core/rest/restserver.h

@@ -24,7 +24,7 @@
 #include <QObject>
 
 #include "webserver.h"
-#include "jsonhandler.h"
+#include "jsonrpc/jsonhandler.h"
 #include "devicesresource.h"
 #include "deviceclassesresource.h"
 #include "vendorsresource.h"

libguh-core/rest/rulesresource.h

@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QHash>
 
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 #include "restresource.h"
 #include "httpreply.h"
 

libguh-core/rest/vendorsresource.h

@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QHash>
 
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 #include "restresource.h"
 #include "httpreply.h"
 

libnymea/coap/coap.cpp

@@ -23,7 +23,7 @@
     \brief The client connection class to a CoAP server.
 
     \ingroup coap
-    \inmodule libguh
+    \inmodule libnymea
 
     The Coap class provides a signal solt based communication with a \l{https://tools.ietf.org/html/rfc7252}{CoAP (Constrained Application Protocol)}
     server. The API of this class was inspired by the \l{http://doc.qt.io/qt-5/qnetworkaccessmanager.html}{QNetworkAccessManager} and was

libnymea/coap/coapobserveresource.cpp

@@ -23,7 +23,7 @@
     \brief Holds information about an observed resource.
 
     \ingroup coap
-    \inmodule libguh
+    \inmodule libnymea
 
     The CoapObserveResource class holds information about an observed resource.
 

libnymea/coap/coapoption.cpp

@@ -23,7 +23,7 @@
     \brief Represents the option of a \l{CoapPdu}.
 
     \ingroup coap
-    \inmodule libguh
+    \inmodule libnymea
 
     The CoapOption class provides an easy way to create / parse CoAP options of a \l{CoapPdu} (Protocol Data Unit). An options
     can be compared with a HTTP header.

libnymea/coap/coappdu.cpp

@@ -23,7 +23,7 @@
     \brief Represents a CoAP protocol data unit (PDU).
 
     \ingroup coap
-    \inmodule libguh
+    \inmodule libnymea
 
 */
 

libnymea/coap/coapreply.cpp

@@ -23,7 +23,7 @@
     \brief Represents a reply of a CoAP request.
 
     \ingroup coap
-    \inmodule libguh
+    \inmodule libnymea
 
     The CoapReply class contains the data and headers for a request sent with \l{Coap} client.
 

libnymea/coap/coaprequest.cpp

@@ -23,7 +23,7 @@
     \brief Represents a request to a CoAP server.
 
     \ingroup coap
-    \inmodule libguh
+    \inmodule libnymea
 
 */
 

libnymea/coap/corelink.cpp

@@ -23,7 +23,7 @@
     \brief Represents a link of a CoRE link format.
 
     \ingroup coap
-    \inmodule libguh
+    \inmodule libnymea
 
     This class represents a Constrained RESTful Environments (CoRE) Link format according to the
     \l{http://tools.ietf.org/html/rfc6690}{RFC6690} specification.

libnymea/coap/corelinkparser.cpp

@@ -23,7 +23,7 @@
     \brief Provides an easy way to parse a CoRE link list.
 
     \ingroup coap
-    \inmodule libguh
+    \inmodule libnymea
 
     \section2 Example
 

libnymea/devicemanager.cpp

@@ -26,7 +26,7 @@
     \brief The main entry point when interacting with \l{Device}{Devices}
 
     \ingroup devices
-    \inmodule libguh
+    \inmodule libnymea
 
     The DeviceManager hold  s all information about supported and configured Devices in the system.
 
@@ -244,10 +244,10 @@ QList<QJsonObject> DeviceManager::pluginsMetadata()
         QDir dir(path);
         foreach (const QString &entry, dir.entryList()) {
             QFileInfo fi;
-            if (entry.startsWith("libguh_deviceplugin") && entry.endsWith(".so")) {
+            if (entry.startsWith("libnymea_deviceplugin") && entry.endsWith(".so")) {
                 fi.setFile(path + "/" + entry);
             } else {
-                fi.setFile(path + "/" + entry + "/libguh_deviceplugin" + entry + ".so");
+                fi.setFile(path + "/" + entry + "/libnymea_deviceplugin" + entry + ".so");
             }
             if (!fi.exists()) {
                 continue;
@@ -1008,10 +1008,10 @@ void DeviceManager::loadPlugins()
         qCDebug(dcDeviceManager) << "Loading plugins from:" << dir.absolutePath();
         foreach (const QString &entry, dir.entryList()) {
             QFileInfo fi;
-            if (entry.startsWith("libguh_deviceplugin") && entry.endsWith(".so")) {
+            if (entry.startsWith("libnymea_deviceplugin") && entry.endsWith(".so")) {
                 fi.setFile(path + "/" + entry);
             } else {
-                fi.setFile(path + "/" + entry + "/libguh_deviceplugin" + entry + ".so");
+                fi.setFile(path + "/" + entry + "/libnymea_deviceplugin" + entry + ".so");
             }
 
             if (!fi.exists())

libnymea/hardware/gpio.cpp

@@ -25,7 +25,7 @@
   \brief The Gpio class allows to interact with the GPIOs.
 
   \ingroup hardware
-  \inmodule libguh
+  \inmodule libnymea
 
   A "General Purpose Input/Output" (GPIO) is a flexible software-controlled
   digital signal. They are provided from many kinds of chip, and are familiar

libnymea/hardware/gpiomonitor.cpp

@@ -25,7 +25,7 @@
     \brief The GpioMonitor class allows to monitor GPIOs.
 
     \ingroup hardware
-    \inmodule libguh
+    \inmodule libnymea
 
     An instance of this class creates a thread, which monitors each of the added GPIOs. The object
     emits a signal if one of the added GPIOs changes its value. The GpioMonitor configures a GPIO as an

libnymea/hardware/radio433/radio433.cpp

@@ -25,7 +25,7 @@
   \brief The Radio433 class helps to interact with the 433 MHz receiver and transmitter.
 
   \ingroup hardware
-  \inmodule libguh
+  \inmodule libnymea
 
   This class handles all supported radio 433 MHz transmitter. Receiving data on the 433.92 MHz frequency
   is only supported, if there are \l{Gpio}{GPIO's} available and a suitable receiver is connected to GPIO 27. Examples for receiver

libnymea/libnymea.pro

@@ -1,6 +1,6 @@
-include(../guh.pri)
+include(../nymea.pri)
 
-TARGET = guh
+TARGET = nymea
 TEMPLATE = lib
 
 QT += network bluetooth

libnymea/loggingcategories.h

@@ -29,7 +29,7 @@
 // Include dcCoap
 #include "coap/coap.h"
 
-// Core / libguh
+// Core / libnymea
 Q_DECLARE_LOGGING_CATEGORY(dcApplication)
 Q_DECLARE_LOGGING_CATEGORY(dcDeviceManager)
 Q_DECLARE_LOGGING_CATEGORY(dcTimeManager)

libnymea/network/avahi/avahiserviceentry.cpp

@@ -25,7 +25,7 @@
     \brief Holds information about an avahi service entry.
 
     \ingroup types
-    \inmodule libguh
+    \inmodule libnymea
 
 */
 

libnymea/network/avahi/qtavahiservicebrowser.cpp

@@ -25,7 +25,7 @@
     \brief Allows to browse avahi services in the local network.
 
     \ingroup hardware
-    \inmodule libguh
+    \inmodule libnymea
 */
 
 /*! \fn void QtAvahiServiceBrowser::serviceEntryAdded(const AvahiServiceEntry &entry);

libnymea/network/networkaccessmanager.cpp

@@ -25,7 +25,7 @@
   \brief Allows to send network requests and receive replies.
 
   \ingroup hardware
-  \inmodule libguh
+  \inmodule libnymea
 
   The network manager class is a reimplementation of the \l{http://doc-snapshot.qt-project.org/qt5-5.4/qnetworkaccessmanager.html}{QNetworkAccessManager}
   and allows plugins to send network requests and receive replies.