squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-01 05:08:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change parseBool() to return optional bool value

Browse Source
This commit is contained in:
Vladimir Golovnev (Glassez)
2021-01-03 15:33:32 +03:00
parent 4429a16ca8
commit d0cac421bb
6 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/base/utils/string.cpp
View File

@@ -190,11 +190,14 @@ QString Utils::String::wildcardToRegex(const QString &pattern)
return qt_regexp_toCanonical(pattern, QRegExp::Wildcard);
}
bool Utils::String::parseBool(const QString &string, const bool defaultValue)
std::optional<bool> Utils::String::parseBool(const QString &string)
{
if (defaultValue)
return (string.compare("false", Qt::CaseInsensitive) == 0) ? false : true;
return (string.compare("true", Qt::CaseInsensitive) == 0) ? true : false;
if (string.compare("true", Qt::CaseInsensitive) == 0)
return true;
if (string.compare("false", Qt::CaseInsensitive) == 0)
return false;
return std::nullopt;
}
QString Utils::String::join(const QVector<QStringRef> &strings, const QString &separator)

4
src/base/utils/string.h
View File

@@ -29,6 +29,8 @@
#pragma once
#include <optional>
#include <QChar>
#include <QMetaEnum>
#include <QString>
@@ -64,7 +66,7 @@ namespace Utils::String
return str;
}
bool parseBool(const QString &string, bool defaultValue);
std::optional<bool> parseBool(const QString &string);
QString join(const QVector<QStringRef> &strings, const QString &separator);