Changeset 44124 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Dec 13, 2012 5:11:48 PM (12 years ago)

Author:

vboxsync

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

82704

Message:

Eliminate last use of the CombinedProgess class - bugtracker id 6167

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (2 diffs)
• xpcom/module.cpp (modified) (2 diffs)

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

@@ -64 +64 @@
 # include "UsbCardReader.h"
 #endif
-#include "ProgressCombinedImpl.h"
+#include "ProgressImpl.h"
 #include "ConsoleVRDPServer.h"
 #include "VMMDev.h"
@@ -6697 +6697 @@
             else
             {
-                /* create a combined progress object */
-                ComObjPtr<CombinedProgress> pProgress;
+                // Create a simple progress object
+                ComObjPtr<Progress> pProgress;
                 pProgress.createObject();
+
+                // Assign hard disk progresses to the progresses list
                 VMPowerUpTask::ProgressList progresses(task->hardDiskProgresses);
-                progresses.push_back(ComPtr<IProgress> (pPowerupProgress));
+
+                // Setup params to be used to initialize Progress object properties.
+                ULONG cOperations = 1;
+                ULONG ulTotalOperationsWeight = 1;
+
+                // Go round them and set number of operations and weight.
+                for (VMPowerUpTask::ProgressList::const_iterator it = progresses.begin(); it !=  progresses.end(); ++it)
+                {
+                    ++cOperations;
+                    ulTotalOperationsWeight += 1;
+                }
+
                 rc = pProgress->init(static_cast<IConsole *>(this),
-                                     progressDesc.raw(), progresses.begin(),
-                                     progresses.end());
+                                     progressDesc.raw(),
+                                     TRUE, // Cancelable
+                                     cOperations,
+                                     ulTotalOperationsWeight,
+                                     Bstr(tr("Starting Hard Disk operations")).raw(), // first sub-op decription
+                                     1 );
                 AssertComRCReturnRC(rc);
-                pProgress.queryInterfaceTo(aProgress);
+
+                // Perform all the necessary operations.
+                for (VMPowerUpTask::ProgressList::const_iterator it = progresses.begin(); it !=  progresses.end(); ++it)
+                {
+                    rc = pProgress->SetNextOperation(BstrFmt(tr("Disk Image Reset Operation - Immutable Image")).raw(), 1);
+                    AssertComRCReturnRC(rc);
+                    rc = pProgress.queryInterfaceTo(aProgress);
+                    AssertComRCReturnRC(rc);
+                }
+
+                // Now do the power up.
+                rc = pPowerupProgress.queryInterfaceTo(aProgress);
+                AssertComRCReturnRC(rc);
             }
         }

trunk/src/VBox/Main/src-client/xpcom/module.cpp

@@ -49 +49 @@
 #include "NATEngineImpl.h"
 #include "NetworkAdapterImpl.h"
-#include "ProgressCombinedImpl.h"
 #include "ProgressImpl.h"
 #include "RemoteUSBDeviceImpl.h"
@@ -85 +84 @@
 NS_DECL_CLASSINFO(Progress)
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Progress, IProgress)
-NS_DECL_CLASSINFO(CombinedProgress)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(CombinedProgress, IProgress)
 NS_DECL_CLASSINFO(OUSBDevice)
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(OUSBDevice, IUSBDevice)