Changeset 172 for trunk/src/gui/util

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/util/qcompleter.cpp (modified) (6 diffs)

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_)
             && (!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 )
         setCaseSensitivity(Qt::CaseInsensitive);
 #else
@@ -1621 +1621 @@
     } while (idx.isValid());
 
-#if !defined(Q_OS_WIN) || defined(Q_OS_WINCE)
+#if !defined(Q_OS_)
     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 )
     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 )
     if (!doubleSlash.isEmpty())
         parts[0].prepend(doubleSlash);