Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-18 16:32:33 +02:00
Code Issues Projects Releases Activity

Replace {} with explicit std::nullopt

Browse Source
This commit is contained in:
Elias Steurer 2019-10-28 18:01:16 +01:00
parent bbb70ece42
commit c7d93b3fae
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ScreenPlay/src/util.cpp
View File

@ -49,7 +49,7 @@ std::optional<QJsonObject> Util::openJsonFileToObject(const QString& path)
auto jsonString = openJsonFileToString(path); auto jsonString = openJsonFileToString(path);
if (!jsonString.has_value()) { if (!jsonString.has_value()) {
return {}; return std::nullopt;
} }
QJsonDocument jsonDocument; QJsonDocument jsonDocument;
@ -58,7 +58,7 @@ std::optional<QJsonObject> Util::openJsonFileToObject(const QString& path)
if (!(parseError.error == QJsonParseError::NoError)) { if (!(parseError.error == QJsonParseError::NoError)) {
qWarning() << "Settings Json Parse Error: " << parseError.errorString(); qWarning() << "Settings Json Parse Error: " << parseError.errorString();
return {}; return std::nullopt;
} }
return jsonDocument.object(); return jsonDocument.object();
@ -69,7 +69,7 @@ std::optional<QString> Util::openJsonFileToString(const QString& path)
QFile file; QFile file;
file.setFileName(path); file.setFileName(path);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
return {}; return std::nullopt;
} }
QString fileContent = file.readAll(); QString fileContent = file.readAll();
file.flush(); file.flush();