diff options
author | Jonas M. Gastal <jgastal@profusion.mobi> | 2012-01-30 11:09:13 -0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 20:01:02 +0100 |
commit | c22be731680c8766894419f9c91a659459baadeb (patch) | |
tree | 093f520ca4de4a3aaf3a2d58400a12ab72a90264 /src/corelib | |
parent | fe7265a0bbe4da9577fecd8cb9be22262523f65b (diff) |
QDir::NoDotAndDotDot is now QDir::NoDot|QDir::NoDotDot.
Change-Id: I8ef7782258c2ec02ad2ec2a5d5cab90f53c62aa3
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/io/qdir.cpp | 1 | ||||
-rw-r--r-- | src/corelib/io/qdir.h | 2 | ||||
-rw-r--r-- | src/corelib/io/qdiriterator.cpp | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index e09c133961..afd6620e65 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -2217,7 +2217,6 @@ QDebug operator<<(QDebug debug, QDir::Filters filters) if (filters & QDir::Files) flags << QLatin1String("Files"); if (filters & QDir::Drives) flags << QLatin1String("Drives"); if (filters & QDir::NoSymLinks) flags << QLatin1String("NoSymLinks"); - if (filters & QDir::NoDotAndDotDot) flags << QLatin1String("NoDotAndDotDot"); // ### Qt5: remove (because NoDotAndDotDot=NoDot|NoDotDot) if (filters & QDir::NoDot) flags << QLatin1String("NoDot"); if (filters & QDir::NoDotDot) flags << QLatin1String("NoDotDot"); if ((filters & QDir::AllEntries) == QDir::AllEntries) flags << QLatin1String("AllEntries"); diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h index bc7837a7c1..5551ecd2fb 100644 --- a/src/corelib/io/qdir.h +++ b/src/corelib/io/qdir.h @@ -77,9 +77,9 @@ public: AllDirs = 0x400, CaseSensitive = 0x800, - NoDotAndDotDot = 0x1000, // ### Qt5 NoDotAndDotDot = NoDot|NoDotDot NoDot = 0x2000, NoDotDot = 0x4000, + NoDotAndDotDot = NoDot | NoDotDot, NoFilter = -1 }; diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index cd80e1adf6..c5f24071aa 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -330,8 +330,6 @@ bool QDirIteratorPrivate::matchesFilters(const QString &fileName, const QFileInf return false; if ((filters & QDir::NoDotDot) && dotOrDotDot && fileNameSize == 2) return false; - if ((filters & QDir::NoDotAndDotDot) && dotOrDotDot) // ### Qt5 remove (NoDotAndDotDot == NoDot|NoDotDot) - return false; // name filter #ifndef QT_NO_REGEXP |