Minor whitespace fixes.

[pulseview.git] / pv / data / decode / decoder.cpp

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index e2db774283496c6d3d1d58dfa068317433050b56..f5fdd0c9a7361f830c6abdd9757be9b5cbe72e7b 100644 (file)
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -20,12 +20,12 @@
 
 #include <cassert>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 #include <libsigrokdecode/libsigrokdecode.h>
 
-#include "decoder.h"
+#include "decoder.hpp"
 
-#include <pv/view/logicsignal.h>
+#include <pv/view/logicsignal.hpp>
 
 using std::set;
 using std::map;
@@ -102,7 +102,7 @@ bool Decoder::have_required_channels() const
 set< shared_ptr<pv::data::Logic> > Decoder::get_data()
 {
        set< shared_ptr<pv::data::Logic> > data;
-       for(auto i = channels_.cbegin(); i != channels_.cend(); i++) {
+       for (auto i = channels_.cbegin(); i != channels_.cend(); i++) {
                shared_ptr<view::LogicSignal> signal((*i).second);
                assert(signal);
                data.insert(signal->logic_data());
@@ -128,14 +128,14 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_si
                session, decoder_->id, opt_hash);
        g_hash_table_destroy(opt_hash);
 
-       if(!decoder_inst)
-               return NULL;
+       if (!decoder_inst)
+               return nullptr;
 
        // Setup the channels
        GHashTable *const channels = g_hash_table_new_full(g_str_hash,
                g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
-       for(auto i = channels_.cbegin(); i != channels_.cend(); i++)
+       for (auto i = channels_.cbegin(); i != channels_.cend(); i++)
        {
                shared_ptr<view::LogicSignal> signal((*i).second);
                GVariant *const gvar = g_variant_new_int32(