From 1215888438b901ad80e8bf9882cdcc6a3f057399 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Sat, 4 Dec 2021 20:12:59 +0100
Subject: converters.h: slightly clearer code in _impl::addTo

---
 lib/converters.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/converters.h b/lib/converters.h
index e7bc6898..8ddf6e45 100644
--- a/lib/converters.h
+++ b/lib/converters.h
@@ -288,6 +288,8 @@ QVariantHash QUOTIENT_API fromJson(const QJsonValue& jv);
 
 // Conditional insertion into a QJsonObject
 
+constexpr bool IfNotEmpty = false;
+
 namespace _impl {
     template <typename ValT>
     inline void addTo(QJsonObject& o, const QString& k, ValT&& v)
@@ -333,7 +335,7 @@ namespace _impl {
 
     // This one is for types that have isEmpty() when Force is false
     template <typename ValT>
-    struct AddNode<ValT, false, decltype(std::declval<ValT>().isEmpty())> {
+    struct AddNode<ValT, IfNotEmpty, decltype(std::declval<ValT>().isEmpty())> {
         template <typename ContT, typename ForwardedT>
         static void impl(ContT& container, const QString& key,
                          ForwardedT&& value)
@@ -343,9 +345,9 @@ namespace _impl {
         }
     };
 
-    // This one unfolds Omittable<> (also only when Force is false)
+    // This one unfolds Omittable<> (also only when IfNotEmpty is requested)
     template <typename ValT>
-    struct AddNode<Omittable<ValT>, false> {
+    struct AddNode<Omittable<ValT>, IfNotEmpty> {
         template <typename ContT, typename OmittableT>
         static void impl(ContT& container, const QString& key,
                          const OmittableT& value)
@@ -356,8 +358,6 @@ namespace _impl {
     };
 } // namespace _impl
 
-constexpr bool IfNotEmpty = false;
-
 /*! Add a key-value pair to QJsonObject or QUrlQuery
  *
  * Adds a key-value pair(s) specified by \p key and \p value to
-- 
cgit v1.2.3