Use alphabetical order for #includes.

[pulseview.git] / pv / binding / decoder.cpp

diff --git a/pv/binding/decoder.cpp b/pv/binding/decoder.cpp
index c5d014879f51d9580ab249328e387356fe6e4a09..b2b4e4f7e6728198713a67e8042b71b5e4ce0c8f 100644 (file)
--- a/pv/binding/decoder.cpp
+++ b/pv/binding/decoder.cpp
@@ -23,8 +23,8 @@
 
 #include <boost/none_t.hpp>
 
-#include <pv/data/decoderstack.hpp>
 #include <pv/data/decode/decoder.hpp>
+#include <pv/data/decoderstack.hpp>
 #include <pv/prop/double.hpp>
 #include <pv/prop/enum.hpp>
 #include <pv/prop/int.hpp>
@@ -128,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)
@@ -143,5 +140,5 @@ void Decoder::setter(const char *id, Glib::VariantBase value)
        decoder_stack_->begin_decode();
 }
 
-} // binding
-} // pv
+}  // namespace binding
+}  // namespace pv