AndroidManifest.xml: Bump PV version to 0.4.0.

[pulseview.git] / android / loghandler.cpp

diff --git a/android/loghandler.cpp b/android/loghandler.cpp
index 3cd2e3b7e5c444e12d1eb19f155dcb98ac31a7c2..2c6674cda51cdcd6a398198525c301a24acf3462 100644 (file)
--- a/android/loghandler.cpp
+++ b/android/loghandler.cpp
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>
 
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>
 

-#include "android/loghandler.h"
+#include "android/loghandler.hpp"

 
 namespace pv {
 
 
 namespace pv {
 


@@ -94,11 +94,10 @@ int AndroidLogHandler::srd_callback(void *cb_data, int loglevel, const char *for
 
 void AndroidLogHandler::install_callbacks()
 {
 
 void AndroidLogHandler::install_callbacks()
 {

-       sr_log_callback_set(sr_callback, NULL);
+       sr_log_callback_set(sr_callback, nullptr);

 #ifdef ENABLE_DECODE
 #ifdef ENABLE_DECODE

-       srd_log_callback_set(srd_callback, NULL);
+       srd_log_callback_set(srd_callback, nullptr);

 #endif
 }
 
 } // namespace pv
 #endif
 }
 
 } // namespace pv

-