Changeset 172 for trunk/src/corelib/io

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/corelib/io

Files:

• qdir.cpp (modified) (7 diffs)
• qfile.cpp (modified) (2 diffs)
• qfileinfo.cpp (modified) (1 diff)
• qfsfileengine.cpp (modified) (1 diff)
• qiodevice.cpp (modified) (1 diff)
• qtextstream.cpp (modified) (2 diffs)
• qurl.cpp (modified) (1 diff)

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