Index: trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 90569)
@@ -932,6 +932,6 @@
  UICommon_QT_MOCHDRS += \
 	src/networking/UIDownloader.h \
-	src/networking/UIDownloaderAdditions.h \
 	src/networking/UIDownloaderExtensionPack.h \
+	src/networking/UIDownloaderGuestAdditions.h \
 	src/networking/UIDownloaderUserManual.h \
 	src/networking/UINetworkCustomer.h \
@@ -1483,6 +1483,6 @@
  UICommon_SOURCES += \
 	src/networking/UIDownloader.cpp \
-	src/networking/UIDownloaderAdditions.cpp \
 	src/networking/UIDownloaderExtensionPack.cpp \
+	src/networking/UIDownloaderGuestAdditions.cpp \
 	src/networking/UIDownloaderUserManual.cpp \
 	src/networking/UINetworkCustomer.cpp \
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts	(revision 90569)
@@ -5731,5 +5731,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts	(revision 90569)
@@ -4264,5 +4264,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>VirtualBox Guest Additions</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts	(revision 90569)
@@ -5671,5 +5671,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts	(revision 90569)
@@ -5716,5 +5716,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts	(revision 90569)
@@ -4490,5 +4490,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Select folder to save Guest Additions image to</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts	(revision 90569)
@@ -4804,5 +4804,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Select folder to save Guest Additions image to</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_el.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_el.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_el.ts	(revision 90569)
@@ -4720,5 +4720,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Select folder to save Guest Additions image to</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts	(revision 90569)
@@ -6223,5 +6223,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts	(revision 90569)
@@ -6343,7 +6343,7 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
-    <message>
-        <location filename="../src/net/UIDownloaderAdditions.cpp" line="+196"/>
+    <name>UIDownloaderGuestAdditions</name>
+    <message>
+        <location filename="../src/net/UIDownloaderGuestAdditions.cpp" line="+196"/>
         <source>Select folder to save Guest Additions image to</source>
         <translation>Hautatu Gonbidatu Gehigarri irudia gordetzeko agiritegia</translation>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa.ts	(revision 90569)
@@ -5182,5 +5182,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Select folder to save Guest Additions image to</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts	(revision 90569)
@@ -5018,5 +5018,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts	(revision 90569)
@@ -5893,5 +5893,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>&lt;p&gt;Failed to save the downloaded file as &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;.&lt;/nobr&gt;&lt;/p&gt;</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl.ts	(revision 90569)
@@ -5010,5 +5010,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_he.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_he.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_he.ts	(revision 90569)
@@ -4519,5 +4519,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>VirtualBox Guest Additions</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hr_HR.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hr_HR.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hr_HR.ts	(revision 90569)
@@ -4520,5 +4520,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Select folder to save Guest Additions image to</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts	(revision 90569)
@@ -5990,5 +5990,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts	(revision 90569)
@@ -5828,5 +5828,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts	(revision 90569)
@@ -6456,5 +6456,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Select folder to save Guest Additions image to</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts	(revision 90569)
@@ -6059,5 +6059,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts	(revision 90569)
@@ -4863,5 +4863,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts	(revision 90569)
@@ -5989,5 +5989,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts	(revision 90569)
@@ -5588,5 +5588,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>&lt;p&gt;Failed to save the downloaded file as &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;.&lt;/nobr&gt;&lt;/p&gt;</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts	(revision 90569)
@@ -4563,5 +4563,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Select folder to save Guest Additions image to</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts	(revision 90569)
@@ -5274,5 +5274,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts	(revision 90569)
@@ -5247,5 +5247,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts	(revision 90569)
@@ -6301,5 +6301,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts	(revision 90569)
@@ -5054,5 +5054,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts	(revision 90569)
@@ -6062,5 +6062,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts	(revision 90569)
@@ -5305,5 +5305,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sl.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sl.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sl.ts	(revision 90569)
@@ -5830,7 +5830,7 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
-    <message>
-        <location filename="../src/net/UIDownloaderAdditions.cpp" line="+196"/>
+    <name>UIDownloaderGuestAdditions</name>
+    <message>
+        <location filename="../src/net/UIDownloaderGuestAdditions.cpp" line="+196"/>
         <source>Select folder to save Guest Additions image to</source>
         <translation>Izberite mapo za shranjevanje programa Guest Additions</translation>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts	(revision 90569)
@@ -5362,5 +5362,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts	(revision 90569)
@@ -5692,5 +5692,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_th.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_th.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_th.ts	(revision 90569)
@@ -4398,5 +4398,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Select folder to save Guest Additions image to</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts	(revision 90569)
@@ -6027,5 +6027,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts	(revision 90569)
@@ -5638,5 +5638,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Cancel</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts	(revision 90569)
@@ -4253,5 +4253,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>VirtualBox Guest Additions</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts	(revision 90569)
@@ -5884,5 +5884,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>Select folder to save Guest Additions image to</source>
Index: trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts	(revision 90569)
@@ -4378,5 +4378,5 @@
 </context>
 <context>
-    <name>UIDownloaderAdditions</name>
+    <name>UIDownloaderGuestAdditions</name>
     <message>
         <source>VirtualBox Guest Additions</source>
Index: trunk/src/VBox/Frontends/VirtualBox/src/networking/UIDownloaderAdditions.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/networking/UIDownloaderAdditions.cpp	(revision 90568)
+++ 	(revision )
@@ -1,183 +1,0 @@
-/* $Id$ */
-/** @file
- * VBox Qt GUI - UIDownloaderAdditions class implementation.
- */
-
-/*
- * Copyright (C) 2006-2021 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-
-/* Qt includes: */
-#include <QDir>
-#include <QFile>
-#include <QVariant>
-
-/* GUI includes: */
-#include "QIFileDialog.h"
-#include "UICommon.h"
-#include "UIDownloaderAdditions.h"
-#include "UIMessageCenter.h"
-#include "UIModalWindowManager.h"
-#include "UINetworkReply.h"
-#include "UIVersion.h"
-
-/* Other VBox includes: */
-#include <iprt/sha.h>
-
-
-UIDownloaderAdditions::UIDownloaderAdditions()
-{
-    /* Get version number and adjust it for test and trunk builds. The server only has official releases. */
-    const QString strVersion = UIVersion(uiCommon().vboxVersionStringNormalized()).effectiveReleasedVersion().toString();
-
-    /* Prepare source/target: */
-    const QString strSourceName = QString("%1_%2.iso").arg(GUI_GuestAdditionsName, strVersion);
-    const QString strSourcePath = QString("https://download.virtualbox.org/virtualbox/%1/").arg(strVersion);
-    const QString strSource = strSourcePath + strSourceName;
-    const QString strPathSHA256SumsFile = QString("https://www.virtualbox.org/download/hashes/%1/SHA256SUMS").arg(strVersion);
-    const QString strTarget = QDir(uiCommon().homeFolder()).absoluteFilePath(QString("%1.tmp").arg(strSourceName));
-
-    /* Set source/target: */
-    setSource(strSource);
-    setTarget(strTarget);
-    setPathSHA256SumsFile(strPathSHA256SumsFile);
-}
-
-QString UIDownloaderAdditions::description() const
-{
-    return UIDownloader::description().arg(tr("VirtualBox Guest Additions"));
-}
-
-bool UIDownloaderAdditions::askForDownloadingConfirmation(UINetworkReply *pReply)
-{
-    return msgCenter().confirmDownloadGuestAdditions(source().toString(), pReply->header(UINetworkReply::ContentLengthHeader).toInt());
-}
-
-void UIDownloaderAdditions::handleDownloadedObject(UINetworkReply *pReply)
-{
-    m_receivedData = pReply->readAll();
-}
-
-void UIDownloaderAdditions::handleVerifiedObject(UINetworkReply *pReply)
-{
-    /* Try to verify the SHA-256 checksum: */
-    QString strCalculatedSumm;
-    bool fSuccess = false;
-    do
-    {
-        /* Read received data into the buffer: */
-        const QByteArray receivedData(pReply->readAll());
-        /* Make sure it's not empty: */
-        if (receivedData.isEmpty())
-            break;
-
-        /* Parse buffer contents to dictionary: */
-        const QStringList dictionary(QString(receivedData).split("\n", QString::SkipEmptyParts));
-        /* Make sure it's not empty: */
-        if (dictionary.isEmpty())
-            break;
-
-        /* Parse each record to tags, look for the required one: */
-        foreach (const QString &strRecord, dictionary)
-        {
-            const QString strFileName = strRecord.section(" *", 1);
-            const QString strDownloadedSumm = strRecord.section(" *", 0, 0);
-            if (strFileName == source().fileName())
-            {
-                /* Calc the SHA-256 on the bytes, creating a string: */
-                uint8_t abHash[RTSHA256_HASH_SIZE];
-                RTSha256(m_receivedData.constData(), m_receivedData.length(), abHash);
-                char szDigest[RTSHA256_DIGEST_LEN + 1];
-                int rc = RTSha256ToString(abHash, szDigest, sizeof(szDigest));
-                if (RT_FAILURE(rc))
-                {
-                    AssertRC(rc);
-                    szDigest[0] = '\0';
-                }
-                strCalculatedSumm = szDigest;
-                //printf("Downloaded SHA-256 summ: [%s]\n", strDownloadedSumm.toUtf8().constData());
-                //printf("Calculated SHA-256 summ: [%s]\n", strCalculatedSumm.toUtf8().constData());
-                /* Make sure checksum is valid: */
-                fSuccess = strDownloadedSumm == strCalculatedSumm;
-                break;
-            }
-        }
-    }
-    while (false);
-
-    /* If SHA-256 checksum verification failed: */
-    if (!fSuccess)
-    {
-        /* Warn the user about additions-image was downloaded and saved but checksum is invalid: */
-        msgCenter().cannotValidateGuestAdditionsSHA256Sum(source().toString(), QDir::toNativeSeparators(target()));
-        return;
-    }
-
-    /* Make sure temporary file exists.  If we have
-     * reached this place, it's already written and verified. */
-    const QString strTempFilename = target();
-    if (!QFile::exists(strTempFilename))
-    {
-        /* But still we are providing a failsafe.
-         * Since we can try to write it again. */
-        QFile file(strTempFilename);
-        if (!file.open(QIODevice::WriteOnly))
-            AssertFailedReturnVoid();
-        file.write(m_receivedData);
-    }
-
-    /* Rename temporary file to target one.  This can require a number
-     * of tries to let user choose the place to save file to. */
-    QString strNetTarget = target();
-    strNetTarget.remove(QRegExp("\\.tmp$"));
-    setTarget(strNetTarget);
-    while (true)
-    {
-        /* Make sure target file doesn't exist: */
-        bool fTargetFileExists = QFile::exists(target());
-        if (fTargetFileExists)
-        {
-            /* We should ask user about file rewriting (or exit otherwise): */
-            if (!msgCenter().confirmOverridingFile(QDir::toNativeSeparators(target())))
-                break;
-            /* And remove file if rewriting confirmed: */
-            if (QFile::remove(target()))
-                fTargetFileExists = false;
-        }
-
-        /* Try to rename temporary file to target one (would fail if target file still exists): */
-        const bool fFileRenamed = !fTargetFileExists && QFile::rename(strTempFilename, target());
-
-        /* If file renamed: */
-        if (fFileRenamed)
-        {
-            /* Warn the user about additions-image downloaded and saved, propose to mount it (and/or exit in any case): */
-            if (msgCenter().proposeMountGuestAdditions(source().toString(), QDir::toNativeSeparators(target())))
-                emit sigDownloadFinished(target());
-            break;
-        }
-        else
-        {
-            /* Warn the user about additions-image was downloaded but was NOT saved: */
-            msgCenter().cannotSaveGuestAdditions(source().toString(), QDir::toNativeSeparators(target()));
-            /* Ask the user for another location for the additions-image file: */
-            const QString strTarget = QIFileDialog::getExistingDirectory(QFileInfo(target()).absolutePath(),
-                                                                         windowManager().mainWindowShown(),
-                                                                         tr("Select folder to save Guest Additions image to"), true);
-
-            /* Check if user had really set a new target (and exit in opposite case): */
-            if (!strTarget.isNull())
-                setTarget(QDir(strTarget).absoluteFilePath(QFileInfo(target()).fileName()));
-            else
-                break;
-        }
-    }
-}
Index: trunk/src/VBox/Frontends/VirtualBox/src/networking/UIDownloaderAdditions.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/networking/UIDownloaderAdditions.h	(revision 90568)
+++ 	(revision )
@@ -1,63 +1,0 @@
-/* $Id$ */
-/** @file
- * VBox Qt GUI - UIDownloaderAdditions class declaration.
- */
-
-/*
- * Copyright (C) 2006-2021 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-
-#ifndef FEQT_INCLUDED_SRC_networking_UIDownloaderAdditions_h
-#define FEQT_INCLUDED_SRC_networking_UIDownloaderAdditions_h
-#ifndef RT_WITHOUT_PRAGMA_ONCE
-# pragma once
-#endif
-
-/* GUI includes: */
-#include "UIDownloader.h"
-
-/* Forward declarations: */
-class QByteArray;
-
-/** UIDownloader extension for background additions downloading. */
-class SHARED_LIBRARY_STUFF UIDownloaderAdditions : public UIDownloader
-{
-    Q_OBJECT;
-
-signals:
-
-    /** Notifies listeners about downloading finished.
-      * @param  strFile  Brings the downloaded file-name. */
-    void sigDownloadFinished(const QString &strFile);
-
-public:
-
-    /** Constructs downloader. */
-    UIDownloaderAdditions();
-
-private:
-
-    /** Returns description of the current network operation. */
-    virtual QString description() const /* override */;
-
-    /** Asks user for downloading confirmation for passed @a pReply. */
-    virtual bool askForDownloadingConfirmation(UINetworkReply *pReply) /* override */;
-    /** Handles downloaded object for passed @a pReply. */
-    virtual void handleDownloadedObject(UINetworkReply *pReply) /* override */;
-    /** Handles verified object for passed @a pReply. */
-    virtual void handleVerifiedObject(UINetworkReply *pReply) /* override */;
-
-    /** Holds the cached received data awaiting for verification. */
-    QByteArray m_receivedData;
-};
-
-#endif /* !FEQT_INCLUDED_SRC_networking_UIDownloaderAdditions_h */
-
Index: trunk/src/VBox/Frontends/VirtualBox/src/networking/UIDownloaderGuestAdditions.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/networking/UIDownloaderGuestAdditions.cpp	(revision 90569)
+++ trunk/src/VBox/Frontends/VirtualBox/src/networking/UIDownloaderGuestAdditions.cpp	(revision 90569)
@@ -0,0 +1,183 @@
+/* $Id$ */
+/** @file
+ * VBox Qt GUI - UIDownloaderGuestAdditions class implementation.
+ */
+
+/*
+ * Copyright (C) 2006-2021 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+/* Qt includes: */
+#include <QDir>
+#include <QFile>
+#include <QVariant>
+
+/* GUI includes: */
+#include "QIFileDialog.h"
+#include "UICommon.h"
+#include "UIDownloaderGuestAdditions.h"
+#include "UIMessageCenter.h"
+#include "UIModalWindowManager.h"
+#include "UINetworkReply.h"
+#include "UIVersion.h"
+
+/* Other VBox includes: */
+#include <iprt/sha.h>
+
+
+UIDownloaderGuestAdditions::UIDownloaderGuestAdditions()
+{
+    /* Get version number and adjust it for test and trunk builds. The server only has official releases. */
+    const QString strVersion = UIVersion(uiCommon().vboxVersionStringNormalized()).effectiveReleasedVersion().toString();
+
+    /* Prepare source/target: */
+    const QString strSourceName = QString("%1_%2.iso").arg(GUI_GuestAdditionsName, strVersion);
+    const QString strSourcePath = QString("https://download.virtualbox.org/virtualbox/%1/").arg(strVersion);
+    const QString strSource = strSourcePath + strSourceName;
+    const QString strPathSHA256SumsFile = QString("https://www.virtualbox.org/download/hashes/%1/SHA256SUMS").arg(strVersion);
+    const QString strTarget = QDir(uiCommon().homeFolder()).absoluteFilePath(QString("%1.tmp").arg(strSourceName));
+
+    /* Set source/target: */
+    setSource(strSource);
+    setTarget(strTarget);
+    setPathSHA256SumsFile(strPathSHA256SumsFile);
+}
+
+QString UIDownloaderGuestAdditions::description() const
+{
+    return UIDownloader::description().arg(tr("VirtualBox Guest Additions"));
+}
+
+bool UIDownloaderGuestAdditions::askForDownloadingConfirmation(UINetworkReply *pReply)
+{
+    return msgCenter().confirmDownloadGuestAdditions(source().toString(), pReply->header(UINetworkReply::ContentLengthHeader).toInt());
+}
+
+void UIDownloaderGuestAdditions::handleDownloadedObject(UINetworkReply *pReply)
+{
+    m_receivedData = pReply->readAll();
+}
+
+void UIDownloaderGuestAdditions::handleVerifiedObject(UINetworkReply *pReply)
+{
+    /* Try to verify the SHA-256 checksum: */
+    QString strCalculatedSumm;
+    bool fSuccess = false;
+    do
+    {
+        /* Read received data into the buffer: */
+        const QByteArray receivedData(pReply->readAll());
+        /* Make sure it's not empty: */
+        if (receivedData.isEmpty())
+            break;
+
+        /* Parse buffer contents to dictionary: */
+        const QStringList dictionary(QString(receivedData).split("\n", QString::SkipEmptyParts));
+        /* Make sure it's not empty: */
+        if (dictionary.isEmpty())
+            break;
+
+        /* Parse each record to tags, look for the required one: */
+        foreach (const QString &strRecord, dictionary)
+        {
+            const QString strFileName = strRecord.section(" *", 1);
+            const QString strDownloadedSumm = strRecord.section(" *", 0, 0);
+            if (strFileName == source().fileName())
+            {
+                /* Calc the SHA-256 on the bytes, creating a string: */
+                uint8_t abHash[RTSHA256_HASH_SIZE];
+                RTSha256(m_receivedData.constData(), m_receivedData.length(), abHash);
+                char szDigest[RTSHA256_DIGEST_LEN + 1];
+                int rc = RTSha256ToString(abHash, szDigest, sizeof(szDigest));
+                if (RT_FAILURE(rc))
+                {
+                    AssertRC(rc);
+                    szDigest[0] = '\0';
+                }
+                strCalculatedSumm = szDigest;
+                //printf("Downloaded SHA-256 summ: [%s]\n", strDownloadedSumm.toUtf8().constData());
+                //printf("Calculated SHA-256 summ: [%s]\n", strCalculatedSumm.toUtf8().constData());
+                /* Make sure checksum is valid: */
+                fSuccess = strDownloadedSumm == strCalculatedSumm;
+                break;
+            }
+        }
+    }
+    while (false);
+
+    /* If SHA-256 checksum verification failed: */
+    if (!fSuccess)
+    {
+        /* Warn the user about additions-image was downloaded and saved but checksum is invalid: */
+        msgCenter().cannotValidateGuestAdditionsSHA256Sum(source().toString(), QDir::toNativeSeparators(target()));
+        return;
+    }
+
+    /* Make sure temporary file exists.  If we have
+     * reached this place, it's already written and verified. */
+    const QString strTempFilename = target();
+    if (!QFile::exists(strTempFilename))
+    {
+        /* But still we are providing a failsafe.
+         * Since we can try to write it again. */
+        QFile file(strTempFilename);
+        if (!file.open(QIODevice::WriteOnly))
+            AssertFailedReturnVoid();
+        file.write(m_receivedData);
+    }
+
+    /* Rename temporary file to target one.  This can require a number
+     * of tries to let user choose the place to save file to. */
+    QString strNetTarget = target();
+    strNetTarget.remove(QRegExp("\\.tmp$"));
+    setTarget(strNetTarget);
+    while (true)
+    {
+        /* Make sure target file doesn't exist: */
+        bool fTargetFileExists = QFile::exists(target());
+        if (fTargetFileExists)
+        {
+            /* We should ask user about file rewriting (or exit otherwise): */
+            if (!msgCenter().confirmOverridingFile(QDir::toNativeSeparators(target())))
+                break;
+            /* And remove file if rewriting confirmed: */
+            if (QFile::remove(target()))
+                fTargetFileExists = false;
+        }
+
+        /* Try to rename temporary file to target one (would fail if target file still exists): */
+        const bool fFileRenamed = !fTargetFileExists && QFile::rename(strTempFilename, target());
+
+        /* If file renamed: */
+        if (fFileRenamed)
+        {
+            /* Warn the user about additions-image downloaded and saved, propose to mount it (and/or exit in any case): */
+            if (msgCenter().proposeMountGuestAdditions(source().toString(), QDir::toNativeSeparators(target())))
+                emit sigDownloadFinished(target());
+            break;
+        }
+        else
+        {
+            /* Warn the user about additions-image was downloaded but was NOT saved: */
+            msgCenter().cannotSaveGuestAdditions(source().toString(), QDir::toNativeSeparators(target()));
+            /* Ask the user for another location for the additions-image file: */
+            const QString strTarget = QIFileDialog::getExistingDirectory(QFileInfo(target()).absolutePath(),
+                                                                         windowManager().mainWindowShown(),
+                                                                         tr("Select folder to save Guest Additions image to"), true);
+
+            /* Check if user had really set a new target (and exit in opposite case): */
+            if (!strTarget.isNull())
+                setTarget(QDir(strTarget).absoluteFilePath(QFileInfo(target()).fileName()));
+            else
+                break;
+        }
+    }
+}
Index: trunk/src/VBox/Frontends/VirtualBox/src/networking/UIDownloaderGuestAdditions.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/networking/UIDownloaderGuestAdditions.h	(revision 90569)
+++ trunk/src/VBox/Frontends/VirtualBox/src/networking/UIDownloaderGuestAdditions.h	(revision 90569)
@@ -0,0 +1,62 @@
+/* $Id$ */
+/** @file
+ * VBox Qt GUI - UIDownloaderGuestAdditions class declaration.
+ */
+
+/*
+ * Copyright (C) 2006-2021 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+#ifndef FEQT_INCLUDED_SRC_networking_UIDownloaderGuestAdditions_h
+#define FEQT_INCLUDED_SRC_networking_UIDownloaderGuestAdditions_h
+#ifndef RT_WITHOUT_PRAGMA_ONCE
+# pragma once
+#endif
+
+/* GUI includes: */
+#include "UIDownloader.h"
+
+/* Forward declarations: */
+class QByteArray;
+
+/** UIDownloader extension for background guest additions downloading. */
+class SHARED_LIBRARY_STUFF UIDownloaderGuestAdditions : public UIDownloader
+{
+    Q_OBJECT;
+
+signals:
+
+    /** Notifies listeners about downloading finished.
+      * @param  strFile  Brings the downloaded file-name. */
+    void sigDownloadFinished(const QString &strFile);
+
+public:
+
+    /** Constructs downloader. */
+    UIDownloaderGuestAdditions();
+
+private:
+
+    /** Returns description of the current network operation. */
+    virtual QString description() const /* override */;
+
+    /** Asks user for downloading confirmation for passed @a pReply. */
+    virtual bool askForDownloadingConfirmation(UINetworkReply *pReply) /* override */;
+    /** Handles downloaded object for passed @a pReply. */
+    virtual void handleDownloadedObject(UINetworkReply *pReply) /* override */;
+    /** Handles verified object for passed @a pReply. */
+    virtual void handleVerifiedObject(UINetworkReply *pReply) /* override */;
+
+    /** Holds the cached received data awaiting for verification. */
+    QByteArray m_receivedData;
+};
+
+#endif /* !FEQT_INCLUDED_SRC_networking_UIDownloaderGuestAdditions_h */
Index: trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp	(revision 90568)
+++ trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp	(revision 90569)
@@ -22,6 +22,6 @@
 /* GUI includes: */
 #include "UICommon.h"
-#include "UIDownloaderAdditions.h"
 #include "UIDownloaderExtensionPack.h"
+#include "UIDownloaderGuestAdditions.h"
 #include "UIDownloaderUserManual.h"
 #include "UINotificationObjects.h"
@@ -1591,8 +1591,8 @@
 {
     /* Create and configure the User Manual downloader: */
-    UIDownloaderAdditions *pDownloader = new UIDownloaderAdditions;
+    UIDownloaderGuestAdditions *pDownloader = new UIDownloaderGuestAdditions;
     if (pDownloader)
     {
-        connect(pDownloader, &UIDownloaderAdditions::sigDownloadFinished,
+        connect(pDownloader, &UIDownloaderGuestAdditions::sigDownloadFinished,
                 this, &UINotificationDownloaderGuestAdditions::sigGuestAdditionsDownloaded);
         return pDownloader;
