Changeset 846 for trunk/src/corelib/io/qdir.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/io/qdir.cpp (modified) (100 diffs)

trunk/src/corelib/io/qdir.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -53 +53 @@
 #include "qvector.h"
 #include "qalgorithms.h"
+
+
 #ifdef QT_BUILD_CORE_LIB
-# include "qresource.h"
-#endif
-
-#include "qvarlengtharray.h"
-
-#include "private/qcoreglobaldata_p.h"
+#  include "qresource.h"
+#  include "private/qcoreglobaldata_p.h"
+#endif
+
 #include <stdlib.h>
 
@@ -83 +83 @@
 //************* QDirPrivate
 class QDirPrivate
-{
-    QDir *q_ptr;
-    Q_DECLARE_PUBLIC(QDir)
-
-    friend struct QScopedPointerDeleter<QDirPrivate>;
-protected:
-    QDirPrivate(QDir*, const QDir *copy=0);
-    ~QDirPrivate();
-
-    QString initFileEngine(const QString &file);
-
-    void updateFileLists() const;
-    void sortFileList(QDir::SortFlags, QFileInfoList &, QStringList *, QFileInfoList *) const;
-
-private:
+    : public QSharedData
+{
+public:
+    QDirPrivate(const QString &path,
+            const QStringList &nameFilters_ = QStringList(),
+            QDir::SortFlags sort_ = QDir::SortFlags(QDir::Name | QDir::IgnoreCase),
+            QDir::Filters filters_ = QDir::AllEntries)
+        : QSharedData()
+        , nameFilters(nameFilters_)
+        , sort(sort_)
+        , filters(filters_)
 #ifdef QT3_SUPPORT
-    QChar filterSepChar;
-    bool matchAllDirs;
-#endif
+        , filterSepChar(0)
+        , matchAllDirs(false)
+#endif
+        , fileListsInitialized(false)
+    {
+        setPath(path.isEmpty() ? QString::fromLatin1(".") : path);
+
+        bool empty = nameFilters.isEmpty();
+        if (!empty) {
+            empty = true;
+            for (int i = 0; i < nameFilters.size(); ++i) {
+                if (!nameFilters.at(i).isEmpty()) {
+                    empty = false;
+                    break;
+                }
+            }
+        }
+        if (empty)
+            nameFilters = QStringList(QString::fromLatin1("*"));
+    }
+
+    QDirPrivate(const QDirPrivate &copy)
+        : QSharedData(copy)
+        , path(copy.path)
+        , nameFilters(copy.nameFilters)
+        , sort(copy.sort)
+        , filters(copy.filters)
+#ifdef QT3_SUPPORT
+        , filterSepChar(copy.filterSepChar)
+        , matchAllDirs(copy.matchAllDirs)
+#endif
+        , fileListsInitialized(false)
+    {
+    }
+
+    bool exists() const
+    {
+        const QAbstractFileEngine::FileFlags info =
+            fileEngine->fileFlags(QAbstractFileEngine::DirectoryType
+                                           | QAbstractFileEngine::ExistsFlag
+                                           | QAbstractFileEngine::Refresh);
+        if (!(info & QAbstractFileEngine::DirectoryType))
+            return false;
+        return info & QAbstractFileEngine::ExistsFlag;
+    }
+
+    void initFileEngine();
+    void initFileLists() const;
+
+    static void sortFileList(QDir::SortFlags, QFileInfoList &, QStringList *, QFileInfoList *);
+
     static inline QChar getFilterSepChar(const QString &nameFilter)
     {
@@ -110 +154 @@
         return sep;
     }
-    static inline QStringList splitFilters(const QString &nameFilter, QChar sep=0) {
-        if(sep == 0)
+
+    static inline QStringList splitFilters(const QString &nameFilter, QChar sep = 0)
+    {
+        if (sep == 0)
             sep = getFilterSepChar(nameFilter);
         QStringList ret = nameFilter.split(sep);
-        for(int i = 0; i < ret.count(); i++)
+        for)
             ret[i] = ret[i].trimmed();
         return ret;
     }
 
-    struct Data {
-        inline Data()
-            : ref(1), fileEngine(0)
-        { clear(); }
-        inline Data(const Data &copy)
-            : ref(1), path(copy.path), nameFilters(copy.nameFilters), sort(copy.sort),
-              filters(copy.filters), fileEngine(0)
-        { clear(); }
-        inline ~Data()
-        { delete fileEngine; }
-
-        inline void clear() {
-            listsDirty = 1;
+    inline void setPath(QString p)
+    {
+        if ((p.endsWith(QLatin1Char('/')) || p.endsWith(QLatin1Char('\\')))
+                && p.length() > 1) {
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) || defined(Q_OS_OS2)
+            if (!(p.length() == 3 && p.at(1) == QLatin1Char(':')))
+#endif
+                p.truncate(p.length() - 1);
         }
-        mutable QAtomicInt ref;
-
-        QString path;
-        QStringList nameFilters;
-        QDir::SortFlags sort;
-        QDir::Filters filters;
-
-        mutable QAbstractFileEngine *fileEngine;
-
-        mutable uint listsDirty : 1;
-        mutable QStringList files;
-        mutable QFileInfoList fileInfos;
-    } *data;
-    inline void setPath(const QString &p)
-    {
-        detach(false);
-        QString path = p;
-        if ((path.endsWith(QLatin1Char('/')) || path.endsWith(QLatin1Char('\\')))
-                && path.length() > 1) {
-#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) || defined(Q_OS_OS2)
-            if (!(path.length() == 3 && path.at(1) == QLatin1Char(':')))
-#endif
-                path.truncate(path.length() - 1);
-        }
-        if(!data->fileEngine || !QDir::isRelativePath(path))
-            path = initFileEngine(path);
-        data->fileEngine->setFileName(path);
+
+        path = p;
+        initFileEngine();
+
         // set the path to be the qt friendly version so then we can operate on it using just /
-        data->path = data->fileEngine->fileName(QAbstractFileEngine::DefaultName);
-        data->clear();
-    }
-    inline void reset() {
-        detach();
-        data->clear();
-    }
-    void detach(bool createFileEngine = true);
+        path = fileEngine->fileName(QAbstractFileEngine::DefaultName);
+        clearFileLists();
+    }
+
+    inline void clearFileLists() {
+        fileListsInitialized = false;
+        files.clear();
+        fileInfos.clear();
+    }
+
+    QString path;
+    QStringList nameFilters;
+    QDir::SortFlags sort;
+    QDir::Filters filters;
+
+#ifdef QT3_SUPPORT
+    QChar filterSepChar;
+    bool matchAllDirs;
+#endif
+
+    QScopedPointer<QAbstractFileEngine> fileEngine;
+
+    mutable bool fileListsInitialized;
+    mutable QStringList files;
+    mutable QFileInfoList fileInfos;
 };
 
-QDirPrivate::QDirPrivate(QDir *qq, const QDir *copy) : q_ptr(qq)
-#ifdef QT3_SUPPORT
-                                                     , filterSepChar(0)
-                                                     , matchAllDirs(false)
-#endif
-{
-    if(copy) {
-        copy->d_func()->data->ref.ref();
-        data = copy->d_func()->data;
-    } else {
-        data = new QDirPrivate::Data;
-        data->clear();
-    }
-}
-
-QDirPrivate::~QDirPrivate()
-{
-    if (!data->ref.deref())
-        delete data;
-    data = 0;
-    q_ptr = 0;
-}
-
 /* For sorting */
-struct QDirSortItem {
+struct QDirSortItem
+{
     mutable QString filename_cache;
     mutable QString suffix_cache;
@@ -202 +215 @@
 
 
-class QDirSortItemComparator {
+class QDirSortItemComparator
+{
     int qt_cmp_si_sort_flags;
 public:
@@ -241 +255 @@
                                : f2->item.suffix();
 
-        r = qt_cmp_si_sort_flags & QDir::LocaleAware
+r = qt_cmp_si_sort_flags & QDir::LocaleAware
             ? f1->suffix_cache.localeAwareCompare(f2->suffix_cache)
             : f1->suffix_cache.compare(f2->suffix_cache);
@@ -261 +275 @@
                                     : f2->item.fileName();
 
-        r = qt_cmp_si_sort_flags & QDir::LocaleAware
+r = qt_cmp_si_sort_flags & QDir::LocaleAware
             ? f1->filename_cache.localeAwareCompare(f2->filename_cache)
             : f1->filename_cache.compare(f2->filename_cache);
@@ -273 +287 @@
 
 inline void QDirPrivate::sortFileList(QDir::SortFlags sort, QFileInfoList &l,
-                                      QStringList *names, QFileInfoList *infos) const
-{
-    if(names)
-        names->clear();
-    if(infos)
-        infos->clear();
+                                      QStringList *names, QFileInfoList *infos)
+{
+    // names and infos are always empty lists or 0 here
     int n = l.size();
-    if(n > 0) {
+    if(n > 0) {
         if (n == 1 || (sort & QDir::SortByMask) == QDir::Unsorted) {
-            if(infos)
+            if(infos)
                 *infos = l;
-            if(names) {
+            if(names) {
                 for (int i = 0; i < n; ++i)
                     names->append(l.at(i).fileName());
@@ -292 +303 @@
             for (int i = 0; i < n; ++i)
                 si[i].item = l.at(i);
-            qSort(si.data(), si.data()+n, QDirSortItemComparator(sort));
+            qSort(si.data(), si.data()n, QDirSortItemComparator(sort));
             // put them back in the list(s)
-            if(infos) {
+            if(infos) {
                 for (int i = 0; i < n; ++i)
                     infos->append(si[i].item);
             }
-            if(names) {
+            if(names) {
                 for (int i = 0; i < n; ++i)
                     names->append(si[i].item.fileName());
@@ -306 +317 @@
 }
 
-inline void QDirPrivate::updateFileLists() const
-{
-    if(data->listsDirty) {
+inline void QDirPrivate::FileLists() const
+{
+    if) {
         QFileInfoList l;
-        QDirIterator it(data->path, data->nameFilters, data->filters);
+        QDirIterator it(filters);
         while (it.hasNext()) {
             it.next();
             l.append(it.fileInfo());
         }
-        sortFileList(data->sort, l, &data->files, &data->fileInfos);
-        data->listsDirty = 0;
-    }
-}
-
-QString QDirPrivate::initFileEngine(const QString &path)
-{
-    detach(false);
-    delete data->fileEngine;
-    data->fileEngine = 0;
-    data->clear();
-    data->fileEngine = QAbstractFileEngine::create(path);
-    return data->fileEngine->fileName(QAbstractFileEngine::DefaultName);
-}
-
-void QDirPrivate::detach(bool createFileEngine)
-{
-    qAtomicDetach(data);
-    if (createFileEngine) {
-        QAbstractFileEngine *newFileEngine = QAbstractFileEngine::create(data->path);
-        delete data->fileEngine;
-        data->fileEngine = newFileEngine;
-    }
+        sortFileList(sort, l, &files, &fileInfos);
+        fileListsInitialized = true;
+    }
+}
+
+inline void QDirPrivate::initFileEngine()
+{
+    fileEngine.reset(QAbstractFileEngine::create(path));
 }
 
@@ -521 +517 @@
     \sa currentPath()
 */
-
-QDir::QDir(const QString &path) : d_ptr(new QDirPrivate(this))
-{
-    Q_D(QDir);
-    d->setPath(path.isEmpty() ? QString::fromLatin1(".") : path);
-    d->data->nameFilters = QStringList(QString::fromLatin1("*"));
-    d->data->filters = AllEntries;
-    d->data->sort = SortFlags(Name | IgnoreCase);
+QDir::QDir(const QString &path) : d_ptr(new QDirPrivate(path))
+{
 }
 
@@ -549 +539 @@
     \sa exists(), setPath(), setNameFilter(), setFilter(), setSorting()
 */
-
 QDir::QDir(const QString &path, const QString &nameFilter,
-           SortFlags sort, Filters filters)  : d_ptr(new QDirPrivate(this))
-{
-    Q_D(QDir);
-    d->setPath(path.isEmpty() ? QString::fromLatin1(".") : path);
-    d->data->nameFilters = QDir::nameFiltersFromString(nameFilter);
-    bool empty = d->data->nameFilters.isEmpty();
-    if(!empty) {
-        empty = true;
-        for(int i = 0; i < d->data->nameFilters.size(); ++i) {
-            if(!d->data->nameFilters.at(i).isEmpty()) {
-                empty = false;
-                break;
-            }
-        }
-    }
-    if (empty)
-        d->data->nameFilters = QStringList(QString::fromLatin1("*"));
-    d->data->sort = sort;
-    d->data->filters = filters;
+           SortFlags sort, Filters filters)
+    : d_ptr(new QDirPrivate(path, QDir::nameFiltersFromString(nameFilter), sort, filters))
+{
 }
 
@@ -578 +551 @@
     \sa operator=()
 */
-
-QDir::QDir(const QDir &dir)  : d_ptr(new QDirPrivate(this, &dir))
+QDir::QDir(const QDir &dir)
+)
 {
 }
@@ -587 +560 @@
     effect on the underlying directory in the file system.
 */
-
 QDir::~QDir()
 {
@@ -608 +580 @@
       absoluteFilePath(), isRelative(), makeAbsolute()
 */
-
 void QDir::setPath(const QString &path)
 {
-    Q_D(QDir);
-    d->setPath(path);
+    d_ptr->setPath(path);
 }
 
@@ -625 +595 @@
     absoluteFilePath(), toNativeSeparators(), makeAbsolute()
 */
-
 QString QDir::path() const
 {
-    Q_D(const QDir);
-    return d->data->path;
+    );
+    return d->path;
 }
 
@@ -640 +609 @@
     dirName(), absoluteFilePath()
 */
-
 QString QDir::absolutePath() const
 {
-    Q_D(const QDir);
-    QString ret = d->data->path;
+    );
+    QString ret = d->path;
     if (QDir::isRelativePath(ret))
         ret = absoluteFilePath(QString::fromLatin1(""));
     return cleanPath(ret);
 }
-
 
 /*!
@@ -667 +634 @@
         absoluteFilePath()
 */
-
 QString QDir::canonicalPath() const
 {
-    Q_D(const QDir);
-
-    if(!d->data->fileEngine)
-        return QLatin1String("");
-    return cleanPath(d->data->fileEngine->fileName(QAbstractFileEngine::CanonicalName));
+    return cleanPath(d_ptr->fileEngine->fileName(QAbstractFileEngine::CanonicalName));
 }
 
@@ -688 +650 @@
     \sa path(), filePath(), absolutePath(), absoluteFilePath()
 */
-
 QString QDir::dirName() const
 {
-    Q_D(const QDir);
-    int pos = d->data->path.lastIndexOf(QLatin1Char('/'));
+    );
+    int pos = d->path.lastIndexOf(QLatin1Char('/'));
     if (pos == -1)
-        return d->data->path;
-    return d->data->path.mid(pos + 1);
+        return d->path;
+    return d->path.mid(pos + 1);
 }
 
@@ -707 +668 @@
     \sa dirName() absoluteFilePath(), isRelative(), canonicalPath()
 */
-
 QString QDir::filePath(const QString &fileName) const
 {
-    Q_D(const QDir);
+    );
     if (isAbsolutePath(fileName))
         return QString(fileName);
 
-    QString ret = d->data->path;
-    if(!fileName.isEmpty()) {
+    QString ret = d->path;
+    if(!fileName.isEmpty()) {
         if (!ret.isEmpty() && ret[(int)ret.length()-1] != QLatin1Char('/') && fileName[0] != QLatin1Char('/'))
             ret += QLatin1Char('/');
@@ -731 +691 @@
     \sa relativeFilePath() filePath() canonicalPath()
 */
-
 QString QDir::absoluteFilePath(const QString &fileName) const
 {
-    Q_D(const QDir);
+    );
 
 #ifdef Q_OS_OS2
@@ -791 +750 @@
     if (isAbsolutePath(fileName))
         return fileName;
-    if(!d->data->fileEngine)
-        return fileName;
 
     QString ret;
 #ifndef QT_NO_FSFILEENGINE
-    if (isRelativePath(d->data->path)) //get pwd
+    if (isRelativePath(d->path)) //get pwd
         ret = QFSFileEngine::currentPath(fileName);
 #endif
-    if(!d->data->path.isEmpty() && d->data->path != QLatin1String(".")) {
+    if->path != QLatin1String(".")) {
         if (!ret.isEmpty() && !ret.endsWith(QLatin1Char('/')))
             ret += QLatin1Char('/');
-        ret += d->data->path;
+        ret += d->path;
     }
     if (!fileName.isEmpty()) {
@@ -821 +778 @@
     \sa absoluteFilePath() filePath() canonicalPath()
 */
-
 QString QDir::relativeFilePath(const QString &fileName) const
 {
@@ -908 +864 @@
     QString n(pathName);
 #if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX) || defined(Q_OS_SYMBIAN)
-    for (int i=0; i<(int)n.length(); i++) {
+    for (int i) {
         if (n[i] == QLatin1Char('/'))
             n[i] = QLatin1Char('\\');
@@ -932 +888 @@
     QString n(pathName);
 #if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX) || defined(Q_OS_SYMBIAN)
-    for (int i=0; i<(int)n.length(); i++) {
+    for (int i) {
         if (n[i] == QLatin1Char('\\'))
             n[i] = QLatin1Char('/');
@@ -951 +907 @@
     \sa cdUp(), isReadable(), exists(), path()
 */
-
 bool QDir::cd(const QString &dirName)
 {
-    Q_D(QDir);
+    // Don't detach just yet.
+    const QDirPrivate * const d = d_ptr.constData();
 
     if (dirName.isEmpty() || dirName == QLatin1String("."))
         return true;
-    QString newPath = d->data->path;
+    QString newPath = d->path;
     if (isAbsolutePath(dirName)) {
         newPath = cleanPath(dirName);
@@ -971 +927 @@
         newPath += dirName;
         if (dirName.indexOf(QLatin1Char('/')) >= 0
-            || d->data->path == QLatin1String(".")
+            || d->path == QLatin1String(".")
             || dirName == QLatin1String("..")) {
             newPath = cleanPath(newPath);
@@ -987 +943 @@
         }
     }
-    {
-        QFileInfo fi(newPath);
-        if (!(fi.exists() && fi.isDir()))
-            return false;
-    }
-
-    d->setPath(newPath);
-    refresh();
+
+    );
+    
+
+    
+        return false;
+
+    ();
     return true;
 }
@@ -1008 +964 @@
     \sa cd(), isReadable(), exists(), path()
 */
-
 bool QDir::cdUp()
 {
@@ -1017 +972 @@
     Returns the string list set by setNameFilters()
 */
-
 QStringList QDir::nameFilters() const
 {
-    Q_D(const QDir);
-
-    return d->data->nameFilters;
+    const QDirPrivate* d = d_ptr.constData();
+    return d->nameFilters;
 }
 
@@ -1040 +993 @@
     \sa nameFilters(), setFilter()
 */
-
 void QDir::setNameFilters(const QStringList &nameFilters)
 {
-    Q_D(QDir);
-    d->detach();
-    d->data->nameFilters = nameFilters;
+    QDirPrivate* d = d_ptr.data();
+    d->initFileEngine();
+    d->clearFileLists();
+
+    d->nameFilters = nameFilters;
 }
 
@@ -1096 +1050 @@
     }
 
-    for (int i = 0; i < prefix.count(); i++) {
+    for (int i = 0; i < prefix.count(); ) {
         if (!prefix.at(i).isLetterOrNumber()) {
             qWarning("QDir::setSearchPaths: Prefix can only contain letters or numbers");
@@ -1146 +1100 @@
     Returns the value set by setFilter()
 */
-
 QDir::Filters QDir::filter() const
 {
-    Q_D(const QDir);
-
-    return d->data->filters;
+    const QDirPrivate* d = d_ptr.constData();
+    return d->filters;
 }
 
@@ -1170 +1122 @@
                        systems that don't support symbolic links).
     \value NoDotAndDotDot Do not list the special entries "." and "..".
+
+
     \value AllEntries  List directories, files, drives and symlinks (this does not list
                 broken symlinks unless you specify System).
@@ -1228 +1182 @@
     \sa filter(), setNameFilters()
 */
-
 void QDir::setFilter(Filters filters)
 {
-    Q_D(QDir);
-
-    d->detach();
-    d->data->filters = filters;
+    QDirPrivate* d = d_ptr.data();
+    d->initFileEngine();
+    d->clearFileLists();
+
+    d->filters = filters;
 }
 
@@ -1242 +1196 @@
     \sa setSorting() SortFlag
 */
-
 QDir::SortFlags QDir::sorting() const
 {
-    Q_D(const QDir);
-
-    return d->data->sort;
+    const QDirPrivate* d = d_ptr.constData();
+    return d->sort;
 }
 
@@ -1288 +1240 @@
     \sa sorting() SortFlag
 */
-
 void QDir::setSorting(SortFlags sort)
 {
-    Q_D(QDir);
-
-    d->detach();
-    d->data->sort = sort;
-}
-
+    Q);
+    d->initFileEngine();
+    d->();
+
+    d->sort = sort;
+}
 
 /*!
@@ -1305 +1256 @@
     \sa operator[](), entryList()
 */
-
 uint QDir::count() const
 {
-    Q_D(const QDir);
-
-    d->updateFileLists();
-    return d->data->files.count();
+    const QDirPrivate* d = d_ptr.constData();
+    d->initFileLists();
+    return d->files.count();
 }
 
@@ -1317 +1266 @@
     Returns the file name at position \a pos in the list of file
     names. Equivalent to entryList().at(index).
-
-    Returns an empty string if \a pos is out of range or if the
-    entryList() function failed.
+    \a pos must be a valid index position in the list (i.e., 0 <= pos < count()).
 
     \sa count(), entryList()
 */
-
 QString QDir::operator[](int pos) const
 {
-    Q_D(const QDir);
-
-    d->updateFileLists();
-    return d->data->files[pos];
+    const QDirPrivate* d = d_ptr.constData();
+    d->initFileLists();
+    return d->files[pos];
 }
 
@@ -1351 +1296 @@
     \sa entryInfoList(), setNameFilters(), setSorting(), setFilter()
 */
-
 QStringList QDir::entryList(Filters filters, SortFlags sort) const
 {
-    Q_D(const QDir);
-
-    return entryList(d->data->nameFilters, filters, sort);
+    const QDirPrivate* d = d_ptr.constData();
+    return entryList(d->nameFilters, filters, sort);
 }
 
@@ -1378 +1321 @@
 QFileInfoList QDir::entryInfoList(Filters filters, SortFlags sort) const
 {
-    Q_D(const QDir);
-
-    return entryInfoList(d->data->nameFilters, filters, sort);
+    const QDirPrivate* d = d_ptr.constData();
+    return entryInfoList(d->nameFilters, filters, sort);
 }
 
@@ -1399 +1341 @@
     \sa entryInfoList(), setNameFilters(), setSorting(), setFilter()
 */
-
 QStringList QDir::entryList(const QStringList &nameFilters, Filters filters,
                             SortFlags sort) const
 {
-    Q_D(const QDir);
+    );
 
     if (filters == NoFilter)
-        filters = d->data->filters;
+        filters = d->filters;
 #ifdef QT3_SUPPORT
     if (d->matchAllDirs)
@@ -1412 +1353 @@
 #endif
     if (sort == NoSort)
-        sort = d->data->sort;
-    if (filters == NoFilter && sort == NoSort && nameFilters == d->data->nameFilters) {
-        d->updateFileLists();
-        return d->data->files;
-    }
+        sort = d->sort;
+
+    if (filters == d->filters && sort == d->sort && nameFilters == d->nameFilters) {
+        d->initFileLists();
+        return d->files;
+    }
+
     QFileInfoList l;
-    QDirIterator it(d->data->path, nameFilters, filters);
+    QDirIterator it(d->path, nameFilters, filters);
     while (it.hasNext()) {
         it.next();
@@ -1444 +1387 @@
     \sa entryList(), setNameFilters(), setSorting(), setFilter(), isReadable(), exists()
 */
-
 QFileInfoList QDir::entryInfoList(const QStringList &nameFilters, Filters filters,
                                   SortFlags sort) const
 {
-    Q_D(const QDir);
+    );
 
     if (filters == NoFilter)
-        filters = d->data->filters;
+        filters = d->filters;
 #ifdef QT3_SUPPORT
     if (d->matchAllDirs)
@@ -1457 +1399 @@
 #endif
     if (sort == NoSort)
-        sort = d->data->sort;
-    if (filters == NoFilter && sort == NoSort && nameFilters == d->data->nameFilters) {
-        d->updateFileLists();
-        return d->data->fileInfos;
-    }
+        sort = d->sort;
+
+    if (filters == d->filters && sort == d->sort && nameFilters == d->nameFilters) {
+        d->initFileLists();
+        return d->fileInfos;
+    }
+
     QFileInfoList l;
-    QDirIterator it(d->data->path, nameFilters, filters);
+    QDirIterator it(d->path, nameFilters, filters);
     while (it.hasNext()) {
         it.next();
@@ -1480 +1424 @@
     \sa rmdir()
 */
-
 bool QDir::mkdir(const QString &dirName) const
 {
-    Q_D(const QDir);
+    );
 
     if (dirName.isEmpty()) {
@@ -1489 +1432 @@
         return false;
     }
-    if(!d->data->fileEngine)
-        return false;
 
 #ifdef Q_OS_OS2
@@ -1498 +1439 @@
     QString fn = filePath(dirName);
 #endif
-    return d->data->fileEngine->mkdir(fn, false);
+    return d->fileEngine->mkdir(fn, false);
 }
 
@@ -1510 +1451 @@
     \sa mkdir()
 */
-
 bool QDir::rmdir(const QString &dirName) const
 {
-    Q_D(const QDir);
+    );
 
     if (dirName.isEmpty()) {
@@ -1519 +1459 @@
         return false;
     }
-    if(!d->data->fileEngine)
-        return false;
 
 #ifdef Q_OS_OS2
@@ -1528 +1466 @@
     QString fn = filePath(dirName);
 #endif
-    return d->data->fileEngine->rmdir(fn, false);
+    return d->fileEngine->rmdir(fn, false);
 }
 
@@ -1541 +1479 @@
     \sa rmpath()
 */
-
 bool QDir::mkpath(const QString &dirPath) const
 {
-    Q_D(const QDir);
+    );
 
     if (dirPath.isEmpty()) {
@@ -1550 +1487 @@
         return false;
     }
-    if(!d->data->fileEngine)
-        return false;
 
 #ifdef Q_OS_OS2
@@ -1559 +1494 @@
     QString fn = filePath(dirPath);
 #endif
-    return d->data->fileEngine->mkdir(fn, true);
+    return d->fileEngine->mkdir(fn, true);
 }
 
@@ -1575 +1510 @@
 bool QDir::rmpath(const QString &dirPath) const
 {
-    Q_D(const QDir);
+    );
 
     if (dirPath.isEmpty()) {
@@ -1581 +1516 @@
         return false;
     }
-    if(!d->data->fileEngine)
-        return false;
 
 #ifdef Q_OS_OS2
@@ -1590 +1523 @@
     QString fn = filePath(dirPath);
 #endif
-    return d->data->fileEngine->rmdir(fn, true);
+    return d->fileEngine->rmdir(fn, true);
 }
 
@@ -1602 +1535 @@
     \sa QFileInfo::isReadable()
 */
-
-
 bool QDir::isReadable() const
 {
-    Q_D(const QDir);
-
-    if(!d->data->fileEngine)
-        return false;
-    const QAbstractFileEngine::FileFlags info = d->data->fileEngine->fileFlags(QAbstractFileEngine::DirectoryType
-                                                                       |QAbstractFileEngine::PermsMask);
-    if(!(info & QAbstractFileEngine::DirectoryType))
+    const QDirPrivate* d = d_ptr.constData();
+
+    const QAbstractFileEngine::FileFlags info =
+        d->fileEngine->fileFlags(QAbstractFileEngine::DirectoryType
+                                       | QAbstractFileEngine::PermsMask);
+    if (!(info & QAbstractFileEngine::DirectoryType))
         return false;
     return info & QAbstractFileEngine::ReadUserPerm;
@@ -1628 +1558 @@
     \sa QFileInfo::exists(), QFile::exists()
 */
-
 bool QDir::exists() const
 {
-    Q_D(const QDir);
-
-    if(!d->data->fileEngine)
-        return false;
-    const QAbstractFileEngine::FileFlags info =
-        d->data->fileEngine->fileFlags(
-            QAbstractFileEngine::DirectoryType
-            | QAbstractFileEngine::ExistsFlag
-            | QAbstractFileEngine::Refresh);
-    if(!(info & QAbstractFileEngine::DirectoryType))
-        return false;
-    return info & QAbstractFileEngine::ExistsFlag;
+    return d_ptr->exists();
 }
 
@@ -1657 +1575 @@
     \sa root(), rootPath()
 */
-
 bool QDir::isRoot() const
 {
-    Q_D(const QDir);
-
-    if(!d->data->fileEngine)
-        return true;
-    return d->data->fileEngine->fileFlags(QAbstractFileEngine::FlagsMask) & QAbstractFileEngine::RootFlag;
+    return d_ptr->fileEngine->fileFlags(QAbstractFileEngine::FlagsMask) & QAbstractFileEngine::RootFlag;
 }
 
@@ -1692 +1605 @@
     \sa makeAbsolute() isAbsolute() isAbsolutePath() cleanPath()
 */
-
 bool QDir::isRelative() const
 {
-    Q_D(const QDir);
-
-    if(!d->data->fileEngine)
-        return false;
-    return d->data->fileEngine->isRelativePath();
+    return d_ptr->fileEngine->isRelativePath();
 }
 
@@ -1710 +1618 @@
     \sa isAbsolute() isAbsolutePath() isRelative() cleanPath()
 */
-
 bool QDir::makeAbsolute() // ### What do the return values signify?
 {
-    Q_D(QDir);
-
-    if(!d->data->fileEngine)
+    QString absolutePath = d_ptr.constData()->fileEngine->fileName(QAbstractFileEngine::AbsoluteName);
+    if (QDir::isRelativePath(absolutePath))
         return false;
-    QString absolutePath = d->data->fileEngine->fileName(QAbstractFileEngine::AbsoluteName);
-    if(QDir::isRelativePath(absolutePath))
+
+    QScopedPointer<QDirPrivate> dir(new QDirPrivate(*d_ptr.constData()));
+    dir->setPath(absolutePath);
+
+    d_ptr = dir.take();
+
+    if (!(d_ptr->fileEngine->fileFlags(QAbstractFileEngine::TypesMask) & QAbstractFileEngine::DirectoryType))
         return false;
-    d->detach();
-    d->data->path = absolutePath;
-    d->data->fileEngine->setFileName(absolutePath);
-    if(!(d->data->fileEngine->fileFlags(QAbstractFileEngine::TypesMask) & QAbstractFileEngine::DirectoryType))
-        return false;
+
     return true;
 }
@@ -1737 +1644 @@
     \snippet doc/src/snippets/code/src_corelib_io_qdir.cpp 10
 */
-
 bool QDir::operator==(const QDir &dir) const
 {
-    const QDirPrivate *d = d_func();
-    const QDirPrivate *other = dir.d_func();
-
-    if(d->data == other->data)
+    const QDirPrivate *d = d_();
+    const QDirPrivate *other = dir.d_();
+
+    if)
         return true;
-    Q_ASSERT(d->data->fileEngine && other->data->fileEngine);
-    if(d->data->fileEngine->caseSensitive() != other->data->fileEngine->caseSensitive())
+    if (d->fileEngine->caseSensitive() != other->fileEngine->caseSensitive())
         return false;
-    if(d->data->filters == other->data->filters
-       && d->data->sort == other->data->sort
-       && d->data->nameFilters == other->data->nameFilters) {
+    if->filters
+       && d->->sort
+       && d->->nameFilters) {
         QString dir1 = absolutePath(), dir2 = dir.absolutePath();
-        if(!other->data->fileEngine->caseSensitive())
+        if->fileEngine->caseSensitive())
             return (dir1.toLower() == dir2.toLower());
 
@@ -1765 +1670 @@
     object.
 */
-
 QDir &QDir::operator=(const QDir &dir)
 {
-    if (this == &dir)
-        return *this;
-
-    Q_D(QDir);
-    qAtomicAssign(d->data, dir.d_func()->data);
+    d_ptr = dir.d_ptr;
     return *this;
 }
@@ -1784 +1684 @@
     Use setPath() instead.
 */
-
 QDir &QDir::operator=(const QString &path)
 {
-    Q_D(QDir);
-
-    d->setPath(path);
+    d_ptr->setPath(path);
     return *this;
 }
@@ -1805 +1702 @@
 */
 
-
 /*!
     Removes the file, \a fileName.
@@ -1812 +1708 @@
     returns false.
 */
-
 bool QDir::remove(const QString &fileName)
 {
@@ -1819 +1714 @@
         return false;
     }
-    QString p = filePath(fileName);
-    return QFile::remove(p);
+    return QFile::remove(filePath(fileName));
 }
 
@@ -1834 +1728 @@
     \a newName points to an open file.
 */
-
 bool QDir::rename(const QString &oldName, const QString &newName)
 {
-    Q_D(QDir);
-
     if (oldName.isEmpty() || newName.isEmpty()) {
         qWarning("QDir::rename: Empty or null file name(s)");
         return false;
     }
-    if(!d->data->fileEngine)
-        return false;
 
     QFile file(filePath(oldName));
-    if(!file.exists())
+    if(!file.exists())
         return false;
     return file.rename(filePath(newName));
@@ -1862 +1751 @@
     \sa QFileInfo::exists(), QFile::exists()
 */
-
 bool QDir::exists(const QString &name) const
 {
@@ -1869 +1757 @@
         return false;
     }
-    QString tmp = filePath(name);
-    return QFile::exists(tmp);
+    return QFile::exists(filePath(name));
 }
 
@@ -1882 +1769 @@
     \sa root(), rootPath()
 */
-
 QFileInfoList QDir::drives()
 {
@@ -1902 +1788 @@
     toNativeSeparators().
 */
-
 QChar QDir::separator()
 {
@@ -1921 +1806 @@
     returns false.
 
-    \sa current() currentPath() home() root() temp()
-*/
-
+    \sa current(), currentPath(), home(), root(), temp()
+*/
 bool QDir::setCurrent(const QString &path)
 {
@@ -1942 +1826 @@
     ensuring that its path() will be the same as its absolutePath().
 
-    \sa currentPath(), home(), root(), temp()
+    \sa currentPath(), home(), root(), temp()
 */
 
@@ -1948 +1832 @@
     Returns the absolute path of the application's current directory.
 
-    \sa current(), homePath(), rootPath(), tempPath()
+    \sa current(), homePath(), rootPath(), tempPath()
 */
 QString QDir::currentPath()
@@ -1965 +1849 @@
     Use currentPath() instead.
 
-    \sa currentPath()
+    \sa currentPath()
 */
 
@@ -2022 +1906 @@
 
 /*!
-  \fn QString QDir::homeDirPath()
-
-  Returns the absolute path of the user's home directory.
-
-  Use homePath() instead.
-
-  \sa homePath()
- */
+  \fn QString QDir::homeDirPath()
+
+  Returns the absolute path of the user's home directory.
+
+  Use homePath() instead.
+
+  \sa homePath()
+*/
 
 /*!
@@ -2095 +1979 @@
 
 /*!
-  \fn QString QDir::rootDirPath()
-
-  Returns the absolute path of the root directory.
-
-  Use rootPath() instead.
-
-  \sa rootPath()
+  \fn QString QDir::rootDirPath()
+
+  Returns the absolute path of the root directory.
+
+  Use rootPath() instead.
+
+  \sa rootPath()
 */
 
@@ -2114 +1998 @@
     \sa {QRegExp wildcard matching}, QRegExp::exactMatch() entryList() entryInfoList()
 */
-
-
 bool QDir::match(const QStringList &filters, const QString &fileName)
 {
-    for(QStringList::ConstIterator sit = filters.begin(); sit != filters.end(); ++sit) {
+    fornd(); ++sit) {
         QRegExp rx(*sit, Qt::CaseInsensitive, QRegExp::Wildcard);
         if (rx.exactMatch(fileName))
@@ -2134 +2016 @@
     \sa {QRegExp wildcard matching}, QRegExp::exactMatch() entryList() entryInfoList()
 */
-
 bool QDir::match(const QString &filter, const QString &fileName)
 {
     return match(nameFiltersFromString(filter), fileName);
 }
-#endif
+#endif
 
 /*!
@@ -2152 +2033 @@
     \sa absolutePath() canonicalPath()
 */
-
 QString QDir::cleanPath(const QString &path)
 {
@@ -2159 +2039 @@
     QString name = path;
     QChar dir_separator = separator();
-    if(dir_separator != QLatin1Char('/'))
-        name.replace(dir_separator, QLatin1Char('/'));
+    if(dir_separator != QLatin1Char('/'))
+ name.replace(dir_separator, QLatin1Char('/'));
 
     int used = 0, levels = 0;
@@ -2168 +2048 @@
 
     const QChar *p = name.unicode();
-    for(int i = 0, last = -1, iwrite = 0; i < len; i++) {
-        if(p[i] == QLatin1Char('/')) {
-            while(i < len-1 && p[i+1] == QLatin1Char('/')) {
+    for) {
+        if(p[i] == QLatin1Char('/')) {
+            while(i < len-1 && p[i+1] == QLatin1Char('/')) {
 #if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_OS2) //allow unc paths
-                if(!i)
+                if(!i)
                     break;
 #endif
@@ -2178 +2058 @@
             }
             bool eaten = false;
-            if(i < len - 1 && p[i+1] == QLatin1Char('.')) {
+            if(i < len - 1 && p[i+1] == QLatin1Char('.')) {
                 int dotcount = 1;
-                if(i < len - 2 && p[i+2] == QLatin1Char('.'))
+                if(i < len - 2 && p[i+2] == QLatin1Char('.'))
                     dotcount++;
-                if(i == len - dotcount - 1) {
-                    if(dotcount == 1) {
+                if(i == len - dotcount - 1) {
+                    if(dotcount == 1) {
                         break;
-                    } else if(levels) {
-                        if(last == -1) {
-                            for(int i2 = iwrite-1; i2 >= 0; i2--) {
-                                if(out[i2] == QLatin1Char('/')) {
+                    } else if(levels) {
+                        if(last == -1) {
+                            for(int i2 = iwrite-1; i2 >= 0; i2--) {
+                                if(out[i2] == QLatin1Char('/')) {
                                     last = i2;
                                     break;
@@ -2197 +2077 @@
                         break;
                     }
-                } else if(p[i+dotcount+1] == QLatin1Char('/')) {
-                    if(dotcount == 2 && levels) {
-                        if(last == -1 || iwrite - last == 1) {
-                            for(int i2 = (last == -1) ? (iwrite-1) : (last-1); i2 >= 0; i2--) {
-                                if(out[i2] == QLatin1Char('/')) {
+                } else if(p[i+dotcount+1] == QLatin1Char('/')) {
+                    if(dotcount == 2 && levels) {
+                        if(last == -1 || iwrite - last == 1) {
+                            for(int i2 = (last == -1) ? (iwrite-1) : (last-1); i2 >= 0; i2--) {
+                                if(out[i2] == QLatin1Char('/')) {
                                     eaten = true;
                                     last = i2;
@@ -2210 +2090 @@
                             eaten = true;
                         }
-                        if(eaten) {
+                        if(eaten) {
                             levels--;
                             used -= iwrite - last;
@@ -2222 +2102 @@
                         last = -1;
                         ++i;
-                    } else if(dotcount == 1) {
+                    } else if(dotcount == 1) {
                         eaten = true;
                     }
-                    if(eaten)
+                    if(eaten)
                         i += dotcount;
                 } else {
                     levels++;
                 }
-            } else if(last != -1 && iwrite - last == 1) {
+            } else if(last != -1 && iwrite - last == 1) {
 #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) || defined(Q_OS_OS2)
                 eaten = (iwrite > 2);
@@ -2237 +2117 @@
 #endif
                 last = -1;
-            } else if(last != -1 && i == len-1) {
+            } else if(last != -1 && i == len-1) {
                 eaten = true;
             } else {
                 levels++;
             }
-            if(!eaten)
+            if(!eaten)
                 last = i - (i - iwrite);
             else
                 continue;
-        } else if(!i && p[i] == QLatin1Char('.')) {
+        } else if(!i && p[i] == QLatin1Char('.')) {
             int dotcount = 1;
-            if(len >= 1 && p[1] == QLatin1Char('.'))
+            if(len >= 1 && p[1] == QLatin1Char('.'))
                 dotcount++;
-            if(len >= dotcount && p[dotcount] == QLatin1Char('/')) {
-                if(dotcount == 1) {
+            if(len >= dotcount && p[dotcount] == QLatin1Char('/')) {
+                if(dotcount == 1) {
                     i++;
-                    while(i+1 < len-1 && p[i+1] == QLatin1Char('/'))
+                    while(i+1 < len-1 && p[i+1] == QLatin1Char('/'))
                         i++;
                     continue;
@@ -2262 +2142 @@
         used++;
     }
-    QString ret;
-    if(used == len)
-        ret = name;
-    else
-        ret = QString(out, used);
-
+
+    QString ret = (used == len ? name : QString(out, used));
     // Strip away last slash except for root directories
-    if (ret.endsWith(QLatin1Char('/'))
-        && !(ret.size() == 1 || (ret.size() == 3 && ret.at(1) == QLatin1Char(':'))))
-        ret = ret.left(ret.length() - 1);
+    if (ret.length() > 1 && ret.endsWith(QLatin1Char('/'))) {
+#if defined (Q_OS_WIN) || defined (Q_OS_SYMBIAN)
+        if (!(ret.length() == 3 && ret.at(1) == QLatin1Char(':')))
+#endif
+            ret.chop(1);
+    }
 
     return ret;
@@ -2282 +2161 @@
     \sa isRelative() isAbsolutePath() makeAbsolute()
 */
-
 bool QDir::isRelativePath(const QString &path)
 {
@@ -2291 +2169 @@
     Refreshes the directory information.
 */
-
 void QDir::refresh() const
 {
-    Q_D(const QDir);
-
-    d->data->clear();
+    Q);
+    d->initFileEngine();
+    d->();
 }
 
@@ -2306 +2183 @@
     by a space or by a semicolon.)
 */
-
 QStringList QDir::nameFiltersFromString(const QString &nameFilter)
 {
@@ -2373 +2249 @@
 bool QDir::matchAllDirs() const
 {
-    Q_D(const QDir);
+    );
     return d->matchAllDirs;
 }
@@ -2385 +2261 @@
 void QDir::setMatchAllDirs(bool on)
 {
-    Q_D(QDir);
+    QDirPrivate* d = d_ptr.data();
+    d->initFileEngine();
+    d->clearFileLists();
+
     d->matchAllDirs = on;
 }
@@ -2394 +2273 @@
 QString QDir::nameFilter() const
 {
-    Q_D(const QDir);
-
+    const QDirPrivate* d = d_ptr.constData();
     return nameFilters().join(QString(d->filterSepChar));
 }
@@ -2421 +2299 @@
 void QDir::setNameFilter(const QString &nameFilter)
 {
-    Q_D(QDir);
+    QDirPrivate* d = d_ptr.data();
+    d->initFileEngine();
+    d->clearFileLists();
 
     d->filterSepChar = QDirPrivate::getFilterSepChar(nameFilter);
-    setNameFilters(QDirPrivate::splitFilters(nameFilter, d->filterSepChar));
+    );
 }
 
@@ -2498 +2378 @@
     Use QDir::SortFlags instead.
 */
-#endif
+#endif // QT3_SUPPORT
+
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug debug, QDir::Filters filters)
@@ -2511 +2392 @@
         if (filters & QDir::Drives) flags << QLatin1String("Drives");
         if (filters & QDir::NoSymLinks) flags << QLatin1String("NoSymLinks");
-        if (filters & QDir::NoDotAndDotDot) flags << QLatin1String("NoDotAndDotDot");
+        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");
         if (filters & QDir::Readable) flags << QLatin1String("Readable");
@@ -2561 +2444 @@
     return debug.space();
 }
-
-
-
-#endif
+#endif // QT_NO_DEBUG_STREAM
 
 QT_END_NAMESPACE