X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=018051df0fccc0182a92fb9ce6727aa9303863a0;hb=859ca3070b30afde85ac345e8761ebf3b10017b1;hp=e2db774283496c6d3d1d58dfa068317433050b56;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;p=pulseview.git

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index e2db774..018051d 100644
--- 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;
@@ -129,7 +129,7 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_si
 	g_hash_table_destroy(opt_hash);
 
 	if(!decoder_inst)
-		return NULL;
+		return nullptr;
 
 	// Setup the channels
 	GHashTable *const channels = g_hash_table_new_full(g_str_hash,