chatterino2
Code Issues

refactor: remove use of raw nonstd:: (#6690)

Browse Source 
Reviewed-by: Nerixyz <nerixdev@outlook.de>
This commit is contained in:
pajlada
2025-12-30 11:06:10 +01:00
committed by GitHub
parent 6741d5e359
commit 864216a32e
7 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/ImageUploader.cpp
+5 -6
View File
@@ -158,7 +158,7 @@ ExpectedStr<QJsonObject> validateImportJson(const QString &clipboardText)
{
if (clipboardText.isEmpty())
{
return nonstd::make_unexpected("Clipboard must not be empty");
return makeUnexpected("Clipboard must not be empty");
}
QJsonParseError parseError;
@@ -167,25 +167,24 @@ ExpectedStr<QJsonObject> validateImportJson(const QString &clipboardText)
if (parseError.error != QJsonParseError::NoError)
{
return nonstd::make_unexpected("Clipboard did not contain valid JSON");
return makeUnexpected("Clipboard did not contain valid JSON");
}
if (!doc.isObject())
{
return nonstd::make_unexpected("JSON must be an object");
return makeUnexpected("JSON must be an object");
}
auto settingsObj = doc.object();
if (!settingsObj.contains("Version"))
{
return nonstd::make_unexpected("JSON must contain the 'Version' key");
return makeUnexpected("JSON must contain the 'Version' key");
}
if (!settingsObj.contains("RequestURL"))
{
return nonstd::make_unexpected(
"JSON must contain the 'RequestURL' key");
return makeUnexpected("JSON must contain the 'RequestURL' key");
}
return settingsObj;