diff --git a/platform/qt/qsacnnode.h b/platform/qt/qsacnnode.h index a4dd0df..d36bba0 100644 --- a/platform/qt/qsacnnode.h +++ b/platform/qt/qsacnnode.h @@ -23,7 +23,7 @@ public: explicit QSacnNode(QObject *parent = nullptr, QUuid = QUuid::createUuid(), QString fctn = "OpenLCP QSacnNode", bool ipv4 = true, bool ipv6 = true); - ~QSacnNode(); + virtual ~QSacnNode(); // sACN::RLP::Component void sendUDP(const ACN::PDU::Stream, const ACN::SDT::UDP::ipAddress&) const override; diff --git a/protocol/esta/acn/component.h b/protocol/esta/acn/component.h index ce9f28e..52bbc51 100644 --- a/protocol/esta/acn/component.h +++ b/protocol/esta/acn/component.h @@ -51,7 +51,7 @@ public: * @param cid * @param fctn */ - Component(UUID::uuid cid = UUID::uuid(), std::string fctn = "OpenLCP ACN Component") + explicit Component(UUID::uuid cid = UUID::uuid(), std::string fctn = "OpenLCP ACN Component") : cid_(cid) , fctn_(fctn) , uacn_(std::string()) diff --git a/protocol/esta/acn/dmp/appliance.h b/protocol/esta/acn/dmp/appliance.h index dffd334..1462252 100644 --- a/protocol/esta/acn/dmp/appliance.h +++ b/protocol/esta/acn/dmp/appliance.h @@ -40,7 +40,7 @@ class Appliance , public DMP::Component { public: - Appliance(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP DMP Appliance"); + explicit Appliance(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP DMP Appliance"); virtual void RlpReceiver(PDU::Message); }; diff --git a/protocol/esta/acn/dmp/component.h b/protocol/esta/acn/dmp/component.h index 2dedc35..d51218f 100644 --- a/protocol/esta/acn/dmp/component.h +++ b/protocol/esta/acn/dmp/component.h @@ -49,7 +49,7 @@ class Component : public virtual ACN::Component { public: - Component(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP DMP Component"); + explicit Component(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP DMP Component"); void addDmpSender(PDU::Handler); void DmpReceiver(std::shared_ptr>); diff --git a/protocol/esta/acn/dmp/controller.h b/protocol/esta/acn/dmp/controller.h index 3183d31..0962ae6 100644 --- a/protocol/esta/acn/dmp/controller.h +++ b/protocol/esta/acn/dmp/controller.h @@ -34,7 +34,7 @@ class Controller : public virtual DMP::Component { public: - Controller(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP DMP Controller"); + explicit Controller(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP DMP Controller"); }; } // namespace ACN::DMP diff --git a/protocol/esta/acn/dmp/device.h b/protocol/esta/acn/dmp/device.h index 0d62dd6..66d1677 100644 --- a/protocol/esta/acn/dmp/device.h +++ b/protocol/esta/acn/dmp/device.h @@ -37,8 +37,8 @@ class Device : public virtual DMP::Component { public: - Device(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP DMP Device"); - ~Device(); + explicit Device(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP DMP Device"); + virtual ~Device(); protected: virtual void rxDmpGetProperty(PDU::Message) override; diff --git a/protocol/esta/acn/dmp/event.h b/protocol/esta/acn/dmp/event.h index 833805b..ec40fa5 100644 --- a/protocol/esta/acn/dmp/event.h +++ b/protocol/esta/acn/dmp/event.h @@ -31,7 +31,7 @@ namespace ACN::DMP { class Event { public: - Event(); + explicit Event(); }; } // namespace ACN::DMP diff --git a/protocol/esta/acn/rlp/component.h b/protocol/esta/acn/rlp/component.h index 1e403dd..bddb50b 100644 --- a/protocol/esta/acn/rlp/component.h +++ b/protocol/esta/acn/rlp/component.h @@ -46,8 +46,8 @@ class Component : public ACN::Component { public: - Component(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP RLP Component", - bool ipv4 = true, bool ipv6 = true); + explicit Component(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP RLP Component", + bool ipv4 = true, bool ipv6 = true); /// \brief Set the IPv4 enabled state /// \param state diff --git a/protocol/esta/acn/sdt/channel.h b/protocol/esta/acn/sdt/channel.h index 441110b..a0a04ed 100644 --- a/protocol/esta/acn/sdt/channel.h +++ b/protocol/esta/acn/sdt/channel.h @@ -47,8 +47,8 @@ enum Direction { */ class Channel { public: - Channel(std::shared_ptr, Direction); - ~Channel(); + explicit Channel(std::shared_ptr, Direction); + virtual ~Channel(); private: std::shared_ptr owner_; diff --git a/protocol/esta/acn/sdt/identity.h b/protocol/esta/acn/sdt/identity.h index 4960bb4..4152a27 100644 --- a/protocol/esta/acn/sdt/identity.h +++ b/protocol/esta/acn/sdt/identity.h @@ -31,7 +31,7 @@ namespace ACN::SDT { class Identity { public: - Identity(); + explicit Identity(); }; } // namespace ACN::SDT diff --git a/protocol/esta/acn/sdt/leader.h b/protocol/esta/acn/sdt/leader.h index ec9f62c..3355090 100644 --- a/protocol/esta/acn/sdt/leader.h +++ b/protocol/esta/acn/sdt/leader.h @@ -38,7 +38,7 @@ class Leader : public ACN::RLP::Component { public: - Leader(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP SDT Leader"); + explicit Leader(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP SDT Leader"); // RLP->SDT frames virtual void SdtReceiver(PDU::Message); diff --git a/protocol/esta/acn/sdt/member.h b/protocol/esta/acn/sdt/member.h index 72ee526..9e7972b 100644 --- a/protocol/esta/acn/sdt/member.h +++ b/protocol/esta/acn/sdt/member.h @@ -34,7 +34,7 @@ class Member : public ACN::RLP::Component { public: - Member(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP SDT Member"); + explicit Member(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP SDT Member"); virtual void SdtReceiver(PDU::Message); }; diff --git a/protocol/esta/acn/sdt/session.h b/protocol/esta/acn/sdt/session.h index 16048ee..359a7cb 100644 --- a/protocol/esta/acn/sdt/session.h +++ b/protocol/esta/acn/sdt/session.h @@ -50,8 +50,8 @@ struct SessionId { */ class Session { public: - Session(); - ~Session(); + explicit Session(); + virtual ~Session(); SessionId id(); diff --git a/protocol/esta/dmx/device.h b/protocol/esta/dmx/device.h index acdaa4d..4d28ed2 100644 --- a/protocol/esta/dmx/device.h +++ b/protocol/esta/dmx/device.h @@ -36,7 +36,7 @@ namespace DMX { class Device { public: - Device(); + explicit Device(); virtual ~Device(); uint16_t footprint() const; diff --git a/protocol/esta/dmx/patch.h b/protocol/esta/dmx/patch.h index 85bd8da..df266e8 100644 --- a/protocol/esta/dmx/patch.h +++ b/protocol/esta/dmx/patch.h @@ -31,7 +31,7 @@ namespace DMX { class Patch { public: - Patch(); + explicit Patch(); }; } // namespace DMX diff --git a/protocol/esta/dmx/personality.h b/protocol/esta/dmx/personality.h index 1569bfc..95121bb 100644 --- a/protocol/esta/dmx/personality.h +++ b/protocol/esta/dmx/personality.h @@ -34,7 +34,7 @@ namespace DMX { class Personality { public: - Personality(); + explicit Personality(); virtual ~Personality(); uint16_t footprint() const; diff --git a/protocol/esta/dmx/universe.h b/protocol/esta/dmx/universe.h index a1044f9..cf53be0 100644 --- a/protocol/esta/dmx/universe.h +++ b/protocol/esta/dmx/universe.h @@ -46,7 +46,7 @@ using DimmerData = std::array; //!< Array of 513 b */ class Universe { public: - Universe (int timeout_period = E111_DATA_LOSS_TIMEOUT); + explicit Universe (int timeout_period = E111_DATA_LOSS_TIMEOUT); virtual long age(); virtual double rxRate(); diff --git a/protocol/esta/rdm/controller.h b/protocol/esta/rdm/controller.h index d6bf246..1980e7a 100644 --- a/protocol/esta/rdm/controller.h +++ b/protocol/esta/rdm/controller.h @@ -35,8 +35,8 @@ namespace RDM { class Controller { public: - Controller(); - ~Controller(); + explicit Controller(); + virtual ~Controller(); bool findDevices(uint64_t lowerBound = 0, uint64_t upperBound = 0xFFFFFFFFFFFE) const; diff --git a/protocol/esta/rdm/device.h b/protocol/esta/rdm/device.h index 788fa04..26d90f3 100644 --- a/protocol/esta/rdm/device.h +++ b/protocol/esta/rdm/device.h @@ -44,7 +44,7 @@ class Device : public DMX::Device { public: - Device(UID id = UID(), Device* parent = nullptr); + explicit Device(UID id = UID(), Device* parent = nullptr); virtual ~Device(); void addSubDevice(uint16_t number, Device* dev); diff --git a/protocol/esta/rdm/message.h b/protocol/esta/rdm/message.h index c95770b..9caa850 100644 --- a/protocol/esta/rdm/message.h +++ b/protocol/esta/rdm/message.h @@ -41,9 +41,9 @@ using MsgPtr = std::shared_ptr; //!< valid RDM Message */ struct Message { - Message(); - Message(const Message &obj); - Message(const std::vector &data); + explicit Message(); + explicit Message(const Message &obj); + explicit Message(const std::vector &data); void read(const std::vector &data); void write(std::vector &data) const; diff --git a/protocol/esta/rdm/parameter.h b/protocol/esta/rdm/parameter.h index ca9b523..3942d5d 100644 --- a/protocol/esta/rdm/parameter.h +++ b/protocol/esta/rdm/parameter.h @@ -42,8 +42,8 @@ using PidAction = std::function; class Parameter { public: - Parameter(); - ~Parameter(); + explicit Parameter(); + virtual ~Parameter(); void disc(const MsgPtr message, MsgPtr response) const; void get(const MsgPtr message, MsgPtr response) const; diff --git a/protocol/esta/rdm/responder.h b/protocol/esta/rdm/responder.h index 44aba17..35dc56c 100644 --- a/protocol/esta/rdm/responder.h +++ b/protocol/esta/rdm/responder.h @@ -37,7 +37,7 @@ class Responder : public Device { public: - Responder(UID id, Device* parent = nullptr); + explicit Responder(UID id, Device* parent = nullptr); virtual ~Responder(); union { diff --git a/protocol/esta/rdm/sensor.h b/protocol/esta/rdm/sensor.h index d73c6dc..fe6c9ed 100644 --- a/protocol/esta/rdm/sensor.h +++ b/protocol/esta/rdm/sensor.h @@ -36,7 +36,7 @@ namespace RDM { class Sensor { public: - Sensor(); + explicit Sensor(); virtual ~Sensor() {}; // RDM required properties diff --git a/protocol/esta/rdmnet/broker.h b/protocol/esta/rdmnet/broker.h index ccf99f8..56916c3 100644 --- a/protocol/esta/rdmnet/broker.h +++ b/protocol/esta/rdmnet/broker.h @@ -38,8 +38,8 @@ class Broker , public RPT::Broker { public: - Broker(UUID::uuid = UUID::uuid(), std::string ftcn = "OpenLCP RDMnet Broker", - RDM::UID = RDM::UID()); + explicit Broker(UUID::uuid = UUID::uuid(), std::string ftcn = "OpenLCP RDMnet Broker", + RDM::UID = RDM::UID()); void rlpBrokerReceiver(ACN::PDU::Message); diff --git a/protocol/esta/rdmnet/controller.h b/protocol/esta/rdmnet/controller.h index 61326dd..ddfe276 100644 --- a/protocol/esta/rdmnet/controller.h +++ b/protocol/esta/rdmnet/controller.h @@ -38,8 +38,8 @@ class Controller , public RPT::Controller { public: - Controller(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP RDMnet Controller", - RDM::UID = RDM::UID()); + explicit Controller(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP RDMnet Controller", + RDM::UID = RDM::UID()); void rlpRptReceiver(ACN::PDU::Message); }; diff --git a/protocol/esta/rdmnet/device.h b/protocol/esta/rdmnet/device.h index 26dbaf6..a47c29b 100644 --- a/protocol/esta/rdmnet/device.h +++ b/protocol/esta/rdmnet/device.h @@ -36,8 +36,8 @@ class Device , public RPT::Device { public: - Device(UUID::uuid cid = UUID::uuid(), std::string fctn = "OpenLCP RDMnet Device", - RDM::UID uid = RDM::UID(), UUID::uuid rid = UUID::uuid()); + explicit Device(UUID::uuid cid = UUID::uuid(), std::string fctn = "OpenLCP RDMnet Device", + RDM::UID uid = RDM::UID(), UUID::uuid rid = UUID::uuid()); void rlpRptReceiver(ACN::PDU::Message); diff --git a/protocol/esta/rdmnet/ept/broker.h b/protocol/esta/rdmnet/ept/broker.h index 5b0d201..ba93a98 100644 --- a/protocol/esta/rdmnet/ept/broker.h +++ b/protocol/esta/rdmnet/ept/broker.h @@ -32,7 +32,7 @@ namespace RDMnet::EPT { class Broker { public: - Broker(); + explicit Broker(); }; } // namespace RDMnet::EPT diff --git a/protocol/esta/rdmnet/ept/client.h b/protocol/esta/rdmnet/ept/client.h index f320cc2..669996e 100644 --- a/protocol/esta/rdmnet/ept/client.h +++ b/protocol/esta/rdmnet/ept/client.h @@ -33,7 +33,7 @@ namespace RDMnet::EPT { class Client { public: - Client(); + explicit Client(); /** * @brief receiveEPT diff --git a/protocol/esta/rdmnet/implementation.h b/protocol/esta/rdmnet/implementation.h index 484247b..db00d47 100644 --- a/protocol/esta/rdmnet/implementation.h +++ b/protocol/esta/rdmnet/implementation.h @@ -40,8 +40,9 @@ class Implementation , public EPT::Client { public: - Implementation(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP RDMnet Implementation", - RDM::UID = RDM::UID()); + explicit Implementation(UUID::uuid = UUID::uuid(), + std::string fctn = "OpenLCP RDMnet Implementation", + RDM::UID = RDM::UID()); protected: void rlpLlrpReceiver(ACN::PDU::Message); diff --git a/protocol/esta/rdmnet/llrp/manager.h b/protocol/esta/rdmnet/llrp/manager.h index 19ee79f..d101b6e 100644 --- a/protocol/esta/rdmnet/llrp/manager.h +++ b/protocol/esta/rdmnet/llrp/manager.h @@ -24,7 +24,7 @@ #pragma once #include "llrp.h" -#include "component.h" +#include "rlp/component.h" namespace RDMnet::LLRP { @@ -38,7 +38,7 @@ class Manager : public ACN::RLP::Component { public: - Manager(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP LLRP Manager"); + explicit Manager(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP LLRP Manager"); void rlpLlrpReceiver(ACN::PDU::Message); diff --git a/protocol/esta/rdmnet/llrp/target.h b/protocol/esta/rdmnet/llrp/target.h index 32ae706..643a99b 100644 --- a/protocol/esta/rdmnet/llrp/target.h +++ b/protocol/esta/rdmnet/llrp/target.h @@ -37,7 +37,7 @@ namespace RDMnet::LLRP { class Target { public: - Target(); + explicit Target(); virtual void LLRPsetup() = 0; //!< listens on LLRP_PORT diff --git a/protocol/esta/rdmnet/rpt/broker.h b/protocol/esta/rdmnet/rpt/broker.h index cd38946..76057d5 100644 --- a/protocol/esta/rdmnet/rpt/broker.h +++ b/protocol/esta/rdmnet/rpt/broker.h @@ -31,7 +31,7 @@ namespace RDMnet::RPT { class Broker { public: - Broker(); + explicit Broker(); }; } // namespace RDMnet::RPT diff --git a/protocol/esta/rdmnet/rpt/controller.h b/protocol/esta/rdmnet/rpt/controller.h index d032591..7112cc3 100644 --- a/protocol/esta/rdmnet/rpt/controller.h +++ b/protocol/esta/rdmnet/rpt/controller.h @@ -31,7 +31,7 @@ namespace RDMnet::RPT { class Controller { public: - Controller(); + explicit Controller(); }; } // namespace RDMnet::RPT diff --git a/protocol/esta/rdmnet/rpt/device.h b/protocol/esta/rdmnet/rpt/device.h index 22b267b..9383240 100644 --- a/protocol/esta/rdmnet/rpt/device.h +++ b/protocol/esta/rdmnet/rpt/device.h @@ -31,7 +31,7 @@ namespace RDMnet::RPT { class Device { public: - Device(); + explicit Device(); protected: bool connectedToBroker; ///< True if the device is connected to a broker. diff --git a/protocol/esta/sacn/arbitratinguniverse.cpp b/protocol/esta/sacn/arbitratinguniverse.cpp index 8ba79ab..4f5bf77 100644 --- a/protocol/esta/sacn/arbitratinguniverse.cpp +++ b/protocol/esta/sacn/arbitratinguniverse.cpp @@ -39,14 +39,6 @@ ArbitratingUniverse::ArbitratingUniverse() } -/** - * @brief ArbitratingUniverse::~MergeProxyUniverse - */ -ArbitratingUniverse::~ArbitratingUniverse() -{ -} - - /** * @brief ArbitratingUniverse::setHoldLastLook * @param state diff --git a/protocol/esta/sacn/arbitratinguniverse.h b/protocol/esta/sacn/arbitratinguniverse.h index 9422ab9..0b9276c 100644 --- a/protocol/esta/sacn/arbitratinguniverse.h +++ b/protocol/esta/sacn/arbitratinguniverse.h @@ -55,8 +55,7 @@ class ArbitratingUniverse : public sACN::Universe { public: - ArbitratingUniverse(); - ~ArbitratingUniverse(); + explicit ArbitratingUniverse(); uint16_t expectedUniverse; ///< Expected universe number diff --git a/protocol/esta/sacn/node.h b/protocol/esta/sacn/node.h index f6a46ad..490f503 100644 --- a/protocol/esta/sacn/node.h +++ b/protocol/esta/sacn/node.h @@ -36,7 +36,7 @@ class Node , public Source { public: - Node(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP sACN Node"); + explicit Node(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP sACN Node"); }; } // SACN diff --git a/protocol/esta/sacn/receiver.h b/protocol/esta/sacn/receiver.h index a1b6b00..8546739 100644 --- a/protocol/esta/sacn/receiver.h +++ b/protocol/esta/sacn/receiver.h @@ -65,8 +65,8 @@ class Receiver : public virtual ACN::RLP::Component { public: - Receiver(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP sACN Receiver"); - ~Receiver(); + explicit Receiver(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP sACN Receiver"); + virtual ~Receiver(); virtual void subscribe(const uint16_t); virtual void unsubscribe(const uint16_t); diff --git a/protocol/esta/sacn/source.h b/protocol/esta/sacn/source.h index 5a94b42..d806389 100644 --- a/protocol/esta/sacn/source.h +++ b/protocol/esta/sacn/source.h @@ -47,8 +47,8 @@ class Source : public virtual ACN::RLP::Component { public: - Source(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP sACN Source"); - ~Source(); + explicit Source(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP sACN Source"); + virtual ~Source(); virtual void create(const uint16_t); virtual void terminate(const uint16_t); diff --git a/protocol/esta/sacn/universe.h b/protocol/esta/sacn/universe.h index 14a76da..febb21c 100644 --- a/protocol/esta/sacn/universe.h +++ b/protocol/esta/sacn/universe.h @@ -46,8 +46,8 @@ class Universe , public std::enable_shared_from_this { public: - Universe(Source* = nullptr); - ~Universe(); + explicit Universe(Source* = nullptr); + virtual ~Universe(); friend class UniverseSender;