Changeset 1027

Timestamp:

Aug 25, 2011, 9:35:37 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

Make QFileSystemModel put "." and ".." entries first.

There are consumers of QFileSystemModel that do not exclude these
pseudo directories from the listing (e.g. the File System view in Qt Creator)
and having ".." coming after directory names that start with e.g. an exclamation
mark ("!") there looks weird.

Suggested by Rudi Ihle.

File:

• trunk/src/gui/dialogs/qfilesystemmodel.cpp (modified) (1 diff)

trunk/src/gui/dialogs/qfilesystemmodel.cpp

@@ -1079 +1079 @@
             if (left ^ right)
                 return left;
+
+            // place "." and ".." pseudo dirs on top
+            if (left) {
+                int lw = l->fileName == QLatin1String(".") ? 2 :
+                         l->fileName == QLatin1String("..") ? 1 : 0;
+                int rw = r->fileName == QLatin1String(".") ? 2 :
+                         r->fileName == QLatin1String("..") ? 1 : 0;
+                if (lw || rw)
+                    return lw > rw;
+            }
 #endif
             return QFileSystemModelPrivate::naturalCompare(l->fileName,