Changeset 172 for trunk/src/gui

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.

Location:

trunk/src/gui

Files:

• dialogs/qfiledialog.cpp (modified) (4 diffs)
• dialogs/qfiledialog_p.h (modified) (3 diffs)
• dialogs/qfileinfogatherer.cpp (modified) (1 diff)
• dialogs/qfilesystemmodel.cpp (modified) (4 diffs)
• util/qcompleter.cpp (modified) (6 diffs)

trunk/src/gui/dialogs/qfiledialog.cpp

@@ -782 +782 @@
             text.remove(current);
             if (text.at(0) == QDir::separator()
-#ifdef Q_OS_WIN
-                //On Windows both cases can happen
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+                //On Windows and OS/2 both cases can happen
                 || text.at(0) == QLatin1Char('/')
 #endif
@@ -3171 +3171 @@
     QString pathCopy = QDir::toNativeSeparators(path);
     QString sep = QDir::separator();
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
     if (pathCopy == QLatin1String("\\") || pathCopy == QLatin1String("\\\\"))
         return QStringList(pathCopy);
@@ -3183 +3183 @@
     QRegExp re(QLatin1String("[") + QRegExp::escape(sep) + QLatin1String("]"));
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
     QStringList parts = pathCopy.split(re, QString::SkipEmptyParts);
     if (!doubleSlash.isEmpty() && !parts.isEmpty())
@@ -3195 +3195 @@
 #endif
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
     bool startsFromRoot = !parts.isEmpty() && parts[0].endsWith(QLatin1Char(':'));
 #else

trunk/src/gui/dialogs/qfiledialog_p.h

@@ -100 +100 @@
     QFSCompletor(QAbstractItemModel *model, QObject *parent = 0) : QCompleter(model, parent), proxyModel(0), sourceModel(0)
     {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         setCaseSensitivity(Qt::CaseInsensitive);
 #endif
@@ -196 +196 @@
         return MAX_PATH;
 #endif //Q_OS_WINCE
+#elif defined(Q_OS_OS2)
+        Q_UNUSED(path);
+        return CCHMAXPATH;
 #else
         Q_UNUSED(path);
@@ -296 +299 @@
     bool fileNameLabelExplicitlySat;
     QStringList nameFilters;
-    
+
     // Members for using native dialogs:
     bool nativeDialogInUse;

trunk/src/gui/dialogs/qfileinfogatherer.cpp

@@ -285 +285 @@
 {
     QString driveName = drive.absoluteFilePath();
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_OS2)
     if (driveName.startsWith(QLatin1Char('/'))) // UNC host
         return drive.fileName();

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);

trunk/src/gui/util/qcompleter.cpp

@@ -135 +135 @@
     To provide completions, QCompleter needs to know the path from an index.
     This is provided by pathFromIndex(). The default implementation of
-    pathFromIndex(), returns the data for the \l{Qt::EditRole}{edit role} 
+    pathFromIndex(), returns the data for the \l{Qt::EditRole}{edit role}
     for list models and the absolute file path if the mode is a QDirModel.
 
@@ -483 +483 @@
         QString str = source->index(i, c->column).data().toString();
         if (str.startsWith(c->prefix, c->cs)
-#if !defined(Q_OS_WIN) || defined(Q_OS_WINCE)
+#if !defined(Q_OS_OS2) && (!defined(Q_OS_WIN) || defined(Q_OS_WINCE))
             && (!dirModel || QDir::toNativeSeparators(str) != QDir::separator())
 #endif
@@ -988 +988 @@
 #ifndef QT_NO_DIRMODEL
     if (qobject_cast<QDirModel *>(model)) {
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_OS2)
         setCaseSensitivity(Qt::CaseInsensitive);
 #else
@@ -1621 +1621 @@
     } while (idx.isValid());
 
-#if !defined(Q_OS_WIN) || defined(Q_OS_WINCE)
+#if !defined(Q_OS_OS2) && (!defined(Q_OS_WIN) || defined(Q_OS_WINCE))
     if (list.count() == 1) // only the separator or some other text
         return list[0];
@@ -1655 +1655 @@
     QString pathCopy = QDir::toNativeSeparators(path);
     QString sep = QDir::separator();
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_OS2)
     if (pathCopy == QLatin1String("\\") || pathCopy == QLatin1String("\\\\"))
         return QStringList(pathCopy);
@@ -1668 +1668 @@
     QStringList parts = pathCopy.split(re);
 
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_OS2)
     if (!doubleSlash.isEmpty())
         parts[0].prepend(doubleSlash);