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

Timestamp:

Nov 27, 2018 11:00:10 AM (6 years ago)

Author:

vboxsync

Message:

bugref:9152. Replaced the word "oci" by "cloud" in the names in the Appliance code.

Location:

trunk/src/VBox/Main/include

Files:

• ApplianceImpl.h (modified) (4 diffs)
• ApplianceImplPrivate.h (modified) (6 diffs)

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

@@ -115 +115 @@
     class TaskOVF;
     class TaskOPC;
-    class TaskOCI;
+    class TaskCloud;
 
     struct Data;            // opaque, defined in ApplianceImpl.cpp
     Data *m;
 
-    enum SetUpProgressMode { ImportFile, ImportS3, WriteFile, WriteS3, ExportOCI };
+    enum SetUpProgressMode { ImportFile, ImportS3, WriteFile, WriteS3, ExportCloud };
 
     /** @name General stuff
@@ -139 +139 @@
     static void i_importOrExportThreadTask(TaskOVF *pTask);
     static void i_exportOPCThreadTask(TaskOPC *pTask);
-    static void i_exportOCIThreadTask(TaskOCI *pTask);
+    static void i_exportCloudThreadTask(TaskCloud *pTask);
 
     HRESULT i_initBackendNames();
@@ -218 +218 @@
     HRESULT i_writeImpl(ovf::OVFVersion_T aFormat, const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress);
     HRESULT i_writeOPCImpl(ovf::OVFVersion_T aFormat, const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress);
-    HRESULT i_writeOCIImpl(const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress);
+    HRESULT i_writeCloudImpl(const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress);
 
     HRESULT i_writeFS(TaskOVF *pTask);
@@ -224 +224 @@
     HRESULT i_writeFSOVA(TaskOVF *pTask, AutoWriteLockBase& writeLock);
     HRESULT i_writeFSOPC(TaskOPC *pTask);
-    HRESULT i_writeFSOCI(TaskOCI *pTask);
+    HRESULT i_writeFSCloud(TaskCloud *pTask);
     HRESULT i_writeFSImpl(TaskOVF *pTask, AutoWriteLockBase &writeLock, RTVFSFSSTREAM hVfsFssDst);
     HRESULT i_writeBufferToFile(RTVFSFSSTREAM hVfsFssDst, const char *pszFilename, const void *pvContent, size_t cbContent);

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

@@ -231 +231 @@
     uint32_t                  m_cPwProvided;
 
-    struct OciExportData_T {
+    struct CloudExportData_T {
         Utf8Str strDisplayMachineName;
         Utf8Str strProfileFilePath;
@@ -245 +245 @@
     };
 
-    OciExportData_T m_OciExportData;
+    CloudExportData_T m_CloudExportData;
 };
 
@@ -346 +346 @@
 
 
-class Appliance::TaskOCI : public ThreadTask
+class Appliance::TaskCloud : public ThreadTask
 {
 public:
@@ -354 +354 @@
     };
 
-    TaskOCI(Appliance *aThat,
+    TaskCloud(Appliance *aThat,
             TaskType aType,
             LocationInfo aLocInfo,
             ComObjPtr<Progress> &aProgress)
-      : ThreadTask("TaskOCI"),
+      : ThreadTask("TaskCloud"),
         pAppliance(aThat),
         taskType(aType),
@@ -365 +365 @@
         rc(S_OK)
     {
-        m_strTaskName = "OCIExpt";
-    }
-
-    ~TaskOCI()
+        m_strTaskName = "CloudExpt";
+    }
+
+    ~TaskCloud()
     {
     }
@@ -383 +383 @@
     void handler()
     {
-        Appliance::i_exportOCIThreadTask(this);
+        Appliance::i_exportCloudThreadTask(this);
     }
 };