class SR_API Error: public exception
{
public:
- Error(int result);
- ~Error() throw();
+ explicit Error(int result);
+ ~Error() noexcept;
const int result;
- const char *what() const throw();
+ const char *what() const noexcept;
};
/* Base template for classes whose resources are owned by a parent object. */
if (!(shared = _weak_this.lock()))
{
- shared = shared_ptr<Class>((Class *) this, reset_parent);
+ shared = shared_ptr<Class>(static_cast<Class *>(this), reset_parent);
_weak_this = shared;
}
Struct *_structure;
- ParentOwned<Class, Parent, Struct>(Struct *structure) :
+ explicit ParentOwned(Struct *structure) :
_structure(structure)
{
}
protected:
Struct *_structure;
- UserOwned<Class, Struct>(Struct *structure) :
+ explicit UserOwned(Struct *structure) :
_structure(structure)
{
}
shared_ptr<Packet> create_header_packet(Glib::TimeVal start_time);
/** Create a meta packet. */
shared_ptr<Packet> create_meta_packet(
- map<const ConfigKey *, Glib::VariantBase> config);
+ const map<const ConfigKey *, Glib::VariantBase> &config);
/** Create a logic packet. */
shared_ptr<Packet> create_logic_packet(
void *data_pointer, size_t data_length, unsigned int unit_size);
/** Create an analog packet. */
shared_ptr<Packet> create_analog_packet(
- vector<shared_ptr<Channel> > channels,
+ const vector<shared_ptr<Channel> > &channels,
float *data_pointer, unsigned int num_samples, const Quantity *mq,
- const Unit *unit, vector<const QuantityFlag *> mqflags);
+ const Unit *unit, const vector<const QuantityFlag *> &mqflags);
/** Load a saved session.
* @param filename File name string. */
shared_ptr<Session> load_session(string filename);
/** Set configuration for the given key to a specified value.
* @param key ConfigKey to set.
* @param value Value to set. */
- void config_set(const ConfigKey *key, Glib::VariantBase value);
+ void config_set(const ConfigKey *key, const Glib::VariantBase &value);
/** Enumerate available values for the given configuration key.
* @param key ConfigKey to enumerate values for. */
Glib::VariantContainerBase config_list(const ConfigKey *key);
/** Scan for devices and return a list of devices found.
* @param options Mapping of (ConfigKey, value) pairs. */
vector<shared_ptr<HardwareDevice> > scan(
- map<const ConfigKey *, Glib::VariantBase> options =
- map<const ConfigKey *, Glib::VariantBase>());
+ const map<const ConfigKey *, Glib::VariantBase> &options = {});
protected:
bool _initialized;
vector<HardwareDevice *> _devices;
- Driver(struct sr_dev_driver *structure);
+ explicit Driver(struct sr_dev_driver *structure);
~Driver();
friend class Context;
friend class HardwareDevice;
/** Close device. */
void close();
protected:
- Device(struct sr_dev_inst *structure);
+ explicit Device(struct sr_dev_inst *structure);
~Device();
virtual shared_ptr<Device> get_shared_from_this() = 0;
shared_ptr<Channel> get_channel(struct sr_channel *ptr);
/** Get the index number of this channel. */
unsigned int index();
protected:
- Channel(struct sr_channel *structure);
+ explicit Channel(struct sr_channel *structure);
~Channel();
const ChannelType * const _type;
friend class Device;
void add_match(shared_ptr<Channel> channel, const TriggerMatchType *type, float value);
protected:
vector<TriggerMatch *> _matches;
- TriggerStage(struct sr_trigger_stage *structure);
+ explicit TriggerStage(struct sr_trigger_stage *structure);
~TriggerStage();
friend class Trigger;
};
public Device
{
protected:
- SessionDevice(struct sr_dev_inst *sdi);
+ explicit SessionDevice(struct sr_dev_inst *sdi);
~SessionDevice();
shared_ptr<Device> get_shared_from_this();
/** Deleter needed to allow shared_ptr use with protected destructor. */
/** Get filename this session was loaded from. */
string filename();
protected:
- Session(shared_ptr<Context> context);
+ explicit Session(shared_ptr<Context> context);
Session(shared_ptr<Context> context, string filename);
~Session();
shared_ptr<Device> get_device(const struct sr_dev_inst *sdi);
/* Start time of this session. */
Glib::TimeVal start_time();
protected:
- Header(const struct sr_datafeed_header *structure);
+ explicit Header(const struct sr_datafeed_header *structure);
~Header();
shared_ptr<PacketPayload> get_shared_pointer(Packet *parent);
friend class Packet;
/* Mapping of (ConfigKey, value) pairs. */
map<const ConfigKey *, Glib::VariantBase> config();
protected:
- Meta(const struct sr_datafeed_meta *structure);
+ explicit Meta(const struct sr_datafeed_meta *structure);
~Meta();
shared_ptr<PacketPayload> get_shared_pointer(Packet *parent);
map<const ConfigKey *, Glib::VariantBase> _config;
/* Size of each sample in bytes. */
unsigned int unit_size();
protected:
- Logic(const struct sr_datafeed_logic *structure);
+ explicit Logic(const struct sr_datafeed_logic *structure);
~Logic();
shared_ptr<PacketPayload> get_shared_pointer(Packet *parent);
friend class Packet;
{
public:
/** Pointer to data. */
- float *data_pointer();
+ void *data_pointer();
/** Number of samples in this packet. */
- unsigned int num_samples();
+ uint32_t num_samples();
/** Channels for which this packet contains data. */
vector<shared_ptr<Channel> > channels();
/** Measured quantity of the samples in this packet. */
/** Measurement flags associated with the samples in this packet. */
vector<const QuantityFlag *> mq_flags();
protected:
- Analog(const struct sr_datafeed_analog *structure);
+ explicit Analog(const struct sr_datafeed_analog *structure);
~Analog();
shared_ptr<PacketPayload> get_shared_pointer(Packet *parent);
friend class Packet;
map<string, shared_ptr<Option> > options();
/** Create an input using this input format.
* @param options Mapping of (option name, value) pairs. */
- shared_ptr<Input> create_input(map<string, Glib::VariantBase> options =
- map<string, Glib::VariantBase>());
+ shared_ptr<Input> create_input(const map<string, Glib::VariantBase> &options = {});
protected:
- InputFormat(const struct sr_input_module *structure);
+ explicit InputFormat(const struct sr_input_module *structure);
~InputFormat();
friend class Context;
friend class InputDevice;
* @param options Mapping of (option name, value) pairs. */
shared_ptr<Output> create_output(
shared_ptr<Device> device,
- map<string, Glib::VariantBase> options =
- map<string, Glib::VariantBase>());
+ const map<string, Glib::VariantBase> &options = {});
/** Create an output using this format.
* @param filename Name of destination file.
* @param device Device to output for.
* @param options Mapping of (option name, value) pairs. */
shared_ptr<Output> create_output(string filename,
shared_ptr<Device> device,
- map<string, Glib::VariantBase> options =
- map<string, Glib::VariantBase>());
+ const map<string, Glib::VariantBase> &options = {});
/**
* Checks whether a given flag is set.
* @param flag Flag to check
*/
bool test_flag(const OutputFlag *flag);
protected:
- OutputFormat(const struct sr_output_module *structure);
+ explicit OutputFormat(const struct sr_output_module *structure);
~OutputFormat();
friend class Context;
friend class Output;
protected:
Output(shared_ptr<OutputFormat> format, shared_ptr<Device> device);
Output(shared_ptr<OutputFormat> format,
- shared_ptr<Device> device, map<string, Glib::VariantBase> options);
+ shared_ptr<Device> device, const map<string, Glib::VariantBase> &options);
Output(string filename, shared_ptr<OutputFormat> format,
- shared_ptr<Device> device, map<string, Glib::VariantBase> options);
+ shared_ptr<Device> device, const map<string, Glib::VariantBase> &options);
~Output();
const shared_ptr<OutputFormat> _format;
const shared_ptr<Device> _device;