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

Timestamp:

Jan 30, 2023 3:09:52 AM (2 years ago)

Author:

vboxsync

Message:

Main: bugref:4784: rename MachineSharedFolder to SharedFolder [build fix]

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleSharedFolderImpl.h (modified) (1 diff)
• MachineSharedFolderImpl.h (deleted)
• SharedFolderImpl.h (modified) (3 diffs)

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

@@ -121 +121 @@
 };
 
-#endif /* !MAIN_INCLUDED_SharedFolderImpl_h */
+#endif /* !MAIN_INCLUDED_ConsoleSharedFolderImpl_h */
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2006-2022 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -51 +51 @@
                  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,
-                 bool aWritable, bool aAutoMount, const com::Utf8Str &aAutoMountPoint, bool fFailOnError);
+//    HRESULT init(Console *aConsole, const com::Utf8Str &aName, const com::Utf8Str &aHostPath,
+//                 bool aWritable, bool aAutoMount, const com::Utf8Str &aAutoMountPoint, bool fFailOnError);
 //     HRESULT init(VirtualBox *aVirtualBox, const Utf8Str &aName, const Utf8Str &aHostPath,
 //                  bool aWritable, const com::Utf8Str &aAutoMountPoint, bool aAutoMount, bool fFailOnError);
@@ -115 +115 @@
 
     /* weak parents (only one of them is not null) */
-#if !defined(VBOX_COM_INPROC)
     Machine        * const mMachine;
     VirtualBox     * const mVirtualBox;
-#else
-    Console        * const mConsole;
-#endif
 
-    struct Data;            // opaque data struct, defined in SharedFolderImpl.cpp
+    struct Data;            // opaque data struct, defined in MachineSharedFolderImpl.cpp
     Data *m;
 };