explicit constructors and virtual destructors

This commit is contained in:
Kevin Matz 2022-12-10 11:07:13 -05:00
parent 19df7540c1
commit 37367cb6b4
40 changed files with 56 additions and 64 deletions

View File

@ -23,7 +23,7 @@ public:
explicit QSacnNode(QObject *parent = nullptr, explicit QSacnNode(QObject *parent = nullptr,
QUuid = QUuid::createUuid(), QString fctn = "OpenLCP QSacnNode", QUuid = QUuid::createUuid(), QString fctn = "OpenLCP QSacnNode",
bool ipv4 = true, bool ipv6 = true); bool ipv4 = true, bool ipv6 = true);
~QSacnNode(); virtual ~QSacnNode();
// sACN::RLP::Component // sACN::RLP::Component
void sendUDP(const ACN::PDU::Stream, const ACN::SDT::UDP::ipAddress&) const override; void sendUDP(const ACN::PDU::Stream, const ACN::SDT::UDP::ipAddress&) const override;

View File

@ -51,7 +51,7 @@ public:
* @param cid * @param cid
* @param fctn * @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) : cid_(cid)
, fctn_(fctn) , fctn_(fctn)
, uacn_(std::string()) , uacn_(std::string())

View File

@ -40,7 +40,7 @@ class Appliance
, public DMP::Component , public DMP::Component
{ {
public: 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<RLP::Pdu>); virtual void RlpReceiver(PDU::Message<RLP::Pdu>);
}; };

View File

@ -49,7 +49,7 @@ class Component
: public virtual ACN::Component : public virtual ACN::Component
{ {
public: 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<DMP::Pdu>); void addDmpSender(PDU::Handler<DMP::Pdu>);
void DmpReceiver(std::shared_ptr<ACN::PDU::Block<DMP::Pdu>>); void DmpReceiver(std::shared_ptr<ACN::PDU::Block<DMP::Pdu>>);

View File

@ -34,7 +34,7 @@ class Controller
: public virtual DMP::Component : public virtual DMP::Component
{ {
public: 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 } // namespace ACN::DMP

View File

@ -37,8 +37,8 @@ class Device
: public virtual DMP::Component : public virtual DMP::Component
{ {
public: public:
Device(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP DMP Device"); explicit Device(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP DMP Device");
~Device(); virtual ~Device();
protected: protected:
virtual void rxDmpGetProperty(PDU::Message<DMP::Pdu>) override; virtual void rxDmpGetProperty(PDU::Message<DMP::Pdu>) override;

View File

@ -31,7 +31,7 @@ namespace ACN::DMP {
class Event class Event
{ {
public: public:
Event(); explicit Event();
}; };
} // namespace ACN::DMP } // namespace ACN::DMP

View File

@ -46,7 +46,7 @@ class Component
: public ACN::Component : public ACN::Component
{ {
public: public:
Component(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP RLP Component", explicit Component(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP RLP Component",
bool ipv4 = true, bool ipv6 = true); bool ipv4 = true, bool ipv6 = true);
/// \brief Set the IPv4 enabled state /// \brief Set the IPv4 enabled state

View File

@ -47,8 +47,8 @@ enum Direction {
*/ */
class Channel { class Channel {
public: public:
Channel(std::shared_ptr<ACN::RLP::Component>, Direction); explicit Channel(std::shared_ptr<ACN::RLP::Component>, Direction);
~Channel(); virtual ~Channel();
private: private:
std::shared_ptr<ACN::RLP::Component> owner_; std::shared_ptr<ACN::RLP::Component> owner_;

View File

@ -31,7 +31,7 @@ namespace ACN::SDT {
class Identity class Identity
{ {
public: public:
Identity(); explicit Identity();
}; };
} // namespace ACN::SDT } // namespace ACN::SDT

View File

@ -38,7 +38,7 @@ class Leader
: public ACN::RLP::Component : public ACN::RLP::Component
{ {
public: 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 // RLP->SDT frames
virtual void SdtReceiver(PDU::Message<RLP::Pdu>); virtual void SdtReceiver(PDU::Message<RLP::Pdu>);

View File

@ -34,7 +34,7 @@ class Member
: public ACN::RLP::Component : public ACN::RLP::Component
{ {
public: 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<RLP::Pdu>); virtual void SdtReceiver(PDU::Message<RLP::Pdu>);
}; };

View File

@ -50,8 +50,8 @@ struct SessionId {
*/ */
class Session { class Session {
public: public:
Session(); explicit Session();
~Session(); virtual ~Session();
SessionId id(); SessionId id();

View File

@ -36,7 +36,7 @@ namespace DMX {
class Device class Device
{ {
public: public:
Device(); explicit Device();
virtual ~Device(); virtual ~Device();
uint16_t footprint() const; uint16_t footprint() const;

View File

@ -31,7 +31,7 @@ namespace DMX {
class Patch class Patch
{ {
public: public:
Patch(); explicit Patch();
}; };
} // namespace DMX } // namespace DMX

View File

@ -34,7 +34,7 @@ namespace DMX {
class Personality class Personality
{ {
public: public:
Personality(); explicit Personality();
virtual ~Personality(); virtual ~Personality();
uint16_t footprint() const; uint16_t footprint() const;

View File

@ -46,7 +46,7 @@ using DimmerData = std::array<uint8_t, E111_LAST_SLOT + 1>; //!< Array of 513 b
*/ */
class Universe { class Universe {
public: public:
Universe (int timeout_period = E111_DATA_LOSS_TIMEOUT); explicit Universe (int timeout_period = E111_DATA_LOSS_TIMEOUT);
virtual long age(); virtual long age();
virtual double rxRate(); virtual double rxRate();

View File

@ -35,8 +35,8 @@ namespace RDM {
class Controller class Controller
{ {
public: public:
Controller(); explicit Controller();
~Controller(); virtual ~Controller();
bool findDevices(uint64_t lowerBound = 0, bool findDevices(uint64_t lowerBound = 0,
uint64_t upperBound = 0xFFFFFFFFFFFE) const; uint64_t upperBound = 0xFFFFFFFFFFFE) const;

View File

@ -44,7 +44,7 @@ class Device
: public DMX::Device : public DMX::Device
{ {
public: public:
Device(UID id = UID(), Device* parent = nullptr); explicit Device(UID id = UID(), Device* parent = nullptr);
virtual ~Device(); virtual ~Device();
void addSubDevice(uint16_t number, Device* dev); void addSubDevice(uint16_t number, Device* dev);

View File

@ -41,9 +41,9 @@ using MsgPtr = std::shared_ptr<Message>; //!< valid RDM Message
*/ */
struct Message struct Message
{ {
Message(); explicit Message();
Message(const Message &obj); explicit Message(const Message &obj);
Message(const std::vector<uint8_t> &data); explicit Message(const std::vector<uint8_t> &data);
void read(const std::vector<uint8_t> &data); void read(const std::vector<uint8_t> &data);
void write(std::vector<uint8_t> &data) const; void write(std::vector<uint8_t> &data) const;

View File

@ -42,8 +42,8 @@ using PidAction = std::function<void(const MsgPtr message, MsgPtr response)>;
class Parameter class Parameter
{ {
public: public:
Parameter(); explicit Parameter();
~Parameter(); virtual ~Parameter();
void disc(const MsgPtr message, MsgPtr response) const; void disc(const MsgPtr message, MsgPtr response) const;
void get(const MsgPtr message, MsgPtr response) const; void get(const MsgPtr message, MsgPtr response) const;

View File

@ -37,7 +37,7 @@ class Responder
: public Device : public Device
{ {
public: public:
Responder(UID id, Device* parent = nullptr); explicit Responder(UID id, Device* parent = nullptr);
virtual ~Responder(); virtual ~Responder();
union { union {

View File

@ -36,7 +36,7 @@ namespace RDM {
class Sensor class Sensor
{ {
public: public:
Sensor(); explicit Sensor();
virtual ~Sensor() {}; virtual ~Sensor() {};
// RDM required properties // RDM required properties

View File

@ -38,7 +38,7 @@ class Broker
, public RPT::Broker , public RPT::Broker
{ {
public: public:
Broker(UUID::uuid = UUID::uuid(), std::string ftcn = "OpenLCP RDMnet Broker", explicit Broker(UUID::uuid = UUID::uuid(), std::string ftcn = "OpenLCP RDMnet Broker",
RDM::UID = RDM::UID()); RDM::UID = RDM::UID());
void rlpBrokerReceiver(ACN::PDU::Message<ACN::RLP::Pdu>); void rlpBrokerReceiver(ACN::PDU::Message<ACN::RLP::Pdu>);

View File

@ -38,7 +38,7 @@ class Controller
, public RPT::Controller , public RPT::Controller
{ {
public: public:
Controller(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP RDMnet Controller", explicit Controller(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP RDMnet Controller",
RDM::UID = RDM::UID()); RDM::UID = RDM::UID());
void rlpRptReceiver(ACN::PDU::Message<ACN::RLP::Pdu>); void rlpRptReceiver(ACN::PDU::Message<ACN::RLP::Pdu>);

View File

@ -36,7 +36,7 @@ class Device
, public RPT::Device , public RPT::Device
{ {
public: public:
Device(UUID::uuid cid = UUID::uuid(), std::string fctn = "OpenLCP RDMnet Device", explicit Device(UUID::uuid cid = UUID::uuid(), std::string fctn = "OpenLCP RDMnet Device",
RDM::UID uid = RDM::UID(), UUID::uuid rid = UUID::uuid()); RDM::UID uid = RDM::UID(), UUID::uuid rid = UUID::uuid());
void rlpRptReceiver(ACN::PDU::Message<ACN::RLP::Pdu>); void rlpRptReceiver(ACN::PDU::Message<ACN::RLP::Pdu>);

View File

@ -32,7 +32,7 @@ namespace RDMnet::EPT {
class Broker class Broker
{ {
public: public:
Broker(); explicit Broker();
}; };
} // namespace RDMnet::EPT } // namespace RDMnet::EPT

View File

@ -33,7 +33,7 @@ namespace RDMnet::EPT {
class Client class Client
{ {
public: public:
Client(); explicit Client();
/** /**
* @brief receiveEPT * @brief receiveEPT

View File

@ -40,7 +40,8 @@ class Implementation
, public EPT::Client , public EPT::Client
{ {
public: public:
Implementation(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP RDMnet Implementation", explicit Implementation(UUID::uuid = UUID::uuid(),
std::string fctn = "OpenLCP RDMnet Implementation",
RDM::UID = RDM::UID()); RDM::UID = RDM::UID());
protected: protected:

View File

@ -24,7 +24,7 @@
#pragma once #pragma once
#include "llrp.h" #include "llrp.h"
#include "component.h" #include "rlp/component.h"
namespace RDMnet::LLRP { namespace RDMnet::LLRP {
@ -38,7 +38,7 @@ class Manager
: public ACN::RLP::Component : public ACN::RLP::Component
{ {
public: 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<ACN::RLP::Pdu>); void rlpLlrpReceiver(ACN::PDU::Message<ACN::RLP::Pdu>);

View File

@ -37,7 +37,7 @@ namespace RDMnet::LLRP {
class Target class Target
{ {
public: public:
Target(); explicit Target();
virtual void LLRPsetup() = 0; //!< listens on LLRP_PORT virtual void LLRPsetup() = 0; //!< listens on LLRP_PORT

View File

@ -31,7 +31,7 @@ namespace RDMnet::RPT {
class Broker class Broker
{ {
public: public:
Broker(); explicit Broker();
}; };
} // namespace RDMnet::RPT } // namespace RDMnet::RPT

View File

@ -31,7 +31,7 @@ namespace RDMnet::RPT {
class Controller class Controller
{ {
public: public:
Controller(); explicit Controller();
}; };
} // namespace RDMnet::RPT } // namespace RDMnet::RPT

View File

@ -31,7 +31,7 @@ namespace RDMnet::RPT {
class Device class Device
{ {
public: public:
Device(); explicit Device();
protected: protected:
bool connectedToBroker; ///< True if the device is connected to a broker. bool connectedToBroker; ///< True if the device is connected to a broker.

View File

@ -39,14 +39,6 @@ ArbitratingUniverse::ArbitratingUniverse()
} }
/**
* @brief ArbitratingUniverse::~MergeProxyUniverse
*/
ArbitratingUniverse::~ArbitratingUniverse()
{
}
/** /**
* @brief ArbitratingUniverse::setHoldLastLook * @brief ArbitratingUniverse::setHoldLastLook
* @param state * @param state

View File

@ -55,8 +55,7 @@ class ArbitratingUniverse
: public sACN::Universe : public sACN::Universe
{ {
public: public:
ArbitratingUniverse(); explicit ArbitratingUniverse();
~ArbitratingUniverse();
uint16_t expectedUniverse; ///< Expected universe number uint16_t expectedUniverse; ///< Expected universe number

View File

@ -36,7 +36,7 @@ class Node
, public Source , public Source
{ {
public: 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 } // SACN

View File

@ -65,8 +65,8 @@ class Receiver
: public virtual ACN::RLP::Component : public virtual ACN::RLP::Component
{ {
public: public:
Receiver(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP sACN Receiver"); explicit Receiver(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP sACN Receiver");
~Receiver(); virtual ~Receiver();
virtual void subscribe(const uint16_t); virtual void subscribe(const uint16_t);
virtual void unsubscribe(const uint16_t); virtual void unsubscribe(const uint16_t);

View File

@ -47,8 +47,8 @@ class Source
: public virtual ACN::RLP::Component : public virtual ACN::RLP::Component
{ {
public: public:
Source(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP sACN Source"); explicit Source(UUID::uuid = UUID::uuid(), std::string fctn = "OpenLCP sACN Source");
~Source(); virtual ~Source();
virtual void create(const uint16_t); virtual void create(const uint16_t);
virtual void terminate(const uint16_t); virtual void terminate(const uint16_t);

View File

@ -46,8 +46,8 @@ class Universe
, public std::enable_shared_from_this<Universe> , public std::enable_shared_from_this<Universe>
{ {
public: public:
Universe(Source* = nullptr); explicit Universe(Source* = nullptr);
~Universe(); virtual ~Universe();
friend class UniverseSender; friend class UniverseSender;