VirtualBox

Changeset 16853 in vbox


Ignore:
Timestamp:
Feb 17, 2009 3:48:20 PM (16 years ago)
Author:
vboxsync
Message:

Main: rename IDVDImage2 to IDVDImage

Location:
trunk/src/VBox
Files:
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

    r16735 r16853  
    13531353                /* first assume it's a UUID */
    13541354                Guid uuid(a->argv[2]);
    1355                 ComPtr<IDVDImage2> dvdImage;
     1355                ComPtr<IDVDImage> dvdImage;
    13561356                rc = a->virtualBox->GetDVDImage(uuid, dvdImage.asOutParam());
    13571357                if (FAILED(rc) || !dvdImage)

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp

    r16530 r16853  
    909909    else if (strcmp(a->argv[0], "dvd") == 0)
    910910    {
    911         ComPtr<IDVDImage2> dvdImage;
     911        ComPtr<IDVDImage> dvdImage;
    912912        CHECK_ERROR(a->virtualBox, OpenDVDImage(filepath, Guid(), dvdImage.asOutParam()));
    913913    }
    … …  
    950950    if (strcmp(a->argv[0], "dvd") == 0)
    951951    {
    952         ComPtr<IDVDImage2> dvdImage;
     952        ComPtr<IDVDImage> dvdImage;
    953953        rc = a->virtualBox->GetDVDImage(uuid, dvdImage.asOutParam());
    954954        /* not a UUID or not registered? Then it must be a filename */

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

    r16530 r16853  
    572572    if (SUCCEEDED(rc) && dvdDrive)
    573573    {
    574         ComPtr<IDVDImage2> dvdImage;
     574        ComPtr<IDVDImage> dvdImage;
    575575        rc = dvdDrive->GetImage(dvdImage.asOutParam());
    576576        if (SUCCEEDED(rc) && dvdImage)

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

    r16530 r16853  
    431431    if (strcmp(a->argv[0], "dvds") == 0)
    432432    {
    433         com::SafeIfaceArray<IDVDImage2> dvds;
     433        com::SafeIfaceArray<IDVDImage> dvds;
    434434        CHECK_ERROR(a->virtualBox, COMGETTER(DVDImages)(ComSafeArrayAsOutParam(dvds)));
    435435        for (size_t i = 0; i < dvds.size(); ++ i)
    436436        {
    437             ComPtr<IDVDImage2> dvdImage = dvds[i];
     437            ComPtr<IDVDImage> dvdImage = dvds[i];
    438438            Guid uuid;
    439439            dvdImage->COMGETTER(Id)(uuid.asOutParam());

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

    r16530 r16853  
    11191119                /* first assume it's a UUID */
    11201120                Guid uuid(dvd);
    1121                 ComPtr<IDVDImage2> dvdImage;
     1121                ComPtr<IDVDImage> dvdImage;
    11221122                rc = a->virtualBox->GetDVDImage(uuid, dvdImage.asOutParam());
    11231123                if (FAILED(rc) || !dvdImage)

  • trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

    r16530 r16853  
    17871787        {
    17881788            /* try to find an existing one */
    1789             ComPtr <IDVDImage2> image;
     1789            ComPtr <IDVDImage> image;
    17901790            rc = virtualBox->FindDVDImage (medium, image.asOutParam());
    17911791            if (FAILED (rc))

  • trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

    r16637 r16853  
    147147
    148148    const CHardDisk2 &hardDisk() const { return mHardDisk; }
    149     const CDVDImage2 &dvdImage() const { return mDVDImage; }
     149    const CDVDImage &dvdImage() const { return mDVDImage; }
    150150    const CFloppyImage2 &floppyImage() const { return mFloppyImage; }
    151151
    … …  
    247247
    248248    CHardDisk2 mHardDisk;
    249     CDVDImage2 mDVDImage;
     249    CDVDImage mDVDImage;
    250250    CFloppyImage2 mFloppyImage;
    251251

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

    r16806 r16853  
    29162916                            .arg (vbox.GetVersion().remove ("_OSE"));
    29172917
    2918     CDVDImage2Vector vec = vbox.GetDVDImages();
    2919     for (CDVDImage2Vector::ConstIterator it = vec.begin();
     2918    CDVDImageVector vec = vbox.GetDVDImages();
     2919    for (CDVDImageVector::ConstIterator it = vec.begin();
    29202920         it != vec.end(); ++ it)
    29212921    {
    … …  
    29492949    QUuid uuid;
    29502950
    2951     CDVDImage2 image = vbox.FindDVDImage (aSource);
     2951    CDVDImage image = vbox.FindDVDImage (aSource);
    29522952    if (image.isNull())
    29532953    {

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

    r16637 r16853  
    22932293            case KDriveState_ImageMounted:
    22942294            {
    2295                 CDVDImage2 img = dvd.GetImage();
     2295                CDVDImage img = dvd.GetImage();
    22962296                item = QString (sSectionItemTpl2)
    22972297                    .arg (tr ("Image", "details report (DVD)"),
    … …  
    30023002        VBoxMediaList::iterator first = mMediaList.end();
    30033003
    3004         CDVDImage2Vector vec = mVBox.GetDVDImages();
    3005         for (CDVDImage2Vector::ConstIterator it = vec.begin();
     3004        CDVDImageVector vec = mVBox.GetDVDImages();
     3005        for (CDVDImageVector::ConstIterator it = vec.begin();
    30063006             it != vec.end(); ++ it)
    30073007        {

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp

    r15185 r16853  
    11271127        case VBoxDefs::MediaType_DVD:
    11281128        {
    1129             CDVDImage2 image = item->medium().dvdImage();
     1129            CDVDImage image = item->medium().dvdImage();
    11301130            image.Close();
    11311131            result = image;
    … …  
    15541554        case VBoxDefs::MediaType_DVD:
    15551555        {
    1556             CDVDImage2 image = mVBox.OpenDVDImage (aLocation, uuid);
     1556            CDVDImage image = mVBox.OpenDVDImage (aLocation, uuid);
    15571557            if (mVBox.isOk())
    15581558            {

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsCD.cpp

    r14039 r16853  
    109109        case KDriveState_ImageMounted:
    110110        {
    111             CDVDImage2 img = dvd.GetImage();
     111            CDVDImage img = dvd.GetImage();
    112112            QString src = img.GetLocation();
    113113            AssertMsg (!src.isNull(), ("Image file must not be null"));

  • trunk/src/VBox/Main/ApplianceImpl.cpp

    r16849 r16853  
    238238    appliance.createObject();
    239239    rc = appliance->init(this);
    240 //     ComAssertComRCThrowRC(rc);
    241240
    242241    if (SUCCEEDED(rc))

  • trunk/src/VBox/Main/ConsoleImpl.cpp

    r16364 r16853  
    25512551        case DriveState_ImageMounted:
    25522552        {
    2553             ComPtr <IDVDImage2> ImagePtr;
     2553            ComPtr <IDVDImage> ImagePtr;
    25542554            rc = mDVDDrive->GetImage (ImagePtr.asOutParam());
    25552555            if (SUCCEEDED (rc))
    … …  
    44104410        if (driveState == DriveState_ImageMounted)
    44114411        {
    4412             ComPtr <IDVDImage2> image;
     4412            ComPtr <IDVDImage> image;
    44134413            rc = drive->GetImage (image.asOutParam());
    44144414            CheckComRCReturnRC (rc);

  • trunk/src/VBox/Main/ConsoleImpl2.cpp

    r16745 r16853  
    10711071            rc = CFGMR3InsertInteger(pCfg,  "Mountable",            1);             RC_CHECK();
    10721072
    1073             ComPtr<IDVDImage2> dvdImage;
     1073            ComPtr<IDVDImage> dvdImage;
    10741074            hrc = dvdDrive->GetImage(dvdImage.asOutParam());                        H();
    10751075            if (dvdImage)

  • trunk/src/VBox/Main/DVDDriveImpl.cpp

    r16560 r16853  
    266266     * We also don't lock mParent since its mParent field is const. */
    267267
    268     ComObjPtr <DVDImage2> image;
    269     rc = mParent->virtualBox()->findDVDImage2 (&imageId, NULL,
    270                                                true /* aSetError */, &image);
     268    ComObjPtr<DVDImage> image;
     269    rc = mParent->virtualBox()->findDVDImage(&imageId, NULL,
     270                                             true /* aSetError */, &image);
    271271
    272272    if (SUCCEEDED (rc))
    … …  
    370370}
    371371
    372 STDMETHODIMP DVDDrive::GetImage (IDVDImage2 **aDVDImage)
     372STDMETHODIMP DVDDrive::GetImage (IDVDImage **aDVDImage)
    373373{
    374374    CheckComArgOutPointerValid(aDVDImage);

  • trunk/src/VBox/Main/MediumImpl.cpp

    r16560 r16853  
    10961096
    10971097////////////////////////////////////////////////////////////////////////////////
    1098 // DVDImage2 class
    1099 ////////////////////////////////////////////////////////////////////////////////
    1100 
    1101 DEFINE_EMPTY_CTOR_DTOR (DVDImage2)
     1098// DVDImage class
     1099////////////////////////////////////////////////////////////////////////////////
     1100
     1101DEFINE_EMPTY_CTOR_DTOR (DVDImage)
    11021102
    11031103/**
    … …  
    11051105 *       mVirtualBox write lock.
    11061106 */
    1107 HRESULT DVDImage2::unregisterWithVirtualBox()
     1107HRESULT DVDImage::unregisterWithVirtualBox()
    11081108{
    11091109    return mVirtualBox->unregisterDVDImage (this);

  • trunk/src/VBox/Main/VirtualBoxImpl.cpp

    r16707 r16853  
    643643
    644644STDMETHODIMP
    645 VirtualBox::COMGETTER(DVDImages) (ComSafeArrayOut (IDVDImage2 *, aDVDImages))
     645VirtualBox::COMGETTER(DVDImages) (ComSafeArrayOut (IDVDImage *, aDVDImages))
    646646{
    647647    if (ComSafeArrayOutIsNull (aDVDImages))
    … …  
    653653    AutoReadLock alock (this);
    654654
    655     SafeIfaceArray <IDVDImage2> images (mData.mDVDImages2);
     655    SafeIfaceArray <IDVDImage> images (mData.mDVDImages2);
    656656    images.detachTo (ComSafeArrayOutArg (aDVDImages));
    657657
    … …  
    11661166/** @note Doesn't lock anything. */
    11671167STDMETHODIMP VirtualBox::OpenDVDImage (IN_BSTR aLocation, IN_GUID aId,
    1168                                        IDVDImage2 **aDVDImage)
     1168                                       IDVDImage **aDVDImage)
    11691169{
    11701170    CheckComArgStrNotEmptyOrNull(aLocation);
    … …  
    11811181        id.create();
    11821182
    1183     ComObjPtr <DVDImage2> image;
     1183    ComObjPtr <DVDImage> image;
    11841184    image.createObject();
    11851185    rc = image->init (this, aLocation, id);
    … …  
    11961196
    11971197/** @note Locks objects! */
    1198 STDMETHODIMP VirtualBox::GetDVDImage (IN_GUID aId, IDVDImage2 **aDVDImage)
     1198STDMETHODIMP VirtualBox::GetDVDImage (IN_GUID aId, IDVDImage **aDVDImage)
    11991199{
    12001200    CheckComArgOutSafeArrayPointerValid(aDVDImage);
    … …  
    12041204
    12051205    Guid id = aId;
    1206     ComObjPtr <DVDImage2> image;
    1207     HRESULT rc = findDVDImage2 (&id, NULL, true /* setError */, &image);
     1206    ComObjPtr <DVDImage> image;
     1207    HRESULT rc = findDVDImage (&id, NULL, true /* setError */, &image);
    12081208
    12091209    /* the below will set *aDVDImage to NULL if image is null */
    … …  
    12141214
    12151215/** @note Locks objects! */
    1216 STDMETHODIMP VirtualBox::FindDVDImage (IN_BSTR aLocation, IDVDImage2 **aDVDImage)
     1216STDMETHODIMP VirtualBox::FindDVDImage (IN_BSTR aLocation, IDVDImage **aDVDImage)
    12171217{
    12181218    CheckComArgNotNull(aLocation);
    … …  
    12221222    CheckComRCReturnRC (autoCaller.rc());
    12231223
    1224     ComObjPtr <DVDImage2> image;
    1225     HRESULT rc = findDVDImage2 (NULL, aLocation, true /* setError */, &image);
     1224    ComObjPtr <DVDImage> image;
     1225    HRESULT rc = findDVDImage (NULL, aLocation, true /* setError */, &image);
    12261226
    12271227    /* the below will set *aDVDImage to NULL if dvd is null */
    … …  
    26962696
    26972697/**
    2698  * Searches for a DVDImage2 object with the given ID or location in the list of
     2698 * Searches for a DVDImage object with the given ID or location in the list of
    26992699 * registered DVD images. If both ID and file path are specified, the first
    27002700 * object that matches either of them (not necessarily both) is returned.
    … …  
    27102710 * @note Locks this object and image objects for reading.
    27112711 */
    2712 HRESULT VirtualBox::findDVDImage2 (const Guid *aId, CBSTR aLocation,
    2713                                    bool aSetError,
    2714                                    ComObjPtr <DVDImage2> *aImage /* = NULL */)
     2712HRESULT VirtualBox::findDVDImage(const Guid *aId, CBSTR aLocation,
     2713                                 bool aSetError,
     2714                                 ComObjPtr<DVDImage> *aImage /* = NULL */)
    27152715{
    27162716    AssertReturn (aId || aLocation, E_INVALIDARG);
    … …  
    27312731    bool found = false;
    27322732
    2733     for (DVDImage2List::const_iterator it = mData.mDVDImages2.begin();
     2733    for (DVDImageList::const_iterator it = mData.mDVDImages2.begin();
    27342734         it != mData.mDVDImages2.end();
    27352735         ++ it)
    … …  
    29392939
    29402940    {
    2941         ComObjPtr <DVDImage2> image;
    2942         rc = findDVDImage2 (&aId, aLocation, false /* aSetError */, &image);
     2941        ComObjPtr<DVDImage> image;
     2942        rc = findDVDImage (&aId, aLocation, false /* aSetError */, &image);
    29432943        if (SUCCEEDED (rc))
    29442944        {
    … …  
    30693069                case 1: /* DVDImages */
    30703070                {
    3071                     ComObjPtr <DVDImage2> image;
     3071                    ComObjPtr<DVDImage> image;
    30723072                    image.createObject();
    30733073                    rc = image->init (this, *it);
    … …  
    31823182                Key imagesNode = registryNode.createKey ("DVDImages");
    31833183
    3184                 for (DVDImage2List::const_iterator it =
     3184                for (DVDImageList::const_iterator it =
    31853185                        mData.mDVDImages2.begin();
    31863186                     it != mData.mDVDImages2.end();
    … …  
    34233423 * @note Locks this object for writing and @a aImage for reading.
    34243424 */
    3425 HRESULT VirtualBox::registerDVDImage (DVDImage2 *aImage,
     3425HRESULT VirtualBox::registerDVDImage (DVDImage *aImage,
    34263426                                      bool aSaveRegistry /*= true*/)
    34273427{
    … …  
    34803480 * @note Locks this object for writing and @a aImage for reading.
    34813481 */
    3482 HRESULT VirtualBox::unregisterDVDImage (DVDImage2 *aImage,
     3482HRESULT VirtualBox::unregisterDVDImage (DVDImage *aImage,
    34833483                                        bool aSaveRegistry /*= true*/)
    34843484{
    … …  
    36673667
    36683668    /* check DVD paths */
    3669     for (DVDImage2List::iterator it = mData.mDVDImages2.begin();
     3669    for (DVDImageList::iterator it = mData.mDVDImages2.begin();
    36703670         it != mData.mDVDImages2.end();
    36713671         ++ it)

  • trunk/src/VBox/Main/idl/VirtualBox.xidl

    r16830 r16853  
    13951395    </attribute>
    13961396
    1397     <attribute name="DVDImages" type="IDVDImage2" readonly="yes" safearray="yes">
     1397    <attribute name="DVDImages" type="IDVDImage" readonly="yes" safearray="yes">
    13981398      <desc>
    13991399        Array of CD/DVD image objects registered with this VirtualBox instance.
    … …  
    19401940        </desc>
    19411941      </param>
    1942       <param name="image" type="IDVDImage2" dir="return">
     1942      <param name="image" type="IDVDImage" dir="return">
    19431943        <desc>Opened CD/DVD image object.</desc>
    19441944      </param>
    … …  
    19611961        <desc>UUID of the image to look for.</desc>
    19621962      </param>
    1963       <param name="image" type="IDVDImage2" dir="return">
     1963      <param name="image" type="IDVDImage" dir="return">
    19641964        <desc>Found CD/DVD image object.</desc>
    19651965      </param>
    … …  
    19961996        <desc>CD/DVD image file path to look for.</desc>
    19971997      </param>
    1998       <param name="image" type="IDVDImage2" dir="return">
     1998      <param name="image" type="IDVDImage" dir="return">
    19991999        <desc>Found CD/DVD image object.</desc>
    20002000      </param>
    … …  
    77237723      <ul>
    77247724        <li>IHardDisk2 (virtual hard disks)</li>
    7725         <li>IDVDImage2 (standard CD/DVD ISO image files)</li>
     7725        <li>IDVDImage (standard CD/DVD ISO image files)</li>
    77267726        <li>IFloppyImage2 (raw floppy image files)</li>
    77277727      </ul>
    … …  
    78527852        For example, states <link to="MediaState_NotCreated"/>,
    78537853        <link to="MediaState_LockedWrite"/>, <link to="MediaState_Creating"/>,
    7854         <link to="MediaState_Deleting"/> are meaningless for IDVDImage2 and
     7854        <link to="MediaState_Deleting"/> are meaningless for IDVDImage and
    78557855        IFloppyImage2 media.
    78567856      </desc>
    … …  
    92779277
    92789278  <!--
    9279   // IDVDImage2
     9279  // IDVDImage
    92809280  /////////////////////////////////////////////////////////////////////////
    92819281  -->
    92829282
    92839283  <interface
    9284     name="IDVDImage2" extends="IMedium"
    9285     uuid="1c5165f1-9543-478d-a117-84a1d2317068"
     9284    name="IDVDImage" extends="IMedium"
     9285    uuid="b1f90bbb-e8a9-4484-9af1-3638e943f763"
    92869286    wsmap="managed"
    92879287  >
    92889288    <desc>
    9289       The IDVDImage2 interface represents a medium containing the image
     9289      The IDVDImage interface represents a medium containing the image
    92909290      of a CD or DVD disk in the ISO format.
     9291
     9292      This is a subclass of <link to="IMedium" />; see remarks there.
    92919293    </desc>
    92929294
    … …  
    93519353    <method name="getImage">
    93529354      <desc>Returns the currently mounted CD/DVD image.</desc>
    9353       <param name="image" type="IDVDImage2" dir="return"/>
     9355      <param name="image" type="IDVDImage" dir="return"/>
    93549356    </method>
    93559357

  • trunk/src/VBox/Main/include/DVDDriveImpl.h

    r15991 r16853  
    5555        }
    5656
    57         ComObjPtr <DVDImage2> image;
     57        ComObjPtr<DVDImage> image;
    5858        ComPtr <IHostDVDDrive> hostDrive;
    5959        DriveState_T state;
    … …  
    9494    STDMETHOD(CaptureHostDrive) (IHostDVDDrive *aHostDVDDrive);
    9595    STDMETHOD(Unmount)();
    96     STDMETHOD(GetImage) (IDVDImage2 **aDVDImage);
     96    STDMETHOD(GetImage)(IDVDImage **aDVDImage);
    9797    STDMETHOD(GetHostDrive) (IHostDVDDrive **aHostDVDDrive);
    9898

  • trunk/src/VBox/Main/include/MediumImpl.h

    r15051 r16853  
    236236
    237237/**
    238  * The DVDImage2 component class implements the IDVDImage2 interface.
    239  */
    240 class ATL_NO_VTABLE DVDImage2
    241     : public com::SupportErrorInfoDerived <ImageMediumBase, DVDImage2, IDVDImage2>
    242     , public VirtualBoxSupportTranslation <DVDImage2>
    243     , public IDVDImage2
     238 * The DVDImage component class implements the IDVDImage interface.
     239 */
     240class ATL_NO_VTABLE DVDImage
     241    : public com::SupportErrorInfoDerived<ImageMediumBase, DVDImage, IDVDImage>
     242    , public VirtualBoxSupportTranslation<DVDImage>
     243    , public IDVDImage
    244244{
    245245public:
    … …  
    247247    COM_FORWARD_IMedium_TO_BASE (ImageMediumBase)
    248248
    249     VIRTUALBOXSUPPORTTRANSLATION_OVERRIDE (DVDImage2)
    250 
    251     DECLARE_NOT_AGGREGATABLE (DVDImage2)
     249    VIRTUALBOXSUPPORTTRANSLATION_OVERRIDE (DVDImage)
     250
     251    DECLARE_NOT_AGGREGATABLE (DVDImage)
    252252
    253253    DECLARE_PROTECT_FINAL_CONSTRUCT()
    254254
    255     BEGIN_COM_MAP (DVDImage2)
     255    BEGIN_COM_MAP (DVDImage)
    256256        COM_INTERFACE_ENTRY (ISupportErrorInfo)
    257257        COM_INTERFACE_ENTRY2 (IMedium, ImageMediumBase)
    258         COM_INTERFACE_ENTRY (IDVDImage2)
     258        COM_INTERFACE_ENTRY (IDVDImage)
    259259    END_COM_MAP()
    260260
    261261    NS_DECL_ISUPPORTS
    262262
    263     DECLARE_EMPTY_CTOR_DTOR (DVDImage2)
     263    DECLARE_EMPTY_CTOR_DTOR (DVDImage)
    264264
    265265    // public initializer/uninitializer for internal purposes only
    … …  
    279279
    280280    /** For com::SupportErrorInfoImpl. */
    281     static const char *ComponentName() { return "DVDImage2"; }
     281    static const char *ComponentName() { return "DVDImage"; }
    282282
    283283private:

  • trunk/src/VBox/Main/include/VirtualBoxImpl.h

    r16707 r16853  
    4444class SessionMachine;
    4545class HardDisk2;
    46 class DVDImage2;
     46class DVDImage;
    4747class FloppyImage2;
    4848class MachineCollection;
    … …  
    127127    STDMETHOD(COMGETTER(Machines2)) (ComSafeArrayOut (IMachine *, aMachines));
    128128    STDMETHOD(COMGETTER(HardDisks2)) (ComSafeArrayOut (IHardDisk2 *, aHardDisks));
    129     STDMETHOD(COMGETTER(DVDImages)) (ComSafeArrayOut (IDVDImage2 *, aDVDImages));
     129    STDMETHOD(COMGETTER(DVDImages)) (ComSafeArrayOut (IDVDImage *, aDVDImages));
    130130    STDMETHOD(COMGETTER(FloppyImages)) (ComSafeArrayOut (IFloppyImage2 *, aFloppyImages));
    131131    STDMETHOD(COMGETTER(ProgressOperations)) (ComSafeArrayOut (IProgress *, aOperations));
    … …  
    154154
    155155    STDMETHOD(OpenDVDImage) (IN_BSTR aLocation, IN_GUID aId,
    156                              IDVDImage2 **aDVDImage);
    157     STDMETHOD(GetDVDImage) (IN_GUID aId, IDVDImage2 **aDVDImage);
    158     STDMETHOD(FindDVDImage) (IN_BSTR aLocation, IDVDImage2 **aDVDImage);
     156                             IDVDImage **aDVDImage);
     157    STDMETHOD(GetDVDImage) (IN_GUID aId, IDVDImage **aDVDImage);
     158    STDMETHOD(FindDVDImage) (IN_BSTR aLocation, IDVDImage **aDVDImage);
    159159
    160160    STDMETHOD(OpenFloppyImage) (IN_BSTR aLocation, IN_GUID aId,
    … …  
    236236    HRESULT findHardDisk2 (const Guid *aId, CBSTR aLocation,
    237237                           bool aSetError, ComObjPtr <HardDisk2> *aHardDisk = NULL);
    238     HRESULT findDVDImage2 (const Guid *aId, CBSTR aLocation,
    239                            bool aSetError, ComObjPtr <DVDImage2> *aImage = NULL);
     238    HRESULT findDVDImage(const Guid *aId, CBSTR aLocation,
     239                         bool aSetError, ComObjPtr<DVDImage> *aImage = NULL);
    240240    HRESULT findFloppyImage2 (const Guid *aId, CBSTR aLocation,
    241241                              bool aSetError, ComObjPtr <FloppyImage2> *aImage = NULL);
    … …  
    259259    HRESULT unregisterHardDisk2 (HardDisk2 *aHardDisk, bool aSaveRegistry = true);
    260260
    261     HRESULT registerDVDImage (DVDImage2 *aImage, bool aSaveRegistry = true);
    262     HRESULT unregisterDVDImage (DVDImage2 *aImage, bool aSaveRegistry = true);
     261    HRESULT registerDVDImage(DVDImage *aImage, bool aSaveRegistry = true);
     262    HRESULT unregisterDVDImage(DVDImage *aImage, bool aSaveRegistry = true);
    263263
    264264    HRESULT registerFloppyImage (FloppyImage2 *aImage, bool aSaveRegistry = true);
    … …  
    362362
    363363    typedef std::list <ComObjPtr <HardDisk2> > HardDisk2List;
    364     typedef std::list <ComObjPtr <DVDImage2> > DVDImage2List;
     364    typedef std::list <ComObjPtr <DVDImage> > DVDImageList;
    365365    typedef std::list <ComObjPtr <FloppyImage2> > FloppyImage2List;
    366366    typedef std::list <ComObjPtr <SharedFolder> > SharedFolderList;
    … …  
    429429
    430430        HardDisk2List mHardDisks2;
    431         DVDImage2List mDVDImages2;
     431        DVDImageList mDVDImages2;
    432432        FloppyImage2List mFloppyImages2;
    433433        SharedFolderList mSharedFolders;

  • trunk/src/VBox/Main/testcase/tstAPI.cpp

    r16817 r16853  
    961961        }
    962962        {
    963             com::SafeIfaceArray <IDVDImage2> images;
     963            com::SafeIfaceArray <IDVDImage> images;
    964964            CHECK_ERROR_BREAK (virtualBox,
    965965                               COMGETTER(DVDImages) (ComSafeArrayAsOutParam (images)));

  • trunk/src/VBox/Main/testcase/tstVBoxAPILinux.cpp

    r14668 r16853  
    364364     */
    365365    nsID uuid = {0};
    366     nsCOMPtr<IDVDImage2> dvdImage;
     366    nsCOMPtr<IDVDImage> dvdImage;
    367367
    368368    rc = virtualBox->OpenDVDImage(NS_LITERAL_STRING("/home/achimha/isoimages/winnt4ger.iso").get(),

  • trunk/src/VBox/Main/xpcom/server.cpp

    r16707 r16853  
    143143NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Snapshot, ISnapshot)
    144144
    145 NS_DECL_CLASSINFO(DVDImage2)
    146 NS_IMPL_THREADSAFE_ISUPPORTS2_AMBIGUOUS_CI(DVDImage2,
     145NS_DECL_CLASSINFO(DVDImage)
     146NS_IMPL_THREADSAFE_ISUPPORTS2_AMBIGUOUS_CI(DVDImage,
    147147                                           IMedium, ImageMediumBase,
    148                                            IDVDImage2, DVDImage2)
     148                                           IDVDImage, DVDImage)
    149149NS_DECL_CLASSINFO(FloppyImage2)
    150150NS_IMPL_THREADSAFE_ISUPPORTS2_AMBIGUOUS_CI(FloppyImage2,
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette