projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c526a8f
)
Include suggested changes by clang-tidy
author
Soeren Apel
<soeren@apelpie.net>
Thu, 13 Sep 2018 18:10:01 +0000
(20:10 +0200)
committer
Soeren Apel
<soeren@apelpie.net>
Thu, 13 Sep 2018 18:10:01 +0000
(20:10 +0200)
main.cpp
patch
|
blob
|
history
pv/logging.cpp
patch
|
blob
|
history
diff --git
a/main.cpp
b/main.cpp
index ce1257300383e30fe1b6daa8893820737699cac4..dc3f739f25cdac5451502ca2e3462cf7acc93df6 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-236,7
+236,7
@@
int main(int argc, char *argv[])
break;
case 'i':
break;
case 'i':
- open_files.
push
_back(optarg);
+ open_files.
emplace
_back(optarg);
break;
case 'I':
break;
case 'I':
@@
-252,7
+252,7
@@
int main(int argc, char *argv[])
argv += optind;
for (int i = 0; i < argc; i++)
argv += optind;
for (int i = 0; i < argc; i++)
- open_files.
push
_back(argv[i]);
+ open_files.
emplace
_back(argv[i]);
// Prepare the global settings since logging needs them early on
pv::GlobalSettings settings;
// Prepare the global settings since logging needs them early on
pv::GlobalSettings settings;
diff --git
a/pv/logging.cpp
b/pv/logging.cpp
index b04bd9480ac717b82f34674b53d6c50edc9d3ea0..377011b68c928a40cf1cf14c590a220ea9ac6ece 100644
(file)
--- a/
pv/logging.cpp
+++ b/
pv/logging.cpp
@@
-53,12
+53,12
@@
Logging::~Logging()
{
qInstallMessageHandler(nullptr);
sr_log_callback_set(prev_sr_log_cb, prev_sr_log_cb_data);
{
qInstallMessageHandler(nullptr);
sr_log_callback_set(prev_sr_log_cb, prev_sr_log_cb_data);
- prev_sr_log_cb =
NULL
;
- prev_sr_log_cb_data =
NULL
;
+ prev_sr_log_cb =
nullptr
;
+ prev_sr_log_cb_data =
nullptr
;
#ifdef ENABLE_DECODE
srd_log_callback_set(prev_srd_log_cb, prev_srd_log_cb_data);
#ifdef ENABLE_DECODE
srd_log_callback_set(prev_srd_log_cb, prev_srd_log_cb_data);
- prev_srd_log_cb =
NULL
;
- prev_srd_log_cb_data =
NULL
;
+ prev_srd_log_cb =
nullptr
;
+ prev_srd_log_cb_data =
nullptr
;
#endif
GlobalSettings::remove_change_handler(this);
#endif
GlobalSettings::remove_change_handler(this);