projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved default device selection into MainWindow
[pulseview.git]
/
pv
/
data
/
decode
/
decoder.cpp
diff --git
a/pv/data/decode/decoder.cpp
b/pv/data/decode/decoder.cpp
index e2db774283496c6d3d1d58dfa068317433050b56..018051df0fccc0182a92fb9ce6727aa9303863a0 100644
(file)
--- a/
pv/data/decode/decoder.cpp
+++ b/
pv/data/decode/decoder.cpp
@@
-20,12
+20,12
@@
#include <cassert>
#include <cassert>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include <libsigrokdecode/libsigrokdecode.h>
#include <libsigrokdecode/libsigrokdecode.h>
-#include "decoder.h"
+#include "decoder.h
pp
"
-#include <pv/view/logicsignal.h>
+#include <pv/view/logicsignal.h
pp
>
using std::set;
using std::map;
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)
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,
// Setup the channels
GHashTable *const channels = g_hash_table_new_full(g_str_hash,