Changeset 71231 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Mar 6, 2018 10:08:58 AM (7 years ago)

Author:

vboxsync

Message:

Main/Guest Control: Renamed FsObjMoveFlags, DirectoryCopyFlags and FileOpenExFlags to FsObjMoveFlag, DirectoryCopyFlag and FileOpenExFlag accordingly to match the rest of the API.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestSessionImpl.cpp (modified) (8 diffs)
• GuestSessionImplTasks.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -2591 +2591 @@
 
 HRESULT GuestSession::directoryCopy(const com::Utf8Str &aSource, const com::Utf8Str &aDestination,
-                                    const std::vector<DirectoryCopyFlags_T> &aFlags, ComPtr<IProgress> &aProgress)
+                                    const std::vector<DirectoryCopyFlag_T> &aFlags, ComPtr<IProgress> &aProgress)
 {
     RT_NOREF(aSource, aDestination, aFlags, aProgress);
@@ -2598 +2598 @@
 
 HRESULT GuestSession::directoryCopyFromGuest(const com::Utf8Str &aSource, const com::Utf8Str &aDestination,
-                                             const std::vector<DirectoryCopyFlags_T> &aFlags, ComPtr<IProgress> &aProgress)
+                                             const std::vector<DirectoryCopyFlag_T> &aFlags, ComPtr<IProgress> &aProgress)
 {
     RT_NOREF(aSource, aDestination, aFlags, aProgress);
@@ -2605 +2605 @@
 
 HRESULT GuestSession::directoryCopyToGuest(const com::Utf8Str &aSource, const com::Utf8Str &aDestination,
-                                           const std::vector<DirectoryCopyFlags_T> &aFlags, ComPtr<IProgress> &aProgress)
+                                           const std::vector<DirectoryCopyFlag_T> &aFlags, ComPtr<IProgress> &aProgress)
 {
     LogFlowThisFuncEnter();
@@ -2618 +2618 @@
         return setError(E_INVALIDARG, tr("Source directory \"%s\" does not exist"), aSource.c_str());
 
-    uint32_t fFlags = DirectoryCopyFlags_None;
+    uint32_t fFlags = DirectoryCopyFlag_None;
     if (aFlags.size())
     {
@@ -3131 +3131 @@
 {
     LogFlowThisFuncEnter();
-    const std::vector<FileOpenExFlags_T> EmptyFlags;
+    const std::vector<FileOpenExFlag_T> EmptyFlags;
     return fileOpenEx(aPath, aAccessMode, aOpenAction, FileSharingMode_All, aCreationMode, EmptyFlags, aFile);
 }
@@ -3137 +3137 @@
 HRESULT GuestSession::fileOpenEx(const com::Utf8Str &aPath, FileAccessMode_T aAccessMode, FileOpenAction_T aOpenAction,
                                  FileSharingMode_T aSharingMode, ULONG aCreationMode,
-                                 const std::vector<FileOpenExFlags_T> &aFlags, ComPtr<IGuestFile> &aFile)
+                                 const std::vector<FileOpenExFlag_T> &aFlags, ComPtr<IGuestFile> &aFile)
 {
     LogFlowThisFuncEnter();
@@ -3205 +3205 @@
         fOpenEx = aFlags[i];
     if (fOpenEx)
-        return setError(E_INVALIDARG, tr("Unsupported FileOpenExFlags values in aFlags (%#x)"), fOpenEx);
+        return setError(E_INVALIDARG, tr("Unsupported FileOpenExFlag value(s) in aFlags (%#x)"), fOpenEx);
     openInfo.mfOpenEx = fOpenEx;
 
@@ -3422 +3422 @@
 
 HRESULT GuestSession::fsObjMove(const com::Utf8Str &aSource, const com::Utf8Str &aDestination,
-                                const std::vector<FsObjMoveFlags_T> &aFlags, ComPtr<IProgress> &aProgress)
+                                const std::vector<FsObjMoveFlag_T> &aFlags, ComPtr<IProgress> &aProgress)
 {
     RT_NOREF(aSource, aDestination, aFlags, aProgress);

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -631 +631 @@
 SessionTaskCopyDirTo::SessionTaskCopyDirTo(GuestSession *pSession,
                                            const Utf8Str &strSource, const Utf8Str &strDest, const Utf8Str &strFilter,
-                                           DirectoryCopyFlags_T enmDirCopyFlags)
+                                           DirectoryCopyFlag_T enmDirCopyFlags)
                                            : GuestSessionTask(pSession)
                                            , mSource(strSource)
@@ -797 +797 @@
     int rc = directoryCreate(mDest, DirectoryCreateFlag_None, uDirMode, fFollowSymlinks);
     if (   rc == VWRN_ALREADY_EXISTS
-        && !(mDirCopyFlags & DirectoryCopyFlags_CopyIntoExisting))
+        && !(mDirCopyFlags & DirectoryCopyFlag_CopyIntoExisting))
     {
         setProgressErrorMsg(VBOX_E_IPRT_ERROR,