Changeset 81155 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 8, 2019 2:45:09 PM (6 years ago)

Author:

vboxsync

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

133789

Message:

FE/Qt: bugref:6699. Some more fixes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIPathOperations.cpp (modified) (2 diffs)
• guestctrl/UIFileManagerGuestTable.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPathOperations.cpp

@@ -64 +64 @@
     if (doesPathStartWithDriveLetter(newPath))
     {
-        if (newPath.at(newPath.length() - 1) != delimiter)
+        if (newPath.length() == 2)
+        {
             newPath += delimiter;
+            return newPath;
+        }
+        if (newPath.at(2) != delimiter)
+            newPath.insert(2, delimiter);
         return newPath;
     }
@@ -75 +80 @@
 /* static */ QString UIPathOperations::sanitize(const QString &path)
 {
-    //return addStartDelimiter(removeTrailingDelimiters(removeMultipleDelimiters(path)));
     QString newPath = addStartDelimiter(removeTrailingDelimiters(removeMultipleDelimiters(path))).replace(dosDelimiter, delimiter);
     return newPath;

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

@@ -199 +199 @@
                 QVector<QVariant> data;
                 QDateTime changeTime = QDateTime::fromMSecsSinceEpoch(fsInfo.GetChangeTime()/RT_NS_1MS);
-
                 KFsObjType fsObjectType = fileType(fsInfo);
                 UICustomFileSystemItem *item = new UICustomFileSystemItem(fsInfo.GetName(), parent, fsObjectType);
-
                 if (!item)
                     continue;
-
                 item->setData(static_cast<qulonglong>(fsInfo.GetObjectSize()), UICustomFileSystemModelColumn_Size);
                 item->setData(changeTime, UICustomFileSystemModelColumn_ChangeTime);
@@ -297 +294 @@
 
     m_comGuestSession.FsObjRename(item->path(), newPath, aFlags);
+
     if (!m_comGuestSession.isOk())
     {