Changeset 67249 in vbox for trunk/src/VBox/Main/include/MediumImpl.h

Timestamp:

Jun 2, 2017 3:24:58 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

115944

Message:

Main/Appliance++: Removed non-VBOX_WITH_NEW_TAR_CREATOR code.

File:

• trunk/src/VBox/Main/include/MediumImpl.h (modified) (5 diffs)

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

@@ -210 +210 @@
                          MediumVariant_T aVariant,
                          SecretKeyStore *pKeyStore,
-#ifdef VBOX_WITH_NEW_TAR_CREATOR
                          RTVFSIOSTREAM hVfsIosDst,
-#else
-                         PVDINTERFACEIO aVDImageIOIf, void *aVDImageIOUser,
-#endif
                          const ComObjPtr<Progress> &aProgress);
     HRESULT i_importFile(const char *aFilename,
@@ -382 +378 @@
     class DeleteTask;
     class MergeTask;
-#ifndef VBOX_WITH_NEW_TAR_CREATOR
-    class ExportTask;
-#endif
     class ImportTask;
     class EncryptTask;
@@ -397 +390 @@
     friend class DeleteTask;
     friend class MergeTask;
-#ifndef VBOX_WITH_NEW_TAR_CREATOR
-    friend class ExportTask;
-#endif
     friend class ImportTask;
     friend class EncryptTask;
@@ -412 +402 @@
     HRESULT i_taskCompactHandler(Medium::CompactTask &task);
     HRESULT i_taskResizeHandler(Medium::ResizeTask &task);
-#ifndef VBOX_WITH_NEW_TAR_CREATOR
-    HRESULT i_taskExportHandler(Medium::ExportTask &task);
-#endif
     HRESULT i_taskImportHandler(Medium::ImportTask &task);
     HRESULT i_taskEncryptHandler(Medium::EncryptTask &task);
@@ -426 +413 @@
 };
 
-#endif /* ____H_MEDIUMIMPL */
-
+#endif /* !____H_MEDIUMIMPL */
+