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

FilePath: Return optional bytearray for file contents

Browse Source 
For differentiating between "error" and "empty file".

Change-Id: I2c019ceac625e7be3180afa4d47ae3a24df91c1d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2022-09-09 13:48:08 +02:00
parent 28349c1b08
commit 2c51e4bc17
22 changed files with 84 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/fileutils.cpp
View File

@@ -58,8 +58,12 @@ bool FileReader::fetch(const FilePath &filePath, QIODevice::OpenMode mode)
QTC_ASSERT(!(mode & ~(QIODevice::ReadOnly | QIODevice::Text)), return false);
if (filePath.needsDevice()) {
// TODO: add error handling to FilePath::fileContents
m_data = filePath.fileContents();
const std::optional<QByteArray> contents = filePath.fileContents();
if (!contents) {
m_errorString = tr("Cannot read %1").arg(filePath.toUserOutput());
return false;
}
m_data = *contents;
return true;
}
@@ -668,8 +672,8 @@ bool FileUtils::copyIfDifferent(const FilePath &srcFilePath, const FilePath &tgt
const QDateTime srcModified = srcFilePath.lastModified();
const QDateTime tgtModified = tgtFilePath.lastModified();
if (srcModified == tgtModified) {
const QByteArray srcContents = srcFilePath.fileContents();
const QByteArray tgtContents = srcFilePath.fileContents();
const std::optional<QByteArray> srcContents = srcFilePath.fileContents();
const std::optional<QByteArray> tgtContents = srcFilePath.fileContents();
if (srcContents == tgtContents)
return true;
}