Update upstream source from tag 'upstream/0.7.0'

Update to upstream version '0.7.0'
with Debian dir 30dcb77a77433e4a54eab77c0b82ae925dead2d8

1 files changed, 27 insertions, 39 deletions

diff --git a/lib/logging.h b/lib/logging.h
index ce4131bb..1fafa04b 100644
--- a/lib/logging.h
+++ b/lib/logging.h
@@ -1,20 +1,6 @@
-/******************************************************************************
- * Copyright (C) 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
- */
+// SPDX-FileCopyrightText: 2017 Elvis Angelaccio <elvid.angelaccio@kde.org>
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
@@ -23,13 +9,17 @@
 
 Q_DECLARE_LOGGING_CATEGORY(MAIN)
 Q_DECLARE_LOGGING_CATEGORY(STATE)
+Q_DECLARE_LOGGING_CATEGORY(MEMBERS)
 Q_DECLARE_LOGGING_CATEGORY(MESSAGES)
 Q_DECLARE_LOGGING_CATEGORY(EVENTS)
 Q_DECLARE_LOGGING_CATEGORY(EPHEMERAL)
 Q_DECLARE_LOGGING_CATEGORY(E2EE)
 Q_DECLARE_LOGGING_CATEGORY(JOBS)
 Q_DECLARE_LOGGING_CATEGORY(SYNCJOB)
+Q_DECLARE_LOGGING_CATEGORY(THUMBNAILJOB)
+Q_DECLARE_LOGGING_CATEGORY(NETWORK)
 Q_DECLARE_LOGGING_CATEGORY(PROFILER)
+Q_DECLARE_LOGGING_CATEGORY(DATABASE)
 
 namespace Quotient {
 // QDebug manipulators
@@ -48,24 +38,13 @@ using QDebugManip = QDebug (*)(QDebug);
  */
 inline QDebug formatJson(QDebug debug_object)
 {
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-    return debug_object;
-#else
     return debug_object.noquote();
-#endif
 }
 
-/**
- * @brief A helper operator to facilitate usage of formatJson (and possibly
- * other manipulators)
- *
- * @param debug_object to output the json to
- * @param qdm a QDebug manipulator
- * @return a copy of debug_object that has its mode altered by qdm
- */
-inline QDebug operator<<(QDebug debug_object, QDebugManip qdm)
+//! Suppress full qualification of enums/QFlags when logging
+inline QDebug terse(QDebug dbg)
 {
-    return qdm(debug_object);
+    return dbg.verbosity(QDebug::MinimumVerbosity);
 }
 
 inline qint64 profilerMinNsecs()
@@ -79,15 +58,24 @@ inline qint64 profilerMinNsecs()
         * 1000;
 }
 } // namespace Quotient
-/// \deprecated Use namespace Quotient instead
-namespace QMatrixClient = Quotient;
 
-inline QDebug operator<<(QDebug debug_object, const QElapsedTimer& et)
+/**
+ * @brief A helper operator to facilitate usage of formatJson (and possibly
+ * other manipulators)
+ *
+ * @param debug_object to output the json to
+ * @param qdm a QDebug manipulator
+ * @return a copy of debug_object that has its mode altered by qdm
+ */
+inline QDebug operator<<(QDebug debug_object, Quotient::QDebugManip qdm)
+{
+    return qdm(debug_object); // NOLINT(performance-unnecessary-value-param)
+}
+
+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;
 }