Changeset 72898 in vbox
- Timestamp:
- Jul 4, 2018 6:33:51 PM (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/src-server/ApplianceImpl.cpp
r72508 r72898 516 516 517 517 /** 518 * Public method implementation. 519 * @return 518 * Public method implementation. 520 519 */ 521 520 HRESULT Appliance::getCertificate(ComPtr<ICertificate> &aCertificateInfo) … … 533 532 /** 534 533 * Public method implementation. 535 * @param aVirtualSystemDescriptions536 * @return537 534 */ 538 535 HRESULT Appliance::getVirtualSystemDescriptions(std::vector<ComPtr<IVirtualSystemDescription> > &aVirtualSystemDescriptions) … … 548 545 for (std::list< ComObjPtr<VirtualSystemDescription> >::iterator it = vsds.begin(); it != vsds.end(); ++it, ++i) 549 546 { 550 547 (*it).queryInterfaceTo(aVirtualSystemDescriptions[i].asOutParam()); 551 548 } 552 549 return S_OK; … … 555 552 /** 556 553 * Public method implementation. 557 * @param aMachines558 * @return559 554 */ 560 555 HRESULT Appliance::getMachines(std::vector<com::Utf8Str> &aMachines) … … 606 601 607 602 /** 608 * Public method implementation. 609 * @return 603 * Public method implementation. 610 604 */ 611 605 HRESULT Appliance::getWarnings(std::vector<com::Utf8Str> &aWarnings) … … 692 686 // 693 687 //////////////////////////////////////////////////////////////////////////////// 694 // 688 695 689 HRESULT Appliance::i_initSetOfSupportedStandardsURI() 696 690 { … … 810 804 * @return ComObjPtr<MediumFormat> 811 805 */ 812 813 806 HRESULT Appliance::i_findMediumFormatFromDiskImage(const ovf::DiskImage &di, ComObjPtr<MediumFormat>& mf) 814 807 { … … 864 857 865 858 if (mf.isNull()) 866 { 867 rc = setError(E_FAIL, 868 tr("Internal inconsistency looking up medium format for the disk image '%s'"), 869 di.strHref.c_str()); 870 } 859 rc = setError(E_FAIL, tr("Internal inconsistency looking up medium format for the disk image '%s'"), 860 di.strHref.c_str()); 871 861 872 862 return rc; … … 921 911 * 922 912 * Must be called from under the object lock! 923 *924 * @return925 913 */ 926 914 bool Appliance::i_isApplianceIdle() … … 988 976 * Called from Appliance::importImpl() and Appliance::writeImpl() to set up a 989 977 * progress object with the proper weights and maximum progress values. 990 *991 * @param pProgress992 * @param strDescription993 * @param mode994 * @return995 978 */ 996 979 HRESULT Appliance::i_setUpProgress(ComObjPtr<Progress> &pProgress, … … 1104 1087 * that the user interface sees progress correctly and that cancel signals are 1105 1088 * passed on to the second thread. 1089 * 1106 1090 * @param pProgressThis Progress object of the current thread. 1107 1091 * @param pProgressAsync Progress object of asynchronous task running in background. … … 1260 1244 * @thread pTask The task. 1261 1245 */ 1262 /* static */ 1263 void Appliance::i_importOrExportThreadTask(TaskOVF *pTask) 1246 /* static */ void Appliance::i_importOrExportThreadTask(TaskOVF *pTask) 1264 1247 { 1265 1248 LogFlowFuncEnter(); … … 1325 1308 } 1326 1309 1327 /* static */ 1328 DECLCALLBACK(int) Appliance::TaskOVF::updateProgress(unsigned uPercent, void *pvUser) 1310 /* static */ DECLCALLBACK(int) Appliance::TaskOVF::updateProgress(unsigned uPercent, void *pvUser) 1329 1311 { 1330 1312 Appliance::TaskOVF* pTask = *(Appliance::TaskOVF**)pvUser; … … 1389 1371 } 1390 1372 1373 1391 1374 //////////////////////////////////////////////////////////////////////////////// 1392 1375 // … … 1395 1378 //////////////////////////////////////////////////////////////////////////////// 1396 1379 1397 1398 1380 /** 1399 1381 * COM initializer. … … 1426 1408 m = NULL; 1427 1409 } 1410 1428 1411 1429 1412 //////////////////////////////////////////////////////////////////////////////// … … 1435 1418 /** 1436 1419 * Public method implementation. 1437 * @param aCount1438 * @return1439 1420 */ 1440 1421 HRESULT VirtualSystemDescription::getCount(ULONG *aCount) … … 1451 1432 /** 1452 1433 * Public method implementation. 1453 * @return1454 1434 */ 1455 1435 HRESULT VirtualSystemDescription::getDescription(std::vector<VirtualSystemDescriptionType_T> &aTypes, … … 1482 1462 /** 1483 1463 * Public method implementation. 1484 * @return1485 1464 */ 1486 1465 HRESULT VirtualSystemDescription::getDescriptionByType(VirtualSystemDescriptionType_T aType, … … 1517 1496 /** 1518 1497 * Public method implementation. 1519 * @return1520 1498 */ 1521 1499 HRESULT VirtualSystemDescription::getValuesByType(VirtualSystemDescriptionType_T aType, … … 1551 1529 /** 1552 1530 * Public method implementation. 1553 * @return1554 1531 */ 1555 1532 HRESULT VirtualSystemDescription::setFinalValues(const std::vector<BOOL> &aEnabled, … … 1589 1566 /** 1590 1567 * Public method implementation. 1591 * @return1592 1568 */ 1593 1569 HRESULT VirtualSystemDescription::addDescription(VirtualSystemDescriptionType_T aType, … … 1638 1614 * Private method; returns a list of description items containing all the items from the member 1639 1615 * description items of this virtual system that match the given type. 1640 * @param aType1641 * @return1642 1616 */ 1643 1617 std::list<VirtualSystemDescriptionEntry*> VirtualSystemDescription::i_findByType(VirtualSystemDescriptionType_T aType) … … 1657 1631 /* Private method; delete all records from the list 1658 1632 * m->llDescriptions that match the given type. 1659 * @param aType1660 * @return1661 1633 */ 1662 1634 void VirtualSystemDescription::i_removeByType(VirtualSystemDescriptionType_T aType) … … 1676 1648 * the given reference ID. Useful when needing the controller for a particular 1677 1649 * virtual disk. 1678 * @param id1679 * @return1680 1650 */ 1681 1651 const VirtualSystemDescriptionEntry* VirtualSystemDescription::i_findControllerFromID(uint32_t id) … … 1740 1710 /** 1741 1711 * Returns the machine config created by importVBoxMachineXML() or NULL if there's none. 1742 * @return1743 1712 */ 1744 1713 const settings::MachineConfigFile* VirtualSystemDescription::i_getMachineConfig() const
Note:
See TracChangeset
for help on using the changeset viewer.