Changeset 173 for trunk/src/gui/dialogs/qfilesystemmodel.cpp

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.

File:

• trunk/src/gui/dialogs/qfilesystemmodel.cpp (modified) (3 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;