From 7e7b65c370207fa849ac0ec69fe9209f08d8f2e3 Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 14 Jan 2013 09:34:08 +0100 Subject: Add renameOverwrite() to QAbstractFileEngine. QFSFileEngine::rename() on Windows doesn't overwrite the existing destination. Keep that unchanged (it's the desired behavior in QFile::rename), and provide cross-platform rename-overwrite behavior in the new method. This is needed by QSaveFile. Change-Id: I5e753d289d8a53692530a48a1783d62e26169cdc Reviewed-by: Oswald Buddenhagen Reviewed-by: Friedemann Kleint Reviewed-by: Thiago Macieira --- src/corelib/io/qabstractfileengine_p.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/corelib/io/qabstractfileengine_p.h') diff --git a/src/corelib/io/qabstractfileengine_p.h b/src/corelib/io/qabstractfileengine_p.h index 5d07a3a390..2cbd927968 100644 --- a/src/corelib/io/qabstractfileengine_p.h +++ b/src/corelib/io/qabstractfileengine_p.h @@ -131,6 +131,7 @@ public: virtual bool remove(); virtual bool copy(const QString &newName); virtual bool rename(const QString &newName); + virtual bool renameOverwrite(const QString &newName); virtual bool link(const QString &newName); virtual bool mkdir(const QString &dirName, bool createParentDirectories) const; virtual bool rmdir(const QString &dirName, bool recurseParentDirectories) const; -- cgit v1.2.3 From ad893943cfe0434624a1e807ed19e95286e362cc Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 14 Jan 2013 09:41:35 +0100 Subject: Add syncToDisk() to QAbstractFileEngine. This is needed by QSaveFile. Change-Id: I07ebdfd832c0be65c26f0aed1bb7852ac33135ca Reviewed-by: Thiago Macieira --- src/corelib/io/qabstractfileengine_p.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/corelib/io/qabstractfileengine_p.h') diff --git a/src/corelib/io/qabstractfileengine_p.h b/src/corelib/io/qabstractfileengine_p.h index 2cbd927968..5106c01be9 100644 --- a/src/corelib/io/qabstractfileengine_p.h +++ b/src/corelib/io/qabstractfileengine_p.h @@ -124,6 +124,7 @@ public: virtual bool open(QIODevice::OpenMode openMode); virtual bool close(); virtual bool flush(); + virtual bool syncToDisk(); virtual qint64 size() const; virtual qint64 pos() const; virtual bool seek(qint64 pos); -- cgit v1.2.3 From afaa6e42f090d495df85ff5349265da71409a88e Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Mon, 4 Feb 2013 11:06:03 +0200 Subject: Export QAbstractFileEngine[XXXX] classes. We still need them for Android assets implementation. Change-Id: I12bb809c05ac88f3c4a7d6796692b4dc3987027c Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: Paul Olav Tvete --- src/corelib/io/qabstractfileengine_p.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib/io/qabstractfileengine_p.h') diff --git a/src/corelib/io/qabstractfileengine_p.h b/src/corelib/io/qabstractfileengine_p.h index bdc4b5c123..dd64e3d71f 100644 --- a/src/corelib/io/qabstractfileengine_p.h +++ b/src/corelib/io/qabstractfileengine_p.h @@ -66,7 +66,7 @@ class QVariant; class QAbstractFileEngineIterator; class QAbstractFileEnginePrivate; -class Q_AUTOTEST_EXPORT QAbstractFileEngine +class Q_CORE_EXPORT QAbstractFileEngine { public: enum FileFlag { @@ -210,7 +210,7 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstractFileEngine::FileFlags) -class Q_AUTOTEST_EXPORT QAbstractFileEngineHandler +class Q_CORE_EXPORT QAbstractFileEngineHandler { public: QAbstractFileEngineHandler(); @@ -219,7 +219,7 @@ public: }; class QAbstractFileEngineIteratorPrivate; -class Q_AUTOTEST_EXPORT QAbstractFileEngineIterator +class Q_CORE_EXPORT QAbstractFileEngineIterator { public: QAbstractFileEngineIterator(QDir::Filters filters, const QStringList &nameFilters); -- cgit v1.2.3