X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fbinding%2Fdecoder.cpp;h=b2b4e4f7e6728198713a67e8042b71b5e4ce0c8f;hp=7d29e2fdad1b940b963251e190dfa589d77f6591;hb=aca9aa834c742ba70f49d1ac3eb2d1e02e759416;hpb=2ad82c2e40b6865481733913a2c32735602f63c4

diff --git a/pv/binding/decoder.cpp b/pv/binding/decoder.cpp
index 7d29e2f..b2b4e4f 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>
@@ -24,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>
@@ -129,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)
@@ -144,5 +140,5 @@ void Decoder::setter(const char *id, Glib::VariantBase value)
 	decoder_stack_->begin_decode();
 }
 
-} // binding
-} // pv
+}  // namespace binding
+}  // namespace pv