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

Timestamp:

Oct 21, 2019 8:33:26 AM (5 years ago)

Author:

vboxsync

Message:

Main/MachineImplMoveVM: many cleanups including removal of unused code

File:

• trunk/src/VBox/Main/include/MachineImplMoveVM.h (modified) (6 diffs)

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

@@ -49 +49 @@
 typedef struct
 {
-    RTCList<MEDIUMTASKMOVE>     chain;
+    RTCList<MEDIUMTASKMOVE> chain;
     DeviceType_T            devType;
     bool                    fCreateDiffs;
@@ -66 +66 @@
 class MachineMoveVM : public ThreadTask
 {
-    struct ErrorInfoItem
-    {
-        ErrorInfoItem(HRESULT aCode, const char* aDescription)
-            : m_code(aCode)
-            , m_description(aDescription == NULL ? "There is no description" : aDescription)
-        {
-        }
-
-#ifdef DEBUG
-        void logItem() const;
-#endif
-
-        HRESULT m_code;
-        Utf8Str m_description;
-    };
-
     RTCList<MEDIUMTASKCHAINMOVE>            m_llMedias;
     RTCList<SAVESTATETASKMOVE>              m_llSaveStateFiles;
@@ -91 +75 @@
     ComObjPtr<Progress> m_pProgress;
     ComObjPtr<Progress> m_pRollBackProgress;
-    ComPtr<ISession>    m_pSession;
-    ComPtr<IMachine>    m_pSessionMachine;
     Utf8Str             m_targetPath;
     Utf8Str             m_type;
@@ -116 +98 @@
 
     HRESULT init();
+private:
     static DECLCALLBACK(int) updateProgress(unsigned uPercent, void *pvUser);
     static DECLCALLBACK(int) copyFileProgress(unsigned uPercentage, void *pvUser);
-    static void i_MoveVMThreadTask(MachineMoveVM* task);
+    static void i_MoveVMThreadTask(MachineMoveVM *task);
 
+public:
     void handler()
     {
@@ -125 +109 @@
     }
 
-    HRESULT createMachineList(const ComPtr<ISnapshot> &pSnapshot, std::vector< ComObjPtr<Machine> > &aMachineList) const;
+private:
+    HRESULT createMachineList(const ComPtr<ISnapshot> &pSnapshot, std::vector<ComObjPtr<Machine> > &aMachineList) const;
     inline HRESULT queryBaseName(const ComPtr<IMedium> &pMedium, Utf8Str &strBaseName) const;
     HRESULT queryMediasForAllStates(const std::vector<ComObjPtr<Machine> > &aMachineList);
@@ -131 +116 @@
     HRESULT addSaveState(const ComObjPtr<Machine> &machine);
     void printStateFile(settings::SnapshotsList &snl);
-    HRESULT getFilesList(const Utf8Str& strRootFolder, fileList_t &filesList);
-    HRESULT getFolderSize(const Utf8Str& strRootFolder, uint64_t& size);
-    HRESULT deleteFiles(const RTCList<Utf8Str>& listOfFiles);
-    HRESULT updatePathsToStateFiles(const std::map<Utf8Str, SAVESTATETASKMOVE>& listOfFiles,
-                                    const Utf8Str& sourcePath, const Utf8Str& targetPath);
-    HRESULT moveAllDisks(const std::map<Utf8Str, MEDIUMTASKMOVE>& listOfDisks, const Utf8Str* strTargetFolder = NULL);
-    HRESULT restoreAllDisks(const std::map<Utf8Str, MEDIUMTASKMOVE>& listOfDisks);
+    HRESULT getFilesList(const Utf8Str &strRootFolder, fileList_t &filesList);
+    HRESULT getFolderSize(const Utf8Str &strRootFolder, uint64_t &size);
+    HRESULT deleteFiles(const RTCList<Utf8Str> &listOfFiles);
+    HRESULT updatePathsToStateFiles(const std::map<Utf8Str, SAVESTATETASKMOVE> &listOfFiles,
+                                    const Utf8Str &sourcePath, const Utf8Str &targetPath);
+    HRESULT moveAllDisks(const std::map<Utf8Str, MEDIUMTASKMOVE> &listOfDisks, const Utf8Str &strTargetFolder = Utf8Str::Empty);
+    HRESULT restoreAllDisks(const std::map<Utf8Str, MEDIUMTASKMOVE> &listOfDisks);
     HRESULT isMediumTypeSupportedForMoving(const ComPtr<IMedium> &pMedium);
 };