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

Utils: filepathify fileutils

Browse Source 
Change-Id: Ic9048369f64d793f5f567cdb0c715488fb5a4ff6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2021-05-18 09:47:07 +02:00
parent 013bf6a743
commit a13aef759e
66 changed files with 147 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libs/utils/fileutils.h
View File

@@ -281,14 +281,14 @@ class QTCREATOR_UTILS_EXPORT FileReader
Q_DECLARE_TR_FUNCTIONS(Utils::FileUtils) // sic!
public:
static QByteArray fetchQrc(const QString &fileName); // Only for internal resources
bool fetch(const QString &fileName, QIODevice::OpenMode mode = QIODevice::NotOpen); // QIODevice::ReadOnly is implicit
bool fetch(const QString &fileName, QIODevice::OpenMode mode, QString *errorString);
bool fetch(const QString &fileName, QString *errorString)
{ return fetch(fileName, QIODevice::NotOpen, errorString); }
bool fetch(const FilePath &filePath, QIODevice::OpenMode mode = QIODevice::NotOpen); // QIODevice::ReadOnly is implicit
bool fetch(const FilePath &filePath, QIODevice::OpenMode mode, QString *errorString);
bool fetch(const FilePath &filePath, QString *errorString)
{ return fetch(filePath, QIODevice::NotOpen, errorString); }
#ifdef QT_GUI_LIB
bool fetch(const QString &fileName, QIODevice::OpenMode mode, QWidget *parent);
bool fetch(const QString &fileName, QWidget *parent)
{ return fetch(fileName, QIODevice::NotOpen, parent); }
bool fetch(const FilePath &filePath, QIODevice::OpenMode mode, QWidget *parent);
bool fetch(const FilePath &filePath, QWidget *parent)
{ return fetch(filePath, QIODevice::NotOpen, parent); }
#endif // QT_GUI_LIB
const QByteArray &data() const { return m_data; }
const QString &errorString() const { return m_errorString; }
@@ -304,7 +304,7 @@ public:
FileSaverBase();
virtual ~FileSaverBase();
QString fileName() const { return m_fileName; }
FilePath filePath() const { return m_filePath; }
bool hasError() const { return m_hasError; }
QString errorString() const { return m_errorString; }
virtual bool finalize();
@@ -324,7 +324,7 @@ public:
protected:
std::unique_ptr<QFile> m_file;
QString m_fileName;
FilePath m_filePath;
QString m_errorString;
bool m_hasError = false;
@@ -337,7 +337,7 @@ class QTCREATOR_UTILS_EXPORT FileSaver : public FileSaverBase
Q_DECLARE_TR_FUNCTIONS(Utils::FileUtils) // sic!
public:
// QIODevice::WriteOnly is implicit
explicit FileSaver(const QString &filename, QIODevice::OpenMode mode = QIODevice::NotOpen);
explicit FileSaver(const FilePath &filePath, QIODevice::OpenMode mode = QIODevice::NotOpen);
bool finalize() override;
using FileSaverBase::finalize;