diff options
author | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-04-20 20:10:25 +0300 |
---|---|---|
committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-04-20 22:08:20 +0300 |
commit | 3429622d754a87ecca98b3fbde994f24e40d34b4 (patch) | |
tree | 1e69a898fb2a364f4bb77afd3a9e1997d11cbd98 /lib/configuration/qt_specialization.cpp | |
parent | move lib/about to src/about (diff) | |
download | smolbote-3429622d754a87ecca98b3fbde994f24e40d34b4.tar.xz |
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
Diffstat (limited to 'lib/configuration/qt_specialization.cpp')
-rw-r--r-- | lib/configuration/qt_specialization.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
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 <> |