From 803ee32089242ae324a9cfac7bed719b22c6cfb3 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 29 Jan 2018 16:46:34 +0100 Subject: [PATCH] libguh.h -> libnymea.h --- .../hardware/network/networkaccessmanagerimpl.h | 2 +- libnymea-core/hardware/radio433/radio433brennenstuhl.h | 2 +- .../hardware/radio433/radio433brennenstuhlgateway.h | 2 +- libnymea-core/hardware/radio433/radio433transmitter.h | 2 +- libnymea/coap/coap.h | 4 ++-- libnymea/coap/coapobserveresource.h | 4 ++-- libnymea/coap/coapoption.h | 4 ++-- libnymea/coap/coappdu.h | 4 ++-- libnymea/coap/coappdublock.h | 4 ++-- libnymea/coap/coapreply.h | 4 ++-- libnymea/coap/coaprequest.h | 4 ++-- libnymea/coap/corelink.h | 4 ++-- libnymea/coap/corelinkparser.h | 4 ++-- libnymea/devicemanager.h | 4 ++-- libnymea/guhsettings.h | 4 ++-- .../bluetoothlowenergy/bluetoothdiscoveryreply.h | 4 ++-- .../bluetoothlowenergy/bluetoothlowenergydevice.h | 4 ++-- .../bluetoothlowenergy/bluetoothlowenergymanager.h | 4 ++-- libnymea/hardware/gpio.h | 4 ++-- libnymea/hardware/gpiomonitor.h | 4 ++-- libnymea/hardware/pwm.h | 4 ++-- libnymea/hardware/radio433/radio433.h | 4 ++-- libnymea/hardware/radio433/radio433receiver.h | 2 +- libnymea/{libguh.h => libnymea.h} | 10 +++++----- libnymea/libnymea.pro | 2 +- libnymea/network/avahi/avahiserviceentry.h | 4 ++-- libnymea/network/avahi/qtavahiservicebrowser.h | 4 ++-- libnymea/network/networkaccessmanager.h | 4 ++-- libnymea/network/oauth2.h | 4 ++-- libnymea/network/upnp/upnpdevice.h | 4 ++-- libnymea/network/upnp/upnpdevicedescriptor.h | 4 ++-- libnymea/network/upnp/upnpdiscovery.h | 4 ++-- libnymea/plugin/device.h | 4 ++-- libnymea/plugin/devicedescriptor.h | 4 ++-- libnymea/plugin/devicepairinginfo.h | 4 ++-- libnymea/plugin/deviceplugin.h | 4 ++-- libnymea/types/action.h | 4 ++-- libnymea/types/actiontype.h | 4 ++-- libnymea/types/deviceclass.h | 4 ++-- libnymea/types/event.h | 4 ++-- libnymea/types/eventdescriptor.h | 4 ++-- libnymea/types/eventtype.h | 4 ++-- libnymea/types/param.h | 6 +++--- libnymea/types/paramdescriptor.h | 4 ++-- libnymea/types/paramtype.h | 4 ++-- libnymea/types/ruleaction.h | 4 ++-- libnymea/types/ruleactionparam.h | 6 +++--- libnymea/types/state.h | 4 ++-- libnymea/types/statedescriptor.h | 4 ++-- libnymea/types/statetype.h | 4 ++-- libnymea/types/vendor.h | 4 ++-- libnymea/typeutils.h | 4 ++-- 52 files changed, 103 insertions(+), 103 deletions(-) rename libnymea/{libguh.h => libnymea.h} (92%) diff --git a/libnymea-core/hardware/network/networkaccessmanagerimpl.h b/libnymea-core/hardware/network/networkaccessmanagerimpl.h index ab2aaf7c..9c15cc52 100644 --- a/libnymea-core/hardware/network/networkaccessmanagerimpl.h +++ b/libnymea-core/hardware/network/networkaccessmanagerimpl.h @@ -23,7 +23,7 @@ #ifndef NETWORKACCESSMANAGERIMPL_H #define NETWORKACCESSMANAGERIMPL_H -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" #include "network/networkaccessmanager.h" diff --git a/libnymea-core/hardware/radio433/radio433brennenstuhl.h b/libnymea-core/hardware/radio433/radio433brennenstuhl.h index 71f6818f..6dcc4b71 100644 --- a/libnymea-core/hardware/radio433/radio433brennenstuhl.h +++ b/libnymea-core/hardware/radio433/radio433brennenstuhl.h @@ -25,7 +25,7 @@ #include -#include "libguh.h" +#include "libnymea.h" #include "hardwareresource.h" #include "hardware/radio433/radio433.h" #include "radio433brennenstuhlgateway.h" diff --git a/libnymea-core/hardware/radio433/radio433brennenstuhlgateway.h b/libnymea-core/hardware/radio433/radio433brennenstuhlgateway.h index 12a77595..c692168b 100644 --- a/libnymea-core/hardware/radio433/radio433brennenstuhlgateway.h +++ b/libnymea-core/hardware/radio433/radio433brennenstuhlgateway.h @@ -28,7 +28,7 @@ #include #include -#include "libguh.h" +#include "libnymea.h" namespace guhserver { diff --git a/libnymea-core/hardware/radio433/radio433transmitter.h b/libnymea-core/hardware/radio433/radio433transmitter.h index 1c34f349..75f0a4f3 100644 --- a/libnymea-core/hardware/radio433/radio433transmitter.h +++ b/libnymea-core/hardware/radio433/radio433transmitter.h @@ -29,7 +29,7 @@ #include #include -#include "libguh.h" +#include "libnymea.h" #include "hardware/gpio.h" namespace guhserver { diff --git a/libnymea/coap/coap.h b/libnymea/coap/coap.h index 9d9d9c72..f94e0e60 100644 --- a/libnymea/coap/coap.h +++ b/libnymea/coap/coap.h @@ -29,7 +29,7 @@ #include #include -#include "libguh.h" +#include "libnymea.h" #include "coaprequest.h" #include "coapreply.h" #include "coapobserveresource.h" @@ -45,7 +45,7 @@ Q_DECLARE_LOGGING_CATEGORY(dcCoap) -class LIBGUH_EXPORT Coap : public QObject +class LIBNYMEA_EXPORT Coap : public QObject { Q_OBJECT diff --git a/libnymea/coap/coapobserveresource.h b/libnymea/coap/coapobserveresource.h index b4490c45..f1fa611a 100644 --- a/libnymea/coap/coapobserveresource.h +++ b/libnymea/coap/coapobserveresource.h @@ -25,9 +25,9 @@ #include #include -#include "libguh.h" +#include "libnymea.h" -class LIBGUH_EXPORT CoapObserveResource +class LIBNYMEA_EXPORT CoapObserveResource { public: CoapObserveResource(); diff --git a/libnymea/coap/coapoption.h b/libnymea/coap/coapoption.h index 7be6616e..e04f54b2 100644 --- a/libnymea/coap/coapoption.h +++ b/libnymea/coap/coapoption.h @@ -25,9 +25,9 @@ #include #include -#include "libguh.h" +#include "libnymea.h" -class LIBGUH_EXPORT CoapOption +class LIBNYMEA_EXPORT CoapOption { Q_GADGET Q_ENUMS(Option) diff --git a/libnymea/coap/coappdu.h b/libnymea/coap/coappdu.h index 23f3c1d8..b81cd5e1 100644 --- a/libnymea/coap/coappdu.h +++ b/libnymea/coap/coappdu.h @@ -24,7 +24,7 @@ #include #include -#include "libguh.h" +#include "libnymea.h" #include "coapoption.h" #include "coappdublock.h" @@ -43,7 +43,7 @@ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ -class LIBGUH_EXPORT CoapPdu : public QObject +class LIBNYMEA_EXPORT CoapPdu : public QObject { Q_OBJECT Q_ENUMS(MessageType) diff --git a/libnymea/coap/coappdublock.h b/libnymea/coap/coappdublock.h index 70dd7f75..aae7b75c 100644 --- a/libnymea/coap/coappdublock.h +++ b/libnymea/coap/coappdublock.h @@ -23,9 +23,9 @@ #include -#include "libguh.h" +#include "libnymea.h" -class LIBGUH_EXPORT CoapPduBlock +class LIBNYMEA_EXPORT CoapPduBlock { public: CoapPduBlock(); diff --git a/libnymea/coap/coapreply.h b/libnymea/coap/coapreply.h index 7ba8106a..ab77d070 100644 --- a/libnymea/coap/coapreply.h +++ b/libnymea/coap/coapreply.h @@ -24,12 +24,12 @@ #include #include -#include "libguh.h" +#include "libnymea.h" #include "coappdu.h" #include "coapoption.h" #include "coaprequest.h" -class LIBGUH_EXPORT CoapReply : public QObject +class LIBNYMEA_EXPORT CoapReply : public QObject { friend class Coap; diff --git a/libnymea/coap/coaprequest.h b/libnymea/coap/coaprequest.h index c989bfe0..c018d649 100644 --- a/libnymea/coap/coaprequest.h +++ b/libnymea/coap/coaprequest.h @@ -24,11 +24,11 @@ #include #include -#include "libguh.h" +#include "libnymea.h" #include "coappdu.h" #include "coapoption.h" -class LIBGUH_EXPORT CoapRequest +class LIBNYMEA_EXPORT CoapRequest { // friend class Coap; public: diff --git a/libnymea/coap/corelink.h b/libnymea/coap/corelink.h index 52b2cd13..f67b8036 100644 --- a/libnymea/coap/corelink.h +++ b/libnymea/coap/corelink.h @@ -24,10 +24,10 @@ #include #include -#include "libguh.h" +#include "libnymea.h" #include "coappdu.h" -class LIBGUH_EXPORT CoreLink +class LIBNYMEA_EXPORT CoreLink { public: CoreLink(); diff --git a/libnymea/coap/corelinkparser.h b/libnymea/coap/corelinkparser.h index 2f958c1f..fd4f5cd4 100644 --- a/libnymea/coap/corelinkparser.h +++ b/libnymea/coap/corelinkparser.h @@ -23,12 +23,12 @@ #include -#include "libguh.h" +#include "libnymea.h" #include "corelink.h" // Constrained RESTful Environments (CoRE) Link Format : http://tools.ietf.org/html/rfc6690 -class LIBGUH_EXPORT CoreLinkParser : public QObject +class LIBNYMEA_EXPORT CoreLinkParser : public QObject { Q_OBJECT public: diff --git a/libnymea/devicemanager.h b/libnymea/devicemanager.h index 439fbfa9..8a3dbff8 100644 --- a/libnymea/devicemanager.h +++ b/libnymea/devicemanager.h @@ -24,7 +24,7 @@ #ifndef DEVICEMANAGER_H #define DEVICEMANAGER_H -#include "libguh.h" +#include "libnymea.h" #include "plugin/device.h" #include "plugin/devicedescriptor.h" @@ -47,7 +47,7 @@ class DevicePlugin; class DevicePairingInfo; class HardwareManager; -class LIBGUH_EXPORT DeviceManager : public QObject +class LIBNYMEA_EXPORT DeviceManager : public QObject { Q_OBJECT Q_ENUMS(DeviceError) diff --git a/libnymea/guhsettings.h b/libnymea/guhsettings.h index bc7f7988..89703497 100644 --- a/libnymea/guhsettings.h +++ b/libnymea/guhsettings.h @@ -26,11 +26,11 @@ #include #include -#include "libguh.h" +#include "libnymea.h" class QSettings; -class LIBGUH_EXPORT GuhSettings : public QObject +class LIBNYMEA_EXPORT GuhSettings : public QObject { Q_OBJECT public: diff --git a/libnymea/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.h b/libnymea/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.h index d1d1a13d..4e2be5d2 100644 --- a/libnymea/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.h +++ b/libnymea/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.h @@ -26,9 +26,9 @@ #include #include -#include "libguh.h" +#include "libnymea.h" -class LIBGUH_EXPORT BluetoothDiscoveryReply : public QObject +class LIBNYMEA_EXPORT BluetoothDiscoveryReply : public QObject { Q_OBJECT diff --git a/libnymea/hardware/bluetoothlowenergy/bluetoothlowenergydevice.h b/libnymea/hardware/bluetoothlowenergy/bluetoothlowenergydevice.h index 586c9b49..bb7bc0ff 100644 --- a/libnymea/hardware/bluetoothlowenergy/bluetoothlowenergydevice.h +++ b/libnymea/hardware/bluetoothlowenergy/bluetoothlowenergydevice.h @@ -29,9 +29,9 @@ #include #include -#include "libguh.h" +#include "libnymea.h" -class LIBGUH_EXPORT BluetoothLowEnergyDevice : public QObject +class LIBNYMEA_EXPORT BluetoothLowEnergyDevice : public QObject { Q_OBJECT diff --git a/libnymea/hardware/bluetoothlowenergy/bluetoothlowenergymanager.h b/libnymea/hardware/bluetoothlowenergy/bluetoothlowenergymanager.h index 5bbebaab..632d780a 100644 --- a/libnymea/hardware/bluetoothlowenergy/bluetoothlowenergymanager.h +++ b/libnymea/hardware/bluetoothlowenergy/bluetoothlowenergymanager.h @@ -35,9 +35,9 @@ #include "bluetoothdiscoveryreply.h" #include "bluetoothlowenergydevice.h" -#include "libguh.h" +#include "libnymea.h" -class LIBGUH_EXPORT BluetoothLowEnergyManager : public HardwareResource +class LIBNYMEA_EXPORT BluetoothLowEnergyManager : public HardwareResource { Q_OBJECT diff --git a/libnymea/hardware/gpio.h b/libnymea/hardware/gpio.h index 25c6f127..f56573de 100644 --- a/libnymea/hardware/gpio.h +++ b/libnymea/hardware/gpio.h @@ -29,9 +29,9 @@ #include #include -#include "libguh.h" +#include "libnymea.h" -class LIBGUH_EXPORT Gpio : public QObject +class LIBNYMEA_EXPORT Gpio : public QObject { Q_OBJECT public: diff --git a/libnymea/hardware/gpiomonitor.h b/libnymea/hardware/gpiomonitor.h index 526ecf2b..bfdeca0f 100644 --- a/libnymea/hardware/gpiomonitor.h +++ b/libnymea/hardware/gpiomonitor.h @@ -28,10 +28,10 @@ #include #include -#include "libguh.h" +#include "libnymea.h" #include "gpio.h" -class LIBGUH_EXPORT GpioMonitor : public QObject +class LIBNYMEA_EXPORT GpioMonitor : public QObject { Q_OBJECT diff --git a/libnymea/hardware/pwm.h b/libnymea/hardware/pwm.h index d3a5431d..bef41a6c 100644 --- a/libnymea/hardware/pwm.h +++ b/libnymea/hardware/pwm.h @@ -28,7 +28,7 @@ #include #include -#include "libguh.h" +#include "libnymea.h" /* i.MX6 PWMs * @@ -57,7 +57,7 @@ * */ -class LIBGUH_EXPORT Pwm : public QObject +class LIBNYMEA_EXPORT Pwm : public QObject { Q_OBJECT public: diff --git a/libnymea/hardware/radio433/radio433.h b/libnymea/hardware/radio433/radio433.h index 45b3a22c..f7ef99bf 100644 --- a/libnymea/hardware/radio433/radio433.h +++ b/libnymea/hardware/radio433/radio433.h @@ -25,10 +25,10 @@ #include -#include "libguh.h" +#include "libnymea.h" #include "hardwareresource.h" -class LIBGUH_EXPORT Radio433 : public HardwareResource +class LIBNYMEA_EXPORT Radio433 : public HardwareResource { Q_OBJECT diff --git a/libnymea/hardware/radio433/radio433receiver.h b/libnymea/hardware/radio433/radio433receiver.h index bcae4fc8..8162f962 100644 --- a/libnymea/hardware/radio433/radio433receiver.h +++ b/libnymea/hardware/radio433/radio433receiver.h @@ -23,7 +23,7 @@ #include -#include "libguh.h" +#include "libnymea.h" #include "../gpio.h" class LIBGUH_EXPORT Radio433Receiver : public QThread diff --git a/libnymea/libguh.h b/libnymea/libnymea.h similarity index 92% rename from libnymea/libguh.h rename to libnymea/libnymea.h index a782d313..a5240ef1 100644 --- a/libnymea/libguh.h +++ b/libnymea/libnymea.h @@ -20,16 +20,16 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#ifndef LIBGUH -#define LIBGUH +#ifndef LIBNYMEA_H +#define LIBNYMEA_H #include #if defined(LIBNYMEA_LIBRARY) -# define LIBGUH_EXPORT Q_DECL_EXPORT +# define LIBNYMEA_EXPORT Q_DECL_EXPORT #else -# define LIBGUH_EXPORT Q_DECL_IMPORT +# define LIBNYMEA_EXPORT Q_DECL_IMPORT #endif -#endif // LIBGUH +#endif // LIBNYMEA_H diff --git a/libnymea/libnymea.pro b/libnymea/libnymea.pro index 8f811bd6..8c52ed01 100644 --- a/libnymea/libnymea.pro +++ b/libnymea/libnymea.pro @@ -15,7 +15,7 @@ INSTALLS += target LIBS += -lavahi-common -lavahi-client HEADERS += devicemanager.h \ - libguh.h \ + libnymea.h \ typeutils.h \ loggingcategories.h \ guhsettings.h \ diff --git a/libnymea/network/avahi/avahiserviceentry.h b/libnymea/network/avahi/avahiserviceentry.h index 4e1a0443..bb0cc8e5 100644 --- a/libnymea/network/avahi/avahiserviceentry.h +++ b/libnymea/network/avahi/avahiserviceentry.h @@ -30,9 +30,9 @@ #include -#include "libguh.h" +#include "libnymea.h" -class LIBGUH_EXPORT AvahiServiceEntry +class LIBNYMEA_EXPORT AvahiServiceEntry { public: AvahiServiceEntry(); diff --git a/libnymea/network/avahi/qtavahiservicebrowser.h b/libnymea/network/avahi/qtavahiservicebrowser.h index e9e98c03..6ab22b26 100644 --- a/libnymea/network/avahi/qtavahiservicebrowser.h +++ b/libnymea/network/avahi/qtavahiservicebrowser.h @@ -26,11 +26,11 @@ #include #include -#include "libguh.h" +#include "libnymea.h" #include "hardwareresource.h" #include "avahiserviceentry.h" -class LIBGUH_EXPORT QtAvahiServiceBrowser : public HardwareResource +class LIBNYMEA_EXPORT QtAvahiServiceBrowser : public HardwareResource { Q_OBJECT diff --git a/libnymea/network/networkaccessmanager.h b/libnymea/network/networkaccessmanager.h index 33933ad8..a39aa6b1 100644 --- a/libnymea/network/networkaccessmanager.h +++ b/libnymea/network/networkaccessmanager.h @@ -23,7 +23,7 @@ #ifndef NETWORKACCESSMANAGER_H #define NETWORKACCESSMANAGER_H -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" #include "hardwareresource.h" @@ -34,7 +34,7 @@ #include #include -class LIBGUH_EXPORT NetworkAccessManager : public HardwareResource +class LIBNYMEA_EXPORT NetworkAccessManager : public HardwareResource { Q_OBJECT diff --git a/libnymea/network/oauth2.h b/libnymea/network/oauth2.h index 0a080243..5abcd844 100644 --- a/libnymea/network/oauth2.h +++ b/libnymea/network/oauth2.h @@ -31,11 +31,11 @@ #include #include -#include "libguh.h" +#include "libnymea.h" // OAuth 2.0 - Resource Owner Password Credentials Grant: http://tools.ietf.org/html/rfc6749#section-4.3 -class LIBGUH_EXPORT OAuth2 : public QObject +class LIBNYMEA_EXPORT OAuth2 : public QObject { Q_OBJECT public: diff --git a/libnymea/network/upnp/upnpdevice.h b/libnymea/network/upnp/upnpdevice.h index f9c51765..8dc9dd8e 100644 --- a/libnymea/network/upnp/upnpdevice.h +++ b/libnymea/network/upnp/upnpdevice.h @@ -25,10 +25,10 @@ #include -#include "libguh.h" +#include "libnymea.h" #include "upnpdevicedescriptor.h" -class LIBGUH_EXPORT UpnpDevice : public QObject +class LIBNYMEA_EXPORT UpnpDevice : public QObject { Q_OBJECT public: diff --git a/libnymea/network/upnp/upnpdevicedescriptor.h b/libnymea/network/upnp/upnpdevicedescriptor.h index 2e3dda3a..cfafafde 100644 --- a/libnymea/network/upnp/upnpdevicedescriptor.h +++ b/libnymea/network/upnp/upnpdevicedescriptor.h @@ -27,11 +27,11 @@ #include #include -#include "libguh.h" +#include "libnymea.h" // reference: http://upnp.org/specs/arch/UPnP-arch-DeviceArchitecture-v1.1.pdf -class LIBGUH_EXPORT UpnpDeviceDescriptor +class LIBNYMEA_EXPORT UpnpDeviceDescriptor { public: explicit UpnpDeviceDescriptor(); diff --git a/libnymea/network/upnp/upnpdiscovery.h b/libnymea/network/upnp/upnpdiscovery.h index f6468dd3..fb0c308d 100644 --- a/libnymea/network/upnp/upnpdiscovery.h +++ b/libnymea/network/upnp/upnpdiscovery.h @@ -31,7 +31,7 @@ #include #include -#include "libguh.h" +#include "libnymea.h" #include "devicemanager.h" #include "hardwareresource.h" #include "upnpdiscoveryreply.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 -class LIBGUH_EXPORT UpnpDiscovery : public HardwareResource +class LIBNYMEA_EXPORT UpnpDiscovery : public HardwareResource { Q_OBJECT diff --git a/libnymea/plugin/device.h b/libnymea/plugin/device.h index eb707acb..980a576f 100644 --- a/libnymea/plugin/device.h +++ b/libnymea/plugin/device.h @@ -25,7 +25,7 @@ #define DEVICE_H #include "typeutils.h" -#include "libguh.h" +#include "libnymea.h" #include "types/deviceclass.h" #include "types/state.h" @@ -35,7 +35,7 @@ #include #include -class LIBGUH_EXPORT Device: public QObject +class LIBNYMEA_EXPORT Device: public QObject { Q_OBJECT diff --git a/libnymea/plugin/devicedescriptor.h b/libnymea/plugin/devicedescriptor.h index d1b8e7db..90d62bdf 100644 --- a/libnymea/plugin/devicedescriptor.h +++ b/libnymea/plugin/devicedescriptor.h @@ -24,13 +24,13 @@ #ifndef DEVICEDESCRIPTION_H #define DEVICEDESCRIPTION_H -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" #include "types/param.h" #include -class LIBGUH_EXPORT DeviceDescriptor +class LIBNYMEA_EXPORT DeviceDescriptor { public: DeviceDescriptor(); diff --git a/libnymea/plugin/devicepairinginfo.h b/libnymea/plugin/devicepairinginfo.h index 0fc82f8b..7f9e125c 100644 --- a/libnymea/plugin/devicepairinginfo.h +++ b/libnymea/plugin/devicepairinginfo.h @@ -23,11 +23,11 @@ #ifndef DEVICEPAIRINGINFO_H #define DEVICEPAIRINGINFO_H -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" #include "types/param.h" -class LIBGUH_EXPORT DevicePairingInfo +class LIBNYMEA_EXPORT DevicePairingInfo { public: DevicePairingInfo(); diff --git a/libnymea/plugin/deviceplugin.h b/libnymea/plugin/deviceplugin.h index c70cb0bd..34bf795e 100644 --- a/libnymea/plugin/deviceplugin.h +++ b/libnymea/plugin/deviceplugin.h @@ -26,7 +26,7 @@ #include "devicemanager.h" -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" #include "types/deviceclass.h" @@ -46,7 +46,7 @@ class Device; class DeviceManager; -class LIBGUH_EXPORT DevicePlugin: public QObject +class LIBNYMEA_EXPORT DevicePlugin: public QObject { Q_OBJECT diff --git a/libnymea/types/action.h b/libnymea/types/action.h index b165d342..97042957 100644 --- a/libnymea/types/action.h +++ b/libnymea/types/action.h @@ -24,13 +24,13 @@ #ifndef ACTION_H #define ACTION_H -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" #include "param.h" #include -class LIBGUH_EXPORT Action +class LIBNYMEA_EXPORT Action { public: explicit Action(const ActionTypeId &actionTypeId = ActionTypeId(), const DeviceId &deviceId = DeviceId()); diff --git a/libnymea/types/actiontype.h b/libnymea/types/actiontype.h index 31234b98..d8b37784 100644 --- a/libnymea/types/actiontype.h +++ b/libnymea/types/actiontype.h @@ -24,13 +24,13 @@ #ifndef ACTIONTYPE_H #define ACTIONTYPE_H -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" #include "paramtype.h" #include -class LIBGUH_EXPORT ActionType +class LIBNYMEA_EXPORT ActionType { public: ActionType(const ActionTypeId &id); diff --git a/libnymea/types/deviceclass.h b/libnymea/types/deviceclass.h index eeaebcfe..2c12f5bc 100644 --- a/libnymea/types/deviceclass.h +++ b/libnymea/types/deviceclass.h @@ -24,7 +24,7 @@ #ifndef DEVICECLASS_H #define DEVICECLASS_H -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" #include "types/vendor.h" #include "types/eventtype.h" @@ -35,7 +35,7 @@ #include #include -class LIBGUH_EXPORT DeviceClass +class LIBNYMEA_EXPORT DeviceClass { Q_GADGET Q_ENUMS(CreateMethod) diff --git a/libnymea/types/event.h b/libnymea/types/event.h index a252efb2..240b1308 100644 --- a/libnymea/types/event.h +++ b/libnymea/types/event.h @@ -24,7 +24,7 @@ #ifndef EVENT_H #define EVENT_H -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" #include "types/param.h" @@ -32,7 +32,7 @@ #include #include -class LIBGUH_EXPORT Event +class LIBNYMEA_EXPORT Event { public: Event(); diff --git a/libnymea/types/eventdescriptor.h b/libnymea/types/eventdescriptor.h index b10660c9..b5622bec 100644 --- a/libnymea/types/eventdescriptor.h +++ b/libnymea/types/eventdescriptor.h @@ -24,7 +24,7 @@ #ifndef EVENTDESCRIPTOR_H #define EVENTDESCRIPTOR_H -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" #include "paramdescriptor.h" #include "event.h" @@ -33,7 +33,7 @@ #include #include -class LIBGUH_EXPORT EventDescriptor +class LIBNYMEA_EXPORT EventDescriptor { public: enum Type { diff --git a/libnymea/types/eventtype.h b/libnymea/types/eventtype.h index c1b764f5..b6b4e800 100644 --- a/libnymea/types/eventtype.h +++ b/libnymea/types/eventtype.h @@ -24,13 +24,13 @@ #ifndef TRIGGERTYPE_H #define TRIGGERTYPE_H -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" #include "paramtype.h" #include -class LIBGUH_EXPORT EventType +class LIBNYMEA_EXPORT EventType { public: EventType(const EventTypeId &id); diff --git a/libnymea/types/param.h b/libnymea/types/param.h index 19081230..5b91cafb 100644 --- a/libnymea/types/param.h +++ b/libnymea/types/param.h @@ -24,13 +24,13 @@ #ifndef PARAM_H #define PARAM_H -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" #include #include -class LIBGUH_EXPORT Param +class LIBNYMEA_EXPORT Param { public: Param(const ParamTypeId ¶mTypeId = ParamTypeId(), const QVariant &value = QVariant()); @@ -50,7 +50,7 @@ private: Q_DECLARE_METATYPE(Param) QDebug operator<<(QDebug dbg, const Param ¶m); -class LIBGUH_EXPORT ParamList: public QList +class LIBNYMEA_EXPORT ParamList: public QList { public: bool hasParam(const ParamTypeId ¶mTypeId) const; diff --git a/libnymea/types/paramdescriptor.h b/libnymea/types/paramdescriptor.h index 8dddd3a2..819bac7f 100644 --- a/libnymea/types/paramdescriptor.h +++ b/libnymea/types/paramdescriptor.h @@ -24,12 +24,12 @@ #ifndef PARAMDESCRIPTOR_H #define PARAMDESCRIPTOR_H -#include "libguh.h" +#include "libnymea.h" #include "param.h" #include "typeutils.h" -class LIBGUH_EXPORT ParamDescriptor : public Param +class LIBNYMEA_EXPORT ParamDescriptor : public Param { public: ParamDescriptor(const ParamTypeId ¶mTypeId, const QVariant &value = QVariant()); diff --git a/libnymea/types/paramtype.h b/libnymea/types/paramtype.h index e86f133c..99a481cc 100644 --- a/libnymea/types/paramtype.h +++ b/libnymea/types/paramtype.h @@ -27,10 +27,10 @@ #include #include -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" -class LIBGUH_EXPORT ParamType +class LIBNYMEA_EXPORT ParamType { public: ParamType() = default; diff --git a/libnymea/types/ruleaction.h b/libnymea/types/ruleaction.h index a9b14472..a6e81a18 100644 --- a/libnymea/types/ruleaction.h +++ b/libnymea/types/ruleaction.h @@ -24,11 +24,11 @@ #ifndef RULEACTION_H #define RULEACTION_H -#include "libguh.h" +#include "libnymea.h" #include "action.h" #include "ruleactionparam.h" -class LIBGUH_EXPORT RuleAction +class LIBNYMEA_EXPORT RuleAction { public: enum Type { diff --git a/libnymea/types/ruleactionparam.h b/libnymea/types/ruleactionparam.h index c096e399..e6e8edfb 100644 --- a/libnymea/types/ruleactionparam.h +++ b/libnymea/types/ruleactionparam.h @@ -29,10 +29,10 @@ #include #include "param.h" -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" -class LIBGUH_EXPORT RuleActionParam +class LIBNYMEA_EXPORT RuleActionParam { public: RuleActionParam(const Param ¶m = Param()); @@ -64,7 +64,7 @@ private: Q_DECLARE_METATYPE(RuleActionParam) QDebug operator<<(QDebug dbg, const RuleActionParam &ruleActionParam); -class LIBGUH_EXPORT RuleActionParamList: public QList +class LIBNYMEA_EXPORT RuleActionParamList: public QList { public: bool hasParam(const ParamTypeId &ruleActionParamTypeId) const; diff --git a/libnymea/types/state.h b/libnymea/types/state.h index 6bb88d5c..13452bc4 100644 --- a/libnymea/types/state.h +++ b/libnymea/types/state.h @@ -24,13 +24,13 @@ #ifndef STATE_H #define STATE_H -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" #include #include -class LIBGUH_EXPORT State +class LIBNYMEA_EXPORT State { public: State(const StateTypeId &stateTypeId, const DeviceId &deviceId); diff --git a/libnymea/types/statedescriptor.h b/libnymea/types/statedescriptor.h index faa0bfb2..084a04a5 100644 --- a/libnymea/types/statedescriptor.h +++ b/libnymea/types/statedescriptor.h @@ -24,7 +24,7 @@ #ifndef STATEDESCRIPTOR_H #define STATEDESCRIPTOR_H -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" #include "paramdescriptor.h" #include "state.h" @@ -34,7 +34,7 @@ #include #include -class LIBGUH_EXPORT StateDescriptor +class LIBNYMEA_EXPORT StateDescriptor { public: StateDescriptor(); diff --git a/libnymea/types/statetype.h b/libnymea/types/statetype.h index 2e0d9670..bb94e004 100644 --- a/libnymea/types/statetype.h +++ b/libnymea/types/statetype.h @@ -25,12 +25,12 @@ #ifndef STATETYPE_H #define STATETYPE_H -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" #include -class LIBGUH_EXPORT StateType +class LIBNYMEA_EXPORT StateType { public: StateType(const StateTypeId &id); diff --git a/libnymea/types/vendor.h b/libnymea/types/vendor.h index 1e339649..e6c7527b 100644 --- a/libnymea/types/vendor.h +++ b/libnymea/types/vendor.h @@ -24,12 +24,12 @@ #ifndef VENDOR_H #define VENDOR_H -#include "libguh.h" +#include "libnymea.h" #include "typeutils.h" #include -class LIBGUH_EXPORT Vendor +class LIBNYMEA_EXPORT Vendor { public: Vendor(const VendorId &id, const QString &name = QString()); diff --git a/libnymea/typeutils.h b/libnymea/typeutils.h index b361f261..2a8c96ea 100644 --- a/libnymea/typeutils.h +++ b/libnymea/typeutils.h @@ -27,7 +27,7 @@ #include #include -#include "libguh.h" +#include "libnymea.h" #define DECLARE_TYPE_ID(type) class type##Id: public QUuid \ { \ @@ -60,7 +60,7 @@ DECLARE_TYPE_ID(Rule) DECLARE_TYPE_ID(PairingTransaction) -class LIBGUH_EXPORT Types +class LIBNYMEA_EXPORT Types { Q_GADGET Q_ENUMS(InputType)