feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Add std::expected implementation

Browse Source 
Adds a std::expected implementation that is compatible with >= C++11.

FilePath::fileContents and FilePath::writeFileContents as well as
FilePath::copyFile are changed to return std::expected.

A couple of macros have been added to aid in using the expected types.

An auto test was added showing how to use the library.

Change-Id: Ibe3aecfc1029a0cf13b45bf5184ff03a04a2393b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Marcus Tillmanns
2022-11-24 08:52:47 +01:00
parent 13c7283c0e
commit eca7044361
35 changed files with 2986 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/utils/filepath.h
View File

@@ -5,6 +5,7 @@
#include "utils_global.h"
#include "expected.h"
#include "filepathinfo.h"
#include "osspecificaspects.h"
@@ -119,15 +120,15 @@ public:
OsType osType() const;
bool removeFile() const;
bool removeRecursively(QString *error = nullptr) const;
bool copyFile(const FilePath &target) const;
expected_str<void> copyFile(const FilePath &target) const;
bool renameFile(const FilePath &target) const;
qint64 fileSize() const;
qint64 bytesAvailable() const;
bool createDir() const;
FilePaths dirEntries(const FileFilter &filter, QDir::SortFlags sort = QDir::NoSort) const;
FilePaths dirEntries(QDir::Filters filters) const;
std::optional<QByteArray> fileContents(qint64 maxSize = -1, qint64 offset = 0) const;
bool writeFileContents(const QByteArray &data, qint64 offset = 0) const;
expected_str<QByteArray> fileContents(qint64 maxSize = -1, qint64 offset = 0) const;
expected_str<qint64> writeFileContents(const QByteArray &data, qint64 offset = 0) const;
FilePathInfo filePathInfo() const;
bool operator==(const FilePath &other) const;
@@ -198,11 +199,12 @@ public:
static void sort(FilePaths &files);
// Asynchronous interface
void asyncCopyFile(const Continuation<bool> &cont, const FilePath &target) const;
void asyncFileContents(const Continuation<const std::optional<QByteArray> &> &cont,
void asyncCopyFile(const Continuation<const expected_str<void> &> &cont,
const FilePath &target) const;
void asyncFileContents(const Continuation<const expected_str<QByteArray> &> &cont,
qint64 maxSize = -1,
qint64 offset = 0) const;
void asyncWriteFileContents(const Continuation<bool> &cont,
void asyncWriteFileContents(const Continuation<const expected_str<qint64> &> &cont,
const QByteArray &data,
qint64 offset = 0) const;