rename logging

libguh/devicemanager.cpp

@@ -169,7 +169,7 @@
 */
 
 #include "devicemanager.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include "hardware/radio433/radio433.h"
 

libguh/hardware/gpio.cpp

@@ -67,7 +67,7 @@
 */
 
 #include "gpio.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 

libguh/hardware/gpiomonitor.cpp

@@ -148,7 +148,7 @@
  */
 
 #include "gpiomonitor.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 /*! Constructs a \l{GpioMonitor} object with the given \a parent. */
 GpioMonitor::GpioMonitor(QObject *parent) :

libguh/hardware/radio433/radio433.cpp

@@ -50,7 +50,7 @@
 */
 
 #include "radio433.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QFileInfo>
 

libguh/hardware/radio433/radio433brennenstuhlgateway.cpp

@@ -19,7 +19,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "radio433brennenstuhlgateway.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 Radio433BrennenstuhlGateway::Radio433BrennenstuhlGateway(QObject *parent) :
     QObject(parent)

libguh/hardware/radio433/radio433receiver.cpp

@@ -24,7 +24,7 @@
 #include <sys/time.h>
 
 #include "radio433receiver.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 Radio433Receiver::Radio433Receiver(QObject *parent, int gpio) :
     QThread(parent),m_gpioPin(gpio)

libguh/libguh.pro

@@ -37,7 +37,7 @@ SOURCES += plugin/device.cpp \
            types/ruleaction.cpp \
            types/ruleactionparam.cpp \
            types/statedescriptor.cpp \
-           loggingcategorys.cpp \
+           loggingcategories.cpp \
 
 HEADERS += plugin/device.h \
            plugin/deviceclass.h \
@@ -70,5 +70,5 @@ HEADERS += plugin/device.h \
            types/ruleactionparam.h \
            types/statedescriptor.h \
            typeutils.h \
-           loggingcategorys.h \
+           loggingcategories.h \
 

libguh/loggingcategories.cpp

@@ -18,7 +18,7 @@
  *                                                                         *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 Q_LOGGING_CATEGORY(dcApplication, "Application")
 Q_LOGGING_CATEGORY(dcDeviceManager, "DeviceManager")

libguh/network/networkmanager.cpp

@@ -37,7 +37,7 @@
  */
 
 #include "networkmanager.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 /*! Construct the hardware resource NetworkManager with the given \a parent. */
 NetworkManager::NetworkManager(QObject *parent) :

libguh/network/upnpdiscovery/upnpdiscovery.cpp

@@ -48,7 +48,7 @@
 
 
 #include "upnpdiscovery.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 /*! Construct the hardware resource UpnpDiscovery with the given \a parent. */
 UpnpDiscovery::UpnpDiscovery(QObject *parent) :

libguh/network/upnpdiscovery/upnpdiscoveryrequest.cpp

@@ -19,7 +19,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "upnpdiscoveryrequest.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 UpnpDiscoveryRequest::UpnpDiscoveryRequest(UpnpDiscovery *upnpDiscovery, PluginId pluginId, QString searchTarget, QString userAgent):
     QObject(upnpDiscovery),

libguh/plugin/device.cpp

@@ -40,7 +40,7 @@
 
 #include "device.h"
 #include "types/event.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 

libguh/plugin/deviceplugin.cpp

@@ -137,7 +137,7 @@
 */
 
 #include "deviceplugin.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include "devicemanager.h"
 #include "hardware/radio433/radio433.h"

plugins/deviceplugins/boblight/bobclient.cpp

@@ -21,7 +21,7 @@
 
 
 #include "bobclient.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include "libboblight/boblight.h"
 

plugins/deviceplugins/boblight/devicepluginboblight.cpp

@@ -50,7 +50,7 @@
 
 #include "plugin/device.h"
 #include "devicemanager.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include "bobclient.h"
 #include "plugininfo.h"

plugins/deviceplugins/commandlauncher/deviceplugincommandlauncher.cpp

@@ -105,7 +105,7 @@
 #include "plugin/device.h"
 #include "devicemanager.h"
 #include "plugininfo.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 

plugins/deviceplugins/conrad/devicepluginconrad.cpp

@@ -50,7 +50,7 @@
 #include "plugin/device.h"
 #include "devicemanager.h"
 #include "plugininfo.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 #include <QStringList>

plugins/deviceplugins/elro/devicepluginelro.cpp

@@ -47,7 +47,7 @@
 #include "devicepluginelro.h"
 #include "devicemanager.h"
 #include "plugininfo.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 #include <QStringList>

plugins/deviceplugins/eq-3/deviceplugineq-3.cpp

@@ -72,7 +72,7 @@
 #include "devicemanager.h"
 #include "types/param.h"
 #include "plugininfo.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 

plugins/deviceplugins/eq-3/maxcube.cpp

@@ -19,7 +19,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "maxcube.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 MaxCube::MaxCube(QObject *parent, QString serialNumber, QHostAddress hostAdress, quint16 port):
     QTcpSocket(parent), m_serialNumber(serialNumber), m_hostAddress(hostAdress), m_port(port)

plugins/deviceplugins/intertechno/devicepluginintertechno.cpp

@@ -49,7 +49,7 @@
 #include "plugin/device.h"
 #include "devicemanager.h"
 #include "plugininfo.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 #include <QStringList>

plugins/deviceplugins/leynew/devicepluginleynew.cpp

@@ -53,7 +53,7 @@
 #include "devicepluginleynew.h"
 #include "devicemanager.h"
 #include "plugininfo.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 #include <QStringList>

plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.cpp

@@ -49,7 +49,7 @@
 #include "plugin/device.h"
 #include "devicemanager.h"
 #include "plugininfo.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 

plugins/deviceplugins/lgsmarttv/tvdevice.cpp

@@ -19,7 +19,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "tvdevice.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 TvDevice::TvDevice(QObject *parent, UpnpDeviceDescriptor upnpDeviceDescriptor) :
     UpnpDevice(parent, upnpDeviceDescriptor)

plugins/deviceplugins/lgsmarttv/tveventhandler.cpp

@@ -19,7 +19,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "tveventhandler.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 TvEventHandler::TvEventHandler(QObject *parent, QHostAddress host, int port) :
     QTcpServer(parent),m_host(host),m_port(port)

plugins/deviceplugins/lircd/devicepluginlircd.cpp

@@ -50,7 +50,7 @@
 
 #include "plugin/device.h"
 #include "devicemanager.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include "lircdclient.h"
 

plugins/deviceplugins/lircd/lircdclient.cpp

@@ -19,7 +19,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "lircdclient.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 #include <QLocalSocket>

plugins/deviceplugins/mailnotification/devicepluginmailnotification.cpp

@@ -67,7 +67,7 @@
 #include "plugin/device.h"
 #include "devicemanager.h"
 #include "plugininfo.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 #include <QJsonDocument>

plugins/deviceplugins/mailnotification/smtpclient.cpp

@@ -19,7 +19,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "smtpclient.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 SmtpClient::SmtpClient(QObject *parent):
     QObject(parent)

plugins/deviceplugins/mock/devicepluginmock.cpp

@@ -25,7 +25,7 @@
 #include "plugin/device.h"
 #include "devicemanager.h"
 #include "plugininfo.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 #include <QStringList>

plugins/deviceplugins/mock/httpdaemon.cpp

@@ -25,7 +25,7 @@
 #include "plugin/deviceclass.h"
 #include "plugin/deviceplugin.h"
 #include "types/statetype.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QTcpSocket>
 #include <QDebug>

plugins/deviceplugins/openweathermap/devicepluginopenweathermap.cpp

@@ -56,7 +56,7 @@
 #include "plugin/device.h"
 #include "devicemanager.h"
 #include "plugininfo.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 #include <QJsonDocument>

plugins/deviceplugins/philipshue/devicepluginphilipshue.cpp

@@ -51,7 +51,7 @@
 #include "plugin/device.h"
 #include "types/param.h"
 #include "plugininfo.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 #include <QStringList>

plugins/deviceplugins/tune/deviceplugintune.cpp

@@ -25,7 +25,7 @@
 #include "deviceplugintune.h"
 #include "devicemanager.h"
 #include "plugininfo.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 DevicePluginTune::DevicePluginTune()
 {

plugins/deviceplugins/tune/jsonrpcserver.cpp

@@ -19,7 +19,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "jsonrpcserver.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 extern PluginId pluginId;
 extern DeviceClassId moodDeviceClassId;

plugins/deviceplugins/tune/tunemanager.cpp

@@ -19,7 +19,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "tunemanager.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 TuneManager::TuneManager(int port, QObject *parent) :
     QObject(parent),

plugins/deviceplugins/udpcommander/devicepluginudpcommander.cpp

@@ -65,7 +65,7 @@
 #include "devicepluginudpcommander.h"
 #include "plugin/device.h"
 #include "plugininfo.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 DevicePluginUdpCommander::DevicePluginUdpCommander()
 {

plugins/deviceplugins/unitec/devicepluginunitec.cpp

@@ -47,7 +47,7 @@
 #include "devicepluginunitec.h"
 #include "devicemanager.h"
 #include "plugininfo.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 #include <QStringList>

plugins/deviceplugins/wakeonlan/devicepluginwakeonlan.cpp

@@ -53,7 +53,7 @@
 #include "plugin/device.h"
 #include "devicemanager.h"
 #include "plugininfo.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 #include <QStringList>

plugins/deviceplugins/wemo/devicepluginwemo.cpp

@@ -53,7 +53,7 @@
 #include "plugin/device.h"
 #include "devicemanager.h"
 #include "plugininfo.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 #include <QNetworkReply>

plugins/deviceplugins/wifidetector/devicepluginwifidetector.cpp

@@ -52,7 +52,7 @@
 #include "plugin/device.h"
 #include "devicemanager.h"
 #include "plugininfo.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 #include <QStringList>

server/guhcore.cpp

@@ -100,7 +100,7 @@
 */
 
 #include "guhcore.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 #include "jsonrpcserver.h"
 #include "ruleengine.h"
 #include "logging/logengine.h"

server/guhservice.cpp

@@ -20,7 +20,7 @@
 
 #include <unistd.h>
 #include "guhservice.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 GuhService::GuhService(int argc, char **argv):
     QtService<QCoreApplication>(argc, argv, "guh daemon")

server/jsonrpc/actionhandler.cpp

@@ -24,7 +24,7 @@
 #include "guhcore.h"
 #include "devicemanager.h"
 #include "types/action.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 

server/jsonrpc/devicehandler.cpp

@@ -22,7 +22,7 @@
 #include "devicehandler.h"
 #include "guhcore.h"
 #include "devicemanager.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 #include "plugin/device.h"
 #include "plugin/deviceclass.h"
 #include "plugin/deviceplugin.h"

server/jsonrpc/eventhandler.cpp

@@ -21,7 +21,7 @@
 
 #include "eventhandler.h"
 #include "guhcore.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 EventHandler::EventHandler(QObject *parent) :
     JsonHandler(parent)

server/jsonrpc/jsonhandler.cpp

@@ -20,7 +20,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "jsonhandler.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QMetaMethod>
 #include <QDebug>

server/jsonrpc/jsonrpcserver.cpp

@@ -36,7 +36,7 @@
 #include "plugin/device.h"
 #include "rule.h"
 #include "ruleengine.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include "devicehandler.h"
 #include "actionhandler.h"

server/jsonrpc/jsontypes.cpp

@@ -24,7 +24,7 @@
 #include "plugin/device.h"
 #include "devicemanager.h"
 #include "ruleengine.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QStringList>
 #include <QJsonDocument>

server/jsonrpc/logginghandler.cpp

@@ -22,7 +22,7 @@
 #include "logginghandler.h"
 #include "logging/logengine.h"
 #include "guhcore.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 LoggingHandler::LoggingHandler(QObject *parent) :
     JsonHandler(parent)

server/jsonrpc/ruleshandler.cpp

@@ -23,7 +23,7 @@
 
 #include "guhcore.h"
 #include "ruleengine.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 

server/jsonrpc/statehandler.cpp

@@ -21,7 +21,7 @@
 
 #include "statehandler.h"
 #include "guhcore.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 StateHandler::StateHandler(QObject *parent) :
     JsonHandler(parent)

server/logging/logengine.cpp

@@ -19,7 +19,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "logengine.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 #include "logging.h"
 
 #include <QSqlDatabase>

server/main.cpp

@@ -28,7 +28,7 @@
 
 #include "guhcore.h"
 #include "guhservice.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 QHash<QString, bool> s_loggingFilters;
 

server/ruleengine.cpp

@@ -76,7 +76,7 @@
 
 
 #include "ruleengine.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 #include "types/paramdescriptor.h"
 #include "types/eventdescriptor.h"
 

server/stateevaluator.cpp

@@ -22,7 +22,7 @@
 #include "stateevaluator.h"
 #include "guhcore.h"
 #include "devicemanager.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 StateEvaluator::StateEvaluator(const StateDescriptor &stateDescriptor):
     m_stateDescriptor(stateDescriptor),

server/tcpserver.cpp

@@ -20,7 +20,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "tcpserver.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 
 #include <QDebug>
 #include <QJsonDocument>