X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fbinding%2Fdecoderoptions.cpp;h=d9b4b88d540ebb285b1ea28e352e21003f978705;hp=a01d722f431f2a47feb2e258f73f48e25baa4ee2;hb=c1035a1452fa2aec5414975e83e531c10504b80c;hpb=e8d009288de28cb194bc7964f96677c2baf900c9

diff --git a/pv/prop/binding/decoderoptions.cpp b/pv/prop/binding/decoderoptions.cpp
index a01d722..d9b4b88 100644
--- a/pv/prop/binding/decoderoptions.cpp
+++ b/pv/prop/binding/decoderoptions.cpp
@@ -20,16 +20,16 @@
 
 #include <libsigrokdecode/libsigrokdecode.h>
 
-#include "decoderoptions.h"
+#include "decoderoptions.hpp"
 
 #include <boost/none_t.hpp>
 
-#include <pv/data/decoderstack.h>
-#include <pv/data/decode/decoder.h>
-#include <pv/prop/double.h>
-#include <pv/prop/enum.h>
-#include <pv/prop/int.h>
-#include <pv/prop/string.h>
+#include <pv/data/decoderstack.hpp>
+#include <pv/data/decode/decoder.hpp>
+#include <pv/prop/double.hpp>
+#include <pv/prop/enum.hpp>
+#include <pv/prop/int.hpp>
+#include <pv/prop/string.hpp>
 
 using boost::none;
 using std::make_pair;
@@ -46,12 +46,12 @@ namespace binding {
 DecoderOptions::DecoderOptions(
 	shared_ptr<pv::data::DecoderStack> decoder_stack,
 	shared_ptr<data::decode::Decoder> decoder) :
-	_decoder_stack(decoder_stack),
-	_decoder(decoder)
+	decoder_stack_(decoder_stack),
+	decoder_(decoder)
 {
-	assert(_decoder);
+	assert(decoder_);
 
-	const srd_decoder *const dec = _decoder->decoder();
+	const srd_decoder *const dec = decoder_->decoder();
 	assert(dec);
 
 	for (GSList *l = dec->options; l; l = l->next)
@@ -82,7 +82,7 @@ DecoderOptions::DecoderOptions(
 		else
 			continue;
 
-		_properties.push_back(prop);
+		properties_.push_back(prop);
 	}
 }
 
@@ -103,20 +103,20 @@ Glib::VariantBase DecoderOptions::getter(const char *id)
 {
 	GVariant *val = NULL;
 
-	assert(_decoder);
+	assert(decoder_);
 
 	// Get the value from the hash table if it is already present
-	const map<string, GVariant*>& options = _decoder->options();
+	const map<string, GVariant*>& options = decoder_->options();
 	const auto iter = options.find(id);
 
 	if (iter != options.end())
 		val = (*iter).second;
 	else
 	{
-		assert(_decoder->decoder());
+		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;
@@ -135,11 +135,11 @@ Glib::VariantBase DecoderOptions::getter(const char *id)
 
 void DecoderOptions::setter(const char *id, Glib::VariantBase value)
 {
-	assert(_decoder);
-	_decoder->set_option(id, value.gobj());
+	assert(decoder_);
+	decoder_->set_option(id, value.gobj());
 
-	assert(_decoder_stack);
-	_decoder_stack->begin_decode();
+	assert(decoder_stack_);
+	decoder_stack_->begin_decode();
 }
 
 } // binding