Changeset 92900 in vbox

Timestamp:

Dec 14, 2021 4:52:04 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9371. Incorparating new copy flags.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl

Files:

• UIFileManagerGuestTable.cpp (modified) (2 diffs)
• UIFileManagerHostTable.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp

@@ -624 +624 @@
              * into existing directories on the guest. This otherwise would fail (default). */
             if (RTFS_IS_DIRECTORY(ObjInfo.Attr.fMode))
+            {
                 aFlags.append("CopyIntoExisting");
+                aFlags.append("Recursive");
+                aFlags.append("FollowLinks");
+            }
             else /* Make sure to keep the vector in sync with the number of source items by adding an empty entry. */
                 aFlags.append("");
@@ -690 +694 @@
         KFsObjType eType = fileType(fileInfo);
         if (eType == KFsObjType_Directory)
+        {
             aFlags.append("CopyIntoExisting");
+            aFlags.append("Recursive");
+            aFlags.append("FollowLinks");
+        }
         else /* Make sure to keep the vector in sync with the number of source items by adding an empty entry. */
             aFlags.append("");

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.cpp

@@ -373 +373 @@
         propertyStringList << UIFileManager::tr("<b>Owner:</b> %1").arg(fileInfo.owner());
 
-        return propertyStringList.join(QString());;
+        return propertyStringList.join(QString());
     }