From 9612cf3ad52f2b8ab702809838b06d9d11a0f6a2 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 25 Jul 2016 07:49:38 +0000 Subject: [PATCH] adjust QFileInfoPrivate constructors to new data order Signed-off-by: Ivailo Monev --- src/core/io/qfileinfo_p.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/core/io/qfileinfo_p.h b/src/core/io/qfileinfo_p.h index 02012cfa1..6a0d63798 100644 --- a/src/core/io/qfileinfo_p.h +++ b/src/core/io/qfileinfo_p.h @@ -70,33 +70,30 @@ public: inline QFileInfoPrivate() : QSharedData(), fileEngine(0), - cachedFlags(0), isDefaultConstructed(true), - cache_enabled(true), fileFlags(0), fileSize(0) + cache_enabled(true), fileFlags(0), cachedFlags(0), fileSize(0) {} inline QFileInfoPrivate(const QFileInfoPrivate ©) : QSharedData(copy), fileEntry(copy.fileEntry), metaData(copy.metaData), fileEngine(QFileSystemEngine::resolveEntryAndCreateLegacyEngine(fileEntry, metaData)), - cachedFlags(0), #ifndef QT_NO_FSFILEENGINE isDefaultConstructed(false), #else isDefaultConstructed(!fileEngine), #endif - cache_enabled(copy.cache_enabled), fileFlags(0), fileSize(0) + cache_enabled(copy.cache_enabled), fileFlags(0), cachedFlags(0), fileSize(0) {} inline QFileInfoPrivate(const QString &file) : fileEntry(QDir::fromNativeSeparators(file)), fileEngine(QFileSystemEngine::resolveEntryAndCreateLegacyEngine(fileEntry, metaData)), - cachedFlags(0), #ifndef QT_NO_FSFILEENGINE isDefaultConstructed(false), #else isDefaultConstructed(!fileEngine), #endif - cache_enabled(true), fileFlags(0), fileSize(0) + cache_enabled(true), fileFlags(0), cachedFlags(0), fileSize(0) { } @@ -105,9 +102,8 @@ public: fileEntry(file), metaData(data), fileEngine(QFileSystemEngine::resolveEntryAndCreateLegacyEngine(fileEntry, metaData)), - cachedFlags(0), isDefaultConstructed(false), - cache_enabled(true), fileFlags(0), fileSize(0) + cache_enabled(true), fileFlags(0), cachedFlags(0), fileSize(0) { //If the file engine is not null, this maybe a "mount point" for a custom file engine //in which case we can't trust the metadata -- 2.11.0