1 files changed, 23 insertions, 38 deletions

diff --git a/src/widgets/dialogs/qfilesystemmodel_p.h b/src/widgets/dialogs/qfilesystemmodel_p.h
index 9c432e1ae6..844e417e2d 100644
--- a/src/widgets/dialogs/qfilesystemmodel_p.h
+++ b/src/widgets/dialogs/qfilesystemmodel_p.h
@@ -99,13 +99,13 @@ public:
     class QFileSystemNode
     {
     public:
-        explicit QFileSystemNode(const QString &filename = QString(), QFileSystemNode *p = 0)
-            : fileName(filename), populatedChildren(false), isVisible(false), dirtyChildrenIndex(-1), parent(p), info(0) {}
+        Q_DISABLE_COPY_MOVE(QFileSystemNode)
+
+        explicit QFileSystemNode(const QString &filename = QString(), QFileSystemNode *p = nullptr)
+            : fileName(filename), parent(p) {}
         ~QFileSystemNode() {
             qDeleteAll(children);
             delete info;
-            info = 0;
-            parent = 0;
         }
 
         QString fileName;
@@ -116,7 +116,7 @@ public:
         inline qint64 size() const { if (info && !info->isDir()) return info->size(); return 0; }
         inline QString type() const { if (info) return info->displayType; return QLatin1String(""); }
         inline QDateTime lastModified() const { if (info) return info->lastModified(); return QDateTime(); }
-        inline QFile::Permissions permissions() const { if (info) return info->permissions(); return 0; }
+        inline QFile::Permissions permissions() const { if (info) return info->permissions(); return nullptr; }
         inline bool isReadable() const { return ((permissions() & QFile::ReadUser) != 0); }
         inline bool isWritable() const { return ((permissions() & QFile::WriteUser) != 0); }
         inline bool isExecutable() const { return ((permissions() & QFile::ExeUser) != 0); }
@@ -162,7 +162,7 @@ public:
             return info && (*info == fileInfo);
         }
 
-        inline bool hasInformation() const { return info != 0; }
+        inline bool hasInformation() const { return info != nullptr; }
 
         void populate(const QExtendedInformation &fileInfo) {
             if (!info)
@@ -204,31 +204,16 @@ public:
             }
         }
 
-        bool populatedChildren;
-        bool isVisible;
         QHash<QFileSystemModelNodePathKey, QFileSystemNode *> children;
         QList<QString> visibleChildren;
-        int dirtyChildrenIndex;
+        QExtendedInformation *info = nullptr;
         QFileSystemNode *parent;
-
-
-        QExtendedInformation *info;
-
+        int dirtyChildrenIndex = -1;
+        bool populatedChildren = false;
+        bool isVisible = false;
     };
 
-    QFileSystemModelPrivate() :
-            forceSort(true),
-            sortColumn(0),
-            sortOrder(Qt::AscendingOrder),
-            readOnly(true),
-            setRootPath(false),
-            filters(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs),
-            nameFilterDisables(true), // false on windows, true on mac and unix
-            disableRecursiveSort(false)
-    {
-        delayedSortTimer.setSingleShot(true);
-    }
-
+    QFileSystemModelPrivate() = default;
     void init();
     /*
       \internal
@@ -303,18 +288,7 @@ public:
     QFileInfoGatherer fileInfoGatherer;
 #endif // filesystemwatcher
     QTimer delayedSortTimer;
-    bool forceSort;
-    int sortColumn;
-    Qt::SortOrder sortOrder;
-    bool readOnly;
-    bool setRootPath;
-    QDir::Filters filters;
     QHash<const QFileSystemNode*, bool> bypassFilters;
-    bool nameFilterDisables;
-    //This flag is an optimization for the QFileDialog
-    //It enable a sort which is not recursive, it means
-    //we sort only what we see.
-    bool disableRecursiveSort;
 #if QT_CONFIG(regularexpression)
     QStringList nameFilters;
 #endif
@@ -322,7 +296,6 @@ public:
 
     QFileSystemNode root;
 
-    QBasicTimer fetchingTimer;
     struct Fetching {
         QString dir;
         QString file;
@@ -330,6 +303,18 @@ public:
     };
     QVector<Fetching> toFetch;
 
+    QBasicTimer fetchingTimer;
+
+    QDir::Filters filters = QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs;
+    int sortColumn = 0;
+    Qt::SortOrder sortOrder = Qt::AscendingOrder;
+    bool forceSort = true;
+    bool readOnly = true;
+    bool setRootPath = false;
+    bool nameFilterDisables = true; // false on windows, true on mac and unix
+    // This flag is an optimization for QFileDialog. It enables a sort which is
+    // not recursive, meaning we sort only what we see.
+    bool disableRecursiveSort = false;
 };
 Q_DECLARE_TYPEINFO(QFileSystemModelPrivate::Fetching, Q_MOVABLE_TYPE);