VirtualBox

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


Ignore:
Timestamp:
Apr 4, 2011 1:16:09 PM (14 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
70949
Message:

iprt::MiniString -> RTCString.

Location:
trunk/src/VBox/Main/include
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r35523 r36527  
    6666{
    6767    /** The name. */
    68     iprt::MiniString        strName;
     68    RTCString        strName;
    6969    /** The module name. */
    70     iprt::MiniString        strModule;
     70    RTCString        strModule;
    7171    /** The description. */
    72     iprt::MiniString        strDescription;
     72    RTCString        strDescription;
    7373    /** The frontend or component which it plugs into. */
    74     iprt::MiniString        strFrontend;
     74    RTCString        strFrontend;
    7575} VBOXEXTPACKPLUGINDESC;
    7676/** Pointer to a plug-in descriptor. */
    … …  
    8585{
    8686    /** The name. */
    87     iprt::MiniString        strName;
     87    RTCString        strName;
    8888    /** The description. */
    89     iprt::MiniString        strDescription;
     89    RTCString        strDescription;
    9090    /** The version string. */
    91     iprt::MiniString        strVersion;
     91    RTCString        strVersion;
    9292    /** The internal revision number. */
    9393    uint32_t                uRevision;
    9494    /** The name of the main module. */
    95     iprt::MiniString        strMainModule;
     95    RTCString        strMainModule;
    9696    /** The name of the VRDE module, empty if none. */
    97     iprt::MiniString        strVrdeModule;
     97    RTCString        strVrdeModule;
    9898    /** The number of plug-in descriptors. */
    9999    uint32_t                cPlugIns;
    … …  
    111111
    112112void                VBoxExtPackInitDesc(PVBOXEXTPACKDESC a_pExtPackDesc);
    113 iprt::MiniString   *VBoxExtPackLoadDesc(const char *a_pszDir, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo);
    114 iprt::MiniString   *VBoxExtPackLoadDescFromVfsFile(RTVFSFILE hVfsFile, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo);
    115 iprt::MiniString   *VBoxExtPackExtractNameFromTarballPath(const char *pszTarball);
     113RTCString   *VBoxExtPackLoadDesc(const char *a_pszDir, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo);
     114RTCString   *VBoxExtPackLoadDescFromVfsFile(RTVFSFILE hVfsFile, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo);
     115RTCString   *VBoxExtPackExtractNameFromTarballPath(const char *pszTarball);
    116116void                VBoxExtPackFreeDesc(PVBOXEXTPACKDESC a_pExtPackDesc);
    117117bool                VBoxExtPackIsValidName(const char *pszName);
    118118bool                VBoxExtPackIsValidMangledName(const char *pszMangledName, size_t cchMax = RTSTR_MAX);
    119 iprt::MiniString   *VBoxExtPackMangleName(const char *pszName);
    120 iprt::MiniString   *VBoxExtPackUnmangleName(const char *pszMangledName, size_t cbMax);
     119RTCString   *VBoxExtPackMangleName(const char *pszName);
     120RTCString   *VBoxExtPackUnmangleName(const char *pszMangledName, size_t cbMax);
    121121int                 VBoxExtPackCalcDir(char *pszExtPackDir, size_t cbExtPackDir, const char *pszParentDir, const char *pszName);
    122122bool                VBoxExtPackIsValidVersionString(const char *pszName);

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

    r34341 r36527  
    11/* $Id$ */
    22/** @file
    3  * Classes for handling hardware detection under Linux.
     3 * VirtualBox Main - Classes for handling hardware detection under Linux.
    44 *
    55 * Please feel free to expand these to work for other systems (Solaris!) or to
    … …  
    4040    {
    4141        /** The device node of the drive. */
    42         iprt::MiniString mDevice;
     42        RTCString mDevice;
    4343        /** A unique identifier for the device, if available.  This should be
    4444         * kept consistent across different probing methods of a given
    4545         * platform if at all possible. */
    46         iprt::MiniString mUdi;
     46        RTCString mUdi;
    4747        /** A textual description of the drive. */
    48         iprt::MiniString mDescription;
     48        RTCString mDescription;
    4949
    5050        /** Constructors */
    51         DriveInfo(const iprt::MiniString &aDevice,
    52                   const iprt::MiniString &aUdi = "",
    53                   const iprt::MiniString &aDescription = "")
     51        DriveInfo(const RTCString &aDevice,
     52                  const RTCString &aUdi = "",
     53                  const RTCString &aDescription = "")
    5454            : mDevice(aDevice),
    5555              mUdi(aUdi),

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

    r36128 r36527  
    11/* $Id$ */
    2 
    32/** @file
    4  *
    5  * VBox Performance Classes declaration.
     3 * VirtualBox Main - Performance Classes declaration.
    64 */
    75
    … …  
    534532
    535533    private:
    536         iprt::MiniString mName;
     534        RTCString mName;
    537535        BaseMetric *mBaseMetric;
    538536        SubMetric  *mSubMetric;
    … …  
    549547        static bool patternMatch(const char *pszPat, const char *pszName,
    550548                                 bool fSeenColon = false);
    551         bool match(const ComPtr<IUnknown> object, const iprt::MiniString &name) const;
     549        bool match(const ComPtr<IUnknown> object, const RTCString &name) const;
    552550    private:
    553551        void init(ComSafeArrayIn(IN_BSTR, metricNames),
    554552                  ComSafeArrayIn(IUnknown * , objects));
    555553
    556         typedef std::pair<const ComPtr<IUnknown>, const iprt::MiniString> FilterElement;
     554        typedef std::pair<const ComPtr<IUnknown>, const RTCString> FilterElement;
    557555        typedef std::list<FilterElement> ElementList;
    558556

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

    r35536 r36527  
    11/* $Id$ */
    22/** @file
    3  * OVF reader declarations.
     3 * VirtualBox Main - OVF reader declarations.
    44 *
    5  * Depends only on IPRT, including the iprt::MiniString and IPRT XML classes.
     5 * Depends only on IPRT, including the RTCString and IPRT XML classes.
    66 */
    77
    … …  
    160160{
    161161    // fields from /DiskSection/Disk
    162     iprt::MiniString strDiskId;     // value from DiskSection/Disk/@diskId
     162    RTCString strDiskId;     // value from DiskSection/Disk/@diskId
    163163    int64_t iCapacity;              // value from DiskSection/Disk/@capacity;
    164164                                    // (maximum size for dynamic images, I guess; we always translate this to bytes)
    … …  
    166166                                    // (actual used size of disk, always in bytes; can be an estimate of used disk
    167167                                    // space, but cannot be larger than iCapacity; -1 if not set)
    168     iprt::MiniString strFormat;              // value from DiskSection/Disk/@format
     168    RTCString strFormat;              // value from DiskSection/Disk/@format
    169169                // typically http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized
    170     iprt::MiniString uuidVbox;      // optional; if the file was exported by VirtualBox >= 3.2,
     170    RTCString uuidVbox;      // optional; if the file was exported by VirtualBox >= 3.2,
    171171                                    // then this has the UUID with which the disk was registered
    172172
    173173    // fields from /References/File; the spec says the file reference from disk can be empty,
    174174    // so in that case, strFilename will be empty, then a new disk should be created
    175     iprt::MiniString strHref;       // value from /References/File/@href (filename); if empty, then the remaining fields are ignored
     175    RTCString strHref;       // value from /References/File/@href (filename); if empty, then the remaining fields are ignored
    176176    int64_t iSize;                  // value from /References/File/@size (optional according to spec; then we set -1 here)
    177177    int64_t iChunkSize;             // value from /References/File/@chunkSize (optional, unsupported)
    178     iprt::MiniString strCompression; // value from /References/File/@compression (optional, can be "gzip" according to spec)
     178    RTCString strCompression; // value from /References/File/@compression (optional, can be "gzip" according to spec)
    179179
    180180    // additional field which has a descriptive size in megabytes derived from the above; this can be used for progress reports
    … …  
    207207struct VirtualHardwareItem
    208208{
    209     iprt::MiniString strDescription;
    210     iprt::MiniString strCaption;
    211     iprt::MiniString strElementName;
     209    RTCString strDescription;
     210    RTCString strCaption;
     211    RTCString strElementName;
    212212
    213213    uint32_t ulInstanceID;
    … …  
    215215
    216216    ResourceType_T resourceType;
    217     iprt::MiniString strOtherResourceType;
    218     iprt::MiniString strResourceSubType;
     217    RTCString strOtherResourceType;
     218    RTCString strResourceSubType;
    219219    bool fResourceRequired;
    220220
    221     iprt::MiniString strHostResource;   // "Abstractly specifies how a device shall connect to a resource on the deployment platform.
     221    RTCString strHostResource;   // "Abstractly specifies how a device shall connect to a resource on the deployment platform.
    222222                                        // Not all devices need a backing." Used with disk items, for which this references a virtual
    223223                                        // disk from the Disks section.
    224224    bool fAutomaticAllocation;
    225225    bool fAutomaticDeallocation;
    226     iprt::MiniString strConnection;     // "All Ethernet adapters that specify the same abstract network connection name within an OVF
     226    RTCString strConnection;     // "All Ethernet adapters that specify the same abstract network connection name within an OVF
    227227                                        // package shall be deployed on the same network. The abstract network connection name shall be
    228228                                        // listed in the NetworkSection at the outermost envelope level." We ignore this and only set up
    229229                                        // a network adapter depending on the network name.
    230     iprt::MiniString strAddress;        // "Device-specific. For an Ethernet adapter, this specifies the MAC address."
     230    RTCString strAddress;        // "Device-specific. For an Ethernet adapter, this specifies the MAC address."
    231231    int32_t lAddress;                   // strAddress as an integer, if applicable.
    232     iprt::MiniString strAddressOnParent;         // "For a device, this specifies its location on the controller."
    233     iprt::MiniString strAllocationUnits;         // "Specifies the units of allocation used. For example, “byte * 2^20”."
     232    RTCString strAddressOnParent;         // "For a device, this specifies its location on the controller."
     233    RTCString strAllocationUnits;         // "Specifies the units of allocation used. For example, “byte * 2^20”."
    234234    uint64_t ullVirtualQuantity;        // "Specifies the quantity of resources presented. For example, “256”."
    235235    uint64_t ullReservation;            // "Specifies the minimum quantity of resources guaranteed to be available."
    … …  
    237237    uint64_t ullWeight;                 // "Specifies a relative priority for this allocation in relation to other allocations."
    238238
    239     iprt::MiniString strConsumerVisibility;
    240     iprt::MiniString strMappingBehavior;
    241     iprt::MiniString strPoolID;
     239    RTCString strConsumerVisibility;
     240    RTCString strMappingBehavior;
     241    RTCString strPoolID;
    242242    uint32_t ulBusNumber;               // seen with IDE controllers, but not listed in OVF spec
    243243
    … …  
    257257};
    258258
    259 typedef std::map<iprt::MiniString, DiskImage> DiskImagesMap;
     259typedef std::map<RTCString, DiskImage> DiskImagesMap;
    260260
    261261struct VirtualSystem;
    … …  
    270270    ControllerSystemType    system;             // one of IDE, SATA, SCSI
    271271
    272     iprt::MiniString        strControllerType;
     272    RTCString        strControllerType;
    273273            // controller subtype (Item/ResourceSubType); e.g. "LsiLogic"; can be empty (esp. for IDE)
    274274            // note that we treat LsiLogicSAS as a SCSI controller (system == SCSI) even though VirtualBox
    … …  
    296296    uint32_t            ulAddressOnParent;      // parsed strAddressOnParent of hardware item; will be 0 or 1 for IDE
    297297                                                // and possibly higher for disks attached to SCSI controllers (untested)
    298     iprt::MiniString    strDiskId;              // if the hard disk has an ovf:/disk/<id> reference,
     298    RTCString    strDiskId;              // if the hard disk has an ovf:/disk/<id> reference,
    299299                                                // this receives the <id> component; points to one of the
    300300                                                // references in Appliance::Data.mapDisks
    301301};
    302302
    303 typedef std::map<iprt::MiniString, VirtualDisk> VirtualDisksMap;
     303typedef std::map<RTCString, VirtualDisk> VirtualDisksMap;
    304304
    305305/**
    … …  
    309309struct EthernetAdapter
    310310{
    311     iprt::MiniString    strAdapterType;         // "PCNet32" or "E1000" or whatever; from <rasd:ResourceSubType>
    312     iprt::MiniString    strNetworkName;         // from <rasd:Connection>
     311    RTCString    strAdapterType;         // "PCNet32" or "E1000" or whatever; from <rasd:ResourceSubType>
     312    RTCString    strNetworkName;         // from <rasd:Connection>
    313313};
    314314
    … …  
    321321struct VirtualSystem
    322322{
    323     iprt::MiniString    strName;                // copy of VirtualSystem/@id
    324 
    325     iprt::MiniString    strDescription;         // copy of VirtualSystem/AnnotationSection content, if any
     323    RTCString    strName;                // copy of VirtualSystem/@id
     324
     325    RTCString    strDescription;         // copy of VirtualSystem/AnnotationSection content, if any
    326326
    327327    CIMOSType_T         cimos;
    328     iprt::MiniString    strCimosDesc;           // readable description of the cimos type in the case of cimos = 0/1/102
    329     iprt::MiniString    strTypeVbox;            // optional type from @vbox:ostype attribute (VirtualBox 4.0 or higher)
    330 
    331     iprt::MiniString    strVirtualSystemType;   // generic hardware description; OVF says this can be something like "vmx-4" or "xen";
     328    RTCString    strCimosDesc;           // readable description of the cimos type in the case of cimos = 0/1/102
     329    RTCString    strTypeVbox;            // optional type from @vbox:ostype attribute (VirtualBox 4.0 or higher)
     330
     331    RTCString    strVirtualSystemType;   // generic hardware description; OVF says this can be something like "vmx-4" or "xen";
    332332                                                // VMware Workstation 6.5 is "vmx-07"
    333333
    … …  
    350350    bool                fHasUsbController;      // true if there's a USB controller item in mapHardwareItems
    351351
    352     iprt::MiniString    strSoundCardType;       // if not empty, then the system wants a soundcard; this then specifies the hardware;
     352    RTCString    strSoundCardType;       // if not empty, then the system wants a soundcard; this then specifies the hardware;
    353353                                                // VMware Workstation 6.5 uses "ensoniq1371" for example
    354354
    355     iprt::MiniString    strLicenseText;         // license info if any; receives contents of VirtualSystem/EulaSection/License
    356 
    357     iprt::MiniString    strProduct;             // product info if any; receives contents of VirtualSystem/ProductSection/Product
    358     iprt::MiniString    strVendor;              // product info if any; receives contents of VirtualSystem/ProductSection/Vendor
    359     iprt::MiniString    strVersion;             // product info if any; receives contents of VirtualSystem/ProductSection/Version
    360     iprt::MiniString    strProductUrl;          // product info if any; receives contents of VirtualSystem/ProductSection/ProductUrl
    361     iprt::MiniString    strVendorUrl;           // product info if any; receives contents of VirtualSystem/ProductSection/VendorUrl
     355    RTCString    strLicenseText;         // license info if any; receives contents of VirtualSystem/EulaSection/License
     356
     357    RTCString    strProduct;             // product info if any; receives contents of VirtualSystem/ProductSection/Product
     358    RTCString    strVendor;              // product info if any; receives contents of VirtualSystem/ProductSection/Vendor
     359    RTCString    strVersion;             // product info if any; receives contents of VirtualSystem/ProductSection/Version
     360    RTCString    strProductUrl;          // product info if any; receives contents of VirtualSystem/ProductSection/ProductUrl
     361    RTCString    strVendorUrl;           // product info if any; receives contents of VirtualSystem/ProductSection/VendorUrl
    362362
    363363    const xml::ElementNode                      // pointer to <vbox:Machine> element under <VirtualSystem> element or NULL if not present
    … …  
    408408{
    409409public:
    410     OVFReader(const void *pvBuf, size_t cbSize, const iprt::MiniString &path);
    411     OVFReader(const iprt::MiniString &path);
     410    OVFReader(const void *pvBuf, size_t cbSize, const RTCString &path);
     411    OVFReader(const RTCString &path);
    412412
    413413    // Data fields
    414     iprt::MiniString            m_strPath;            // file name given to constructor
     414    RTCString            m_strPath;            // file name given to constructor
    415415    DiskImagesMap               m_mapDisks;           // map of DiskImage structs, sorted by DiskImage.strDiskId
    416416    std::list<VirtualSystem>    m_llVirtualSystems;   // list of virtual systems, created by and valid after read()
Note: See TracChangeset for help on using the changeset viewer.

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