rename logging

2015-06-21 16:59:21 +02:00 · 2015-06-21 16:59:21 +02:00 · 5bbf1fc70b
commit 5bbf1fc70b
parent c496d26866
58 changed files with 58 additions and 58 deletions
--- a/libguh/devicemanager.cpp
+++ b/libguh/devicemanager.cpp
@ -169,7 +169,7 @@
 */

 #include "devicemanager.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"

 #include "hardware/radio433/radio433.h"

--- a/libguh/hardware/gpio.cpp
+++ b/libguh/hardware/gpio.cpp
@ -67,7 +67,7 @@
 */

 #include "gpio.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"

 #include <QDebug>

--- a/libguh/hardware/gpiomonitor.cpp
+++ b/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) :
--- a/libguh/hardware/radio433/radio433.cpp
+++ b/libguh/hardware/radio433/radio433.cpp
@ -50,7 +50,7 @@
 */

 #include "radio433.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"

 #include <QFileInfo>

--- a/libguh/hardware/radio433/radio433brennenstuhlgateway.cpp
+++ b/libguh/hardware/radio433/radio433brennenstuhlgateway.cpp
@ -19,7 +19,7 @@
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

 #include "radio433brennenstuhlgateway.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"

 Radio433BrennenstuhlGateway::Radio433BrennenstuhlGateway(QObject *parent) :
    QObject(parent)
--- a/libguh/hardware/radio433/radio433receiver.cpp
+++ b/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)
--- a/libguh/libguh.pro
+++ b/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 \

--- a/libguh/loggingcategories.cpp
+++ b/libguh/loggingcategories.cpp
@ -18,7 +18,7 @@
 *                                                                         *
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

-#include "loggingcategorys.h"
+#include "loggingcategories.h"

 Q_LOGGING_CATEGORY(dcApplication, "Application")
 Q_LOGGING_CATEGORY(dcDeviceManager, "DeviceManager")
--- a/libguh/loggingcategories.h
+++ b/libguh/loggingcategories.h
--- a/libguh/network/networkmanager.cpp
+++ b/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) :
--- a/libguh/network/upnpdiscovery/upnpdiscovery.cpp
+++ b/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) :
--- a/libguh/network/upnpdiscovery/upnpdiscoveryrequest.cpp
+++ b/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),
--- a/libguh/plugin/device.cpp
+++ b/libguh/plugin/device.cpp
@ -40,7 +40,7 @@

 #include "device.h"
 #include "types/event.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"

 #include <QDebug>

--- a/libguh/plugin/deviceplugin.cpp
+++ b/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"
--- a/plugins/deviceplugins/boblight/bobclient.cpp
+++ b/plugins/deviceplugins/boblight/bobclient.cpp
@ -21,7 +21,7 @@


 #include "bobclient.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"

 #include "libboblight/boblight.h"

--- a/plugins/deviceplugins/boblight/devicepluginboblight.cpp
+++ b/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"
--- a/plugins/deviceplugins/commandlauncher/deviceplugincommandlauncher.cpp
+++ b/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>

--- a/plugins/deviceplugins/conrad/devicepluginconrad.cpp
+++ b/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>
--- a/plugins/deviceplugins/elro/devicepluginelro.cpp
+++ b/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>
--- a/plugins/deviceplugins/eq-3/deviceplugineq-3.cpp
+++ b/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>

--- a/plugins/deviceplugins/eq-3/maxcube.cpp
+++ b/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)
--- a/plugins/deviceplugins/intertechno/devicepluginintertechno.cpp
+++ b/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>
--- a/plugins/deviceplugins/leynew/devicepluginleynew.cpp
+++ b/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>
--- a/plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.cpp
+++ b/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>

--- a/plugins/deviceplugins/lgsmarttv/tvdevice.cpp
+++ b/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)
--- a/plugins/deviceplugins/lgsmarttv/tveventhandler.cpp
+++ b/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)
--- a/plugins/deviceplugins/lircd/devicepluginlircd.cpp
+++ b/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"

--- a/plugins/deviceplugins/lircd/lircdclient.cpp
+++ b/plugins/deviceplugins/lircd/lircdclient.cpp
@ -19,7 +19,7 @@
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

 #include "lircdclient.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"

 #include <QDebug>
 #include <QLocalSocket>
--- a/plugins/deviceplugins/mailnotification/devicepluginmailnotification.cpp
+++ b/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>
--- a/plugins/deviceplugins/mailnotification/smtpclient.cpp
+++ b/plugins/deviceplugins/mailnotification/smtpclient.cpp
@ -19,7 +19,7 @@
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

 #include "smtpclient.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"

 SmtpClient::SmtpClient(QObject *parent):
    QObject(parent)
--- a/plugins/deviceplugins/mock/devicepluginmock.cpp
+++ b/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>
--- a/plugins/deviceplugins/mock/httpdaemon.cpp
+++ b/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>
--- a/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.cpp
+++ b/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>
--- a/plugins/deviceplugins/philipshue/devicepluginphilipshue.cpp
+++ b/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>
--- a/plugins/deviceplugins/tune/deviceplugintune.cpp
+++ b/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()
 {
--- a/plugins/deviceplugins/tune/jsonrpcserver.cpp
+++ b/plugins/deviceplugins/tune/jsonrpcserver.cpp
@ -19,7 +19,7 @@
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

 #include "jsonrpcserver.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"

 extern PluginId pluginId;
 extern DeviceClassId moodDeviceClassId;
--- a/plugins/deviceplugins/tune/tunemanager.cpp
+++ b/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),
--- a/plugins/deviceplugins/udpcommander/devicepluginudpcommander.cpp
+++ b/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()
 {
--- a/plugins/deviceplugins/unitec/devicepluginunitec.cpp
+++ b/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>
--- a/plugins/deviceplugins/wakeonlan/devicepluginwakeonlan.cpp
+++ b/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>
--- a/plugins/deviceplugins/wemo/devicepluginwemo.cpp
+++ b/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>
--- a/plugins/deviceplugins/wifidetector/devicepluginwifidetector.cpp
+++ b/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>
--- a/server/guhcore.cpp
+++ b/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"
--- a/server/guhservice.cpp
+++ b/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")
--- a/server/jsonrpc/actionhandler.cpp
+++ b/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>

--- a/server/jsonrpc/devicehandler.cpp
+++ b/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"
--- a/server/jsonrpc/eventhandler.cpp
+++ b/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)
--- a/server/jsonrpc/jsonhandler.cpp
+++ b/server/jsonrpc/jsonhandler.cpp
@ -20,7 +20,7 @@
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

 #include "jsonhandler.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"

 #include <QMetaMethod>
 #include <QDebug>
--- a/server/jsonrpc/jsonrpcserver.cpp
+++ b/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"
--- a/server/jsonrpc/jsontypes.cpp
+++ b/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>
--- a/server/jsonrpc/logginghandler.cpp
+++ b/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)
--- a/server/jsonrpc/ruleshandler.cpp
+++ b/server/jsonrpc/ruleshandler.cpp
@ -23,7 +23,7 @@

 #include "guhcore.h"
 #include "ruleengine.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"

 #include <QDebug>

--- a/server/jsonrpc/statehandler.cpp
+++ b/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)
--- a/server/logging/logengine.cpp
+++ b/server/logging/logengine.cpp
@ -19,7 +19,7 @@
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

 #include "logengine.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 #include "logging.h"

 #include <QSqlDatabase>
--- a/server/main.cpp
+++ b/server/main.cpp
@ -28,7 +28,7 @@

 #include "guhcore.h"
 #include "guhservice.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"

 QHash<QString, bool> s_loggingFilters;

--- a/server/ruleengine.cpp
+++ b/server/ruleengine.cpp
@ -76,7 +76,7 @@


 #include "ruleengine.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"
 #include "types/paramdescriptor.h"
 #include "types/eventdescriptor.h"

--- a/server/stateevaluator.cpp
+++ b/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),
--- a/server/tcpserver.cpp
+++ b/server/tcpserver.cpp
@ -20,7 +20,7 @@
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

 #include "tcpserver.h"
-#include "loggingcategorys.h"
+#include "loggingcategories.h"

 #include <QDebug>
 #include <QJsonDocument>