Changeset 172 for trunk

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

Files:

• corelib/io/qdir.cpp (modified) (7 diffs)
• corelib/io/qfile.cpp (modified) (2 diffs)
• corelib/io/qfileinfo.cpp (modified) (1 diff)
• corelib/io/qfsfileengine.cpp (modified) (1 diff)
• corelib/io/qiodevice.cpp (modified) (1 diff)
• corelib/io/qtextstream.cpp (modified) (2 diffs)
• corelib/io/qurl.cpp (modified) (1 diff)
• gui/dialogs/qfiledialog.cpp (modified) (4 diffs)
• gui/dialogs/qfiledialog_p.h (modified) (3 diffs)
• gui/dialogs/qfileinfogatherer.cpp (modified) (1 diff)
• gui/dialogs/qfilesystemmodel.cpp (modified) (4 diffs)
• gui/util/qcompleter.cpp (modified) (6 diffs)

trunk/src/corelib/io/qdir.cpp

@@ -62 +62 @@
 static QString driveSpec(const QString &path)
 {
-#ifdef Q_OS_WIN
+#if
     if (path.size() < 2)
         return QString();
@@ -147 +147 @@
         if ((path.endsWith(QLatin1Char('/')) || path.endsWith(QLatin1Char('\\')))
                 && path.length() > 1) {
-#ifdef Q_OS_WIN
+#if
             if (!(path.length() == 3 && path.at(1) == QLatin1Char(':')))
 #endif
@@ -780 +780 @@
     }
 
-#ifdef Q_OS_WIN
+#if
     if (fileDrive.toLower() != dirDrive.toLower()
         || (file.startsWith(QLatin1String("//"))
@@ -799 +799 @@
     int i = 0;
     while (i < dirElts.size() && i < fileElts.size() &&
-#ifdef Q_OS_WIN
+#if
            dirElts.at(i).toLower() == fileElts.at(i).toLower())
 #else
@@ -2075 +2075 @@
         if(p[i] == QLatin1Char('/')) {
             while(i < len-1 && p[i+1] == QLatin1Char('/')) {
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) //allow unc paths
+#if ) //allow unc paths
                 if(!i)
                     break;
@@ -2135 +2135 @@
                 }
             } else if(last != -1 && iwrite - last == 1) {
-#ifdef Q_OS_WIN
+#if
                 eaten = (iwrite > 2);
 #else
@@ -2233 +2233 @@
     \snippet doc/src/snippets/code/src_corelib_io_qdir.cpp 13
 
-    If the file name contains characters that cannot be part of a valid C++ function name 
+    If the file name contains characters that cannot be part of a valid C++ function name
     (such as '-'), they have to be replaced by the underscore character ('_').
 

trunk/src/corelib/io/qfile.cpp

@@ -1524 +1524 @@
     int writeBufferSize = writeBuffer.size();
     if ((openMode & QIODevice::Unbuffered) || writeBufferSize + 1 >= QFILE_WRITEBUFFER_SIZE
-#ifdef Q_OS_WIN
+#if
         || ((openMode & QIODevice::Text) && c == '\n' && writeBufferSize + 2 >= QFILE_WRITEBUFFER_SIZE)
 #endif
@@ -1547 +1547 @@
 
     int len = 1;
-#ifdef Q_OS_WIN
+#if
     if ((openMode & QIODevice::Text) && c == '\n') {
         ++len;

trunk/src/corelib/io/qfileinfo.cpp

@@ -171 +171 @@
         break;
     };
-#ifdef Q_OS_UNIX
+#if
     return QT_ACCESS(QFile::encodeName(data->fileName).data(), mode) == 0;
 #endif

trunk/src/corelib/io/qfsfileengine.cpp

@@ -146 +146 @@
     known.insert(path);
     do {
-#ifdef Q_OS_WIN
+#if
         // UNC, skip past the first two elements
         if (separatorPos == 0 && tmpPath.startsWith(QLatin1String("//")))

trunk/src/corelib/io/qiodevice.cpp

@@ -1213 +1213 @@
         return qint64(-1);
 
-#ifdef Q_OS_WIN
+#if
     if (d->openMode & Text) {
         const char *endOfData = data + maxSize;

trunk/src/corelib/io/qtextstream.cpp

@@ -652 +652 @@
         return true;
 
-#if defined (Q_OS_WIN)
+#if defined)
     // handle text translation and bypass the Text flag in the device.
     bool textModeEnabled = device->isTextModeEnabled();
@@ -685 +685 @@
         return false;
 
-#if defined (Q_OS_WIN)
+#if defined)
     // replace the text flag
     if (textModeEnabled)

trunk/src/corelib/io/qurl.cpp

@@ -5926 +5926 @@
     if (fileInfo.isAbsolute()) {
         QString absPath = fileInfo.absolutePath();
-#ifdef Q_OS_WIN
+#if
         if (absPath.size() > 1 && absPath.at(1) == QLatin1Char(':'))
             absPath = absPath.mid(2);

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
+                //On Windows 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
     if (pathCopy == QLatin1String("\\") || pathCopy == QLatin1String("\\\\"))
         return QStringList(pathCopy);
@@ -3183 +3183 @@
     QRegExp re(QLatin1String("[") + QRegExp::escape(sep) + QLatin1String("]"));
 
-#ifdef Q_OS_WIN
+#if
     QStringList parts = pathCopy.split(re, QString::SkipEmptyParts);
     if (!doubleSlash.isEmpty() && !parts.isEmpty())
@@ -3195 +3195 @@
 #endif
 
-#ifdef Q_OS_WIN
+#if
     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
         setCaseSensitivity(Qt::CaseInsensitive);
 #endif
@@ -196 +196 @@
         return MAX_PATH;
 #endif //Q_OS_WINCE
+
+
+
 #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 )
     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_)
         && 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 )
     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
+        // On Windows, "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_)
     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_)
             && (!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);