1 files changed, 29 insertions, 13 deletions

diff --git a/src/gui/itemmodels/qfilesystemmodel_p.h b/src/gui/itemmodels/qfilesystemmodel_p.h
index 3cb08d1308..e01b0d56e6 100644
--- a/src/gui/itemmodels/qfilesystemmodel_p.h
+++ b/src/gui/itemmodels/qfilesystemmodel_p.h
@@ -50,7 +50,10 @@ public:
 
 Q_DECLARE_TYPEINFO(QFileSystemModelNodePathKey, Q_RELOCATABLE_TYPE);
 
-inline size_t qHash(const QFileSystemModelNodePathKey &key) { return qHash(key.toCaseFolded()); }
+inline size_t qHash(const QFileSystemModelNodePathKey &key, size_t seed = 0)
+{
+    return qHash(key.toCaseFolded(), seed);
+}
 #else // Q_OS_WIN
 typedef QString QFileSystemModelNodePathKey;
 #endif
@@ -60,7 +63,13 @@ class Q_GUI_EXPORT QFileSystemModelPrivate : public QAbstractItemModelPrivate
     Q_DECLARE_PUBLIC(QFileSystemModel)
 
 public:
-    enum { NumColumns = 4 };
+    enum {
+        NameColumn,
+        SizeColumn,
+        TypeColumn,
+        TimeColumn,
+        NumColumns = 4
+    };
 
     class QFileSystemNode
     {
@@ -81,7 +90,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 QLatin1StringView(""); }
-        inline QDateTime lastModified() const { if (info) return info->lastModified(); return QDateTime(); }
+        inline QDateTime lastModified(const QTimeZone &tz) const { return info ? info->lastModified(tz) : QDateTime(); }
         inline QFile::Permissions permissions() const { if (info) return info->permissions(); return { }; }
         inline bool isReadable() const { return ((permissions() & QFile::ReadUser) != 0); }
         inline bool isWritable() const { return ((permissions() & QFile::WriteUser) != 0); }
@@ -89,7 +98,7 @@ public:
         inline bool isDir() const {
             if (info)
                 return info->isDir();
-            if (children.count() > 0)
+            if (children.size() > 0)
                 return true;
             return false;
         }
@@ -141,9 +150,13 @@ public:
             return visibleChildren.indexOf(childName);
         }
         void updateIcon(QAbstractFileIconProvider *iconProvider, const QString &path) {
+            if (!iconProvider)
+                return;
+
             if (info)
                 info->icon = iconProvider->icon(QFileInfo(path));
-            for (QFileSystemNode *child : qAsConst(children)) {
+
+            for (QFileSystemNode *child : std::as_const(children)) {
                 //On windows the root (My computer) has no path so we don't want to add a / for nothing (e.g. /C:/)
                 if (!path.isEmpty()) {
                     if (path.endsWith(u'/'))
@@ -156,9 +169,12 @@ public:
         }
 
         void retranslateStrings(QAbstractFileIconProvider *iconProvider, const QString &path) {
+            if (!iconProvider)
+                return;
+
             if (info)
                 info->displayType = iconProvider->type(QFileInfo(path));
-            for (QFileSystemNode *child : qAsConst(children)) {
+            for (QFileSystemNode *child : std::as_const(children)) {
                 //On windows the root (My computer) has no path so we don't want to add a / for nothing (e.g. /C:/)
                 if (!path.isEmpty()) {
                     if (path.endsWith(u'/'))
@@ -206,7 +222,7 @@ public:
     inline int translateVisibleLocation(QFileSystemNode *parent, int row) const {
         if (sortOrder != Qt::AscendingOrder) {
             if (parent->dirtyChildrenIndex == -1)
-                return parent->visibleChildren.count() - row - 1;
+                return parent->visibleChildren.size() - row - 1;
 
             if (row < parent->dirtyChildrenIndex)
                 return parent->dirtyChildrenIndex - row - 1;
@@ -241,18 +257,18 @@ public:
     QString type(const QModelIndex &index) const;
     QString time(const QModelIndex &index) const;
 
-    void _q_directoryChanged(const QString &directory, const QStringList &list);
-    void _q_performDelayedSort();
-    void _q_fileSystemChanged(const QString &path, const QList<QPair<QString, QFileInfo>> &);
-    void _q_resolvedName(const QString &fileName, const QString &resolvedName);
+    void directoryChanged(const QString &directory, const QStringList &list);
+    void performDelayedSort();
+    void fileSystemChanged(const QString &path, const QList<std::pair<QString, QFileInfo>> &);
+    void resolvedName(const QString &fileName, const QString &resolvedName);
 
     QDir rootDir;
 #if QT_CONFIG(filesystemwatcher)
 #  ifdef Q_OS_WIN
     QStringList unwatchPathsAt(const QModelIndex &);
-    void watchPaths(const QStringList &paths) { fileInfoGatherer.watchPaths(paths); }
+    void watchPaths(const QStringList &paths) { fileInfoGatherer->watchPaths(paths); }
 #  endif // Q_OS_WIN
-    QFileInfoGatherer fileInfoGatherer;
+    std::unique_ptr<QFileInfoGatherer> fileInfoGatherer;
 #endif // filesystemwatcher
     QTimer delayedSortTimer;
     QHash<const QFileSystemNode*, bool> bypassFilters;