X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=android%2Floghandler.cpp;h=2c6674cda51cdcd6a398198525c301a24acf3462;hp=b50242041bcc3a4171038defea48765eb440ee5e;hb=ae95fe5832e1f3d63d0f0f952629591aae3419cf;hpb=9137928c9a711ff6d7bf25c9627236d3c61f069e

diff --git a/android/loghandler.cpp b/android/loghandler.cpp
index b5024204..2c6674cd 100644
--- a/android/loghandler.cpp
+++ b/android/loghandler.cpp
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>
 
-#include "android/loghandler.h"
+#include "android/loghandler.hpp"
 
 namespace pv {
 
@@ -47,12 +47,12 @@ int AndroidLogHandler::sr_callback(void *cb_data, int loglevel, const char *form
 
 	/* Only output messages of at least the selected loglevel(s). */
 	if (loglevel > sr_log_loglevel_get())
-		return SR_OK; /* TODO? */
+		return SR_OK;
 
 	if (loglevel < SR_LOG_NONE)
-	  loglevel = SR_LOG_NONE;
+		loglevel = SR_LOG_NONE;
 	else if (loglevel > SR_LOG_SPEW)
-	  loglevel = SR_LOG_SPEW;
+		loglevel = SR_LOG_SPEW;
 
 	ret = __android_log_vprint(prio[loglevel], "sr", format, args);
 
@@ -77,12 +77,12 @@ int AndroidLogHandler::srd_callback(void *cb_data, int loglevel, const char *for
 
 	/* Only output messages of at least the selected loglevel(s). */
 	if (loglevel > srd_log_loglevel_get())
-		return SRD_OK; /* TODO? */
+		return SRD_OK;
 
 	if (loglevel < SRD_LOG_NONE)
-	  loglevel = SRD_LOG_NONE;
+		loglevel = SRD_LOG_NONE;
 	else if (loglevel > SRD_LOG_SPEW)
-	  loglevel = SRD_LOG_SPEW;
+		loglevel = SRD_LOG_SPEW;
 
 	ret = __android_log_vprint(prio[loglevel], "srd", format, args);
 
@@ -94,11 +94,10 @@ int AndroidLogHandler::srd_callback(void *cb_data, int loglevel, const char *for
 
 void AndroidLogHandler::install_callbacks()
 {
-	sr_log_callback_set(sr_callback, NULL);
+	sr_log_callback_set(sr_callback, nullptr);
 #ifdef ENABLE_DECODE
-	srd_log_callback_set(srd_callback, NULL);
+	srd_log_callback_set(srd_callback, nullptr);
 #endif
 }
 
 } // namespace pv
-