Changeset 71537 in vbox

Timestamp:

Mar 28, 2018 12:44:40 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699 Build fix

Location:

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

Files:

• UIGuestFileTable.cpp (modified) (1 diff)
• UIHostFileTable.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestFileTable.cpp

@@ -246 +246 @@
         QString destinationFilePath =  UIPathOperations::mergePaths(guestDestinationPath, UIPathOperations::getObjectName(hostSourcePath));
         /** @todo listen to CProgress object to monitor copy operation: */
-        /*CProgress comProgress =*/ m_comGuestSession.FileCopyFromGuest(hostSourcePath, destinationFilePath, flags);
+        /*CProgress comProgress =*/ m_comGuestSession.FileCopyToGuest(hostSourcePath, destinationFilePath, flags);
     }
     else if(hostFileInfo.isDir())
     {
-        QVector<KDirectoryCopyFlag> aFlags(KDirectoryCopyFlag_CopyIntoExisting);
+        QVector<KDirectoryCopyFlag> aFlags(KDirectoryCopyFlag_None/*CopyIntoExisting*/);
         /** @todo listen to CProgress object to monitor copy operation: */
         /*CProgress comProgress = */ m_comGuestSession.DirectoryCopyToGuest(hostSourcePath, guestDestinationPath, aFlags);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIHostFileTable.cpp

@@ -335 +335 @@
         return propertyString;
     }
-    else
-    {
-        int fileCount = 0;
-        int directoryCount = 0;
-        ULONG64 totalSize = 0;
-
-        for(int i = 0; i < selectedObjects.size(); ++i)
-        {
-            QFileInfo fileInfo(selectedObjects.at(i));
-            if (!fileInfo.exists())
-                continue;
-            if (fileInfo.isFile())
-                ++fileCount;
-            if (fileInfo.isDir())
-                ++directoryCount;
-            totalSize += fileInfo.size();
-        }
-        QString propertyString;
-        propertyString += "<b>Selected:</b> " + QString::number(fileCount) + " files ";
-        propertyString += "and " + QString::number(directoryCount) + " directories";
-        propertyString += "<br/>";
-        propertyString += "<b>Size:</b> " + QString::number(totalSize) + QString(" bytes");
-        if (totalSize >= m_iKiloByte)
-            propertyString += " (" + humanReadableSize(totalSize) + ")";
-
-
-        return propertyString;
-    }
-    return QString();
+
+    int fileCount = 0;
+    int directoryCount = 0;
+    ULONG64 totalSize = 0;
+
+    for(int i = 0; i < selectedObjects.size(); ++i)
+    {
+        QFileInfo fileInfo(selectedObjects.at(i));
+        if (!fileInfo.exists())
+            continue;
+        if (fileInfo.isFile())
+            ++fileCount;
+        if (fileInfo.isDir())
+            ++directoryCount;
+        totalSize += fileInfo.size();
+    }
+    QString propertyString;
+    propertyString += "<b>Selected:</b> " + QString::number(fileCount) + " files ";
+    propertyString += "and " + QString::number(directoryCount) + " directories";
+    propertyString += "<br/>";
+    propertyString += "<b>Size:</b> " + QString::number(totalSize) + QString(" bytes");
+    if (totalSize >= m_iKiloByte)
+        propertyString += " (" + humanReadableSize(totalSize) + ")";
+
+    return propertyString;
 }