Merge branch 'dev' into device-verification

# Conflicts:
#	autotests/testfilecrypto.cpp
#	lib/connection.cpp
#	lib/connection.h
#	lib/database.cpp
#	lib/database.h
#	lib/e2ee/qolmoutboundsession.cpp
#	lib/e2ee/qolmoutboundsession.h
#	lib/eventitem.h
#	lib/events/encryptedevent.cpp
#	lib/events/encryptedevent.h
#	lib/events/encryptedfile.cpp
#	lib/events/encryptedfile.h
#	lib/events/keyverificationevent.cpp
#	lib/events/keyverificationevent.h
#	lib/events/roomkeyevent.h
#	lib/room.cpp
#	lib/room.h

1 files changed, 6 insertions, 13 deletions

diff --git a/lib/logging.h b/lib/logging.h
index fc0a4c99..1fafa04b 100644
--- a/lib/logging.h
+++ b/lib/logging.h
@@ -44,12 +44,7 @@ inline QDebug formatJson(QDebug debug_object)
 //! Suppress full qualification of enums/QFlags when logging
 inline QDebug terse(QDebug dbg)
 {
-    return
-#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
-        dbg.setVerbosity(0), dbg;
-#else
-        dbg.verbosity(QDebug::MinimumVerbosity);
-#endif
+    return dbg.verbosity(QDebug::MinimumVerbosity);
 }
 
 inline qint64 profilerMinNsecs()
@@ -74,15 +69,13 @@ inline qint64 profilerMinNsecs()
  */
 inline QDebug operator<<(QDebug debug_object, Quotient::QDebugManip qdm)
 {
-    return qdm(debug_object);
+    return qdm(debug_object); // NOLINT(performance-unnecessary-value-param)
 }
 
-inline QDebug operator<<(QDebug debug_object, const QElapsedTimer& et)
+inline QDebug operator<<(QDebug debug_object, QElapsedTimer et)
 {
-    auto val = et.nsecsElapsed() / 1000;
-    if (val < 1000)
-        debug_object << val << "µs";
-    else
-        debug_object << val / 1000 << "ms";
+    // NOLINTNEXTLINE(bugprone-integer-division)
+    debug_object << static_cast<double>(et.nsecsElapsed() / 1000) / 1000
+                 << "ms"; // Show in ms with 3 decimal digits precision
     return debug_object;
 }