Nanotrace: Remove the magic booleans and use an enumeration

Hopefully it will make more clear what is disabled or enabled.

Change-Id: Ibc9b2329f5b664ba346bafeb27c54cf082758449
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

2 files changed, 11 insertions, 10 deletions

diff --git a/src/libs/sqlite/sqlitebasestatement.cpp b/src/libs/sqlite/sqlitebasestatement.cpp
index afd7656bca..efddc08e38 100644
--- a/src/libs/sqlite/sqlitebasestatement.cpp
+++ b/src/libs/sqlite/sqlitebasestatement.cpp
@@ -27,22 +27,22 @@ extern "C" int sqlite3_carray_bind(
 namespace Sqlite {
 
 namespace {
-using TraceFile = NanotraceHR::TraceFile<sqliteTracingIsEnabled()>;
+using TraceFile = NanotraceHR::TraceFile<sqliteTracingStatus()>;
 
 TraceFile traceFile{"sqlite.json"};
 
-thread_local NanotraceHR::EventQueueData<NanotraceHR::StringViewTraceEvent, 10000, sqliteTracingIsEnabled()>
+thread_local NanotraceHR::EventQueueData<NanotraceHR::StringViewTraceEvent, 10000, sqliteTracingStatus()>
     eventQueueData(traceFile);
 thread_local NanotraceHR::EventQueue eventQueue = eventQueueData.createEventQueue();
 
-thread_local NanotraceHR::StringViewCategory<sqliteTracingIsEnabled()> sqliteLowLevelCategory{
+thread_local NanotraceHR::StringViewCategory<sqliteTracingStatus()> sqliteLowLevelCategory{
     "sqlite low level"_t, eventQueue};
 
-thread_local NanotraceHR::StringViewCategory<sqliteTracingIsEnabled()> sqliteHighLevelCategory_{
+thread_local NanotraceHR::StringViewCategory<sqliteTracingStatus()> sqliteHighLevelCategory_{
     "sqlite high level"_t, eventQueue};
 } // namespace
 
-NanotraceHR::StringViewCategory<sqliteTracingIsEnabled()> &sqliteHighLevelCategory()
+NanotraceHR::StringViewCategory<sqliteTracingStatus()> &sqliteHighLevelCategory()
 {
     return sqliteHighLevelCategory_;
 }
diff --git a/src/libs/sqlite/sqlitebasestatement.h b/src/libs/sqlite/sqlitebasestatement.h
index c507b0b9d3..d2306c67a5 100644
--- a/src/libs/sqlite/sqlitebasestatement.h
+++ b/src/libs/sqlite/sqlitebasestatement.h
@@ -44,16 +44,16 @@ constexpr static std::underlying_type_t<Enumeration> to_underlying(Enumeration e
     return static_cast<std::underlying_type_t<Enumeration>>(enumeration);
 }
 
-constexpr bool sqliteTracingIsEnabled()
+constexpr NanotraceHR::Tracing sqliteTracingStatus()
 {
 #ifdef ENABLE_SQLITE_TRACING
-    return NanotraceHR::isTracerActive();
+    return NanotraceHR::tracingStatus();
 #else
-    return false;
+    return NanotraceHR::Tracing::IsDisabled;
 #endif
 }
 
-SQLITE_EXPORT NanotraceHR::StringViewCategory<sqliteTracingIsEnabled()> &sqliteHighLevelCategory();
+SQLITE_EXPORT NanotraceHR::StringViewCategory<sqliteTracingStatus()> &sqliteHighLevelCategory();
 
 class SQLITE_EXPORT BaseStatement
 {
@@ -401,7 +401,8 @@ public:
         const_iterator end() const & { return iterator{m_statement, false}; }
 
     private:
-        NanotraceHR::Tracer<std::decay_t<decltype(sqliteHighLevelCategory())>> tracer{
+        using TracerCategory = std::decay_t<decltype(sqliteHighLevelCategory())>;
+        NanotraceHR::Tracer<TracerCategory, typename TracerCategory::IsActive> tracer{
             "range"_t, sqliteHighLevelCategory()};
         StatementImplementation &m_statement;
     };