Changeset 74526 in vbox for trunk/src/VBox/Main/include/GuestDnDPrivate.h

Timestamp:

Sep 28, 2018 3:08:24 PM (6 years ago)

Author:

vboxsync

Message:

DnD: Renaming for DnDURIObject / DnDURIList classes, some typedefs to distinguish flags better. No functional changes.

File:

• trunk/src/VBox/Main/include/GuestDnDPrivate.h (modified) (7 diffs)

trunk/src/VBox/Main/include/GuestDnDPrivate.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2011-2017 Oracle Corporation
+ * Copyright (C) 2011-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -166 +166 @@
     int fromURIList(const DnDURIList &lstURI)
     {
-        return fromString(lstURI.RootToString());
+        return fromString(lstURI.GetRootEntries());
     }
 
@@ -390 +390 @@
 public:
 
-    int createIntermediate(DnDURIObject::Type enmType = DnDURIObject::Unknown)
+    int createIntermediate(DnDURIObject::Type enmType = DnDURIObject::Type_Unknown)
     {
         reset();
@@ -564 +564 @@
         switch (Obj.GetType())
         {
-            case DnDURIObject::Directory:
-            case DnDURIObject::File:
+            case DnDURIObject::Type_Directory:
+            case DnDURIObject::Type_File:
                 rc = VINF_SUCCESS;
                 break;
@@ -647 +647 @@
                 rc = lstURI.AppendURIPathsFromList(lstURIOrg, DNDURILIST_FLAGS_KEEP_OPEN);
                 if (RT_SUCCESS(rc))
-                    cObjToProcess = lstURI.TotalCount();
+                    cObjToProcess = lstURI.GetTotalCount();
             }
         }
@@ -659 +659 @@
         LogFlowFuncEnter();
 
-        int rc = lstURI.RootFromURIData(Data.getData(), Data.getSize(), 0 /* uFlags */);
+        int rc = lstURI.SetFromURIData(Data.getData(), Data.getSize(), 0 /* uFlags */);
         if (RT_SUCCESS(rc))
         {
-            const size_t cRootCount = lstURI.RootCount();
+            const size_t cRootCount = lstURI.GetRootCount();
             LogFlowFunc(("cRootCount=%zu, cObjToProcess=%RU64\n", cRootCount, cObjToProcess));
             if (cRootCount > cObjToProcess)
@@ -675 +675 @@
         const char *pszDroppedFilesDir = droppedFiles.GetDirAbs();
 
-        Utf8Str strURIs = lstURI.RootToString(RTCString(pszDroppedFilesDir));
+        Utf8Str strURIs = lstURI.GetRootEntries(RTCString(pszDroppedFilesDir));
         size_t cbData = strURIs.length();
 
-        LogFlowFunc(("%zu root URIs (%zu bytes)\n", lstURI.RootCount(), cbData));
+        LogFlowFunc(("%zu root URIs (%zu bytes)\n", lstURI.GetRootCount(), cbData));
 
         int rc;