Utils: Replace Result class by type alias to std::expected<T, QString>

... to be able to conveniently return also non-void cases without being
exposed to the syntax of expected.

The price for the more general approach is some uglification of the
void case: The previous 'Result' is now equivalent to 'Result<>',
which needs to be spelled out in function signatures, and some
changes to the special cases.

Change-Id: Ic5026e237ef2077a0765cdb8287122cae99d699f
Reviewed-by: Marcus Tillmanns <[email protected]>
Reviewed-by: Eike Ziller <[email protected]>

2 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/imageviewer/imageviewerfile.cpp b/src/plugins/imageviewer/imageviewerfile.cpp
index 177b6fa67d3..9eeee463951 100644
--- a/src/plugins/imageviewer/imageviewerfile.cpp
+++ b/src/plugins/imageviewer/imageviewerfile.cpp
@@ -146,17 +146,17 @@ Core::IDocument::ReloadBehavior ImageViewerFile::reloadBehavior(ChangeTrigger st
     return BehaviorAsk;
 }
 
-Result ImageViewerFile::reload(Core::IDocument::ReloadFlag flag,
+Result<> ImageViewerFile::reload(Core::IDocument::ReloadFlag flag,
                                Core::IDocument::ChangeType type)
 {
     Q_UNUSED(type)
     if (flag == FlagIgnore)
-        return Result::Ok;
+        return ResultOk;
     emit aboutToReload();
     QString errorString;
     bool success = (openImpl(&errorString, filePath()) == OpenResult::Success);
     emit reloadFinished(success);
-    return Result(success, errorString);
+    return makeResult(success, errorString);
 }
 
 QMovie *ImageViewerFile::movie() const
diff --git a/src/plugins/imageviewer/imageviewerfile.h b/src/plugins/imageviewer/imageviewerfile.h
index 0936302060b..e4cc432651d 100644
--- a/src/plugins/imageviewer/imageviewerfile.h
+++ b/src/plugins/imageviewer/imageviewerfile.h
@@ -39,7 +39,7 @@ public:
                     const Utils::FilePath &realFilePath) override;
 
     ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const override;
-    Utils::Result reload(ReloadFlag flag, ChangeType type) override;
+    Utils::Result<> reload(ReloadFlag flag, ChangeType type) override;
 
     QMovie *movie() const;