From 3429622d754a87ecca98b3fbde994f24e40d34b4 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Mon, 20 Apr 2020 20:10:25 +0300
Subject: Rewrite configuration tests in catch2

- Drop s_conf check in operator<< as s_conf cannot be nullptr there
- Add arithmetic type cast to string values
---
 lib/configuration/qt_specialization.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'lib/configuration/qt_specialization.cpp')

diff --git a/lib/configuration/qt_specialization.cpp b/lib/configuration/qt_specialization.cpp
index c58a498..8487e62 100644
--- a/lib/configuration/qt_specialization.cpp
+++ b/lib/configuration/qt_specialization.cpp
@@ -5,20 +5,14 @@ template <>
 callable_when(unconsumed) [[nodiscard]] std::optional<QString> Configuration::value(const char *path) const
 {
     const auto v = value<std::string>(path);
-    if(!v)
-        return std::nullopt;
-    else
-        return QString::fromStdString(v.value());
+    return v ? std::make_optional(QString::fromStdString(v.value())) : std::nullopt;
 }
 
 template <>
 callable_when(unconsumed) [[nodiscard]] std::optional<QStringList> Configuration::value(const char *path) const
 {
     const auto v = value<std::string>(path);
-    if(!v)
-        return std::nullopt;
-    else
-        return QString::fromStdString(v.value()).split(';');
+    return v ? std::make_optional(QString::fromStdString(v.value()).split(';')) : std::nullopt;
 }
 
 template <>
-- 
cgit v1.2.1