Changeset 92913 in vbox for trunk/src

Timestamp:

Dec 15, 2021 8:25:52 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

148869

Message:

FE/Qt: bugref:9371. Using qt instead of RT to deermine host file type.

Location:

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

Files:

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

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

@@ -31 +31 @@
 #include "UIErrorString.h"
 #include "UIFileManager.h"
+#include "UIFileManagerHostTable.h"
 #include "UIFileManagerGuestTable.h"
 #include "UIMessageCenter.h"
@@ -618 +619 @@
     foreach (const QString &strSource, sourcePaths)
     {
-        RTFSOBJINFO ObjInfo;
-        int vrc = RTPathQueryInfo(strSource.toStdString().c_str(), &ObjInfo, RTFSOBJATTRADD_NOTHING);
-        if (RT_SUCCESS(vrc))
-        {
-            /* If the source is an directory, make sure to add the appropriate flag to make copying work
-             * into existing directories on the guest. This otherwise would fail (default): */
-            if (RTFS_IS_DIRECTORY(ObjInfo.Attr.fMode))
-                aFlags << strDirectoryFlags;
-            else
-                aFlags << strFileFlags;
-        }
+        KFsObjType enmFileType = UIFileManagerHostTable::fileType(strSource);
+        if (enmFileType == KFsObjType_Unknown)
+            emit sigLogOutput(QString("Querying information for host item %1 failed.").arg(strSource), m_strTableName, FileManagerLogType_Error);
+        /* If the source is an directory, make sure to add the appropriate flag to make copying work
+         * into existing directories on the guest. This otherwise would fail (default): */
+        else if (enmFileType == KFsObjType_Directory)
+            aFlags << strDirectoryFlags;
         else
-            emit sigLogOutput(QString("Querying information for host item \"%s\" failed with %Rrc").arg(strSource.toStdString().c_str(), vrc),
-                              m_strTableName, FileManagerLogType_Error);
+            aFlags << strFileFlags;
     }
 

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

@@ -328 +328 @@
 }
 
-/* static */ KFsObjType UIFileManagerHostTable::fileType(const QFileInfo &fsInfo)
+/* static */
+KFsObjType UIFileManagerHostTable::fileType(const QFileInfo &fsInfo)
 {
     if (!fsInfo.exists())
@@ -340 +341 @@
     else if (fsInfo.isDir())
         return KFsObjType_Directory;
-
     return KFsObjType_Unknown;
+}
+
+/* static */
+KFsObjType  UIFileManagerHostTable::fileType(const QString &strPath)
+{
+    return fileType(QFileInfo(strPath));
 }
 

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

@@ -39 +39 @@
     UIFileManagerHostTable(UIActionPool *pActionPool, QWidget *pParent = 0);
     static KFsObjType  fileType(const QFileInfo &fsInfo);
+    static KFsObjType  fileType(const QString &strPath);
 
 protected: