Index: /trunk/src/VBox/Main/src-server/MediumImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/MediumImpl.cpp	(revision 78402)
+++ /trunk/src/VBox/Main/src-server/MediumImpl.cpp	(revision 78403)
@@ -340,9 +340,4 @@
 };
 
-HRESULT Medium::Task::executeTask()
-{
-    return E_NOTIMPL;//ReturnComNotImplemented()
-}
-
 class Medium::CreateBaseTask : public Medium::Task
 {
@@ -364,5 +359,8 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskCreateBaseHandler(*this);
+    }
 };
 
@@ -403,5 +401,9 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskCreateDiffHandler(*this);
+    }
+
     AutoCaller mTargetCaller;
     bool mfKeepMediumLockList;
@@ -466,5 +468,9 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskCloneHandler(*this);
+    }
+
     AutoCaller mTargetCaller;
     AutoCaller mParentCaller;
@@ -501,5 +507,9 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskMoveHandler(*this);
+    }
+
     bool mfKeepMediumLockList;
 };
@@ -530,5 +540,9 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskCompactHandler(*this);
+    }
+
     bool mfKeepMediumLockList;
 };
@@ -562,5 +576,9 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskResizeHandler(*this);
+    }
+
     bool mfKeepMediumLockList;
 };
@@ -590,5 +608,9 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskResetHandler(*this);
+    }
+
     bool mfKeepMediumLockList;
 };
@@ -618,5 +640,9 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskDeleteHandler(*this);
+    }
+
     bool mfKeepMediumLockList;
 };
@@ -665,5 +691,9 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskMergeHandler(*this);
+    }
+
     AutoCaller mTargetCaller;
     AutoCaller mParentForTargetCaller;
@@ -732,5 +762,9 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskImportHandler(*this);
+    }
+
     AutoCaller mParentCaller;
     bool mfKeepTargetMediumLockList;
@@ -784,96 +818,12 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskEncryptHandler(*this);
+    }
+
     AutoCaller mParentCaller;
 };
 
-/**
- * Implementation code for the "create base" task.
- */
-HRESULT Medium::CreateBaseTask::executeTask()
-{
-    return mMedium->i_taskCreateBaseHandler(*this);
-}
-
-/**
- * Implementation code for the "create diff" task.
- */
-HRESULT Medium::CreateDiffTask::executeTask()
-{
-    return mMedium->i_taskCreateDiffHandler(*this);
-}
-
-/**
- * Implementation code for the "clone" task.
- */
-HRESULT Medium::CloneTask::executeTask()
-{
-    return mMedium->i_taskCloneHandler(*this);
-}
-
-/**
- * Implementation code for the "move" task.
- */
-HRESULT Medium::MoveTask::executeTask()
-{
-    return mMedium->i_taskMoveHandler(*this);
-}
-
-/**
- * Implementation code for the "compact" task.
- */
-HRESULT Medium::CompactTask::executeTask()
-{
-    return mMedium->i_taskCompactHandler(*this);
-}
-
-/**
- * Implementation code for the "resize" task.
- */
-HRESULT Medium::ResizeTask::executeTask()
-{
-    return mMedium->i_taskResizeHandler(*this);
-}
-
-
-/**
- * Implementation code for the "reset" task.
- */
-HRESULT Medium::ResetTask::executeTask()
-{
-    return mMedium->i_taskResetHandler(*this);
-}
-
-/**
- * Implementation code for the "delete" task.
- */
-HRESULT Medium::DeleteTask::executeTask()
-{
-    return mMedium->i_taskDeleteHandler(*this);
-}
-
-/**
- * Implementation code for the "merge" task.
- */
-HRESULT Medium::MergeTask::executeTask()
-{
-    return mMedium->i_taskMergeHandler(*this);
-}
-
-/**
- * Implementation code for the "import" task.
- */
-HRESULT Medium::ImportTask::executeTask()
-{
-    return mMedium->i_taskImportHandler(*this);
-}
-
-/**
- * Implementation code for the "encrypt" task.
- */
-HRESULT Medium::EncryptTask::executeTask()
-{
-    return mMedium->i_taskEncryptHandler(*this);
-}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -9633,5 +9583,5 @@
         m->pVirtualBox->i_onMediumConfigChanged(this);
 
-    LogFlowFunc(("LEAVE: mrc=%Rhrc\n", mrc));
+    LogFlowFunc(("LEAVE: mrc=%Rhrc\n", (HRESULT)mrc));
     return mrc;
 }