diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-07-04 11:39:07 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-08-08 21:48:23 +0000 |
| commit | 6504bc6bbc9276fe1a26c1af53c202371f334416 (patch) | |
| tree | 4ec3c60760a261662ed8f43e97e12ad9b7241ca2 /src/corelib/io/qfileinfo_p.h | |
| parent | d3393ce25833c0afd7f0fa6b85fd6f3bd7ad520a (diff) | |
QFileInfo: harmonize QFileInfo() and QFileInfo("")
If a QFileInfo was constructed with an empty path, which could happen
with QFileInfo(QFile()) or via QDir, etc., then it would issue system
calls to empty paths and could even produce warnings. This commit makes
am empty path name be the same as a default-constructed QFileInfo and
corrects the use if 0 for ownerId and groupId to match the
documentation.
[ChangeLog][Important Behavior Changes] QFileInfo on empty strings now
behaves like the default-constructed QFileInfo. Notably, path() will now
be the empty string too, instead of ".", which means absoluteFilePath()
is no longer the current working directory.
Change-Id: I8d96dea9955d4c749b99fffd14ce34968b1d9bbf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib/io/qfileinfo_p.h')
| -rw-r--r-- | src/corelib/io/qfileinfo_p.h | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/corelib/io/qfileinfo_p.h b/src/corelib/io/qfileinfo_p.h index 923247c62c..e4b28f4519 100644 --- a/src/corelib/io/qfileinfo_p.h +++ b/src/corelib/io/qfileinfo_p.h @@ -103,7 +103,7 @@ public: fileEngine(QFileSystemEngine::resolveEntryAndCreateLegacyEngine(fileEntry, metaData)), cachedFlags(0), #ifndef QT_NO_FSFILEENGINE - isDefaultConstructed(false), + isDefaultConstructed(file.isEmpty()), #else isDefaultConstructed(!fileEngine), #endif @@ -179,6 +179,27 @@ public: inline void setCachedFlag(uint c) const { if (cache_enabled) cachedFlags |= c; } + template <typename Ret, typename FSLambda, typename EngineLambda> + Ret checkAttribute(Ret defaultValue, QFileSystemMetaData::MetaDataFlags fsFlags, const FSLambda &fsLambda, + const EngineLambda &engineLambda) const + { + if (isDefaultConstructed) + return defaultValue; + if (fileEngine) + return engineLambda(); + if (!cache_enabled || !metaData.hasFlags(fsFlags)) { + QFileSystemEngine::fillMetaData(fileEntry, metaData, fsFlags); + // ignore errors, fillMetaData will have cleared the flags + } + return fsLambda(); + } + + template <typename Ret, typename FSLambda, typename EngineLambda> + Ret checkAttribute(QFileSystemMetaData::MetaDataFlags fsFlags, const FSLambda &fsLambda, + const EngineLambda &engineLambda) const + { + return checkAttribute(Ret(), fsFlags, fsLambda, engineLambda); + } }; QT_END_NAMESPACE |