C++: Make value get accessors const

[libsigrok.git] / bindings / cxx / classes.cpp

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index 1b53d0a795968aa79c5a64ed0f9be90b38af3f5b..960ac39bc0524a5f0ae7f59604f1fa24eeefcee6 100644 (file)
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -74,7 +74,7 @@ ResourceReader::~ResourceReader()
 }
 
 SR_PRIV int ResourceReader::open_callback(struct sr_resource *res,
-               const char *name, void *cb_data)
+               const char *name, void *cb_data) noexcept
 {
        try {
                auto *const reader = static_cast<ResourceReader*>(cb_data);
@@ -87,7 +87,8 @@ SR_PRIV int ResourceReader::open_callback(struct sr_resource *res,
        return SR_OK;
 }
 
-SR_PRIV int ResourceReader::close_callback(struct sr_resource *res, void *cb_data)
+SR_PRIV int ResourceReader::close_callback(struct sr_resource *res,
+               void *cb_data) noexcept
 {
        try {
                auto *const reader = static_cast<ResourceReader*>(cb_data);
@@ -101,7 +102,7 @@ SR_PRIV int ResourceReader::close_callback(struct sr_resource *res, void *cb_dat
 }
 
 SR_PRIV ssize_t ResourceReader::read_callback(const struct sr_resource *res,
-               void *buf, size_t count, void *cb_data)
+               void *buf, size_t count, void *cb_data) noexcept
 {
        try {
                auto *const reader = static_cast<ResourceReader*>(cb_data);
@@ -198,7 +199,7 @@ Context::~Context()
        check(sr_exit(_structure));
 }
 
-const LogLevel *Context::log_level()
+const LogLevel *Context::log_level() const
 {
        return LogLevel::get(sr_log_loglevel_get());
 }
@@ -208,7 +209,8 @@ void Context::set_log_level(const LogLevel *level)
        check(sr_log_loglevel_set(level->id()));
 }
 
-static int call_log_callback(void *cb_data, int loglevel, const char *format, va_list args)
+static int call_log_callback(void *cb_data, int loglevel,
+               const char *format, va_list args) noexcept
 {
        const unique_ptr<char, decltype(&g_free)>
                message {g_strdup_vprintf(format, args), &g_free};
@@ -366,7 +368,7 @@ shared_ptr<Input> Context::open_stream(string header)
                new Input(shared_from_this(), input), Input::Deleter());
 }
 
-map<string, string> Context::serials(shared_ptr<Driver> driver)
+map<string, string> Context::serials(shared_ptr<Driver> driver) const
 {
        GSList *serial_list = sr_serial_list(driver ? driver->_structure : nullptr);
        map<string, string> serials;
@@ -392,12 +394,12 @@ Driver::~Driver()
 {
 }
 
-string Driver::name()
+string Driver::name() const
 {
        return valid_string(_structure->name);
 }
 
-string Driver::long_name()
+string Driver::long_name() const
 {
        return valid_string(_structure->longname);
 }
@@ -461,7 +463,7 @@ Configurable::~Configurable()
 {
 }
 
-Glib::VariantBase Configurable::config_get(const ConfigKey *key)
+Glib::VariantBase Configurable::config_get(const ConfigKey *key) const
 {
        GVariant *data;
        check(sr_config_get(
@@ -477,7 +479,7 @@ void Configurable::config_set(const ConfigKey *key, const Glib::VariantBase &val
                key->id(), const_cast<GVariant*>(value.gobj())));
 }
 
-Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key)
+Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key) const
 {
        GVariant *data;
        check(sr_config_list(
@@ -519,7 +521,7 @@ map<const ConfigKey *, set<Capability>> Configurable::config_keys(const ConfigKe
 }
 
 bool Configurable::config_check(const ConfigKey *key,
-       const ConfigKey *index_key)
+       const ConfigKey *index_key) const
 {
        GVariant *gvar_opts;
        gsize num_opts;
@@ -571,27 +573,27 @@ Device::~Device()
                delete entry.second;
 }
 
-string Device::vendor()
+string Device::vendor() const
 {
        return valid_string(sr_dev_inst_vendor_get(_structure));
 }
 
-string Device::model()
+string Device::model() const
 {
        return valid_string(sr_dev_inst_model_get(_structure));
 }
 
-string Device::version()
+string Device::version() const
 {
        return valid_string(sr_dev_inst_version_get(_structure));
 }
 
-string Device::serial_number()
+string Device::serial_number() const
 {
        return valid_string(sr_dev_inst_sernum_get(_structure));
 }
 
-string Device::connection_id()
+string Device::connection_id() const
 {
        return valid_string(sr_dev_inst_connid_get(_structure));
 }
@@ -693,7 +695,7 @@ Channel::~Channel()
 {
 }
 
-string Channel::name()
+string Channel::name() const
 {
        return valid_string(_structure->name);
 }
@@ -703,12 +705,12 @@ void Channel::set_name(string name)
        check(sr_dev_channel_name_set(_structure, name.c_str()));
 }
 
-const ChannelType *Channel::type()
+const ChannelType *Channel::type() const
 {
        return ChannelType::get(_structure->type);
 }
 
-bool Channel::enabled()
+bool Channel::enabled() const
 {
        return _structure->enabled;
 }
@@ -718,7 +720,7 @@ void Channel::set_enabled(bool value)
        check(sr_dev_channel_enable(_structure, value));
 }
 
-unsigned int Channel::index()
+unsigned int Channel::index() const
 {
        return _structure->index;
 }
@@ -738,7 +740,7 @@ ChannelGroup::~ChannelGroup()
 {
 }
 
-string ChannelGroup::name()
+string ChannelGroup::name() const
 {
        return valid_string(_structure->name);
 }
@@ -768,7 +770,7 @@ Trigger::~Trigger()
        sr_trigger_free(_structure);
 }
 
-string Trigger::name()
+string Trigger::name() const
 {
        return _structure->name;
 }
@@ -799,7 +801,7 @@ TriggerStage::~TriggerStage()
                delete match;
 }
        
-int TriggerStage::number()
+int TriggerStage::number() const
 {
        return _structure->stage;
 }
@@ -845,12 +847,12 @@ shared_ptr<Channel> TriggerMatch::channel()
        return _channel;
 }
 
-const TriggerMatchType *TriggerMatch::type()
+const TriggerMatchType *TriggerMatch::type() const
 {
        return TriggerMatchType::get(_structure->match);
 }
 
-float TriggerMatch::value()
+float TriggerMatch::value() const
 {
        return _structure->value;
 }
@@ -978,7 +980,7 @@ bool Session::is_running() const
        return (ret != 0);
 }
 
-static void session_stopped_callback(void *data)
+static void session_stopped_callback(void *data) noexcept
 {
        auto *const callback = static_cast<SessionStoppedCallback*>(data);
        (*callback)();
@@ -996,7 +998,7 @@ void Session::set_stopped_callback(SessionStoppedCallback callback)
 }
 
 static void datafeed_callback(const struct sr_dev_inst *sdi,
-       const struct sr_datafeed_packet *pkt, void *cb_data)
+       const struct sr_datafeed_packet *pkt, void *cb_data) noexcept
 {
        auto callback = static_cast<DatafeedCallbackData *>(cb_data);
        callback->run(sdi, pkt);
@@ -1033,7 +1035,7 @@ void Session::set_trigger(shared_ptr<Trigger> trigger)
        _trigger = move(trigger);
 }
 
-string Session::filename()
+string Session::filename() const
 {
        return _filename;
 }
@@ -1082,7 +1084,7 @@ Packet::~Packet()
                delete _payload;
 }
 
-const PacketType *Packet::type()
+const PacketType *Packet::type() const
 {
        return PacketType::get(_structure->type);
 }
@@ -1119,12 +1121,12 @@ shared_ptr<PacketPayload> Header::get_shared_pointer(Packet *_parent)
                ParentOwned::get_shared_pointer(_parent));
 }
 
-int Header::feed_version()
+int Header::feed_version() const
 {
        return _structure->feed_version;
 }
 
-Glib::TimeVal Header::start_time()
+Glib::TimeVal Header::start_time() const
 {
        return Glib::TimeVal(
                _structure->starttime.tv_sec,
@@ -1147,7 +1149,7 @@ shared_ptr<PacketPayload> Meta::get_shared_pointer(Packet *_parent)
                ParentOwned::get_shared_pointer(_parent));
 }
 
-map<const ConfigKey *, Glib::VariantBase> Meta::config()
+map<const ConfigKey *, Glib::VariantBase> Meta::config() const
 {
        map<const ConfigKey *, Glib::VariantBase> result;
        for (auto l = _structure->config; l; l = l->next) {
@@ -1178,12 +1180,12 @@ void *Logic::data_pointer()
        return _structure->data;
 }
 
-size_t Logic::data_length()
+size_t Logic::data_length() const
 {
        return _structure->length;
 }
 
-unsigned int Logic::unit_size()
+unsigned int Logic::unit_size() const
 {
        return _structure->unitsize;
 }
@@ -1209,7 +1211,7 @@ void *Analog::data_pointer()
        return _structure->data;
 }
 
-unsigned int Analog::num_samples()
+unsigned int Analog::num_samples() const
 {
        return _structure->num_samples;
 }
@@ -1224,17 +1226,17 @@ vector<shared_ptr<Channel>> Analog::channels()
        return result;
 }
 
-const Quantity *Analog::mq()
+const Quantity *Analog::mq() const
 {
        return Quantity::get(_structure->meaning->mq);
 }
 
-const Unit *Analog::unit()
+const Unit *Analog::unit() const
 {
        return Unit::get(_structure->meaning->unit);
 }
 
-vector<const QuantityFlag *> Analog::mq_flags()
+vector<const QuantityFlag *> Analog::mq_flags() const
 {
        return QuantityFlag::flags_from_mask(_structure->meaning->mqflags);
 }
@@ -1248,17 +1250,17 @@ InputFormat::~InputFormat()
 {
 }
 
-string InputFormat::name()
+string InputFormat::name() const
 {
        return valid_string(sr_input_id_get(_structure));
 }
 
-string InputFormat::description()
+string InputFormat::description() const
 {
        return valid_string(sr_input_description_get(_structure));
 }
 
-vector<string> InputFormat::extensions()
+vector<string> InputFormat::extensions() const
 {
        vector<string> exts;
        for (const char *const *e = sr_input_extensions_get(_structure);
@@ -1360,27 +1362,27 @@ Option::~Option()
 {
 }
 
-string Option::id()
+string Option::id() const
 {
        return valid_string(_structure->id);
 }
 
-string Option::name()
+string Option::name() const
 {
        return valid_string(_structure->name);
 }
 
-string Option::description()
+string Option::description() const
 {
        return valid_string(_structure->desc);
 }
 
-Glib::VariantBase Option::default_value()
+Glib::VariantBase Option::default_value() const
 {
        return Glib::VariantBase(_structure->def, true);
 }
 
-vector<Glib::VariantBase> Option::values()
+vector<Glib::VariantBase> Option::values() const
 {
        vector<Glib::VariantBase> result;
        for (auto l = _structure->values; l; l = l->next) {
@@ -1399,17 +1401,17 @@ OutputFormat::~OutputFormat()
 {
 }
 
-string OutputFormat::name()
+string OutputFormat::name() const
 {
        return valid_string(sr_output_id_get(_structure));
 }
 
-string OutputFormat::description()
+string OutputFormat::description() const
 {
        return valid_string(sr_output_description_get(_structure));
 }
 
-vector<string> OutputFormat::extensions()
+vector<string> OutputFormat::extensions() const
 {
        vector<string> exts;
        for (const char *const *e = sr_output_extensions_get(_structure);
@@ -1449,7 +1451,7 @@ shared_ptr<Output> OutputFormat::create_output(string filename,
                Output::Deleter());
 }
 
-bool OutputFormat::test_flag(const OutputFlag *flag)
+bool OutputFormat::test_flag(const OutputFlag *flag) const
 {
        return sr_output_test_flag(_structure, flag->id());
 }