From fd87ed4d17dd8fc6fb7fbc936861393c6455815d Mon Sep 17 00:00:00 2001
From: aqua <aqua@iserlohn-fortress.net>
Date: Sun, 28 Apr 2024 17:46:14 +0300
Subject: Added libConfiguration unit test

---
 lib/configuration/qt_specialization.cpp | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

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

diff --git a/lib/configuration/qt_specialization.cpp b/lib/configuration/qt_specialization.cpp
index 8487e62..a97ed2b 100644
--- a/lib/configuration/qt_specialization.cpp
+++ b/lib/configuration/qt_specialization.cpp
@@ -1,36 +1,39 @@
 #include "configuration.h"
-#include <stdexcept>
 
 template <>
-callable_when(unconsumed) [[nodiscard]] std::optional<QString> Configuration::value(const char *path) const
+[[nodiscard]] std::optional<QString> Configuration::value(const char *path) const
 {
-    const auto v = value<std::string>(path);
-    return v ? std::make_optional(QString::fromStdString(v.value())) : std::nullopt;
+    const auto result = value<std::string>(path);
+    return result ? std::make_optional(QString::fromStdString(result.value())) : std::nullopt;
 }
 
 template <>
-callable_when(unconsumed) [[nodiscard]] std::optional<QStringList> Configuration::value(const char *path) const
+[[nodiscard]] std::optional<QStringList> Configuration::value(const char *path) const
 {
-    const auto v = value<std::string>(path);
-    return v ? std::make_optional(QString::fromStdString(v.value()).split(';')) : std::nullopt;
+    const auto result = value<std::string>(path);
+    return result ? std::make_optional(QString::fromStdString(result.value()).split(';')) : std::nullopt;
 }
 
 template <>
-callable_when(unconsumed) QAction &Configuration::shortcut(QAction &action, const char *name) const
+QAction &Configuration::shortcut(QAction &action, const char *name) const
 {
-    if(const auto shortcut = value<QString>(name)) {
+    if(const auto result = value<QString>(name)) {
         const QString old_tooltip = action.toolTip();
-        action.setShortcut(QKeySequence::fromString(shortcut.value()));
-        action.setToolTip(QString("%1 (%2)").arg(old_tooltip, shortcut.value()));
+        const auto &result_value = result.value();
+
+        action.setShortcut(QKeySequence::fromString(result_value));
+        action.setToolTip(QString("%1 (%2)").arg(old_tooltip, result_value));
     }
     return action;
 }
 
 template <>
-callable_when(unconsumed) QKeySequence &Configuration::shortcut(QKeySequence &sequence, const char *name) const
+QKeySequence &Configuration::shortcut(QKeySequence &sequence, const char *name) const
 {
-    if(const auto shortcut = value<QString>(name)) {
-        sequence = QKeySequence::fromString(shortcut.value());
+    if(const auto result = value<QString>(name)) {
+        const auto &result_value = result.value();
+
+        sequence = QKeySequence::fromString(result_value);
     }
     return sequence;
 }
-- 
cgit v1.2.1