Changeset 105018 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jun 25, 2024 11:06:29 AM (7 months ago)

Author:

vboxsync

Message:

doc/manual,include/VBox,Frontends/VBoxManage,HostServices/SharedFolders,
Main/{include,SharedFolder,Console,Machine,VirtualBox.xidl}: Backout
changeset r163634 since it introduces a build dependency on
VirtualBox_XPCOM.h which needs to be built from the VirtualBox.xidl
changes before it can be referenced by the src/VBox/HostServices code.
Need to putback the changes in two parts. bugref:10619

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleSharedFolderImpl.h (modified) (3 diffs)
• MachineImpl.h (modified) (1 diff)
• SharedFolderImpl.h (modified) (4 diffs)

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

@@ -89 +89 @@
     const Utf8Str &i_getAutoMountPoint() const;
 
-    /**
-     * Public internal method for getting the symlink policy.
-     */
-    const SymlinkPolicy_T i_getSymlinkPolicy() const;
-
 protected:
 
@@ -105 +100 @@
 private:
 
-    // wrapped ISharedFolder properties.
+    // wrapped ISharedFolder properies.
     HRESULT getName(com::Utf8Str &aName);
     HRESULT getHostPath(com::Utf8Str &aHostPath);
@@ -116 +111 @@
     HRESULT setAutoMountPoint(com::Utf8Str const &aAutoMountPoint);
     HRESULT getLastAccessError(com::Utf8Str &aLastAccessError);
-    HRESULT getSymlinkPolicy(SymlinkPolicy_T *aSymlinkPolicy);
-    HRESULT setSymlinkPolicy(SymlinkPolicy_T aSymlinkPolicy);
 
     VirtualBoxBase * const mParent;

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

@@ -911 +911 @@
     friend class RecordingScreenSettings;
     friend class SessionMachine;
-    friend class SharedFolder;
     friend class SnapshotMachine;
     friend class VirtualBox;

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

@@ -49 +49 @@
     // public initializer/uninitializer for internal purposes only
     HRESULT init(Machine *aMachine, const com::Utf8Str &aName, const com::Utf8Str &aHostPath,
-                 bool aWritable, bool aAutoMount, const com::Utf8Str &aAutoMountPoint, bool fFailOnError,
-                 SymlinkPolicy_T enmSymlinkPolicy);
+                 bool aWritable, bool aAutoMount, const com::Utf8Str &aAutoMountPoint, bool fFailOnError);
     HRESULT initCopy(Machine *aMachine, SharedFolder *aThat);
 //    HRESULT init(Console *aConsole, const com::Utf8Str &aName, const com::Utf8Str &aHostPath,
@@ -90 +89 @@
     const Utf8Str &i_getAutoMountPoint() const;
 
-    /**
-     * Public internal method for getting the symlink policy.
-     */
-    const SymlinkPolicy_T i_getSymlinkPolicy() const;
-
 protected:
 
@@ -103 +97 @@
                             bool aAutoMount,
                             const com::Utf8Str &aAutoMountPoint,
-                            bool fFailOnError,
-                            SymlinkPolicy_T enmSymlinkPolicy);
+                            bool fFailOnError);
 private:
 
-    // wrapped ISharedFolder properties.
+    // wrapped ISharedFolder properies.
     HRESULT getName(com::Utf8Str &aName);
     HRESULT getHostPath(com::Utf8Str &aHostPath);
@@ -118 +111 @@
     HRESULT setAutoMountPoint(com::Utf8Str const &aAutoMountPoint);
     HRESULT getLastAccessError(com::Utf8Str &aLastAccessError);
-    HRESULT getSymlinkPolicy(SymlinkPolicy_T *aSymlinkPolicy);
-    HRESULT setSymlinkPolicy(SymlinkPolicy_T aSymlinkPolicy);
 
     VirtualBoxBase * const mParent;