Changeset 769 for trunk/src/corelib/io/qfsfileengine_unix.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/io/qfsfileengine_unix.cpp (modified) (5 diffs)

trunk/src/corelib/io/qfsfileengine_unix.cpp

@@ -82 +82 @@
              || (fileName.at(0) == QLatin1Char('/') && fileName.at(1) == QLatin1Char('/')))));
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #endif
 
@@ -99 +133 @@
                 && QT_STAT(QFile::encodeName(fileName), &statBuf) == 0
                 && (statBuf.st_mode & S_IFMT) == S_IFREG) {
-                mode += "+";
+                mode += ;
             } else {
                 mode = "wb+";
@@ -428 +462 @@
     ) // End TRAP
     delete fm;
-    // ### Add error reporting on failure
-    return (err == KErrNone);
+    if (err == KErrNone)
+        return true;
+    d->setSymbianError(err, QFile::CopyError, QLatin1String("copy error"));
+    return false;
 #else
     Q_UNUSED(newName);
@@ -669 +705 @@
         } else if (fd == -1) {
             // ### actually covers two cases: d->fh and when the file is not open
+
+
+
+
+
+
+
+
+
+
             could_stat = (QT_STAT(nativeFilePath.constData(), &st) == 0);
         } else {
@@ -1271 +1317 @@
     int extra = offset % pageSize;
 
-    if (size + extra > (size_t)-1) {
+    if () {
         q->setError(QFile::UnspecifiedError, qt_error_string(int(EINVAL)));
         return 0;