projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignalBase: Implement A2D conversions
[pulseview.git]
/
pv
/
binding
/
decoder.cpp
diff --git
a/pv/binding/decoder.cpp
b/pv/binding/decoder.cpp
index dd5716027aeb492d47ab298c3f506f7f028148cc..c5d014879f51d9580ab249328e387356fe6e4a09 100644
(file)
--- a/
pv/binding/decoder.cpp
+++ b/
pv/binding/decoder.cpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <libsigrokdecode/libsigrokdecode.h>
*/
#include <libsigrokdecode/libsigrokdecode.h>
@@
-59,8
+58,7
@@
Decoder::Decoder(
const srd_decoder *const dec = decoder_->decoder();
assert(dec);
const srd_decoder *const dec = decoder_->decoder();
assert(dec);
- for (GSList *l = dec->options; l; l = l->next)
- {
+ for (GSList *l = dec->options; l; l = l->next) {
const srd_decoder_option *const opt =
(srd_decoder_option*)l->data;
const srd_decoder_option *const opt =
(srd_decoder_option*)l->data;
@@
-106,7
+104,7
@@
shared_ptr<Property> Decoder::bind_enum(
Glib::VariantBase Decoder::getter(const char *id)
{
Glib::VariantBase Decoder::getter(const char *id)
{
- GVariant *val =
NULL
;
+ GVariant *val =
nullptr
;
assert(decoder_);
assert(decoder_);
@@
-116,13
+114,11
@@
Glib::VariantBase Decoder::getter(const char *id)
if (iter != options.end())
val = (*iter).second;
if (iter != options.end())
val = (*iter).second;
- else
- {
+ else {
assert(decoder_->decoder());
// Get the default value if not
assert(decoder_->decoder());
// Get the default value if not
- for (GSList *l = decoder_->decoder()->options; l; l = l->next)
- {
+ for (GSList *l = decoder_->decoder()->options; l; l = l->next) {
const srd_decoder_option *const opt =
(srd_decoder_option*)l->data;
if (strcmp(opt->id, id) == 0) {
const srd_decoder_option *const opt =
(srd_decoder_option*)l->data;
if (strcmp(opt->id, id) == 0) {