Changeset 104692 in vbox for trunk/src/VBox/Main

Timestamp:

May 16, 2024 3:51:25 PM (8 months ago)

Author:

vboxsync

Message:

Main, FE/Qt, ImageMounter: bugref:10690: Replace locally hardcoded Extension Pack name with globally defined one, easier to rebrand.

Location:

trunk/src/VBox/Main

Files:

• include/ExtPackManagerImpl.h (modified) (3 diffs)
• src-client/ConsoleImplConfigCommon.cpp (modified) (2 diffs)
• src-client/ConsoleImplConfigX86.cpp (modified) (2 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2010-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -34 +34 @@
 #include "VirtualBoxBase.h"
 #include <VBox/ExtPack/ExtPack.h>
+#include <VBox/version.h> /* VBOX_PUEL_PRODUCT */
 #include "ExtPackWrap.h"
 #include "ExtPackFileWrap.h"
@@ -41 +42 @@
 
 /** The name of the oracle extension back. */
-#define ORACLE_PUEL_EXTPACK_NAME "Oracle VM VirtualBox Extension Pack"
+#define ORACLE_PUEL_EXTPACK_NAME VBOX_PUEL_PRODUCT
 
 

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

@@ -10 +10 @@
 
 /*
- * Copyright (C) 2006-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2006-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -3156 +3156 @@
             case NetworkAttachmentType_Cloud:
             {
-                static const char *s_pszCloudExtPackName = "Oracle VM VirtualBox Extension Pack";
+                static const char *s_pszCloudExtPackName = VBOX_PUEL_PRODUCT;
                 /*
                  * Cloud network attachments do not work wihout installed extpack.

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

@@ -10 +10 @@
 
 /*
- * Copyright (C) 2006-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2006-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -279 +279 @@
      */
 # ifdef VBOX_WITH_EXTPACK
-    static const char *s_pszPCIRawExtPackName = "Oracle VM VirtualBox Extension Pack";
+    static const char *s_pszPCIRawExtPackName = VBOX_PUEL_PRODUCT;
     if (!mptrExtPackManager->i_isExtPackUsable(s_pszPCIRawExtPackName))
         /* Always fatal! */