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

Timestamp:

Sep 9, 2009, 1:54:31 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib/io, gui/dialogs: Handle DOS-like filesystem details (drives, slashes) on OS/2 similarly to Win32.

File:

• trunk/src/gui/dialogs/qfilesystemmodel.cpp (modified) (4 diffs)

trunk/src/gui/dialogs/qfilesystemmodel.cpp

@@ -356 +356 @@
     QStringList pathElements = absolutePath.split(QLatin1Char('/'), QString::SkipEmptyParts);
     if ((pathElements.isEmpty())
-#if !defined(Q_OS_WIN) || defined(Q_OS_WINCE)
+#if !defined(Q_OS_OS2) && (!defined(Q_OS_WIN) || defined(Q_OS_WINCE))
         && QDir::fromNativeSeparators(longPath) != QLatin1String("/")
 #endif
@@ -362 +362 @@
         return const_cast<QFileSystemModelPrivate::QFileSystemNode*>(&root);
     QModelIndex index = QModelIndex(); // start with "My Computer"
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_OS2)
     if (absolutePath.startsWith(QLatin1String("//"))) { // UNC path
         QString host = QLatin1String("\\\\") + pathElements.first();
@@ -401 +401 @@
     for (int i = 0; i < pathElements.count(); ++i) {
         QString element = pathElements.at(i);
-#ifdef Q_OS_WIN
-        // On Windows, "filename......." and "filename" are equivalent Task #133928
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+        // On Windows and OS/2, "filename......." and "filename" are equivalent Task #133928
         while (element.endsWith(QLatin1Char('.')))
             element.chop(1);
@@ -1266 +1266 @@
     }
     QString fullPath = QDir::fromNativeSeparators(path.join(QDir::separator()));
-#if !defined(Q_OS_WIN) || defined(Q_OS_WINCE)
+#if !defined(Q_OS_OS2) && (!defined(Q_OS_WIN) || defined(Q_OS_WINCE))
     if ((fullPath.length() > 2) && fullPath[0] == QLatin1Char('/') && fullPath[1] == QLatin1Char('/'))
         fullPath = fullPath.mid(1);