Changeset 173

Timestamp:

Sep 9, 2009, 2:38:34 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/dialogs: Fixed: Duplicate file names were added to the file list in QFileDialog when an existing directory was typed directly in the filename entry field with a different case of letters than in the original (on platforms with case insensitive file systems), #65.

Location:

trunk/src/gui/dialogs

Files:

• qfilesystemmodel.cpp (modified) (3 diffs)
• qfilesystemmodel_p.h (modified) (5 diffs)

trunk/src/gui/dialogs/qfilesystemmodel.cpp

@@ -353 +353 @@
         absolutePath = QDir(longPath).absolutePath();
 
-    // ### TODO can we use bool QAbstractFileEngine::caseSensitive() const?
     QStringList pathElements = absolutePath.split(QLatin1Char('/'), QString::SkipEmptyParts);
     if ((pathElements.isEmpty())
@@ -1089 +1088 @@
 
     QList<QPair<QFileSystemModelPrivate::QFileSystemNode*, int> > values;
-    QHash<QString, QFileSystemNode *>::const_iterator iterator;
+    QHash<FileNameKey, QFileSystemNode *>::const_iterator iterator;
     int i = 0;
     for(iterator = indexNode->children.begin() ; iterator != indexNode->children.end() ; ++iterator) {
@@ -1588 +1587 @@
     QStringList newFiles = files;
     qSort(newFiles.begin(), newFiles.end());
-    QHash<QString, QFileSystemNode*>::const_iterator i = parentNode->children.constBegin();
+    QHash<FileNameKey, QFileSystemNode*>::const_iterator i = parentNode->children.constBegin();
     while (i != parentNode->children.constEnd()) {
         QStringList::iterator iterator;

trunk/src/gui/dialogs/qfilesystemmodel_p.h

@@ -81 +81 @@
 
 public:
+
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+    // On Windows and OS/2, file names are case insensitive so use a lowercased
+    // string as a key in the hash map of name->node pairs. Note that strictly
+    // speaking we should use QAbstractFileEngine::caseSensitive() to check if
+    // the case should matter but on these platforms this method in QFSFileEngine
+    // always returns false while doing this check would require to add a
+    // QFileSystemNode* argument to the constructor and hence change almost every
+    // line that uses the hash because the automatic QString->FileNameKey would
+    // not work in this case. Note2: on Windows, evreything actually works without
+    // this class but that's just because we use qt_GetLongPathName() which
+    // always returns a real filename case and any changes in the case are
+    // instantly picked up by QFileSystemWatcher anyway (otherwise we'd get dups
+    // in the file ilst there too).
+    class FileNameKey : public QString
+    {
+    public:
+        FileNameKey(const QString &copy) : QString(copy.toLower()) {}
+    };
+#else
+    typedef QString FileNameKey;
+#endif
+
     class QFileSystemNode
     {
@@ -87 +110 @@
             : fileName(filename), populatedChildren(false), isVisible(false), parent(p), info(0) {}
         ~QFileSystemNode() {
-            QHash<QString, QFileSystemNode*>::const_iterator i = children.constBegin();
+            QHash<FileNameKey, QFileSystemNode*>::const_iterator i = children.constBegin();
             while (i != children.constEnd()) {
                     delete i.value();
@@ -162 +185 @@
             if (info)
                 info->icon = iconProvider->icon(QFileInfo(path));
-            QHash<QString, QFileSystemNode *>::const_iterator iterator;
+            QHash<FileNameKey, QFileSystemNode *>::const_iterator iterator;
             for(iterator = children.constBegin() ; iterator != children.constEnd() ; ++iterator) {
                 iterator.value()->updateIcon(iconProvider, path + QLatin1Char('/') + iterator.value()->fileName);
@@ -171 +194 @@
             if (info)
                 info->displayType = iconProvider->type(QFileInfo(path));
-            QHash<QString, QFileSystemNode *>::const_iterator iterator;
+            QHash<FileNameKey, QFileSystemNode *>::const_iterator iterator;
             for(iterator = children.constBegin() ; iterator != children.constEnd() ; ++iterator) {
                  iterator.value()->retranslateStrings(iconProvider, path + QLatin1Char('/') + iterator.value()->fileName);
@@ -179 +202 @@
         bool populatedChildren;
         bool isVisible;
-        QHash<QString,QFileSystemNode *> children;
+        QHash<FileNameKey, QFileSystemNode *> children;
         QList<QString> visibleChildren;
         QFileSystemNode *parent;