BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

C++: Make most constructors explicit 

Unless implicit conversion is desired, constructors that can be
called with one argument should be marked as "explicit".
This commit is contained in:
Daniel Elstner 2015-10-11 11:39:07 +02:00
parent ce3e1e6132
commit 6c11b49607
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
View File

@ -120,7 +120,7 @@ class SR_API UserDevice;
class SR_API Error: public exception class SR_API Error: public exception
{ {
public: public:
Error(int result); explicit Error(int result);
~Error() throw(); ~Error() throw();
const int result; const int result;
const char *what() const throw(); const char *what() const throw();
@ -194,7 +194,7 @@ protected:
Struct *_structure; Struct *_structure;
ParentOwned<Class, Parent, Struct>(Struct *structure) : explicit ParentOwned(Struct *structure) :
_structure(structure) _structure(structure)
{ {
} }
@ -215,7 +215,7 @@ public:
protected: protected:
Struct *_structure; Struct *_structure;
UserOwned<Class, Struct>(Struct *structure) : explicit UserOwned(Struct *structure) :
_structure(structure) _structure(structure)
{ {
} }
@ -379,7 +379,7 @@ public:
protected: protected:
bool _initialized; bool _initialized;
vector<HardwareDevice *> _devices; vector<HardwareDevice *> _devices;
Driver(struct sr_dev_driver *structure); explicit Driver(struct sr_dev_driver *structure);
~Driver(); ~Driver();
friend class Context; friend class Context;
friend class HardwareDevice; friend class HardwareDevice;
@ -409,7 +409,7 @@ public:
/** Close device. */ /** Close device. */
void close(); void close();
protected: protected:
Device(struct sr_dev_inst *structure); explicit Device(struct sr_dev_inst *structure);
~Device(); ~Device();
virtual shared_ptr<Device> get_shared_from_this() = 0; virtual shared_ptr<Device> get_shared_from_this() = 0;
shared_ptr<Channel> get_channel(struct sr_channel *ptr); shared_ptr<Channel> get_channel(struct sr_channel *ptr);
@ -496,7 +496,7 @@ public:
/** Get the index number of this channel. */ /** Get the index number of this channel. */
unsigned int index(); unsigned int index();
protected: protected:
Channel(struct sr_channel *structure); explicit Channel(struct sr_channel *structure);
~Channel(); ~Channel();
const ChannelType * const _type; const ChannelType * const _type;
friend class Device; friend class Device;
@ -564,7 +564,7 @@ public:
void add_match(shared_ptr<Channel> channel, const TriggerMatchType *type, float value); void add_match(shared_ptr<Channel> channel, const TriggerMatchType *type, float value);
protected: protected:
vector<TriggerMatch *> _matches; vector<TriggerMatch *> _matches;
TriggerStage(struct sr_trigger_stage *structure); explicit TriggerStage(struct sr_trigger_stage *structure);
~TriggerStage(); ~TriggerStage();
friend class Trigger; friend class Trigger;
}; };
@ -614,7 +614,7 @@ class SR_API SessionDevice :
public Device public Device
{ {
protected: protected:
SessionDevice(struct sr_dev_inst *sdi); explicit SessionDevice(struct sr_dev_inst *sdi);
~SessionDevice(); ~SessionDevice();
shared_ptr<Device> get_shared_from_this(); shared_ptr<Device> get_shared_from_this();
/** Deleter needed to allow shared_ptr use with protected destructor. */ /** Deleter needed to allow shared_ptr use with protected destructor. */
@ -663,7 +663,7 @@ public:
/** Get filename this session was loaded from. */ /** Get filename this session was loaded from. */
string filename(); string filename();
protected: protected:
Session(shared_ptr<Context> context); explicit Session(shared_ptr<Context> context);
Session(shared_ptr<Context> context, string filename); Session(shared_ptr<Context> context, string filename);
~Session(); ~Session();
shared_ptr<Device> get_device(const struct sr_dev_inst *sdi); shared_ptr<Device> get_device(const struct sr_dev_inst *sdi);
@ -734,7 +734,7 @@ public:
/* Start time of this session. */ /* Start time of this session. */
Glib::TimeVal start_time(); Glib::TimeVal start_time();
protected: protected:
Header(const struct sr_datafeed_header *structure); explicit Header(const struct sr_datafeed_header *structure);
~Header(); ~Header();
shared_ptr<PacketPayload> get_shared_pointer(Packet *parent); shared_ptr<PacketPayload> get_shared_pointer(Packet *parent);
friend class Packet; friend class Packet;
@ -749,7 +749,7 @@ public:
/* Mapping of (ConfigKey, value) pairs. */ /* Mapping of (ConfigKey, value) pairs. */
map<const ConfigKey *, Glib::VariantBase> config(); map<const ConfigKey *, Glib::VariantBase> config();
protected: protected:
Meta(const struct sr_datafeed_meta *structure); explicit Meta(const struct sr_datafeed_meta *structure);
~Meta(); ~Meta();
shared_ptr<PacketPayload> get_shared_pointer(Packet *parent); shared_ptr<PacketPayload> get_shared_pointer(Packet *parent);
map<const ConfigKey *, Glib::VariantBase> _config; map<const ConfigKey *, Glib::VariantBase> _config;
@ -769,7 +769,7 @@ public:
/* Size of each sample in bytes. */ /* Size of each sample in bytes. */
unsigned int unit_size(); unsigned int unit_size();
protected: protected:
Logic(const struct sr_datafeed_logic *structure); explicit Logic(const struct sr_datafeed_logic *structure);
~Logic(); ~Logic();
shared_ptr<PacketPayload> get_shared_pointer(Packet *parent); shared_ptr<PacketPayload> get_shared_pointer(Packet *parent);
friend class Packet; friend class Packet;
@ -794,7 +794,7 @@ public:
/** Measurement flags associated with the samples in this packet. */ /** Measurement flags associated with the samples in this packet. */
vector<const QuantityFlag *> mq_flags(); vector<const QuantityFlag *> mq_flags();
protected: protected:
Analog(const struct sr_datafeed_analog *structure); explicit Analog(const struct sr_datafeed_analog *structure);
~Analog(); ~Analog();
shared_ptr<PacketPayload> get_shared_pointer(Packet *parent); shared_ptr<PacketPayload> get_shared_pointer(Packet *parent);
friend class Packet; friend class Packet;
@ -818,7 +818,7 @@ public:
* @param options Mapping of (option name, value) pairs. */ * @param options Mapping of (option name, value) pairs. */
shared_ptr<Input> create_input(const map<string, Glib::VariantBase> &options = {}); shared_ptr<Input> create_input(const map<string, Glib::VariantBase> &options = {});
protected: protected:
InputFormat(const struct sr_input_module *structure); explicit InputFormat(const struct sr_input_module *structure);
~InputFormat(); ~InputFormat();
friend class Context; friend class Context;
friend class InputDevice; friend class InputDevice;
@ -918,7 +918,7 @@ public:
*/ */
bool test_flag(const OutputFlag *flag); bool test_flag(const OutputFlag *flag);
protected: protected:
OutputFormat(const struct sr_output_module *structure); explicit OutputFormat(const struct sr_output_module *structure);
~OutputFormat(); ~OutputFormat();
friend class Context; friend class Context;
friend class Output; friend class Output;