X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fbinding%2Fdecoder.cpp;h=39bff52bf0cb55f3ee29aba01995a275769ab2c4;hb=870ea3dbf35b182e120c5d84ab89bf9cb7691232;hp=dd5716027aeb492d47ab298c3f506f7f028148cc;hpb=3cc9ad7b867853315473df611612c562d562ed8a;p=pulseview.git

diff --git a/pv/binding/decoder.cpp b/pv/binding/decoder.cpp
index dd57160..39bff52 100644
--- 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
- * 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>
@@ -59,8 +58,7 @@ Decoder::Decoder(
 	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;
 
@@ -106,7 +104,7 @@ shared_ptr<Property> Decoder::bind_enum(
 
 Glib::VariantBase Decoder::getter(const char *id)
 {
-	GVariant *val = NULL;
+	GVariant *val = nullptr;
 
 	assert(decoder_);
 
@@ -116,13 +114,11 @@ Glib::VariantBase Decoder::getter(const char *id)
 
 	if (iter != options.end())
 		val = (*iter).second;
-	else
-	{
+	else {
 		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) {
@@ -132,10 +128,7 @@ Glib::VariantBase Decoder::getter(const char *id)
 		}
 	}
 
-	if (val)
-		return Glib::VariantBase(val, true);
-	else
-		return Glib::VariantBase();
+	return (val) ? Glib::VariantBase(val, true) : Glib::VariantBase();
 }
 
 void Decoder::setter(const char *id, Glib::VariantBase value)
@@ -147,5 +140,5 @@ void Decoder::setter(const char *id, Glib::VariantBase value)
 	decoder_stack_->begin_decode();
 }
 
-} // binding
-} // pv
+}  // namespace binding
+}  // namespace pv