Changeset 58370 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Oct 22, 2015 10:34:26 AM (9 years ago)

Author:

vboxsync

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

103586

Message:

DnD: Warnings.

File:

• trunk/src/VBox/GuestHost/DragAndDrop/DnDDroppedFiles.cpp (modified) (12 diffs)

trunk/src/VBox/GuestHost/DragAndDrop/DnDDroppedFiles.cpp

@@ -35 +35 @@
 
 DnDDroppedFiles::DnDDroppedFiles(void)
-    : hDir(NULL)
-    , fOpen(0) { }
-
-DnDDroppedFiles::DnDDroppedFiles(const char *pszPath, uint32_t fOpen)
-    : hDir(NULL)
-    , fOpen(0)
-{
-    OpenEx(pszPath, fOpen);
+    : m_fOpen(0)
+    , m_hDir(NULL) { }
+
+DnDDroppedFiles::DnDDroppedFiles(const char *pszPath, uint32_t fFlags)
+    : m_fOpen(0)
+    , m_hDir(NULL)
+{
+    OpenEx(pszPath, fFlags);
 }
 
@@ -56 +56 @@
     AssertPtrReturn(pszFile, VERR_INVALID_POINTER);
 
-    if (!this->lstFiles.contains(pszFile))
-        this->lstFiles.append(pszFile);
+    if (!this->m_lstFiles.contains(pszFile))
+        this->m_lstFiles.append(pszFile);
     return VINF_SUCCESS;
 }
@@ -65 +65 @@
     AssertPtrReturn(pszDir, VERR_INVALID_POINTER);
 
-    if (!this->lstDirs.contains(pszDir))
-        this->lstDirs.append(pszDir);
+    if (!this->m_lstDirs.contains(pszDir))
+        this->m_lstDirs.append(pszDir);
     return VINF_SUCCESS;
 }
@@ -73 +73 @@
 {
     int rc;
-    if (this->hDir != NULL)
-    {
-        rc = RTDirClose(this->hDir);
-        if (RT_SUCCESS(rc))
-            this->hDir = NULL;
+    if (this->m_hDir != NULL)
+    {
+        rc = RTDirClose(this->m_hDir);
+        if (RT_SUCCESS(rc))
+            this->m_hDir = NULL;
     }
     else
@@ -93 +93 @@
 const char *DnDDroppedFiles::GetDirAbs(void) const
 {
-    return this->strPathAbs.c_str();
+    return this->m_strPathAbs.c_str();
 }
 
 bool DnDDroppedFiles::IsOpen(void) const
 {
-    return (this->hDir != NULL);
+    return (this->m_hDir != NULL);
 }
 
@@ -156 +156 @@
             if (RT_SUCCESS(rc))
             {
-                this->hDir       = phDir;
-                this->strPathAbs = pszDropDir;
-                this->fOpen      = fFlags;
+                this->m_hDir       = phDir;
+                this->m_strPathAbs = pszDropDir;
+                this->m_fOpen      = fFlags;
             }
         }
@@ -196 +196 @@
         else
         {
-            this->lstDirs.clear();
-            this->lstFiles.clear();
+            this->m_lstDirs.clear();
+            this->m_lstFiles.clear();
         }
     }
@@ -207 +207 @@
 int DnDDroppedFiles::Reopen(void)
 {
-    if (this->strPathAbs.isEmpty())
+    if (this->m_strPathAbs.isEmpty())
         return VERR_NOT_FOUND;
 
-    return OpenEx(this->strPathAbs.c_str(), this->fOpen);
+    return OpenEx(this->m_strPathAbs.c_str(), this->m_fOpen);
 }
 
 int DnDDroppedFiles::Rollback(void)
 {
-    if (this->strPathAbs.isEmpty())
+    if (this->m_strPathAbs.isEmpty())
         return VINF_SUCCESS;
 
@@ -224 +224 @@
      *       anything recursive here! Steam (tm) knows best ... :-) */
     int rc2;
-    for (size_t i = 0; i < this->lstFiles.size(); i++)
-    {
-        rc2 = RTFileDelete(this->lstFiles.at(i).c_str());
+    for (size_t i = 0; i < this->m_lstFiles.size(); i++)
+    {
+        rc2 = RTFileDelete(this->m_lstFiles.at(i).c_str());
         if (RT_SUCCESS(rc2))
-            this->lstFiles.removeAt(i);
+            this->m_lstFiles.removeAt(i);
 
         if (RT_SUCCESS(rc))
@@ -235 +235 @@
     }
 
-    for (size_t i = 0; i < this->lstDirs.size(); i++)
-    {
-        rc2 = RTDirRemove(this->lstDirs.at(i).c_str());
+    for (size_t i = 0; i < this->m_lstDirs.size(); i++)
+    {
+        rc2 = RTDirRemove(this->m_lstDirs.at(i).c_str());
         if (RT_SUCCESS(rc2))
-            this->lstDirs.removeAt(i);
+            this->m_lstDirs.removeAt(i);
 
         if (RT_SUCCESS(rc))
@@ -248 +248 @@
     if (RT_SUCCESS(rc))
     {
-        Assert(this->lstFiles.isEmpty());
-        Assert(this->lstDirs.isEmpty());
+        Assert(this->m_lstFiles.isEmpty());
+        Assert(this->m_lstDirs.isEmpty());
 
         rc2 = closeInternal();
@@ -256 +256 @@
             /* Try to remove the empty root dropped files directory as well.
              * Might return VERR_DIR_NOT_EMPTY or similar. */
-            rc2 = RTDirRemove(this->strPathAbs.c_str());
+            rc2 = RTDirRemove(this->m_strPathAbs.c_str());
         }
     }