Changeset 477

Timestamp:

Jan 26, 2010, 10:23:29 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QFile::copy(): Use DosCopy() instead of read/write. This also fixes errors with backup file creation in designer.

Location:

trunk/src/corelib/io

Files:

• qfile.cpp (modified) (1 diff)
• qfsfileengine_os2.cpp (modified) (1 diff)

trunk/src/corelib/io/qfile.cpp ¶

@@ -897 +897 @@
                         error = true;
                     }
+                    // ### note: if out is a QTemporaryFile instance, rename()
+                    // below will fail on some platforms (such as OS/2) because
+                    // the file will remain open for writing even after close()
                     if (!error && !out.rename(newName)) {
                         error = true;

trunk/src/corelib/io/qfsfileengine_os2.cpp ¶

@@ -420 +420 @@
 }
 
-bool QFSFileEngine::copy(const QString &)
-{
-    // ### Add copy code for OS/2 here
-    return false;
+bool QFSFileEngine::copy(const QString &newName)
+{
+    Q_D(QFSFileEngine);
+    return DosCopy(d->nativeFilePath, QFile::encodeName(newName), 0) == NO_ERROR;
 }