Changeset 651 for trunk/src/gui/dialogs/qfilesystemmodel.cpp

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/dialogs/qfilesystemmodel.cpp (modified) (3 diffs)

trunk/src/gui/dialogs/qfilesystemmodel.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -1223 +1223 @@
         for (; it != urls.constEnd(); ++it) {
             QString path = (*it).toLocalFile();
-            success = QFile::copy(path, to + QFileInfo(path).fileName())
-                      && QFile::remove(path) && success;
+            success = QFile::rename(path, to + QFileInfo(path).fileName()) && success;
         }
         break;
@@ -1785 +1784 @@
         if (info.size() == -1 && parentNode != &root) {
 #else
-        if (info.size() == -1) {
+        if (info.size() == -1) {
 #endif
             removeNode(parentNode, fileName);