VirtualBox

Changeset 74942 in vbox for trunk


Ignore:
Timestamp:
Oct 19, 2018 12:51:20 PM (6 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9261: fixed variable names and doxygen description according to code guidlines

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
104 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

    r74914 r74942  
    9393
    9494    /** Notifies about 'extra-data change' event: */
    95     void sigExtraDataChange(const QUuid &aMachineID, const QString &strKey, const QString &strValue);
     95    void sigExtraDataChange(const QUuid &uMachineID, const QString &strKey, const QString &strValue);
    9696
    9797public:
     
    105105
    106106    /** Preprocess 'extra-data can change' event: */
    107     void sltPreprocessExtraDataCanChange(const QUuid &aMachineID, const QString &strKey, const QString &strValue, bool &fVeto, QString &strVetoReason);
     107    void sltPreprocessExtraDataCanChange(const QUuid &uMachineID, const QString &strKey, const QString &strValue, bool &fVeto, QString &strVetoReason);
    108108    /** Preprocess 'extra-data change' event: */
    109     void sltPreprocessExtraDataChange(const QUuid &aMachineID, const QString &strKey, const QString &strValue);
     109    void sltPreprocessExtraDataChange(const QUuid &uMachineID, const QString &strKey, const QString &strValue);
    110110
    111111protected:
     
    244244}
    245245
    246 void UIExtraDataEventHandler::sltPreprocessExtraDataCanChange(const QUuid &aMachineID, const QString &strKey, const QString &/* strValue */, bool & /* fVeto */, QString & /* strVetoReason */)
     246void UIExtraDataEventHandler::sltPreprocessExtraDataCanChange(const QUuid &uMachineID, const QString &strKey, const QString &/* strValue */, bool & /* fVeto */, QString & /* strVetoReason */)
    247247{
    248248    /* Preprocess global 'extra-data can change' event: */
    249     if (aMachineID.isNull())
     249    if (uMachineID.isNull())
    250250    {
    251251        if (strKey.startsWith("GUI/"))
     
    259259}
    260260
    261 void UIExtraDataEventHandler::sltPreprocessExtraDataChange(const QUuid &aMachineID, const QString &strKey, const QString &strValue)
     261void UIExtraDataEventHandler::sltPreprocessExtraDataChange(const QUuid &uMachineID, const QString &strKey, const QString &strValue)
    262262{
    263263    /* Preprocess global 'extra-data change' event: */
    264     if (aMachineID.isNull())
     264    if (uMachineID.isNull())
    265265    {
    266266        if (strKey.startsWith("GUI/"))
     
    275275
    276276    /* Motify listener about 'extra-data change' event: */
    277     emit sigExtraDataChange(aMachineID, strKey, strValue);
     277    emit sigExtraDataChange(uMachineID, strKey, strValue);
    278278}
    279279
     
    494494      * @{ */
    495495        /** Handles extra-data map acknowledging. */
    496         void sltExtraDataMapAcknowledging(const QUuid &aID);
     496        void sltExtraDataMapAcknowledging(const QUuid &uID);
    497497        /** Handles extra-data change. */
    498         void sltExtraDataChange(const QUuid &aID, const QString &strKey, const QString &strValue);
     498        void sltExtraDataChange(const QUuid &uID, const QString &strKey, const QString &strValue);
    499499    /** @} */
    500500
     
    504504      * @{ */
    505505        /** Handles machine (un)registration. */
    506         void sltMachineRegistered(const QUuid &aID, bool fAdded);
     506        void sltMachineRegistered(const QUuid &uID, bool fAdded);
    507507    /** @} */
    508508
     
    614614
    615615        /** Adds chooser item. */
    616         void addChooserItem(const QUuid &aID,
     616        void addChooserItem(const QUuid &uID,
    617617                            const QString &strName,
    618618                            const QString &strOsTypeID,
     
    622622                                     const int iPosition = -1);
    623623        /** Adds chooser item by ID. */
    624         void addChooserItemByID(const QUuid &aID,
     624        void addChooserItemByID(const QUuid &uID,
    625625                                const int iPosition = -1);
    626626
     
    752752}
    753753
    754 void UIExtraDataManagerWindow::sltMachineRegistered(const QUuid &aID, bool fRegistered)
     754void UIExtraDataManagerWindow::sltMachineRegistered(const QUuid &uID, bool fRegistered)
    755755{
    756756    /* Machine registered: */
     
    771771            const QUuid uIteratedID = machine.GetId();
    772772            /* If 'iterated ID' equal to 'added ID' => break now: */
    773             if (uIteratedID == aID)
     773            if (uIteratedID == uID)
    774774                break;
    775775            /* If 'iterated ID' is 'known ID' => remember it: */
     
    779779
    780780        /* Add new chooser item into source-model: */
    781         addChooserItemByID(aID, knownIDs.indexOf(uPositionID) + 1);
     781        addChooserItemByID(uID, knownIDs.indexOf(uPositionID) + 1);
    782782        /* And sort proxy-model: */
    783783        m_pModelProxyOfChooser->sort(0, Qt::AscendingOrder);
     
    790790        /* Remove chooser item with 'removed ID' if it is among 'known IDs': */
    791791        for (int iRow = 0; iRow < m_pModelSourceOfChooser->rowCount(); ++iRow)
    792             if (chooserID(iRow) == aID)
     792            if (chooserID(iRow) == uID)
    793793                m_pModelSourceOfChooser->removeRow(iRow);
    794794    }
    795795}
    796796
    797 void UIExtraDataManagerWindow::sltExtraDataMapAcknowledging(const QUuid &aID)
     797void UIExtraDataManagerWindow::sltExtraDataMapAcknowledging(const QUuid &uID)
    798798{
    799799    /* Update item with 'changed ID' if it is among 'known IDs': */
    800800    for (int iRow = 0; iRow < m_pModelSourceOfChooser->rowCount(); ++iRow)
    801         if (chooserID(iRow) == aID)
     801        if (chooserID(iRow) == uID)
    802802            m_pModelSourceOfChooser->itemFromIndex(chooserIndex(iRow))->setData(true, Field_Known);
    803803}
    804804
    805 void UIExtraDataManagerWindow::sltExtraDataChange(const QUuid &aID, const QString &strKey, const QString &strValue)
     805void UIExtraDataManagerWindow::sltExtraDataChange(const QUuid &uID, const QString &strKey, const QString &strValue)
    806806{
    807807    /* Skip unrelated IDs: */
    808     if (currentChooserID() != aID)
     808    if (currentChooserID() != uID)
    809809        return;
    810810
     
    834834        /* Look for the proper place for 'changed key': */
    835835        QString strPositionKey;
    836         foreach (const QString &strIteratedKey, gEDataManager->map(aID).keys())
     836        foreach (const QString &strIteratedKey, gEDataManager->map(uID).keys())
    837837        {
    838838            /* If 'iterated key' equal to 'changed key' => break now: */
     
    18211821}
    18221822
    1823 void UIExtraDataManagerWindow::addChooserItem(const QUuid &aID,
     1823void UIExtraDataManagerWindow::addChooserItem(const QUuid &uID,
    18241824                                              const QString &strName,
    18251825                                              const QString &strOsTypeID,
     
    18331833        pItem->setEditable(false);
    18341834        /* Contains passed ID: */
    1835         pItem->setData(aID, Field_ID);
     1835        pItem->setData(uID, Field_ID);
    18361836        /* Contains passed name: */
    18371837        pItem->setData(strName, Field_Name);
     
    18391839        pItem->setData(strOsTypeID, Field_OsTypeID);
    18401840        /* And designated as known/unknown depending on extra-data manager status: */
    1841         pItem->setData(gEDataManager->contains(aID), Field_Known);
     1841        pItem->setData(gEDataManager->contains(uID), Field_Known);
    18421842        /* If insert position defined: */
    18431843        if (iPosition != -1)
     
    18631863}
    18641864
    1865 void UIExtraDataManagerWindow::addChooserItemByID(const QUuid &aID,
     1865void UIExtraDataManagerWindow::addChooserItemByID(const QUuid &uID,
    18661866                                                  const int iPosition /* = -1 */)
    18671867{
    18681868    /* Global ID? */
    1869     if (aID == UIExtraDataManager::GlobalID)
    1870         return addChooserItem(aID, QString("Global"), QString(), iPosition);
     1869    if (uID == UIExtraDataManager::GlobalID)
     1870        return addChooserItem(uID, QString("Global"), QString(), iPosition);
    18711871
    18721872    /* Search for the corresponding machine by ID: */
    18731873    CVirtualBox vbox = vboxGlobal().virtualBox();
    1874     const CMachine machine = vbox.FindMachine(aID.toString());
     1874    const CMachine machine = vbox.FindMachine(uID.toString());
    18751875    /* Make sure VM is accessible: */
    18761876    if (vbox.isOk() && !machine.isNull() && machine.GetAccessible())
    1877         return addChooserItem(aID, machine.GetName(), machine.GetOSTypeId(), iPosition);
     1877        return addChooserItem(uID, machine.GetName(), machine.GetOSTypeId(), iPosition);
    18781878}
    18791879
     
    20862086#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    20872087
    2088 void UIExtraDataManager::hotloadMachineExtraDataMap(const QUuid &aID)
     2088void UIExtraDataManager::hotloadMachineExtraDataMap(const QUuid &uID)
    20892089{
    20902090    /* Make sure it is valid ID: */
    2091     AssertMsgReturnVoid(!aID.isNull() && aID != GlobalID,
    2092                         ("Invalid VM ID = {%s}\n", aID.toString().toUtf8().constData()));
     2091    AssertMsgReturnVoid(!uID.isNull() && uID != GlobalID,
     2092                        ("Invalid VM ID = {%s}\n", uID.toString().toUtf8().constData()));
    20932093    /* Which is not loaded yet: */
    2094     AssertReturnVoid(!m_data.contains(aID));
     2094    AssertReturnVoid(!m_data.contains(uID));
    20952095
    20962096    /* Search for corresponding machine: */
    20972097    CVirtualBox vbox = vboxGlobal().virtualBox();
    2098     CMachine machine = vbox.FindMachine(aID.toString());
     2098    CMachine machine = vbox.FindMachine(uID.toString());
    20992099    AssertReturnVoid(vbox.isOk() && !machine.isNull());
    21002100
    21012101    /* Make sure at least empty map is created: */
    2102     m_data[aID] = ExtraDataMap();
     2102    m_data[uID] = ExtraDataMap();
    21032103
    21042104    /* Do not handle inaccessible machine: */
     
    21082108    /* Load machine extra-data map: */
    21092109    foreach (const QString &strKey, machine.GetExtraDataKeys())
    2110         m_data[aID][strKey] = machine.GetExtraData(strKey);
     2110        m_data[uID][strKey] = machine.GetExtraData(strKey);
    21112111
    21122112    /* Notifies about extra-data map acknowledged: */
    2113     emit sigExtraDataMapAcknowledging(aID);
    2114 }
    2115 
    2116 QString UIExtraDataManager::extraDataString(const QString &strKey, const QUuid &aID /* = GlobalID */)
     2113    emit sigExtraDataMapAcknowledging(uID);
     2114}
     2115
     2116QString UIExtraDataManager::extraDataString(const QString &strKey, const QUuid &uID /* = GlobalID */)
    21172117{
    21182118    /* Get the value. Return 'QString()' if not found: */
    2119     const QString strValue = extraDataStringUnion(strKey, aID);
     2119    const QString strValue = extraDataStringUnion(strKey, uID);
    21202120    if (strValue.isNull())
    21212121        return QString();
     
    21252125}
    21262126
    2127 void UIExtraDataManager::setExtraDataString(const QString &strKey, const QString &strValue, const QUuid &aID /* = GlobalID */)
     2127void UIExtraDataManager::setExtraDataString(const QString &strKey, const QString &strValue, const QUuid &uID /* = GlobalID */)
    21282128{
    21292129    /* Make sure VBoxSVC is available: */
     
    21322132
    21332133    /* Hot-load machine extra-data map if necessary: */
    2134     if (aID != GlobalID && !m_data.contains(aID))
    2135         hotloadMachineExtraDataMap(aID);
     2134    if (uID != GlobalID && !m_data.contains(uID))
     2135        hotloadMachineExtraDataMap(uID);
    21362136
    21372137    /* Access corresponding map: */
    2138     ExtraDataMap &data = m_data[aID];
     2138    ExtraDataMap &data = m_data[uID];
    21392139
    21402140    /* [Re]cache passed value: */
     
    21422142
    21432143    /* Global extra-data: */
    2144     if (aID == GlobalID)
     2144    if (uID == GlobalID)
    21452145    {
    21462146        /* Get global object: */
     
    21562156        /* Search for corresponding machine: */
    21572157        CVirtualBox vbox = vboxGlobal().virtualBox();
    2158         const CMachine machine = vbox.FindMachine(aID.toString());
     2158        const CMachine machine = vbox.FindMachine(uID.toString());
    21592159        AssertReturnVoid(vbox.isOk() && !machine.isNull());
    21602160        /* Check the configuration access-level: */
     
    21652165        CSession session;
    21662166        if (cLevel == ConfigurationAccessLevel_Full)
    2167             session = vboxGlobal().openSession(aID);
     2167            session = vboxGlobal().openSession(uID);
    21682168        else
    2169             session = vboxGlobal().openExistingSession(aID);
     2169            session = vboxGlobal().openExistingSession(uID);
    21702170        AssertReturnVoid(!session.isNull());
    21712171        /* Get machine from that session: */
     
    21792179}
    21802180
    2181 QStringList UIExtraDataManager::extraDataStringList(const QString &strKey, const QUuid &aID /* = GlobalID */)
     2181QStringList UIExtraDataManager::extraDataStringList(const QString &strKey, const QUuid &uID /* = GlobalID */)
    21822182{
    21832183    /* Get the value. Return 'QStringList()' if not found: */
    2184     const QString strValue = extraDataStringUnion(strKey, aID);
     2184    const QString strValue = extraDataStringUnion(strKey, uID);
    21852185    if (strValue.isNull())
    21862186        return QStringList();
     
    21912191}
    21922192
    2193 void UIExtraDataManager::setExtraDataStringList(const QString &strKey, const QStringList &value, const QUuid &aID /* = GlobalID */)
     2193void UIExtraDataManager::setExtraDataStringList(const QString &strKey, const QStringList &value, const QUuid &uID /* = GlobalID */)
    21942194{
    21952195    /* Make sure VBoxSVC is available: */
     
    21982198
    21992199    /* Hot-load machine extra-data map if necessary: */
    2200     if (aID != GlobalID && !m_data.contains(aID))
    2201         hotloadMachineExtraDataMap(aID);
     2200    if (uID != GlobalID && !m_data.contains(uID))
     2201        hotloadMachineExtraDataMap(uID);
    22022202
    22032203    /* Access corresponding map: */
    2204     ExtraDataMap &data = m_data[aID];
     2204    ExtraDataMap &data = m_data[uID];
    22052205
    22062206    /* [Re]cache passed value: */
     
    22082208
    22092209    /* Global extra-data: */
    2210     if (aID == GlobalID)
     2210    if (uID == GlobalID)
    22112211    {
    22122212        /* Get global object: */
     
    22222222        /* Search for corresponding machine: */
    22232223        CVirtualBox vbox = vboxGlobal().virtualBox();
    2224         const CMachine machine = vbox.FindMachine(aID.toString());
     2224        const CMachine machine = vbox.FindMachine(uID.toString());
    22252225        AssertReturnVoid(vbox.isOk() && !machine.isNull());
    22262226        /* Check the configuration access-level: */
     
    22312231        CSession session;
    22322232        if (cLevel == ConfigurationAccessLevel_Full)
    2233             session = vboxGlobal().openSession(aID);
     2233            session = vboxGlobal().openSession(uID);
    22342234        else
    2235             session = vboxGlobal().openExistingSession(aID);
     2235            session = vboxGlobal().openExistingSession(uID);
    22362236        AssertReturnVoid(!session.isNull());
    22372237        /* Get machine from that session: */
     
    22632263}
    22642264
    2265 QStringList UIExtraDataManager::suppressedMessages(const QUuid &aID /* = GlobalID */)
    2266 {
    2267     return extraDataStringList(GUI_SuppressMessages, aID);
     2265QStringList UIExtraDataManager::suppressedMessages(const QUuid &uID /* = GlobalID */)
     2266{
     2267    return extraDataStringList(GUI_SuppressMessages, uID);
    22682268}
    22692269
     
    23552355}
    23562356
    2357 QList<MachineSettingsPageType> UIExtraDataManager::restrictedMachineSettingsPages(const QUuid &aID)
     2357QList<MachineSettingsPageType> UIExtraDataManager::restrictedMachineSettingsPages(const QUuid &uID)
    23582358{
    23592359    /* Prepare result: */
    23602360    QList<MachineSettingsPageType> result;
    23612361    /* Get restricted machine-settings-pages: */
    2362     foreach (const QString &strValue, extraDataStringList(GUI_RestrictedMachineSettingsPages, aID))
     2362    foreach (const QString &strValue, extraDataStringList(GUI_RestrictedMachineSettingsPages, uID))
    23632363    {
    23642364        MachineSettingsPageType value = gpConverter->fromInternalString<MachineSettingsPageType>(strValue);
     
    29772977}
    29782978
    2979 bool UIExtraDataManager::showMachineInSelectorChooser(const QUuid &aID)
     2979bool UIExtraDataManager::showMachineInSelectorChooser(const QUuid &uID)
    29802980{
    29812981    /* 'True' unless 'restriction' feature allowed: */
    2982     return !isFeatureAllowed(GUI_HideFromManager, aID);
    2983 }
    2984 
    2985 bool UIExtraDataManager::showMachineInSelectorDetails(const QUuid &aID)
     2982    return !isFeatureAllowed(GUI_HideFromManager, uID);
     2983}
     2984
     2985bool UIExtraDataManager::showMachineInSelectorDetails(const QUuid &uID)
    29862986{
    29872987    /* 'True' unless 'restriction' feature allowed: */
    2988     return !isFeatureAllowed(GUI_HideDetails, aID);
    2989 }
    2990 
    2991 bool UIExtraDataManager::machineReconfigurationEnabled(const QUuid &aID)
     2988    return !isFeatureAllowed(GUI_HideDetails, uID);
     2989}
     2990
     2991bool UIExtraDataManager::machineReconfigurationEnabled(const QUuid &uID)
    29922992{
    29932993    /* 'True' unless 'restriction' feature allowed: */
    2994     return !isFeatureAllowed(GUI_PreventReconfiguration, aID);
    2995 }
    2996 
    2997 bool UIExtraDataManager::machineSnapshotOperationsEnabled(const QUuid &aID)
     2994    return !isFeatureAllowed(GUI_PreventReconfiguration, uID);
     2995}
     2996
     2997bool UIExtraDataManager::machineSnapshotOperationsEnabled(const QUuid &uID)
    29982998{
    29992999    /* 'True' unless 'restriction' feature allowed: */
    3000     return !isFeatureAllowed(GUI_PreventSnapshotOperations, aID);
    3001 }
    3002 
    3003 bool UIExtraDataManager::machineFirstTimeStarted(const QUuid &aID)
     3000    return !isFeatureAllowed(GUI_PreventSnapshotOperations, uID);
     3001}
     3002
     3003bool UIExtraDataManager::machineFirstTimeStarted(const QUuid &uID)
    30043004{
    30053005    /* 'True' only if feature is allowed: */
    3006     return isFeatureAllowed(GUI_FirstRun, aID);
    3007 }
    3008 
    3009 void UIExtraDataManager::setMachineFirstTimeStarted(bool fFirstTimeStarted, const QUuid &aID)
     3006    return isFeatureAllowed(GUI_FirstRun, uID);
     3007}
     3008
     3009void UIExtraDataManager::setMachineFirstTimeStarted(bool fFirstTimeStarted, const QUuid &uID)
    30103010{
    30113011    /* 'True' if feature allowed, null-string otherwise: */
    3012     setExtraDataString(GUI_FirstRun, toFeatureAllowed(fFirstTimeStarted), aID);
    3013 }
    3014 
    3015 QStringList UIExtraDataManager::machineWindowIconNames(const QUuid &aID)
    3016 {
    3017     return extraDataStringList(GUI_MachineWindowIcons, aID);
     3012    setExtraDataString(GUI_FirstRun, toFeatureAllowed(fFirstTimeStarted), uID);
     3013}
     3014
     3015QStringList UIExtraDataManager::machineWindowIconNames(const QUuid &uID)
     3016{
     3017    return extraDataStringList(GUI_MachineWindowIcons, uID);
    30183018}
    30193019
    30203020#ifndef VBOX_WS_MAC
    3021 QString UIExtraDataManager::machineWindowNamePostfix(const QUuid &aID)
    3022 {
    3023     return extraDataString(GUI_MachineWindowNamePostfix, aID);
     3021QString UIExtraDataManager::machineWindowNamePostfix(const QUuid &uID)
     3022{
     3023    return extraDataString(GUI_MachineWindowNamePostfix, uID);
    30243024}
    30253025#endif /* !VBOX_WS_MAC */
    30263026
    3027 QRect UIExtraDataManager::machineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QUuid &aID)
     3027QRect UIExtraDataManager::machineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QUuid &uID)
    30283028{
    30293029    /* Choose corresponding key: */
     
    30373037
    30383038    /* Get corresponding extra-data: */
    3039     const QStringList data = extraDataStringList(strKey, aID);
     3039    const QStringList data = extraDataStringList(strKey, uID);
    30403040
    30413041    /* Parse loaded data: */
     
    30593059}
    30603060
    3061 bool UIExtraDataManager::machineWindowShouldBeMaximized(UIVisualStateType visualStateType, ulong uScreenIndex, const QUuid &aID)
     3061bool UIExtraDataManager::machineWindowShouldBeMaximized(UIVisualStateType visualStateType, ulong uScreenIndex, const QUuid &uID)
    30623062{
    30633063    /* Choose corresponding key: */
     
    30713071
    30723072    /* Get corresponding extra-data: */
    3073     const QStringList data = extraDataStringList(strKey, aID);
     3073    const QStringList data = extraDataStringList(strKey, uID);
    30743074
    30753075    /* Make sure 5th item has required value: */
     
    30773077}
    30783078
    3079 void UIExtraDataManager::setMachineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QRect &geometry, bool fMaximized, const QUuid &aID)
     3079void UIExtraDataManager::setMachineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QRect &geometry, bool fMaximized, const QUuid &uID)
    30803080{
    30813081    /* Choose corresponding key: */
     
    30983098
    30993099    /* Re-cache corresponding extra-data: */
    3100     setExtraDataStringList(strKey, data, aID);
     3100    setExtraDataStringList(strKey, data, uID);
    31013101}
    31023102
    31033103#ifndef VBOX_WS_MAC
    3104 bool UIExtraDataManager::menuBarEnabled(const QUuid &aID)
     3104bool UIExtraDataManager::menuBarEnabled(const QUuid &uID)
    31053105{
    31063106    /* 'True' unless feature restricted: */
    3107     return !isFeatureRestricted(GUI_MenuBar_Enabled, aID);
    3108 }
    3109 
    3110 void UIExtraDataManager::setMenuBarEnabled(bool fEnabled, const QUuid &aID)
     3107    return !isFeatureRestricted(GUI_MenuBar_Enabled, uID);
     3108}
     3109
     3110void UIExtraDataManager::setMenuBarEnabled(bool fEnabled, const QUuid &uID)
    31113111{
    31123112    /* 'False' if feature restricted, null-string otherwise: */
    3113     setExtraDataString(GUI_MenuBar_Enabled, toFeatureRestricted(!fEnabled), aID);
     3113    setExtraDataString(GUI_MenuBar_Enabled, toFeatureRestricted(!fEnabled), uID);
    31143114}
    31153115#endif /* !VBOX_WS_MAC */
    31163116
    3117 bool UIExtraDataManager::menuBarContextMenuEnabled(const QUuid &aID)
     3117bool UIExtraDataManager::menuBarContextMenuEnabled(const QUuid &uID)
    31183118{
    31193119    /* 'True' unless feature restricted: */
    3120     return !isFeatureRestricted(GUI_MenuBar_ContextMenu_Enabled, aID);
    3121 }
    3122 
    3123 void UIExtraDataManager::setMenuBarContextMenuEnabled(bool fEnabled, const QUuid &aID)
     3120    return !isFeatureRestricted(GUI_MenuBar_ContextMenu_Enabled, uID);
     3121}
     3122
     3123void UIExtraDataManager::setMenuBarContextMenuEnabled(bool fEnabled, const QUuid &uID)
    31243124{
    31253125    /* 'False' if feature restricted, null-string otherwise: */
    3126     setExtraDataString(GUI_MenuBar_ContextMenu_Enabled, toFeatureRestricted(!fEnabled), aID);
    3127 }
    3128 
    3129 UIExtraDataMetaDefs::MenuType UIExtraDataManager::restrictedRuntimeMenuTypes(const QUuid &aID)
     3126    setExtraDataString(GUI_MenuBar_ContextMenu_Enabled, toFeatureRestricted(!fEnabled), uID);
     3127}
     3128
     3129UIExtraDataMetaDefs::MenuType UIExtraDataManager::restrictedRuntimeMenuTypes(const QUuid &uID)
    31303130{
    31313131    /* Prepare result: */
    31323132    UIExtraDataMetaDefs::MenuType result = UIExtraDataMetaDefs::MenuType_Invalid;
    31333133    /* Get restricted runtime-menu-types: */
    3134     foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeMenus, aID))
     3134    foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeMenus, uID))
    31353135    {
    31363136        UIExtraDataMetaDefs::MenuType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::MenuType>(strValue);
     
    31423142}
    31433143
    3144 void UIExtraDataManager::setRestrictedRuntimeMenuTypes(UIExtraDataMetaDefs::MenuType types, const QUuid &aID)
     3144void UIExtraDataManager::setRestrictedRuntimeMenuTypes(UIExtraDataMetaDefs::MenuType types, const QUuid &uID)
    31453145{
    31463146    /* We have MenuType enum registered, so we can enumerate it: */
     
    31713171    }
    31723172    /* Save result: */
    3173     setExtraDataStringList(GUI_RestrictedRuntimeMenus, result, aID);
    3174 }
    3175 
    3176 UIExtraDataMetaDefs::MenuApplicationActionType UIExtraDataManager::restrictedRuntimeMenuApplicationActionTypes(const QUuid &aID)
     3173    setExtraDataStringList(GUI_RestrictedRuntimeMenus, result, uID);
     3174}
     3175
     3176UIExtraDataMetaDefs::MenuApplicationActionType UIExtraDataManager::restrictedRuntimeMenuApplicationActionTypes(const QUuid &uID)
    31773177{
    31783178    /* Prepare result: */
    31793179    UIExtraDataMetaDefs::MenuApplicationActionType result = UIExtraDataMetaDefs::MenuApplicationActionType_Invalid;
    31803180    /* Get restricted runtime-application-menu action-types: */
    3181     foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeApplicationMenuActions, aID))
     3181    foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeApplicationMenuActions, uID))
    31823182    {
    31833183        UIExtraDataMetaDefs::MenuApplicationActionType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::MenuApplicationActionType>(strValue);
     
    31893189}
    31903190
    3191 void UIExtraDataManager::setRestrictedRuntimeMenuApplicationActionTypes(UIExtraDataMetaDefs::MenuApplicationActionType types, const QUuid &aID)
     3191void UIExtraDataManager::setRestrictedRuntimeMenuApplicationActionTypes(UIExtraDataMetaDefs::MenuApplicationActionType types, const QUuid &uID)
    31923192{
    31933193    /* We have MenuApplicationActionType enum registered, so we can enumerate it: */
     
    32183218    }
    32193219    /* Save result: */
    3220     setExtraDataStringList(GUI_RestrictedRuntimeApplicationMenuActions, result, aID);
    3221 }
    3222 
    3223 UIExtraDataMetaDefs::RuntimeMenuMachineActionType UIExtraDataManager::restrictedRuntimeMenuMachineActionTypes(const QUuid &aID)
     3220    setExtraDataStringList(GUI_RestrictedRuntimeApplicationMenuActions, result, uID);
     3221}
     3222
     3223UIExtraDataMetaDefs::RuntimeMenuMachineActionType UIExtraDataManager::restrictedRuntimeMenuMachineActionTypes(const QUuid &uID)
    32243224{
    32253225    /* Prepare result: */
    32263226    UIExtraDataMetaDefs::RuntimeMenuMachineActionType result = UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Invalid;
    32273227    /* Get restricted runtime-machine-menu action-types: */
    3228     foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeMachineMenuActions, aID))
     3228    foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeMachineMenuActions, uID))
    32293229    {
    32303230        UIExtraDataMetaDefs::RuntimeMenuMachineActionType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::RuntimeMenuMachineActionType>(strValue);
     
    32483248}
    32493249
    3250 void UIExtraDataManager::setRestrictedRuntimeMenuMachineActionTypes(UIExtraDataMetaDefs::RuntimeMenuMachineActionType types, const QUuid &aID)
     3250void UIExtraDataManager::setRestrictedRuntimeMenuMachineActionTypes(UIExtraDataMetaDefs::RuntimeMenuMachineActionType types, const QUuid &uID)
    32513251{
    32523252    /* We have RuntimeMenuMachineActionType enum registered, so we can enumerate it: */
     
    32813281        result << gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Nothing);
    32823282    /* Save result: */
    3283     setExtraDataStringList(GUI_RestrictedRuntimeMachineMenuActions, result, aID);
    3284 }
    3285 
    3286 UIExtraDataMetaDefs::RuntimeMenuViewActionType UIExtraDataManager::restrictedRuntimeMenuViewActionTypes(const QUuid &aID)
     3283    setExtraDataStringList(GUI_RestrictedRuntimeMachineMenuActions, result, uID);
     3284}
     3285
     3286UIExtraDataMetaDefs::RuntimeMenuViewActionType UIExtraDataManager::restrictedRuntimeMenuViewActionTypes(const QUuid &uID)
    32873287{
    32883288    /* Prepare result: */
    32893289    UIExtraDataMetaDefs::RuntimeMenuViewActionType result = UIExtraDataMetaDefs::RuntimeMenuViewActionType_Invalid;
    32903290    /* Get restricted runtime-view-menu action-types: */
    3291     foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeViewMenuActions, aID))
     3291    foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeViewMenuActions, uID))
    32923292    {
    32933293        UIExtraDataMetaDefs::RuntimeMenuViewActionType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::RuntimeMenuViewActionType>(strValue);
     
    32993299}
    33003300
    3301 void UIExtraDataManager::setRestrictedRuntimeMenuViewActionTypes(UIExtraDataMetaDefs::RuntimeMenuViewActionType types, const QUuid &aID)
     3301void UIExtraDataManager::setRestrictedRuntimeMenuViewActionTypes(UIExtraDataMetaDefs::RuntimeMenuViewActionType types, const QUuid &uID)
    33023302{
    33033303    /* We have RuntimeMenuViewActionType enum registered, so we can enumerate it: */
     
    33283328    }
    33293329    /* Save result: */
    3330     setExtraDataStringList(GUI_RestrictedRuntimeViewMenuActions, result, aID);
    3331 }
    3332 
    3333 UIExtraDataMetaDefs::RuntimeMenuInputActionType UIExtraDataManager::restrictedRuntimeMenuInputActionTypes(const QUuid &aID)
     3330    setExtraDataStringList(GUI_RestrictedRuntimeViewMenuActions, result, uID);
     3331}
     3332
     3333UIExtraDataMetaDefs::RuntimeMenuInputActionType UIExtraDataManager::restrictedRuntimeMenuInputActionTypes(const QUuid &uID)
    33343334{
    33353335    /* Prepare result: */
    33363336    UIExtraDataMetaDefs::RuntimeMenuInputActionType result = UIExtraDataMetaDefs::RuntimeMenuInputActionType_Invalid;
    33373337    /* Get restricted runtime-machine-menu action-types: */
    3338     foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeInputMenuActions, aID))
     3338    foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeInputMenuActions, uID))
    33393339    {
    33403340        UIExtraDataMetaDefs::RuntimeMenuInputActionType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::RuntimeMenuInputActionType>(strValue);
     
    33463346}
    33473347
    3348 void UIExtraDataManager::setRestrictedRuntimeMenuInputActionTypes(UIExtraDataMetaDefs::RuntimeMenuInputActionType types, const QUuid &aID)
     3348void UIExtraDataManager::setRestrictedRuntimeMenuInputActionTypes(UIExtraDataMetaDefs::RuntimeMenuInputActionType types, const QUuid &uID)
    33493349{
    33503350    /* We have RuntimeMenuInputActionType enum registered, so we can enumerate it: */
     
    33753375    }
    33763376    /* Save result: */
    3377     setExtraDataStringList(GUI_RestrictedRuntimeInputMenuActions, result, aID);
    3378 }
    3379 
    3380 UIExtraDataMetaDefs::RuntimeMenuDevicesActionType UIExtraDataManager::restrictedRuntimeMenuDevicesActionTypes(const QUuid &aID)
     3377    setExtraDataStringList(GUI_RestrictedRuntimeInputMenuActions, result, uID);
     3378}
     3379
     3380UIExtraDataMetaDefs::RuntimeMenuDevicesActionType UIExtraDataManager::restrictedRuntimeMenuDevicesActionTypes(const QUuid &uID)
    33813381{
    33823382    /* Prepare result: */
    33833383    UIExtraDataMetaDefs::RuntimeMenuDevicesActionType result = UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_Invalid;
    33843384    /* Get restricted runtime-devices-menu action-types: */
    3385     foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeDevicesMenuActions, aID))
     3385    foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeDevicesMenuActions, uID))
    33863386    {
    33873387        UIExtraDataMetaDefs::RuntimeMenuDevicesActionType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::RuntimeMenuDevicesActionType>(strValue);
     
    34043404}
    34053405
    3406 void UIExtraDataManager::setRestrictedRuntimeMenuDevicesActionTypes(UIExtraDataMetaDefs::RuntimeMenuDevicesActionType types, const QUuid &aID)
     3406void UIExtraDataManager::setRestrictedRuntimeMenuDevicesActionTypes(UIExtraDataMetaDefs::RuntimeMenuDevicesActionType types, const QUuid &uID)
    34073407{
    34083408    /* We have RuntimeMenuDevicesActionType enum registered, so we can enumerate it: */
     
    34373437        result << gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_Nothing);
    34383438    /* Save result: */
    3439     setExtraDataStringList(GUI_RestrictedRuntimeDevicesMenuActions, result, aID);
     3439    setExtraDataStringList(GUI_RestrictedRuntimeDevicesMenuActions, result, uID);
    34403440}
    34413441
    34423442#ifdef VBOX_WITH_DEBUGGER_GUI
    3443 UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType UIExtraDataManager::restrictedRuntimeMenuDebuggerActionTypes(const QUuid &aID)
     3443UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType UIExtraDataManager::restrictedRuntimeMenuDebuggerActionTypes(const QUuid &uID)
    34443444{
    34453445    /* Prepare result: */
    34463446    UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType result = UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType_Invalid;
    34473447    /* Get restricted runtime-debugger-menu action-types: */
    3448     foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeDebuggerMenuActions, aID))
     3448    foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeDebuggerMenuActions, uID))
    34493449    {
    34503450        UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType>(strValue);
     
    34563456}
    34573457
    3458 void UIExtraDataManager::setRestrictedRuntimeMenuDebuggerActionTypes(UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType types, const QUuid &aID)
     3458void UIExtraDataManager::setRestrictedRuntimeMenuDebuggerActionTypes(UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType types, const QUuid &uID)
    34593459{
    34603460    /* We have RuntimeMenuDebuggerActionType enum registered, so we can enumerate it: */
     
    34853485    }
    34863486    /* Save result: */
    3487     setExtraDataStringList(GUI_RestrictedRuntimeDebuggerMenuActions, result, aID);
     3487    setExtraDataStringList(GUI_RestrictedRuntimeDebuggerMenuActions, result, uID);
    34883488}
    34893489#endif /* VBOX_WITH_DEBUGGER_GUI */
    34903490
    34913491#ifdef VBOX_WS_MAC
    3492 UIExtraDataMetaDefs::MenuWindowActionType UIExtraDataManager::restrictedRuntimeMenuWindowActionTypes(const QUuid &aID)
     3492UIExtraDataMetaDefs::MenuWindowActionType UIExtraDataManager::restrictedRuntimeMenuWindowActionTypes(const QUuid &uID)
    34933493{
    34943494    /* Prepare result: */
    34953495    UIExtraDataMetaDefs::MenuWindowActionType result = UIExtraDataMetaDefs::MenuWindowActionType_Invalid;
    34963496    /* Get restricted runtime-window-menu action-types: */
    3497     foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeWindowMenuActions, aID))
     3497    foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeWindowMenuActions, uID))
    34983498    {
    34993499        UIExtraDataMetaDefs::MenuWindowActionType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::MenuWindowActionType>(strValue);
     
    35053505}
    35063506
    3507 void UIExtraDataManager::setRestrictedRuntimeMenuWindowActionTypes(UIExtraDataMetaDefs::MenuWindowActionType types, const QUuid &aID)
     3507void UIExtraDataManager::setRestrictedRuntimeMenuWindowActionTypes(UIExtraDataMetaDefs::MenuWindowActionType types, const QUuid &uID)
    35083508{
    35093509    /* We have MenuWindowActionType enum registered, so we can enumerate it: */
     
    35343534    }
    35353535    /* Save result: */
    3536     setExtraDataStringList(GUI_RestrictedRuntimeWindowMenuActions, result, aID);
     3536    setExtraDataStringList(GUI_RestrictedRuntimeWindowMenuActions, result, uID);
    35373537}
    35383538#endif /* VBOX_WS_MAC */
    35393539
    3540 UIExtraDataMetaDefs::MenuHelpActionType UIExtraDataManager::restrictedRuntimeMenuHelpActionTypes(const QUuid &aID)
     3540UIExtraDataMetaDefs::MenuHelpActionType UIExtraDataManager::restrictedRuntimeMenuHelpActionTypes(const QUuid &uID)
    35413541{
    35423542    /* Prepare result: */
    35433543    UIExtraDataMetaDefs::MenuHelpActionType result = UIExtraDataMetaDefs::MenuHelpActionType_Invalid;
    35443544    /* Get restricted runtime-help-menu action-types: */
    3545     foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeHelpMenuActions, aID))
     3545    foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeHelpMenuActions, uID))
    35463546    {
    35473547        UIExtraDataMetaDefs::MenuHelpActionType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::MenuHelpActionType>(strValue);
     
    35533553}
    35543554
    3555 void UIExtraDataManager::setRestrictedRuntimeMenuHelpActionTypes(UIExtraDataMetaDefs::MenuHelpActionType types, const QUuid &aID)
     3555void UIExtraDataManager::setRestrictedRuntimeMenuHelpActionTypes(UIExtraDataMetaDefs::MenuHelpActionType types, const QUuid &uID)
    35563556{
    35573557    /* We have MenuHelpActionType enum registered, so we can enumerate it: */
     
    35823582    }
    35833583    /* Save result: */
    3584     setExtraDataStringList(GUI_RestrictedRuntimeHelpMenuActions, result, aID);
    3585 }
    3586 
    3587 UIVisualStateType UIExtraDataManager::restrictedVisualStates(const QUuid &aID)
     3584    setExtraDataStringList(GUI_RestrictedRuntimeHelpMenuActions, result, uID);
     3585}
     3586
     3587UIVisualStateType UIExtraDataManager::restrictedVisualStates(const QUuid &uID)
    35883588{
    35893589    /* Prepare result: */
    35903590    UIVisualStateType result = UIVisualStateType_Invalid;
    35913591    /* Get restricted visual-state-types: */
    3592     foreach (const QString &strValue, extraDataStringList(GUI_RestrictedVisualStates, aID))
     3592    foreach (const QString &strValue, extraDataStringList(GUI_RestrictedVisualStates, uID))
    35933593    {
    35943594        UIVisualStateType value = gpConverter->fromInternalString<UIVisualStateType>(strValue);
     
    36003600}
    36013601
    3602 UIVisualStateType UIExtraDataManager::requestedVisualState(const QUuid &aID)
    3603 {
    3604     if (isFeatureAllowed(GUI_Fullscreen, aID)) return UIVisualStateType_Fullscreen;
    3605     if (isFeatureAllowed(GUI_Seamless, aID)) return UIVisualStateType_Seamless;
    3606     if (isFeatureAllowed(GUI_Scale, aID)) return UIVisualStateType_Scale;
     3602UIVisualStateType UIExtraDataManager::requestedVisualState(const QUuid &uID)
     3603{
     3604    if (isFeatureAllowed(GUI_Fullscreen, uID)) return UIVisualStateType_Fullscreen;
     3605    if (isFeatureAllowed(GUI_Seamless, uID)) return UIVisualStateType_Seamless;
     3606    if (isFeatureAllowed(GUI_Scale, uID)) return UIVisualStateType_Scale;
    36073607    return UIVisualStateType_Normal;
    36083608}
    36093609
    3610 void UIExtraDataManager::setRequestedVisualState(UIVisualStateType visualState, const QUuid &aID)
    3611 {
    3612     setExtraDataString(GUI_Fullscreen, toFeatureAllowed(visualState == UIVisualStateType_Fullscreen), aID);
    3613     setExtraDataString(GUI_Seamless, toFeatureAllowed(visualState == UIVisualStateType_Seamless), aID);
    3614     setExtraDataString(GUI_Scale, toFeatureAllowed(visualState == UIVisualStateType_Scale), aID);
     3610void UIExtraDataManager::setRequestedVisualState(UIVisualStateType visualState, const QUuid &uID)
     3611{
     3612    setExtraDataString(GUI_Fullscreen, toFeatureAllowed(visualState == UIVisualStateType_Fullscreen), uID);
     3613    setExtraDataString(GUI_Seamless, toFeatureAllowed(visualState == UIVisualStateType_Seamless), uID);
     3614    setExtraDataString(GUI_Scale, toFeatureAllowed(visualState == UIVisualStateType_Scale), uID);
    36153615}
    36163616
     
    36223622}
    36233623
    3624 bool UIExtraDataManager::distinguishMachineWindowGroups(const QUuid &aID)
     3624bool UIExtraDataManager::distinguishMachineWindowGroups(const QUuid &uID)
    36253625{
    36263626    /* 'False' unless feature allowed: */
    3627     return isFeatureAllowed(GUI_DistinguishMachineWindowGroups, aID);
    3628 }
    3629 
    3630 void UIExtraDataManager::setDistinguishMachineWindowGroups(const QUuid &aID, bool fEnabled)
     3627    return isFeatureAllowed(GUI_DistinguishMachineWindowGroups, uID);
     3628}
     3629
     3630void UIExtraDataManager::setDistinguishMachineWindowGroups(const QUuid &uID, bool fEnabled)
    36313631{
    36323632    /* 'True' if feature allowed, null-string otherwise: */
    3633     setExtraDataString(GUI_DistinguishMachineWindowGroups, toFeatureAllowed(fEnabled), aID);
     3633    setExtraDataString(GUI_DistinguishMachineWindowGroups, toFeatureAllowed(fEnabled), uID);
    36343634}
    36353635#endif /* VBOX_WS_X11 */
    36363636
    3637 bool UIExtraDataManager::guestScreenAutoResizeEnabled(const QUuid &aID)
     3637bool UIExtraDataManager::guestScreenAutoResizeEnabled(const QUuid &uID)
    36383638{
    36393639    /* 'True' unless feature restricted: */
    3640     return !isFeatureRestricted(GUI_AutoresizeGuest, aID);
    3641 }
    3642 
    3643 void UIExtraDataManager::setGuestScreenAutoResizeEnabled(bool fEnabled, const QUuid &aID)
     3640    return !isFeatureRestricted(GUI_AutoresizeGuest, uID);
     3641}
     3642
     3643void UIExtraDataManager::setGuestScreenAutoResizeEnabled(bool fEnabled, const QUuid &uID)
    36443644{
    36453645    /* 'False' if feature restricted, null-string otherwise: */
    3646     setExtraDataString(GUI_AutoresizeGuest, toFeatureRestricted(!fEnabled), aID);
    3647 }
    3648 
    3649 bool UIExtraDataManager::lastGuestScreenVisibilityStatus(ulong uScreenIndex, const QUuid &aID)
     3646    setExtraDataString(GUI_AutoresizeGuest, toFeatureRestricted(!fEnabled), uID);
     3647}
     3648
     3649bool UIExtraDataManager::lastGuestScreenVisibilityStatus(ulong uScreenIndex, const QUuid &uID)
    36503650{
    36513651    /* Not for primary screen: */
     
    36563656
    36573657    /* 'False' unless feature allowed: */
    3658     return isFeatureAllowed(strKey, aID);
    3659 }
    3660 
    3661 void UIExtraDataManager::setLastGuestScreenVisibilityStatus(ulong uScreenIndex, bool fEnabled, const QUuid &aID)
     3658    return isFeatureAllowed(strKey, uID);
     3659}
     3660
     3661void UIExtraDataManager::setLastGuestScreenVisibilityStatus(ulong uScreenIndex, bool fEnabled, const QUuid &uID)
    36623662{
    36633663    /* Not for primary screen: */
     
    36683668
    36693669    /* 'True' if feature allowed, null-string otherwise: */
    3670     return setExtraDataString(strKey, toFeatureAllowed(fEnabled), aID);
    3671 }
    3672 
    3673 QSize UIExtraDataManager::lastGuestScreenSizeHint(ulong uScreenIndex, const QUuid &aID)
     3670    return setExtraDataString(strKey, toFeatureAllowed(fEnabled), uID);
     3671}
     3672
     3673QSize UIExtraDataManager::lastGuestScreenSizeHint(ulong uScreenIndex, const QUuid &uID)
    36743674{
    36753675    /* Choose corresponding key: */
     
    36773677
    36783678    /* Get corresponding extra-data: */
    3679     const QStringList data = extraDataStringList(strKey, aID);
     3679    const QStringList data = extraDataStringList(strKey, uID);
    36803680
    36813681    /* Parse loaded data: */
     
    36953695}
    36963696
    3697 void UIExtraDataManager::setLastGuestScreenSizeHint(ulong uScreenIndex, const QSize &sizeHint, const QUuid &aID)
     3697void UIExtraDataManager::setLastGuestScreenSizeHint(ulong uScreenIndex, const QSize &sizeHint, const QUuid &uID)
    36983698{
    36993699    /* Choose corresponding key: */
     
    37063706
    37073707    /* Re-cache corresponding extra-data: */
    3708     setExtraDataStringList(strKey, data, aID);
    3709 }
    3710 
    3711 int UIExtraDataManager::hostScreenForPassedGuestScreen(int iGuestScreenIndex, const QUuid &aID)
     3708    setExtraDataStringList(strKey, data, uID);
     3709}
     3710
     3711int UIExtraDataManager::hostScreenForPassedGuestScreen(int iGuestScreenIndex, const QUuid &uID)
    37123712{
    37133713    /* Choose corresponding key: */
     
    37153715
    37163716    /* Get value and convert it to index: */
    3717     const QString strValue = extraDataString(strKey, aID);
     3717    const QString strValue = extraDataString(strKey, uID);
    37183718    bool fOk = false;
    37193719    const int iHostScreenIndex = strValue.toULong(&fOk);
     
    37233723}
    37243724
    3725 void UIExtraDataManager::setHostScreenForPassedGuestScreen(int iGuestScreenIndex, int iHostScreenIndex, const QUuid &aID)
     3725void UIExtraDataManager::setHostScreenForPassedGuestScreen(int iGuestScreenIndex, int iHostScreenIndex, const QUuid &uID)
    37263726{
    37273727    /* Choose corresponding key: */
     
    37293729
    37303730    /* Save passed index under corresponding value: */
    3731     setExtraDataString(strKey, iHostScreenIndex != -1 ? QString::number(iHostScreenIndex) : QString(), aID);
    3732 }
    3733 
    3734 bool UIExtraDataManager::autoMountGuestScreensEnabled(const QUuid &aID)
     3731    setExtraDataString(strKey, iHostScreenIndex != -1 ? QString::number(iHostScreenIndex) : QString(), uID);
     3732}
     3733
     3734bool UIExtraDataManager::autoMountGuestScreensEnabled(const QUuid &uID)
    37353735{
    37363736    /* Show only if 'allowed' flag is set: */
    3737     return isFeatureAllowed(GUI_AutomountGuestScreens, aID);
     3737    return isFeatureAllowed(GUI_AutomountGuestScreens, uID);
    37383738}
    37393739
    37403740#ifdef VBOX_WITH_VIDEOHWACCEL
    3741 bool UIExtraDataManager::useLinearStretch(const QUuid &aID)
     3741bool UIExtraDataManager::useLinearStretch(const QUuid &uID)
    37423742{
    37433743    /* 'True' unless feature restricted: */
    3744     return !isFeatureRestricted(GUI_Accelerate2D_StretchLinear, aID);
    3745 }
    3746 
    3747 bool UIExtraDataManager::usePixelFormatYV12(const QUuid &aID)
     3744    return !isFeatureRestricted(GUI_Accelerate2D_StretchLinear, uID);
     3745}
     3746
     3747bool UIExtraDataManager::usePixelFormatYV12(const QUuid &uID)
    37483748{
    37493749    /* 'True' unless feature restricted: */
    3750     return !isFeatureRestricted(GUI_Accelerate2D_PixformatYV12, aID);
    3751 }
    3752 
    3753 bool UIExtraDataManager::usePixelFormatUYVY(const QUuid &aID)
     3750    return !isFeatureRestricted(GUI_Accelerate2D_PixformatYV12, uID);
     3751}
     3752
     3753bool UIExtraDataManager::usePixelFormatUYVY(const QUuid &uID)
    37543754{
    37553755    /* 'True' unless feature restricted: */
    3756     return !isFeatureRestricted(GUI_Accelerate2D_PixformatUYVY, aID);
    3757 }
    3758 
    3759 bool UIExtraDataManager::usePixelFormatYUY2(const QUuid &aID)
     3756    return !isFeatureRestricted(GUI_Accelerate2D_PixformatUYVY, uID);
     3757}
     3758
     3759bool UIExtraDataManager::usePixelFormatYUY2(const QUuid &uID)
    37603760{
    37613761    /* 'True' unless feature restricted: */
    3762     return !isFeatureRestricted(GUI_Accelerate2D_PixformatYUY2, aID);
    3763 }
    3764 
    3765 bool UIExtraDataManager::usePixelFormatAYUV(const QUuid &aID)
     3762    return !isFeatureRestricted(GUI_Accelerate2D_PixformatYUY2, uID);
     3763}
     3764
     3765bool UIExtraDataManager::usePixelFormatAYUV(const QUuid &uID)
    37663766{
    37673767    /* 'True' unless feature restricted: */
    3768     return !isFeatureRestricted(GUI_Accelerate2D_PixformatAYUV, aID);
     3768    return !isFeatureRestricted(GUI_Accelerate2D_PixformatAYUV, uID);
    37693769}
    37703770#endif /* VBOX_WITH_VIDEOHWACCEL */
    37713771
    37723772#ifndef VBOX_WS_MAC
    3773 bool UIExtraDataManager::miniToolbarEnabled(const QUuid &aID)
     3773bool UIExtraDataManager::miniToolbarEnabled(const QUuid &uID)
    37743774{
    37753775    /* 'True' unless feature restricted: */
    3776     return !isFeatureRestricted(GUI_ShowMiniToolBar, aID);
    3777 }
    3778 
    3779 void UIExtraDataManager::setMiniToolbarEnabled(bool fEnabled, const QUuid &aID)
     3776    return !isFeatureRestricted(GUI_ShowMiniToolBar, uID);
     3777}
     3778
     3779void UIExtraDataManager::setMiniToolbarEnabled(bool fEnabled, const QUuid &uID)
    37803780{
    37813781    /* 'False' if feature restricted, null-string otherwise: */
    3782     setExtraDataString(GUI_ShowMiniToolBar, toFeatureRestricted(!fEnabled), aID);
    3783 }
    3784 
    3785 bool UIExtraDataManager::autoHideMiniToolbar(const QUuid &aID)
     3782    setExtraDataString(GUI_ShowMiniToolBar, toFeatureRestricted(!fEnabled), uID);
     3783}
     3784
     3785bool UIExtraDataManager::autoHideMiniToolbar(const QUuid &uID)
    37863786{
    37873787    /* 'True' unless feature restricted: */
    3788     return !isFeatureRestricted(GUI_MiniToolBarAutoHide, aID);
    3789 }
    3790 
    3791 void UIExtraDataManager::setAutoHideMiniToolbar(bool fAutoHide, const QUuid &aID)
     3788    return !isFeatureRestricted(GUI_MiniToolBarAutoHide, uID);
     3789}
     3790
     3791void UIExtraDataManager::setAutoHideMiniToolbar(bool fAutoHide, const QUuid &uID)
    37923792{
    37933793    /* 'False' if feature restricted, null-string otherwise: */
    3794     setExtraDataString(GUI_MiniToolBarAutoHide, toFeatureRestricted(!fAutoHide), aID);
    3795 }
    3796 
    3797 Qt::AlignmentFlag UIExtraDataManager::miniToolbarAlignment(const QUuid &aID)
     3794    setExtraDataString(GUI_MiniToolBarAutoHide, toFeatureRestricted(!fAutoHide), uID);
     3795}
     3796
     3797Qt::AlignmentFlag UIExtraDataManager::miniToolbarAlignment(const QUuid &uID)
    37983798{
    37993799    /* Return Qt::AlignBottom unless MiniToolbarAlignment_Top specified separately: */
    3800     switch (gpConverter->fromInternalString<MiniToolbarAlignment>(extraDataString(GUI_MiniToolBarAlignment, aID)))
     3800    switch (gpConverter->fromInternalString<MiniToolbarAlignment>(extraDataString(GUI_MiniToolBarAlignment, uID)))
    38013801    {
    38023802        case MiniToolbarAlignment_Top: return Qt::AlignTop;
     
    38063806}
    38073807
    3808 void UIExtraDataManager::setMiniToolbarAlignment(Qt::AlignmentFlag alignment, const QUuid &aID)
     3808void UIExtraDataManager::setMiniToolbarAlignment(Qt::AlignmentFlag alignment, const QUuid &uID)
    38093809{
    38103810    /* Remove record unless Qt::AlignTop specified separately: */
    38113811    switch (alignment)
    38123812    {
    3813         case Qt::AlignTop: setExtraDataString(GUI_MiniToolBarAlignment, gpConverter->toInternalString(MiniToolbarAlignment_Top), aID); return;
     3813        case Qt::AlignTop: setExtraDataString(GUI_MiniToolBarAlignment, gpConverter->toInternalString(MiniToolbarAlignment_Top), uID); return;
    38143814        default: break;
    38153815    }
    3816     setExtraDataString(GUI_MiniToolBarAlignment, QString(), aID);
     3816    setExtraDataString(GUI_MiniToolBarAlignment, QString(), uID);
    38173817}
    38183818#endif /* VBOX_WS_MAC */
    38193819
    3820 bool UIExtraDataManager::statusBarEnabled(const QUuid &aID)
     3820bool UIExtraDataManager::statusBarEnabled(const QUuid &uID)
    38213821{
    38223822    /* 'True' unless feature restricted: */
    3823     return !isFeatureRestricted(GUI_StatusBar_Enabled, aID);
    3824 }
    3825 
    3826 void UIExtraDataManager::setStatusBarEnabled(bool fEnabled, const QUuid &aID)
     3823    return !isFeatureRestricted(GUI_StatusBar_Enabled, uID);
     3824}
     3825
     3826void UIExtraDataManager::setStatusBarEnabled(bool fEnabled, const QUuid &uID)
    38273827{
    38283828    /* 'False' if feature restricted, null-string otherwise: */
    3829     setExtraDataString(GUI_StatusBar_Enabled, toFeatureRestricted(!fEnabled), aID);
    3830 }
    3831 
    3832 bool UIExtraDataManager::statusBarContextMenuEnabled(const QUuid &aID)
     3829    setExtraDataString(GUI_StatusBar_Enabled, toFeatureRestricted(!fEnabled), uID);
     3830}
     3831
     3832bool UIExtraDataManager::statusBarContextMenuEnabled(const QUuid &uID)
    38333833{
    38343834    /* 'True' unless feature restricted: */
    3835     return !isFeatureRestricted(GUI_StatusBar_ContextMenu_Enabled, aID);
    3836 }
    3837 
    3838 void UIExtraDataManager::setStatusBarContextMenuEnabled(bool fEnabled, const QUuid &aID)
     3835    return !isFeatureRestricted(GUI_StatusBar_ContextMenu_Enabled, uID);
     3836}
     3837
     3838void UIExtraDataManager::setStatusBarContextMenuEnabled(bool fEnabled, const QUuid &uID)
    38393839{
    38403840    /* 'False' if feature restricted, null-string otherwise: */
    3841     setExtraDataString(GUI_StatusBar_ContextMenu_Enabled, toFeatureRestricted(!fEnabled), aID);
    3842 }
    3843 
    3844 QList<IndicatorType> UIExtraDataManager::restrictedStatusBarIndicators(const QUuid &aID)
     3841    setExtraDataString(GUI_StatusBar_ContextMenu_Enabled, toFeatureRestricted(!fEnabled), uID);
     3842}
     3843
     3844QList<IndicatorType> UIExtraDataManager::restrictedStatusBarIndicators(const QUuid &uID)
    38453845{
    38463846    /* Prepare result: */
    38473847    QList<IndicatorType> result;
    38483848    /* Get restricted status-bar indicators: */
    3849     foreach (const QString &strValue, extraDataStringList(GUI_RestrictedStatusBarIndicators, aID))
     3849    foreach (const QString &strValue, extraDataStringList(GUI_RestrictedStatusBarIndicators, uID))
    38503850    {
    38513851        const IndicatorType value = gpConverter->fromInternalString<IndicatorType>(strValue);
     
    38573857}
    38583858
    3859 void UIExtraDataManager::setRestrictedStatusBarIndicators(const QList<IndicatorType> &list, const QUuid &aID)
     3859void UIExtraDataManager::setRestrictedStatusBarIndicators(const QList<IndicatorType> &list, const QUuid &uID)
    38603860{
    38613861    /* Parse passed list: */
     
    38653865
    38663866    /* Re-cache corresponding extra-data: */
    3867     setExtraDataStringList(GUI_RestrictedStatusBarIndicators, data, aID);
    3868 }
    3869 
    3870 QList<IndicatorType> UIExtraDataManager::statusBarIndicatorOrder(const QUuid &aID)
     3867    setExtraDataStringList(GUI_RestrictedStatusBarIndicators, data, uID);
     3868}
     3869
     3870QList<IndicatorType> UIExtraDataManager::statusBarIndicatorOrder(const QUuid &uID)
    38713871{
    38723872    /* Prepare result: */
    38733873    QList<IndicatorType> result;
    38743874    /* Get status-bar indicator order: */
    3875     foreach (const QString &strValue, extraDataStringList(GUI_StatusBar_IndicatorOrder, aID))
     3875    foreach (const QString &strValue, extraDataStringList(GUI_StatusBar_IndicatorOrder, uID))
    38763876    {
    38773877        const IndicatorType value = gpConverter->fromInternalString<IndicatorType>(strValue);
     
    39153915}
    39163916
    3917 void UIExtraDataManager::setStatusBarIndicatorOrder(const QList<IndicatorType> &list, const QUuid &aID)
     3917void UIExtraDataManager::setStatusBarIndicatorOrder(const QList<IndicatorType> &list, const QUuid &uID)
    39183918{
    39193919    /* Parse passed list: */
     
    39233923
    39243924    /* Re-cache corresponding extra-data: */
    3925     setExtraDataStringList(GUI_StatusBar_IndicatorOrder, data, aID);
     3925    setExtraDataStringList(GUI_StatusBar_IndicatorOrder, data, uID);
    39263926}
    39273927
    39283928#ifdef VBOX_WS_MAC
    3929 bool UIExtraDataManager::realtimeDockIconUpdateEnabled(const QUuid &aID)
     3929bool UIExtraDataManager::realtimeDockIconUpdateEnabled(const QUuid &uID)
    39303930{
    39313931    /* 'True' unless feature restricted: */
    3932     return !isFeatureRestricted(GUI_RealtimeDockIconUpdateEnabled, aID);
    3933 }
    3934 
    3935 void UIExtraDataManager::setRealtimeDockIconUpdateEnabled(bool fEnabled, const QUuid &aID)
     3932    return !isFeatureRestricted(GUI_RealtimeDockIconUpdateEnabled, uID);
     3933}
     3934
     3935void UIExtraDataManager::setRealtimeDockIconUpdateEnabled(bool fEnabled, const QUuid &uID)
    39363936{
    39373937    /* 'False' if feature restricted, null-string otherwise: */
    3938     setExtraDataString(GUI_RealtimeDockIconUpdateEnabled, toFeatureRestricted(!fEnabled), aID);
    3939 }
    3940 
    3941 int UIExtraDataManager::realtimeDockIconUpdateMonitor(const QUuid &aID)
    3942 {
    3943     return extraDataString(GUI_RealtimeDockIconUpdateMonitor, aID).toInt();
    3944 }
    3945 
    3946 void UIExtraDataManager::setRealtimeDockIconUpdateMonitor(int iIndex, const QUuid &aID)
    3947 {
    3948     setExtraDataString(GUI_RealtimeDockIconUpdateMonitor, iIndex ? QString::number(iIndex) : QString(), aID);
    3949 }
    3950 
    3951 bool UIExtraDataManager::dockIconDisableOverlay(const QUuid &aID)
     3938    setExtraDataString(GUI_RealtimeDockIconUpdateEnabled, toFeatureRestricted(!fEnabled), uID);
     3939}
     3940
     3941int UIExtraDataManager::realtimeDockIconUpdateMonitor(const QUuid &uID)
     3942{
     3943    return extraDataString(GUI_RealtimeDockIconUpdateMonitor, uID).toInt();
     3944}
     3945
     3946void UIExtraDataManager::setRealtimeDockIconUpdateMonitor(int iIndex, const QUuid &uID)
     3947{
     3948    setExtraDataString(GUI_RealtimeDockIconUpdateMonitor, iIndex ? QString::number(iIndex) : QString(), uID);
     3949}
     3950
     3951bool UIExtraDataManager::dockIconDisableOverlay(const QUuid &uID)
    39523952{
    39533953    /* 'False' unless feature allowed: */
    3954     return isFeatureAllowed(GUI_DockIconDisableOverlay, aID);
    3955 }
    3956 
    3957 void UIExtraDataManager::setDockIconDisableOverlay(bool fDisabled, const QUuid &aID)
     3954    return isFeatureAllowed(GUI_DockIconDisableOverlay, uID);
     3955}
     3956
     3957void UIExtraDataManager::setDockIconDisableOverlay(bool fDisabled, const QUuid &uID)
    39583958{
    39593959    /* 'True' if feature allowed, null-string otherwise: */
    3960     setExtraDataString(GUI_DockIconDisableOverlay, toFeatureAllowed(fDisabled), aID);
     3960    setExtraDataString(GUI_DockIconDisableOverlay, toFeatureAllowed(fDisabled), uID);
    39613961}
    39623962#endif /* VBOX_WS_MAC */
    39633963
    3964 bool UIExtraDataManager::passCADtoGuest(const QUuid &aID)
     3964bool UIExtraDataManager::passCADtoGuest(const QUuid &uID)
    39653965{
    39663966    /* 'False' unless feature allowed: */
    3967     return isFeatureAllowed(GUI_PassCAD, aID);
    3968 }
    3969 
    3970 MouseCapturePolicy UIExtraDataManager::mouseCapturePolicy(const QUuid &aID)
    3971 {
    3972     return gpConverter->fromInternalString<MouseCapturePolicy>(extraDataString(GUI_MouseCapturePolicy, aID));
    3973 }
    3974 
    3975 GuruMeditationHandlerType UIExtraDataManager::guruMeditationHandlerType(const QUuid &aID)
    3976 {
    3977     return gpConverter->fromInternalString<GuruMeditationHandlerType>(extraDataString(GUI_GuruMeditationHandler, aID));
    3978 }
    3979 
    3980 bool UIExtraDataManager::hidLedsSyncState(const QUuid &aID)
     3967    return isFeatureAllowed(GUI_PassCAD, uID);
     3968}
     3969
     3970MouseCapturePolicy UIExtraDataManager::mouseCapturePolicy(const QUuid &uID)
     3971{
     3972    return gpConverter->fromInternalString<MouseCapturePolicy>(extraDataString(GUI_MouseCapturePolicy, uID));
     3973}
     3974
     3975GuruMeditationHandlerType UIExtraDataManager::guruMeditationHandlerType(const QUuid &uID)
     3976{
     3977    return gpConverter->fromInternalString<GuruMeditationHandlerType>(extraDataString(GUI_GuruMeditationHandler, uID));
     3978}
     3979
     3980bool UIExtraDataManager::hidLedsSyncState(const QUuid &uID)
    39813981{
    39823982    /* 'True' unless feature restricted: */
    3983     return !isFeatureRestricted(GUI_HidLedsSync, aID);
    3984 }
    3985 
    3986 double UIExtraDataManager::scaleFactor(const QUuid &aID, const int uScreenIndex)
     3983    return !isFeatureRestricted(GUI_HidLedsSync, uID);
     3984}
     3985
     3986double UIExtraDataManager::scaleFactor(const QUuid &uID, const int uScreenIndex)
    39873987{
    39883988    /* Get corresponding extra-data for this machine: */
    3989     QStringList data = extraDataStringList(GUI_ScaleFactor, aID);
     3989    QStringList data = extraDataStringList(GUI_ScaleFactor, uID);
    39903990
    39913991    /* 1.0 is default scale factor: */
     
    40054005}
    40064006
    4007 QList<double> UIExtraDataManager::scaleFactors(const QUuid &aID)
     4007QList<double> UIExtraDataManager::scaleFactors(const QUuid &uID)
    40084008{
    40094009    /* Look for the scale factor for this machine first: */
    4010     QStringList data = extraDataStringList(GUI_ScaleFactor, aID);
     4010    QStringList data = extraDataStringList(GUI_ScaleFactor, uID);
    40114011
    40124012    QList<double> scaleFactorList;
     
    40304030}
    40314031
    4032 void UIExtraDataManager::setScaleFactor(double dScaleFactor, const QUuid &aID, const int uScreenIndex)
    4033 {
    4034     QStringList data = extraDataStringList(GUI_ScaleFactor, aID);
     4032void UIExtraDataManager::setScaleFactor(double dScaleFactor, const QUuid &uID, const int uScreenIndex)
     4033{
     4034    QStringList data = extraDataStringList(GUI_ScaleFactor, uID);
    40354035
    40364036    /* Just make sure that we have corresponding data item: */
     
    40434043
    40444044    data[uScreenIndex] = QString::number(dScaleFactor);
    4045     setExtraDataStringList(GUI_ScaleFactor, data, aID);
    4046 }
    4047 
    4048 void UIExtraDataManager::setScaleFactors(const QList<double> &scaleFactors, const QUuid &aID)
     4045    setExtraDataStringList(GUI_ScaleFactor, data, uID);
     4046}
     4047
     4048void UIExtraDataManager::setScaleFactors(const QList<double> &scaleFactors, const QUuid &uID)
    40494049{
    40504050    QStringList data;
    40514051    for (int i = 0; i < scaleFactors.size(); ++i)
    40524052        data.append(QString::number(scaleFactors[i]));
    4053     setExtraDataStringList(GUI_ScaleFactor, data, aID);
    4054 }
    4055 
    4056 ScalingOptimizationType UIExtraDataManager::scalingOptimizationType(const QUuid &aID)
    4057 {
    4058     return gpConverter->fromInternalString<ScalingOptimizationType>(extraDataString(GUI_Scaling_Optimization, aID));
    4059 }
    4060 
    4061 QRect UIExtraDataManager::informationWindowGeometry(QWidget *pWidget, QWidget *pParentWidget, const QUuid &aID)
     4053    setExtraDataStringList(GUI_ScaleFactor, data, uID);
     4054}
     4055
     4056ScalingOptimizationType UIExtraDataManager::scalingOptimizationType(const QUuid &uID)
     4057{
     4058    return gpConverter->fromInternalString<ScalingOptimizationType>(extraDataString(GUI_Scaling_Optimization, uID));
     4059}
     4060
     4061QRect UIExtraDataManager::informationWindowGeometry(QWidget *pWidget, QWidget *pParentWidget, const QUuid &uID)
    40624062{
    40634063    /* Get corresponding extra-data: */
    4064     const QStringList data = extraDataStringList(GUI_InformationWindowGeometry, aID);
     4064    const QStringList data = extraDataStringList(GUI_InformationWindowGeometry, uID);
    40654065
    40664066    /* Parse loaded data: */
     
    41094109}
    41104110
    4111 bool UIExtraDataManager::informationWindowShouldBeMaximized(const QUuid &aID)
     4111bool UIExtraDataManager::informationWindowShouldBeMaximized(const QUuid &uID)
    41124112{
    41134113    /* Get corresponding extra-data: */
    4114     const QStringList data = extraDataStringList(GUI_InformationWindowGeometry, aID);
     4114    const QStringList data = extraDataStringList(GUI_InformationWindowGeometry, uID);
    41154115
    41164116    /* Make sure 5th item has required value: */
     
    41184118}
    41194119
    4120 void UIExtraDataManager::setInformationWindowGeometry(const QRect &geometry, bool fMaximized, const QUuid &aID)
     4120void UIExtraDataManager::setInformationWindowGeometry(const QRect &geometry, bool fMaximized, const QUuid &uID)
    41214121{
    41224122    /* Serialize passed values: */
     
    41304130
    41314131    /* Re-cache corresponding extra-data: */
    4132     setExtraDataStringList(GUI_InformationWindowGeometry, data, aID);
     4132    setExtraDataStringList(GUI_InformationWindowGeometry, data, uID);
    41334133}
    41344134
     
    42244224}
    42254225
    4226 MachineCloseAction UIExtraDataManager::defaultMachineCloseAction(const QUuid &aID)
    4227 {
    4228     return gpConverter->fromInternalString<MachineCloseAction>(extraDataString(GUI_DefaultCloseAction, aID));
    4229 }
    4230 
    4231 MachineCloseAction UIExtraDataManager::restrictedMachineCloseActions(const QUuid &aID)
     4226MachineCloseAction UIExtraDataManager::defaultMachineCloseAction(const QUuid &uID)
     4227{
     4228    return gpConverter->fromInternalString<MachineCloseAction>(extraDataString(GUI_DefaultCloseAction, uID));
     4229}
     4230
     4231MachineCloseAction UIExtraDataManager::restrictedMachineCloseActions(const QUuid &uID)
    42324232{
    42334233    /* Prepare result: */
    42344234    MachineCloseAction result = MachineCloseAction_Invalid;
    42354235    /* Get restricted machine-close-actions: */
    4236     foreach (const QString &strValue, extraDataStringList(GUI_RestrictedCloseActions, aID))
     4236    foreach (const QString &strValue, extraDataStringList(GUI_RestrictedCloseActions, uID))
    42374237    {
    42384238        MachineCloseAction value = gpConverter->fromInternalString<MachineCloseAction>(strValue);
     
    42444244}
    42454245
    4246 MachineCloseAction UIExtraDataManager::lastMachineCloseAction(const QUuid &aID)
    4247 {
    4248     return gpConverter->fromInternalString<MachineCloseAction>(extraDataString(GUI_LastCloseAction, aID));
    4249 }
    4250 
    4251 void UIExtraDataManager::setLastMachineCloseAction(MachineCloseAction machineCloseAction, const QUuid &aID)
    4252 {
    4253     setExtraDataString(GUI_LastCloseAction, gpConverter->toInternalString(machineCloseAction), aID);
    4254 }
    4255 
    4256 QString UIExtraDataManager::machineCloseHookScript(const QUuid &aID)
    4257 {
    4258     return extraDataString(GUI_CloseActionHook, aID);
     4246MachineCloseAction UIExtraDataManager::lastMachineCloseAction(const QUuid &uID)
     4247{
     4248    return gpConverter->fromInternalString<MachineCloseAction>(extraDataString(GUI_LastCloseAction, uID));
     4249}
     4250
     4251void UIExtraDataManager::setLastMachineCloseAction(MachineCloseAction machineCloseAction, const QUuid &uID)
     4252{
     4253    setExtraDataString(GUI_LastCloseAction, gpConverter->toInternalString(machineCloseAction), uID);
     4254}
     4255
     4256QString UIExtraDataManager::machineCloseHookScript(const QUuid &uID)
     4257{
     4258    return extraDataString(GUI_CloseActionHook, uID);
    42594259}
    42604260
     
    45124512}
    45134513
    4514 void UIExtraDataManager::sltExtraDataChange(const QUuid &aMachineID, const QString &strKey, const QString &strValue)
    4515 {
    4516     /* Re-cache value only if strMachineID known already: */
    4517     if (m_data.contains(aMachineID))
     4514void UIExtraDataManager::sltExtraDataChange(const QUuid &uMachineID, const QString &strKey, const QString &strValue)
     4515{
     4516    /* Re-cache value only if uMachineID known already: */
     4517    if (m_data.contains(uMachineID))
    45184518    {
    45194519        if (!strValue.isEmpty())
    4520             m_data[aMachineID][strKey] = strValue;
     4520            m_data[uMachineID][strKey] = strValue;
    45214521        else
    4522             m_data[aMachineID].remove(strKey);
     4522            m_data[uMachineID].remove(strKey);
    45234523    }
    45244524
    45254525    /* Global extra-data 'change' event: */
    4526     if (aMachineID == GlobalID)
     4526    if (uMachineID == GlobalID)
    45274527    {
    45284528        if (strKey.startsWith("GUI/"))
     
    45474547        /* Current VM only: */
    45484548        if (   vboxGlobal().isVMConsoleProcess()
    4549             && aMachineID == vboxGlobal().managedVMUuid())
     4549            && uMachineID == vboxGlobal().managedVMUuid())
    45504550        {
    45514551            /* HID LEDs sync state changed (allowed if not restricted)? */
    45524552            if (strKey == GUI_HidLedsSync)
    4553                 emit sigHidLedsSyncStateChange(!isFeatureRestricted(strKey, aMachineID));
     4553                emit sigHidLedsSyncStateChange(!isFeatureRestricted(strKey, uMachineID));
    45544554#ifdef VBOX_WS_MAC
    45554555            /* 'Dock icon' appearance changed (allowed if not restricted)? */
    45564556            else if (strKey == GUI_RealtimeDockIconUpdateEnabled ||
    45574557                     strKey == GUI_RealtimeDockIconUpdateMonitor)
    4558                 emit sigDockIconAppearanceChange(!isFeatureRestricted(strKey, aMachineID));
     4558                emit sigDockIconAppearanceChange(!isFeatureRestricted(strKey, uMachineID));
    45594559            /* 'Dock icon overlay' appearance changed (restricted if not allowed)? */
    45604560            else if (strKey == GUI_DockIconDisableOverlay)
    4561                 emit sigDockIconOverlayAppearanceChange(isFeatureAllowed(strKey, aMachineID));
     4561                emit sigDockIconOverlayAppearanceChange(isFeatureAllowed(strKey, uMachineID));
    45624562#endif /* VBOX_WS_MAC */
    45634563        }
     
    45814581#endif /* VBOX_WS_MAC */
    45824582            strKey == GUI_RestrictedRuntimeHelpMenuActions)
    4583             emit sigMenuBarConfigurationChange(aMachineID);
     4583            emit sigMenuBarConfigurationChange(uMachineID);
    45844584        /* Status-bar configuration change: */
    45854585        else if (strKey == GUI_StatusBar_Enabled ||
    45864586                 strKey == GUI_RestrictedStatusBarIndicators ||
    45874587                 strKey == GUI_StatusBar_IndicatorOrder)
    4588             emit sigStatusBarConfigurationChange(aMachineID);
     4588            emit sigStatusBarConfigurationChange(uMachineID);
    45894589        /* Scale-factor change: */
    4590         else if (strKey ==GUI_ScaleFactor)
    4591             emit sigScaleFactorChange(aMachineID);
     4590        else if (strKey == GUI_ScaleFactor)
     4591            emit sigScaleFactorChange(uMachineID);
    45924592        /* Scaling optimization type change: */
    45934593        else if (strKey == GUI_Scaling_Optimization)
    4594             emit sigScalingOptimizationTypeChange(aMachineID);
     4594            emit sigScalingOptimizationTypeChange(uMachineID);
    45954595    }
    45964596
    45974597    /* Notify listeners: */
    4598     emit sigExtraDataChange(aMachineID, strKey, strValue);
     4598    emit sigExtraDataChange(uMachineID, strKey, strValue);
    45994599}
    46004600
     
    46774677#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    46784678
    4679 QString UIExtraDataManager::extraDataStringUnion(const QString &strKey, const QUuid &aID)
    4680 {
    4681     /* If passed strID differs from the GlobalID: */
    4682     if (aID != GlobalID)
     4679QString UIExtraDataManager::extraDataStringUnion(const QString &strKey, const QUuid &uID)
     4680{
     4681    /* If passed uID differs from the GlobalID: */
     4682    if (uID != GlobalID)
    46834683    {
    46844684        /* Search through the machine extra-data first: */
    4685         MapOfExtraDataMaps::const_iterator itMap = m_data.constFind(aID);
     4685        MapOfExtraDataMaps::const_iterator itMap = m_data.constFind(uID);
    46864686        /* Hot-load machine extra-data map if necessary: */
    46874687        if (itMap == m_data.constEnd())
    46884688        {
    4689             hotloadMachineExtraDataMap(aID);
    4690             itMap = m_data.constFind(aID);
     4689            hotloadMachineExtraDataMap(uID);
     4690            itMap = m_data.constFind(uID);
    46914691        }
    46924692        if (itMap != m_data.constEnd())
     
    47134713}
    47144714
    4715 bool UIExtraDataManager::isFeatureAllowed(const QString &strKey, const QUuid &aID /* = GlobalID */)
     4715bool UIExtraDataManager::isFeatureAllowed(const QString &strKey, const QUuid &uID /* = GlobalID */)
    47164716{
    47174717    /* Get the value. Return 'false' if not found: */
    4718     const QString strValue = extraDataStringUnion(strKey, aID);
     4718    const QString strValue = extraDataStringUnion(strKey, uID);
    47194719    if (strValue.isNull())
    47204720        return false;
     
    47274727}
    47284728
    4729 bool UIExtraDataManager::isFeatureRestricted(const QString &strKey, const QUuid &aID /* = GlobalID */)
     4729bool UIExtraDataManager::isFeatureRestricted(const QString &strKey, const QUuid &uID /* = GlobalID */)
    47304730{
    47314731    /* Get the value. Return 'false' if not found: */
    4732     const QString strValue = extraDataStringUnion(strKey, aID);
     4732    const QString strValue = extraDataStringUnion(strKey, uID);
    47334733    if (strValue.isNull())
    47344734        return false;
  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

    r74914 r74942  
    5757
    5858    /** Notifies about extra-data map acknowledging. */
    59     void sigExtraDataMapAcknowledging(const QUuid &aID);
     59    void sigExtraDataMapAcknowledging(const QUuid &uID);
    6060
    6161    /** Notifies about extra-data change. */
    62     void sigExtraDataChange(const QUuid &aID, const QString &strKey, const QString &strValue);
     62    void sigExtraDataChange(const QUuid &uID, const QString &strKey, const QString &strValue);
    6363
    6464    /** Notifies about GUI language change. */
     
    7373
    7474    /** Notifies about menu-bar configuration change. */
    75     void sigMenuBarConfigurationChange(const QUuid &aMachineID);
     75    void sigMenuBarConfigurationChange(const QUuid &uMachineID);
    7676    /** Notifies about status-bar configuration change. */
    77     void sigStatusBarConfigurationChange(const QUuid &aMachineID);
     77    void sigStatusBarConfigurationChange(const QUuid &uMachineID);
    7878
    7979    /** Notifies about HID LEDs synchronization state change. */
     
    8181
    8282    /** Notifies about the scale-factor change. */
    83     void sigScaleFactorChange(const QUuid &aMachineID);
     83    void sigScaleFactorChange(const QUuid &uMachineID);
    8484
    8585    /** Notifies about the scaling optimization type change. */
    86     void sigScalingOptimizationTypeChange(const QUuid &aMachineID);
     86    void sigScalingOptimizationTypeChange(const QUuid &uMachineID);
    8787
    8888#ifdef VBOX_WS_MAC
    8989    /** Notifies about the HiDPI optimization type change. */
    90     void sigHiDPIOptimizationTypeChange(const QUuid &aMachineID);
     90    void sigHiDPIOptimizationTypeChange(const QUuid &uMachineID);
    9191
    9292    /** Mac OS X: Notifies about 'dock icon' appearance change. */
     
    113113    /** @name Base
    114114      * @{ */
    115         /** Returns whether Extra-data Manager cached the map with passed @a strID. */
    116         bool contains(const QUuid &aID) const { return m_data.contains(aID); }
    117         /** Returns read-only extra-data map for passed @a strID. */
    118         const ExtraDataMap map(const QUuid &aID) const { return m_data.value(aID); }
     115        /** Returns whether Extra-data Manager cached the map with passed @a uID. */
     116        bool contains(const QUuid &uID) const { return m_data.contains(uID); }
     117        /** Returns read-only extra-data map for passed @a uID. */
     118        const ExtraDataMap map(const QUuid &uID) const { return m_data.value(uID); }
    119119
    120120        /** Hot-load machine extra-data map. */
    121         void hotloadMachineExtraDataMap(const QUuid &aID);
     121        void hotloadMachineExtraDataMap(const QUuid &uID);
    122122
    123123        /** Returns extra-data value corresponding to passed @a strKey as QString.
    124           * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
    125         QString extraDataString(const QString &strKey, const QUuid &aID = GlobalID);
     124          * If valid @a uID is set => applies to machine extra-data, otherwise => to global one. */
     125        QString extraDataString(const QString &strKey, const QUuid &uID = GlobalID);
    126126        /** Defines extra-data value corresponding to passed @a strKey as strValue.
    127           * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
    128         void setExtraDataString(const QString &strKey, const QString &strValue, const QUuid &aID = GlobalID);
     127          * If valid @a uID is set => applies to machine extra-data, otherwise => to global one. */
     128        void setExtraDataString(const QString &strKey, const QString &strValue, const QUuid &uID = GlobalID);
    129129
    130130        /** Returns extra-data value corresponding to passed @a strKey as QStringList.
    131           * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
    132         QStringList extraDataStringList(const QString &strKey, const QUuid &aID = GlobalID);
     131          * If valid @a uID is set => applies to machine extra-data, otherwise => to global one. */
     132        QStringList extraDataStringList(const QString &strKey, const QUuid &uID = GlobalID);
    133133        /** Defines extra-data value corresponding to passed @a strKey as value.
    134           * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
    135         void setExtraDataStringList(const QString &strKey, const QStringList &value, const QUuid &aID = GlobalID);
     134          * If valid @a uID is set => applies to machine extra-data, otherwise => to global one. */
     135        void setExtraDataStringList(const QString &strKey, const QStringList &value, const QUuid &uID = GlobalID);
    136136    /** @} */
    137137
     
    145145      * @{ */
    146146        /** Returns the list of supressed messages for the Message/Popup center frameworks. */
    147         QStringList suppressedMessages(const QUuid &aID = GlobalID);
     147        QStringList suppressedMessages(const QUuid &uID = GlobalID);
    148148        /** Defines the @a list of supressed messages for the Message/Popup center frameworks. */
    149149        void setSuppressedMessages(const QStringList &list);
     
    190190        QList<GlobalSettingsPageType> restrictedGlobalSettingsPages();
    191191        /** Returns restricted machine settings pages. */
    192         QList<MachineSettingsPageType> restrictedMachineSettingsPages(const QUuid &aID);
     192        QList<MachineSettingsPageType> restrictedMachineSettingsPages(const QUuid &uID);
    193193    /** @} */
    194194
     
    396396      * @{ */
    397397        /** Returns whether machine should be shown in selector-window chooser-pane. */
    398         bool showMachineInSelectorChooser(const QUuid &aID);
     398        bool showMachineInSelectorChooser(const QUuid &uID);
    399399        /** Returns whether machine should be shown in selector-window details-pane. */
    400         bool showMachineInSelectorDetails(const QUuid &aID);
     400        bool showMachineInSelectorDetails(const QUuid &uID);
    401401
    402402        /** Returns whether machine reconfiguration enabled. */
    403         bool machineReconfigurationEnabled(const QUuid &aID);
     403        bool machineReconfigurationEnabled(const QUuid &uID);
    404404        /** Returns whether machine snapshot operations enabled. */
    405         bool machineSnapshotOperationsEnabled(const QUuid &aID);
     405        bool machineSnapshotOperationsEnabled(const QUuid &uID);
    406406
    407407        /** Returns whether this machine is first time started. */
    408         bool machineFirstTimeStarted(const QUuid &aID);
     408        bool machineFirstTimeStarted(const QUuid &uID);
    409409        /** Returns whether this machine is fFirstTimeStarted. */
    410         void setMachineFirstTimeStarted(bool fFirstTimeStarted, const QUuid &aID);
     410        void setMachineFirstTimeStarted(bool fFirstTimeStarted, const QUuid &uID);
    411411
    412412        /** Except Mac OS X: Returns redefined machine-window icon names. */
    413         QStringList machineWindowIconNames(const QUuid &aID);
     413        QStringList machineWindowIconNames(const QUuid &uID);
    414414#ifndef VBOX_WS_MAC
    415415        /** Except Mac OS X: Returns redefined machine-window name postfix. */
    416         QString machineWindowNamePostfix(const QUuid &aID);
     416        QString machineWindowNamePostfix(const QUuid &uID);
    417417#endif
    418418
    419419        /** Returns geometry for machine-window with @a uScreenIndex in @a visualStateType. */
    420         QRect machineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QUuid &sID);
     420        QRect machineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QUuid &uID);
    421421        /** Returns whether machine-window with @a uScreenIndex in @a visualStateType should be maximized. */
    422         bool machineWindowShouldBeMaximized(UIVisualStateType visualStateType, ulong uScreenIndex, const QUuid &aID);
     422        bool machineWindowShouldBeMaximized(UIVisualStateType visualStateType, ulong uScreenIndex, const QUuid &uID);
    423423        /** Defines @a geometry and @a fMaximized state for machine-window with @a uScreenIndex in @a visualStateType. */
    424         void setMachineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QRect &geometry, bool fMaximized, const QUuid &aID);
     424        void setMachineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QRect &geometry, bool fMaximized, const QUuid &uID);
    425425
    426426#ifndef VBOX_WS_MAC
    427427        /** Returns whether Runtime UI menu-bar is enabled. */
    428         bool menuBarEnabled(const QUuid &aID);
     428        bool menuBarEnabled(const QUuid &uID);
    429429        /** Defines whether Runtime UI menu-bar is @a fEnabled. */
    430         void setMenuBarEnabled(bool fEnabled, const QUuid &aID);
     430        void setMenuBarEnabled(bool fEnabled, const QUuid &uID);
    431431#endif /* !VBOX_WS_MAC */
    432432
    433433        /** Returns whether Runtime UI menu-bar context-menu is enabled. */
    434         bool menuBarContextMenuEnabled(const QUuid &aID);
     434        bool menuBarContextMenuEnabled(const QUuid &uID);
    435435        /** Defines whether Runtime UI menu-bar context-menu is @a fEnabled. */
    436         void setMenuBarContextMenuEnabled(bool fEnabled, const QUuid &aID);
     436        void setMenuBarContextMenuEnabled(bool fEnabled, const QUuid &uID);
    437437
    438438        /** Returns restricted Runtime UI menu types. */
    439         UIExtraDataMetaDefs::MenuType restrictedRuntimeMenuTypes(const QUuid &aID);
     439        UIExtraDataMetaDefs::MenuType restrictedRuntimeMenuTypes(const QUuid &uID);
    440440        /** Defines restricted Runtime UI menu types. */
    441         void setRestrictedRuntimeMenuTypes(UIExtraDataMetaDefs::MenuType types, const QUuid &aID);
     441        void setRestrictedRuntimeMenuTypes(UIExtraDataMetaDefs::MenuType types, const QUuid &uID);
    442442
    443443        /** Returns restricted Runtime UI action types for Application menu. */
    444         UIExtraDataMetaDefs::MenuApplicationActionType restrictedRuntimeMenuApplicationActionTypes(const QUuid &aID);
     444        UIExtraDataMetaDefs::MenuApplicationActionType restrictedRuntimeMenuApplicationActionTypes(const QUuid &uID);
    445445        /** Defines restricted Runtime UI action types for Application menu. */
    446         void setRestrictedRuntimeMenuApplicationActionTypes(UIExtraDataMetaDefs::MenuApplicationActionType types, const QUuid &aID);
     446        void setRestrictedRuntimeMenuApplicationActionTypes(UIExtraDataMetaDefs::MenuApplicationActionType types, const QUuid &uID);
    447447
    448448        /** Returns restricted Runtime UI action types for Machine menu. */
    449         UIExtraDataMetaDefs::RuntimeMenuMachineActionType restrictedRuntimeMenuMachineActionTypes(const QUuid &aID);
     449        UIExtraDataMetaDefs::RuntimeMenuMachineActionType restrictedRuntimeMenuMachineActionTypes(const QUuid &uID);
    450450        /** Defines restricted Runtime UI action types for Machine menu. */
    451         void setRestrictedRuntimeMenuMachineActionTypes(UIExtraDataMetaDefs::RuntimeMenuMachineActionType types, const QUuid &aID);
     451        void setRestrictedRuntimeMenuMachineActionTypes(UIExtraDataMetaDefs::RuntimeMenuMachineActionType types, const QUuid &uID);
    452452
    453453        /** Returns restricted Runtime UI action types for View menu. */
    454         UIExtraDataMetaDefs::RuntimeMenuViewActionType restrictedRuntimeMenuViewActionTypes(const QUuid &aID);
     454        UIExtraDataMetaDefs::RuntimeMenuViewActionType restrictedRuntimeMenuViewActionTypes(const QUuid &uID);
    455455        /** Defines restricted Runtime UI action types for View menu. */
    456         void setRestrictedRuntimeMenuViewActionTypes(UIExtraDataMetaDefs::RuntimeMenuViewActionType types, const QUuid &aID);
     456        void setRestrictedRuntimeMenuViewActionTypes(UIExtraDataMetaDefs::RuntimeMenuViewActionType types, const QUuid &uID);
    457457
    458458        /** Returns restricted Runtime UI action types for Input menu. */
    459         UIExtraDataMetaDefs::RuntimeMenuInputActionType restrictedRuntimeMenuInputActionTypes(const QUuid &aID);
     459        UIExtraDataMetaDefs::RuntimeMenuInputActionType restrictedRuntimeMenuInputActionTypes(const QUuid &uID);
    460460        /** Defines restricted Runtime UI action types for Input menu. */
    461         void setRestrictedRuntimeMenuInputActionTypes(UIExtraDataMetaDefs::RuntimeMenuInputActionType types, const QUuid &aID);
     461        void setRestrictedRuntimeMenuInputActionTypes(UIExtraDataMetaDefs::RuntimeMenuInputActionType types, const QUuid &uID);
    462462
    463463        /** Returns restricted Runtime UI action types for Devices menu. */
    464         UIExtraDataMetaDefs::RuntimeMenuDevicesActionType restrictedRuntimeMenuDevicesActionTypes(const QUuid &aID);
     464        UIExtraDataMetaDefs::RuntimeMenuDevicesActionType restrictedRuntimeMenuDevicesActionTypes(const QUuid &uID);
    465465        /** Defines restricted Runtime UI action types for Devices menu. */
    466         void setRestrictedRuntimeMenuDevicesActionTypes(UIExtraDataMetaDefs::RuntimeMenuDevicesActionType types, const QUuid &aID);
     466        void setRestrictedRuntimeMenuDevicesActionTypes(UIExtraDataMetaDefs::RuntimeMenuDevicesActionType types, const QUuid &uID);
    467467
    468468#ifdef VBOX_WITH_DEBUGGER_GUI
    469469        /** Returns restricted Runtime UI action types for Debugger menu. */
    470         UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType restrictedRuntimeMenuDebuggerActionTypes(const QUuid &aID);
     470        UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType restrictedRuntimeMenuDebuggerActionTypes(const QUuid &uID);
    471471        /** Defines restricted Runtime UI action types for Debugger menu. */
    472         void setRestrictedRuntimeMenuDebuggerActionTypes(UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType types, const QUuid &aID);
     472        void setRestrictedRuntimeMenuDebuggerActionTypes(UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType types, const QUuid &uID);
    473473#endif /* VBOX_WITH_DEBUGGER_GUI */
    474474
    475475#ifdef VBOX_WS_MAC
    476476        /** Mac OS X: Returns restricted Runtime UI action types for Window menu. */
    477         UIExtraDataMetaDefs::MenuWindowActionType restrictedRuntimeMenuWindowActionTypes(const QUuid &aID);
     477        UIExtraDataMetaDefs::MenuWindowActionType restrictedRuntimeMenuWindowActionTypes(const QUuid &uID);
    478478        /** Mac OS X: Defines restricted Runtime UI action types for Window menu. */
    479         void setRestrictedRuntimeMenuWindowActionTypes(UIExtraDataMetaDefs::MenuWindowActionType types, const QUuid &aID);
     479        void setRestrictedRuntimeMenuWindowActionTypes(UIExtraDataMetaDefs::MenuWindowActionType types, const QUuid &uID);
    480480#endif /* VBOX_WS_MAC */
    481481
    482482        /** Returns restricted Runtime UI action types for Help menu. */
    483         UIExtraDataMetaDefs::MenuHelpActionType restrictedRuntimeMenuHelpActionTypes(const QUuid &aID);
     483        UIExtraDataMetaDefs::MenuHelpActionType restrictedRuntimeMenuHelpActionTypes(const QUuid &uID);
    484484        /** Defines restricted Runtime UI action types for Help menu. */
    485         void setRestrictedRuntimeMenuHelpActionTypes(UIExtraDataMetaDefs::MenuHelpActionType types, const QUuid &aID);
     485        void setRestrictedRuntimeMenuHelpActionTypes(UIExtraDataMetaDefs::MenuHelpActionType types, const QUuid &uID);
    486486
    487487        /** Returns restricted Runtime UI visual-states. */
    488         UIVisualStateType restrictedVisualStates(const QUuid &aID);
     488        UIVisualStateType restrictedVisualStates(const QUuid &uID);
    489489
    490490        /** Returns requested Runtime UI visual-state. */
    491         UIVisualStateType requestedVisualState(const QUuid &aID);
     491        UIVisualStateType requestedVisualState(const QUuid &uID);
    492492        /** Defines requested Runtime UI visual-state as @a visualState. */
    493         void setRequestedVisualState(UIVisualStateType visualState, const QUuid &aID);
     493        void setRequestedVisualState(UIVisualStateType visualState, const QUuid &uID);
    494494
    495495#ifdef VBOX_WS_X11
     
    498498
    499499        /** Returns whether internal machine-window name should be unique. */
    500         bool distinguishMachineWindowGroups(const QUuid &aID);
     500        bool distinguishMachineWindowGroups(const QUuid &uID);
    501501        /** Defines whether internal machine-window name should be unique. */
    502         void setDistinguishMachineWindowGroups(const QUuid &aID, bool fEnabled);
     502        void setDistinguishMachineWindowGroups(const QUuid &uID, bool fEnabled);
    503503#endif /* VBOX_WS_X11 */
    504504
    505505        /** Returns whether guest-screen auto-resize according machine-window size is enabled. */
    506         bool guestScreenAutoResizeEnabled(const QUuid &aID);
     506        bool guestScreenAutoResizeEnabled(const QUuid &uID);
    507507        /** Defines whether guest-screen auto-resize according machine-window size is @a fEnabled. */
    508         void setGuestScreenAutoResizeEnabled(bool fEnabled, const QUuid &aID);
     508        void setGuestScreenAutoResizeEnabled(bool fEnabled, const QUuid &uID);
    509509
    510510        /** Returns last guest-screen visibility status for screen with @a uScreenIndex. */
    511         bool lastGuestScreenVisibilityStatus(ulong uScreenIndex, const QUuid &aID);
     511        bool lastGuestScreenVisibilityStatus(ulong uScreenIndex, const QUuid &uID);
    512512        /** Defines whether last guest-screen visibility status was @a fEnabled for screen with @a uScreenIndex. */
    513         void setLastGuestScreenVisibilityStatus(ulong uScreenIndex, bool fEnabled, const QUuid &aID);
     513        void setLastGuestScreenVisibilityStatus(ulong uScreenIndex, bool fEnabled, const QUuid &uID);
    514514
    515515        /** Returns last guest-screen size-hint for screen with @a uScreenIndex. */
    516         QSize lastGuestScreenSizeHint(ulong uScreenIndex, const QUuid &aID);
     516        QSize lastGuestScreenSizeHint(ulong uScreenIndex, const QUuid &uID);
    517517        /** Defines last guest-screen @a sizeHint for screen with @a uScreenIndex. */
    518         void setLastGuestScreenSizeHint(ulong uScreenIndex, const QSize &sizeHint, const QUuid &aID);
     518        void setLastGuestScreenSizeHint(ulong uScreenIndex, const QSize &sizeHint, const QUuid &uID);
    519519
    520520        /** Returns host-screen index corresponding to passed guest-screen @a iGuestScreenIndex. */
    521         int hostScreenForPassedGuestScreen(int iGuestScreenIndex, const QUuid &aID);
     521        int hostScreenForPassedGuestScreen(int iGuestScreenIndex, const QUuid &uID);
    522522        /** Defines @a iHostScreenIndex corresponding to passed guest-screen @a iGuestScreenIndex. */
    523         void setHostScreenForPassedGuestScreen(int iGuestScreenIndex, int iHostScreenIndex, const QUuid &aID);
     523        void setHostScreenForPassedGuestScreen(int iGuestScreenIndex, int iHostScreenIndex, const QUuid &uID);
    524524
    525525        /** Returns whether automatic mounting/unmounting of guest-screens enabled. */
    526         bool autoMountGuestScreensEnabled(const QUuid &aID);
     526        bool autoMountGuestScreensEnabled(const QUuid &uID);
    527527
    528528#ifdef VBOX_WITH_VIDEOHWACCEL
    529529        /** Returns whether 2D acceleration should use linear sretch. */
    530         bool useLinearStretch(const QUuid &aID);
     530        bool useLinearStretch(const QUuid &uID);
    531531        /** Returns whether 2D acceleration should use YV12 pixel format. */
    532         bool usePixelFormatYV12(const QUuid &aID);
     532        bool usePixelFormatYV12(const QUuid &uID);
    533533        /** Returns whether 2D acceleration should use UYVY pixel format. */
    534         bool usePixelFormatUYVY(const QUuid &aID);
     534        bool usePixelFormatUYVY(const QUuid &uID);
    535535        /** Returns whether 2D acceleration should use YUY2 pixel format. */
    536         bool usePixelFormatYUY2(const QUuid &aID);
     536        bool usePixelFormatYUY2(const QUuid &uID);
    537537        /** Returns whether 2D acceleration should use AYUV pixel format. */
    538         bool usePixelFormatAYUV(const QUuid &aID);
     538        bool usePixelFormatAYUV(const QUuid &uID);
    539539#endif /* VBOX_WITH_VIDEOHWACCEL */
    540540
    541541#ifndef VBOX_WS_MAC
    542542        /** Returns whether mini-toolbar is enabled for full and seamless screens. */
    543         bool miniToolbarEnabled(const QUuid &aID);
     543        bool miniToolbarEnabled(const QUuid &uID);
    544544        /** Defines whether mini-toolbar is @a fEnabled for full and seamless screens. */
    545         void setMiniToolbarEnabled(bool fEnabled, const QUuid &aID);
     545        void setMiniToolbarEnabled(bool fEnabled, const QUuid &uID);
    546546
    547547        /** Returns whether mini-toolbar should auto-hide itself. */
    548         bool autoHideMiniToolbar(const QUuid &aID);
     548        bool autoHideMiniToolbar(const QUuid &uID);
    549549        /** Defines whether mini-toolbar should @a fAutoHide itself. */
    550         void setAutoHideMiniToolbar(bool fAutoHide, const QUuid &aID);
     550        void setAutoHideMiniToolbar(bool fAutoHide, const QUuid &uID);
    551551
    552552        /** Returns mini-toolbar alignment. */
    553         Qt::AlignmentFlag miniToolbarAlignment(const QUuid &aID);
     553        Qt::AlignmentFlag miniToolbarAlignment(const QUuid &uID);
    554554        /** Returns mini-toolbar @a alignment. */
    555         void setMiniToolbarAlignment(Qt::AlignmentFlag alignment, const QUuid &aID);
     555        void setMiniToolbarAlignment(Qt::AlignmentFlag alignment, const QUuid &uID);
    556556#endif /* VBOX_WS_MAC */
    557557
    558558        /** Returns whether Runtime UI status-bar is enabled. */
    559         bool statusBarEnabled(const QUuid &aID);
     559        bool statusBarEnabled(const QUuid &uID);
    560560        /** Defines whether Runtime UI status-bar is @a fEnabled. */
    561         void setStatusBarEnabled(bool fEnabled, const QUuid &aID);
     561        void setStatusBarEnabled(bool fEnabled, const QUuid &uID);
    562562
    563563        /** Returns whether Runtime UI status-bar context-menu is enabled. */
    564         bool statusBarContextMenuEnabled(const QUuid &aID);
     564        bool statusBarContextMenuEnabled(const QUuid &uID);
    565565        /** Defines whether Runtime UI status-bar context-menu is @a fEnabled. */
    566         void setStatusBarContextMenuEnabled(bool fEnabled, const QUuid &aID);
     566        void setStatusBarContextMenuEnabled(bool fEnabled, const QUuid &uID);
    567567
    568568        /** Returns restricted Runtime UI status-bar indicator list. */
    569         QList<IndicatorType> restrictedStatusBarIndicators(const QUuid &aID);
     569        QList<IndicatorType> restrictedStatusBarIndicators(const QUuid &uID);
    570570        /** Defines restricted Runtime UI status-bar indicator @a list. */
    571         void setRestrictedStatusBarIndicators(const QList<IndicatorType> &list, const QUuid &aID);
     571        void setRestrictedStatusBarIndicators(const QList<IndicatorType> &list, const QUuid &uID);
    572572
    573573        /** Returns Runtime UI status-bar indicator order list. */
    574         QList<IndicatorType> statusBarIndicatorOrder(const QUuid &aID);
     574        QList<IndicatorType> statusBarIndicatorOrder(const QUuid &uID);
    575575        /** Defines Runtime UI status-bar indicator order @a list. */
    576         void setStatusBarIndicatorOrder(const QList<IndicatorType> &list, const QUuid &aID);
     576        void setStatusBarIndicatorOrder(const QList<IndicatorType> &list, const QUuid &uID);
    577577
    578578#ifdef VBOX_WS_MAC
    579579        /** Mac OS X: Returns whether Dock icon should be updated at runtime. */
    580         bool realtimeDockIconUpdateEnabled(const QUuid &aID);
     580        bool realtimeDockIconUpdateEnabled(const QUuid &uID);
    581581        /** Mac OS X: Defines whether Dock icon update should be fEnabled at runtime. */
    582         void setRealtimeDockIconUpdateEnabled(bool fEnabled, const QUuid &aID);
     582        void setRealtimeDockIconUpdateEnabled(bool fEnabled, const QUuid &uID);
    583583
    584584        /** Mac OS X: Returns guest-screen which Dock icon should reflect at runtime. */
    585         int realtimeDockIconUpdateMonitor(const QUuid &aID);
     585        int realtimeDockIconUpdateMonitor(const QUuid &uID);
    586586        /** Mac OS X: Defines guest-screen @a iIndex which Dock icon should reflect at runtime. */
    587         void setRealtimeDockIconUpdateMonitor(int iIndex, const QUuid &aID);
     587        void setRealtimeDockIconUpdateMonitor(int iIndex, const QUuid &uID);
    588588
    589589        /** Mac OS X: Returns whether Dock icon overlay is disabled. */
    590         bool dockIconDisableOverlay(const QUuid &aID);
     590        bool dockIconDisableOverlay(const QUuid &uID);
    591591        /** Mac OS X: Defines whether Dock icon overlay is @a fDisabled. */
    592         void setDockIconDisableOverlay(bool fDisabled, const QUuid &aID);
     592        void setDockIconDisableOverlay(bool fDisabled, const QUuid &uID);
    593593#endif /* VBOX_WS_MAC */
    594594
    595595        /** Returns whether machine should pass CAD to guest. */
    596         bool passCADtoGuest(const QUuid &aID);
     596        bool passCADtoGuest(const QUuid &uID);
    597597
    598598        /** Returns the mouse-capture policy. */
    599         MouseCapturePolicy mouseCapturePolicy(const QUuid &aID);
     599        MouseCapturePolicy mouseCapturePolicy(const QUuid &uID);
    600600
    601601        /** Returns redefined guru-meditation handler type. */
    602         GuruMeditationHandlerType guruMeditationHandlerType(const QUuid &aID);
     602        GuruMeditationHandlerType guruMeditationHandlerType(const QUuid &uID);
    603603
    604604        /** Returns whether machine should perform HID LEDs synchronization. */
    605         bool hidLedsSyncState(const QUuid &aID);
     605        bool hidLedsSyncState(const QUuid &uID);
    606606
    607607        /** Returns the scale-factor. */
    608         double scaleFactor(const QUuid &aID, const int uScreenIndex);
    609         QList<double> scaleFactors(const QUuid &aID);
     608        double scaleFactor(const QUuid &uID, const int uScreenIndex);
     609        QList<double> scaleFactors(const QUuid &uID);
    610610        /** Saves the @a dScaleFactor for the monitor with @a uScreenIndex. If the existing scale factor
    611611          * list (from extra data) does not have scale factors for the screens with ids in [0, uScreenIndex)
    612612          * the this function appends a default scale factor for said screens.*/
    613         void setScaleFactor(double dScaleFactor, const QUuid &aID, const int uScreenIndex);
    614         /** Replaces the scale factor list of the machine with @a aID with @a scaleFactors. */
    615         void setScaleFactors(const QList<double> &scaleFactors, const QUuid &aID);
     613        void setScaleFactor(double dScaleFactor, const QUuid &uID, const int uScreenIndex);
     614        /** Replaces the scale factor list of the machine with @a uID with @a scaleFactors. */
     615        void setScaleFactors(const QList<double> &scaleFactors, const QUuid &uID);
    616616
    617617        /** Returns the scaling optimization type. */
    618         ScalingOptimizationType scalingOptimizationType(const QUuid &aID);
     618        ScalingOptimizationType scalingOptimizationType(const QUuid &uID);
    619619    /** @} */
    620620
     
    622622      * @{ */
    623623        /** Returns information-window geometry using @a pWidget and @a pParentWidget as hints. */
    624         QRect informationWindowGeometry(QWidget *pWidget, QWidget *pParentWidget, const QUuid &aID);
     624        QRect informationWindowGeometry(QWidget *pWidget, QWidget *pParentWidget, const QUuid &uID);
    625625        /** Returns whether information-window should be maximized or not. */
    626         bool informationWindowShouldBeMaximized(const QUuid &aID);
     626        bool informationWindowShouldBeMaximized(const QUuid &uID);
    627627        /** Defines information-window @a geometry and @a fMaximized state. */
    628         void setInformationWindowGeometry(const QRect &geometry, bool fMaximized, const QUuid &aID);
     628        void setInformationWindowGeometry(const QRect &geometry, bool fMaximized, const QUuid &uID);
    629629
    630630        /** Returns information-window elements. */
     
    641641      * @{ */
    642642        /** Returns default machine close action. */
    643         MachineCloseAction defaultMachineCloseAction(const QUuid &aID);
     643        MachineCloseAction defaultMachineCloseAction(const QUuid &uID);
    644644        /** Returns restricted machine close actions. */
    645         MachineCloseAction restrictedMachineCloseActions(const QUuid &aID);
     645        MachineCloseAction restrictedMachineCloseActions(const QUuid &uID);
    646646
    647647        /** Returns last machine close action. */
    648         MachineCloseAction lastMachineCloseAction(const QUuid &aID);
     648        MachineCloseAction lastMachineCloseAction(const QUuid &uID);
    649649        /** Defines last @a machineCloseAction. */
    650         void setLastMachineCloseAction(MachineCloseAction machineCloseAction, const QUuid &aID);
     650        void setLastMachineCloseAction(MachineCloseAction machineCloseAction, const QUuid &uID);
    651651
    652652        /** Returns machine close hook script name as simple string. */
    653         QString machineCloseHookScript(const QUuid &aID);
     653        QString machineCloseHookScript(const QUuid &uID);
    654654    /** @} */
    655655
     
    703703
    704704    /** Handles 'extra-data change' event: */
    705     void sltExtraDataChange(const QUuid &aMachineID, const QString &strKey, const QString &strValue);
     705    void sltExtraDataChange(const QUuid &uMachineID, const QString &strKey, const QString &strValue);
    706706
    707707private:
     
    734734    /** Retrieves an extra-data key from both machine and global sources.
    735735      *
    736       * If @a strID isn't #GlobalID, this will first check the extra-data associated
    737       * with the machine given by @a strID then fallback on the global extra-data.
     736      * If @a uID isn't #GlobalID, this will first check the extra-data associated
     737      * with the machine given by @a uID then fallback on the global extra-data.
    738738      *
    739739      * @returns String value if found, null string if not.
    740740      * @param   strKey      The extra-data key to get.
    741       * @param   aID         Machine UUID or #GlobalID.
     741      * @param   uID         Machine UUID or #GlobalID.
    742742      * @param   strValue    Where to return the value when found. */
    743     QString extraDataStringUnion(const QString &strKey, const QUuid &aID);
     743    QString extraDataStringUnion(const QString &strKey, const QUuid &uID);
    744744    /** Determines whether feature corresponding to passed @a strKey is allowed.
    745       * If valid @a aID is set => applies to machine and global extra-data,
     745      * If valid @a uID is set => applies to machine and global extra-data,
    746746      * otherwise => only to global one. */
    747     bool isFeatureAllowed(const QString &strKey, const QUuid &aID = GlobalID);
     747    bool isFeatureAllowed(const QString &strKey, const QUuid &uID = GlobalID);
    748748    /** Determines whether feature corresponding to passed @a strKey is restricted.
    749       * If valid @a aID is set => applies to machine and global extra-data,
     749      * If valid @a uID is set => applies to machine and global extra-data,
    750750      * otherwise => only to global one. */
    751     bool isFeatureRestricted(const QString &strKey, const QUuid &aID = GlobalID);
     751    bool isFeatureRestricted(const QString &strKey, const QUuid &uID = GlobalID);
    752752
    753753    /** Translates bool flag into QString value. */
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp

    r74914 r74942  
    31023102#endif /* VBOX_WITH_DEBUGGER_GUI */
    31033103
    3104 void UIActionPoolRuntime::sltHandleConfigurationChange(const QUuid &aMachineID)
     3104void UIActionPoolRuntime::sltHandleConfigurationChange(const QUuid &uMachineID)
    31053105{
    31063106    /* Skip unrelated machine IDs: */
    3107     if (vboxGlobal().managedVMUuid() != aMachineID)
     3107    if (vboxGlobal().managedVMUuid() != uMachineID)
    31083108        return;
    31093109
     
    33093309{
    33103310    /* Get machine ID: */
    3311     const QUuid aMachineID = vboxGlobal().managedVMUuid();
    3312     if (aMachineID.isNull())
     3311    const QUuid uMachineID = vboxGlobal().managedVMUuid();
     3312    if (uMachineID.isNull())
    33133313        return;
    33143314
    33153315    /* Recache common action restrictions: */
    3316     m_restrictedMenus[UIActionRestrictionLevel_Base] =                  gEDataManager->restrictedRuntimeMenuTypes(aMachineID);
    3317     m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base] = gEDataManager->restrictedRuntimeMenuApplicationActionTypes(aMachineID);
    3318     m_restrictedActionsMenuMachine[UIActionRestrictionLevel_Base] =     gEDataManager->restrictedRuntimeMenuMachineActionTypes(aMachineID);
    3319     m_restrictedActionsMenuView[UIActionRestrictionLevel_Base] =        gEDataManager->restrictedRuntimeMenuViewActionTypes(aMachineID);
    3320     m_restrictedActionsMenuInput[UIActionRestrictionLevel_Base] =       gEDataManager->restrictedRuntimeMenuInputActionTypes(aMachineID);
    3321     m_restrictedActionsMenuDevices[UIActionRestrictionLevel_Base] =     gEDataManager->restrictedRuntimeMenuDevicesActionTypes(aMachineID);
     3316    m_restrictedMenus[UIActionRestrictionLevel_Base] =                  gEDataManager->restrictedRuntimeMenuTypes(uMachineID);
     3317    m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base] = gEDataManager->restrictedRuntimeMenuApplicationActionTypes(uMachineID);
     3318    m_restrictedActionsMenuMachine[UIActionRestrictionLevel_Base] =     gEDataManager->restrictedRuntimeMenuMachineActionTypes(uMachineID);
     3319    m_restrictedActionsMenuView[UIActionRestrictionLevel_Base] =        gEDataManager->restrictedRuntimeMenuViewActionTypes(uMachineID);
     3320    m_restrictedActionsMenuInput[UIActionRestrictionLevel_Base] =       gEDataManager->restrictedRuntimeMenuInputActionTypes(uMachineID);
     3321    m_restrictedActionsMenuDevices[UIActionRestrictionLevel_Base] =     gEDataManager->restrictedRuntimeMenuDevicesActionTypes(uMachineID);
    33223322#ifdef VBOX_WITH_DEBUGGER_GUI
    3323     m_restrictedActionsMenuDebug[UIActionRestrictionLevel_Base] =       gEDataManager->restrictedRuntimeMenuDebuggerActionTypes(aMachineID);
     3323    m_restrictedActionsMenuDebug[UIActionRestrictionLevel_Base] =       gEDataManager->restrictedRuntimeMenuDebuggerActionTypes(uMachineID);
    33243324#endif /* VBOX_WITH_DEBUGGER_GUI */
    33253325#ifdef VBOX_WS_MAC
    3326     m_restrictedActionsMenuWindow[UIActionRestrictionLevel_Base] =      gEDataManager->restrictedRuntimeMenuWindowActionTypes(aMachineID);
     3326    m_restrictedActionsMenuWindow[UIActionRestrictionLevel_Base] =      gEDataManager->restrictedRuntimeMenuWindowActionTypes(uMachineID);
    33273327#endif /* VBOX_WS_MAC */
    3328     m_restrictedActionsMenuHelp[UIActionRestrictionLevel_Base] =        gEDataManager->restrictedRuntimeMenuHelpActionTypes(aMachineID);
     3328    m_restrictedActionsMenuHelp[UIActionRestrictionLevel_Base] =        gEDataManager->restrictedRuntimeMenuHelpActionTypes(uMachineID);
    33293329
    33303330    /* Recache visual state action restrictions: */
    3331     UIVisualStateType restrictedVisualStates = gEDataManager->restrictedVisualStates(aMachineID);
     3331    UIVisualStateType restrictedVisualStates = gEDataManager->restrictedVisualStates(uMachineID);
    33323332    {
    33333333        if (restrictedVisualStates & UIVisualStateType_Fullscreen)
     
    33433343
    33443344    /* Recache reconfiguration action restrictions: */
    3345     bool fReconfigurationAllowed = gEDataManager->machineReconfigurationEnabled(aMachineID);
     3345    bool fReconfigurationAllowed = gEDataManager->machineReconfigurationEnabled(uMachineID);
    33463346    if (!fReconfigurationAllowed)
    33473347    {
     
    33633363
    33643364    /* Recache snapshot related action restrictions: */
    3365     bool fSnapshotOperationsAllowed = gEDataManager->machineSnapshotOperationsEnabled(aMachineID);
     3365    bool fSnapshotOperationsAllowed = gEDataManager->machineSnapshotOperationsEnabled(uMachineID);
    33663366    if (!fSnapshotOperationsAllowed)
    33673367    {
     
    33843384
    33853385    /* Recache close related action restrictions: */
    3386     MachineCloseAction restrictedCloseActions = gEDataManager->restrictedMachineCloseActions(aMachineID);
     3386    MachineCloseAction restrictedCloseActions = gEDataManager->restrictedMachineCloseActions(uMachineID);
    33873387    bool fAllCloseActionsRestricted =    (!vboxGlobal().isSeparateProcess() || (restrictedCloseActions & MachineCloseAction_Detach))
    33883388                                      && (restrictedCloseActions & MachineCloseAction_SaveState)
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.h

    r74914 r74942  
    200200
    201201    /** Handles configuration-change. */
    202     void sltHandleConfigurationChange(const QUuid &aMachineID);
     202    void sltHandleConfigurationChange(const QUuid &uMachineID);
    203203
    204204    /** Handles 'View' : 'Scale Factor' menu : @a pAction trigger. */
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.h

    r74878 r74942  
    7575    /** @name VirtualBox related signals
    7676      * @{ */
    77         /** Notifies about @a state change event for the machine with @a strId. */
    78         void sigMachineStateChange(const QUuid &aId, const KMachineState state);
    79         /** Notifies about data change event for the machine with @a strId. */
    80         void sigMachineDataChange(const QUuid &aId);
    81         /** Notifies about machine with @a strId was @a fRegistered. */
    82         void sigMachineRegistered(const QUuid &aId, const bool fRegistered);
    83         /** Notifies about @a state change event for the session of the machine with @a strId. */
    84         void sigSessionStateChange(const QUuid &aId, const KSessionState state);
    85         /** Notifies about snapshot with @a strSnapshotId was taken for the machine with @a strId. */
    86         void sigSnapshotTake(const QUuid &aId, const QUuid &aSnapshotId);
    87         /** Notifies about snapshot with @a strSnapshotId was deleted for the machine with @a strId. */
    88         void sigSnapshotDelete(const QUuid &aId, const QUuid &aSnapshotId);
    89         /** Notifies about snapshot with @a strSnapshotId was changed for the machine with @a strId. */
    90         void sigSnapshotChange(const QUuid &aId, const QUuid &aSnapshotId);
    91         /** Notifies about snapshot with @a strSnapshotId was restored for the machine with @a strId. */
    92         void sigSnapshotRestore(const QUuid &aId, const QUuid &aSnapshotId);
     77        /** Notifies about @a state change event for the machine with @a uId. */
     78        void sigMachineStateChange(const QUuid &uId, const KMachineState state);
     79        /** Notifies about data change event for the machine with @a uId. */
     80        void sigMachineDataChange(const QUuid &uId);
     81        /** Notifies about machine with @a uId was @a fRegistered. */
     82        void sigMachineRegistered(const QUuid &uId, const bool fRegistered);
     83        /** Notifies about @a state change event for the session of the machine with @a uId. */
     84        void sigSessionStateChange(const QUuid &uId, const KSessionState state);
     85        /** Notifies about snapshot with @a uSnapshotId was taken for the machine with @a uId. */
     86        void sigSnapshotTake(const QUuid &uId, const QUuid &uSnapshotId);
     87        /** Notifies about snapshot with @a uSnapshotId was deleted for the machine with @a uId. */
     88        void sigSnapshotDelete(const QUuid &uId, const QUuid &uSnapshotId);
     89        /** Notifies about snapshot with @a uSnapshotId was changed for the machine with @a uId. */
     90        void sigSnapshotChange(const QUuid &uId, const QUuid &uSnapshotId);
     91        /** Notifies about snapshot with @a uSnapshotId was restored for the machine with @a uId. */
     92        void sigSnapshotRestore(const QUuid &uId, const QUuid &uSnapshotId);
    9393    /** @} */
    9494
    9595    /** @name VirtualBox Extra-data related signals
    9696      * @{ */
    97         /** Notifies about extra-data of the machine with @a strId can be changed for the key @a strKey to value @a strValue. */
    98         void sigExtraDataCanChange(const QUuid &aId, const QString &strKey, const QString &strValue, bool &fVeto, QString &strVetoReason); /* use Qt::DirectConnection */
    99         /** Notifies about extra-data of the machine with @a strId changed for the key @a strKey to value @a strValue. */
    100         void sigExtraDataChange(const QUuid &aId, const QString &strKey, const QString &strValue);
     97        /** Notifies about extra-data of the machine with @a uId can be changed for the key @a strKey to value @a strValue. */
     98        void sigExtraDataCanChange(const QUuid &uId, const QString &strKey, const QString &strValue, bool &fVeto, QString &strVetoReason); /* use Qt::DirectConnection */
     99        /** Notifies about extra-data of the machine with @a uId changed for the key @a strKey to value @a strValue. */
     100        void sigExtraDataChange(const QUuid &uId, const QString &strKey, const QString &strValue);
    101101    /** @} */
    102102
     
    148148    /** @name Progress related signals
    149149      * @{ */
    150         /** Notifies about @a iPercent change for progress with @a strProgressId. */
    151         void sigProgressPercentageChange(const QUuid &aProgressId, const int iPercent);
    152         /** Notifies about task complete for progress with @a strProgressId. */
    153         void sigProgressTaskComplete(const QUuid &aProgressId);
     150        /** Notifies about @a iPercent change for progress with @a uProgressId. */
     151        void sigProgressPercentageChange(const QUuid &uProgressId, const int iPercent);
     152        /** Notifies about task complete for progress with @a uProgressId. */
     153        void sigProgressTaskComplete(const QUuid &uProgressId);
    154154    /** @} */
    155155
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

    r74923 r74942  
    522522}
    523523
    524 void UIMessageCenter::cannotFindMachineById(const CVirtualBox &vbox, const QUuid &aId) const
     524void UIMessageCenter::cannotFindMachineById(const CVirtualBox &vbox, const QUuid &uId) const
    525525{
    526526    error(0, MessageType_Error,
    527527          tr("There is no virtual machine with the identifier <b>%1</b>.")
    528              .arg(aId.toString()),
     528             .arg(uId.toString()),
    529529          UIErrorString::formatErrorInfo(vbox));
    530530}
     
    10211021
    10221022void UIMessageCenter::cannotFindSnapshotById(const CMachine &comMachine,
    1023                                              const QUuid &aId,
     1023                                             const QUuid &uId,
    10241024                                             QWidget *pParent /* = 0 */) const
    10251025{
    10261026    error(pParent, MessageType_Error,
    10271027          tr("Can't find snapshot with ID=<b>%1</b>.")
    1028              .arg(aId.toString()),
     1028             .arg(uId.toString()),
    10291029          UIErrorString::formatErrorInfo(comMachine));
    10301030}
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

    r74923 r74942  
    251251    void cannotLoadLanguage(const QString &strLangFile) const;
    252252    void cannotFindMachineByName(const CVirtualBox &vbox, const QString &strName) const;
    253     void cannotFindMachineById(const CVirtualBox &vbox, const QUuid &aId) const;
     253    void cannotFindMachineById(const CVirtualBox &vbox, const QUuid &uId) const;
    254254    void cannotOpenSession(const CSession &session) const;
    255255    void cannotOpenSession(const CMachine &machine) const;
     
    301301    void cannotChangeSnapshot(const CSnapshot &comSnapshot, const QString &strSnapshotName, const QString &strMachineName) const;
    302302    void cannotFindSnapshotByName(const CMachine &comMachine, const QString &strName, QWidget *pParent = 0) const;
    303     void cannotFindSnapshotById(const CMachine &comMachine, const QUuid &aId, QWidget *pParent = 0) const;
     303    void cannotFindSnapshotById(const CMachine &comMachine, const QUuid &uId, QWidget *pParent = 0) const;
    304304    void cannotAcquireSnapshotAttributes(const CSnapshot &comSnapshot, QWidget *pParent = 0);
    305305
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVirtualBoxEventHandler.cpp

    r74878 r74942  
    4646    void sigVBoxSVCAvailabilityChange(bool fAvailable);
    4747
    48     /** Notifies about @a state change event for the machine with @a strId. */
    49     void sigMachineStateChange(const QUuid &aId, const KMachineState state);
    50     /** Notifies about data change event for the machine with @a strId. */
    51     void sigMachineDataChange(const QUuid &aId);
    52     /** Notifies about machine with @a strId was @a fRegistered. */
    53     void sigMachineRegistered(const QUuid &aId, const bool fRegistered);
    54     /** Notifies about @a state change event for the session of the machine with @a strId. */
    55     void sigSessionStateChange(const QUuid &aId, const KSessionState state);
    56     /** Notifies about snapshot with @a strSnapshotId was taken for the machine with @a strId. */
    57     void sigSnapshotTake(const QUuid &aId, const QUuid &aSnapshotId);
    58     /** Notifies about snapshot with @a strSnapshotId was deleted for the machine with @a strId. */
    59     void sigSnapshotDelete(const QUuid &aId, const QUuid &aSnapshotId);
    60     /** Notifies about snapshot with @a strSnapshotId was changed for the machine with @a strId. */
    61     void sigSnapshotChange(const QUuid &aId, const QUuid &aSnapshotId);
    62     /** Notifies about snapshot with @a strSnapshotId was restored for the machine with @a strId. */
    63     void sigSnapshotRestore(const QUuid &aId, const QUuid &aSnapshotId);
     48    /** Notifies about @a state change event for the machine with @a uId. */
     49    void sigMachineStateChange(const QUuid &uId, const KMachineState state);
     50    /** Notifies about data change event for the machine with @a uId. */
     51    void sigMachineDataChange(const QUuid &uId);
     52    /** Notifies about machine with @a uId was @a fRegistered. */
     53    void sigMachineRegistered(const QUuid &uId, const bool fRegistered);
     54    /** Notifies about @a state change event for the session of the machine with @a uId. */
     55    void sigSessionStateChange(const QUuid &uId, const KSessionState state);
     56    /** Notifies about snapshot with @a uSnapshotId was taken for the machine with @a uId. */
     57    void sigSnapshotTake(const QUuid &uId, const QUuid &uSnapshotId);
     58    /** Notifies about snapshot with @a uSnapshotId was deleted for the machine with @a uId. */
     59    void sigSnapshotDelete(const QUuid &uId, const QUuid &uSnapshotId);
     60    /** Notifies about snapshot with @a uSnapshotId was changed for the machine with @a uId. */
     61    void sigSnapshotChange(const QUuid &uId, const QUuid &uSnapshotId);
     62    /** Notifies about snapshot with @a uSnapshotId was restored for the machine with @a uId. */
     63    void sigSnapshotRestore(const QUuid &uId, const QUuid &uSnapshotId);
    6464
    6565public:
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVirtualBoxEventHandler.h

    r74878 r74942  
    4242    void sigVBoxSVCAvailabilityChange(bool fAvailable);
    4343
    44     /** Notifies about @a state change event for the machine with @a strId. */
    45     void sigMachineStateChange(const QUuid &aId, const KMachineState state);
    46     /** Notifies about data change event for the machine with @a strId. */
    47     void sigMachineDataChange(const QUuid &aId);
    48     /** Notifies about machine with @a strId was @a fRegistered. */
    49     void sigMachineRegistered(const QUuid &aId, const bool fRegistered);
    50     /** Notifies about @a state change event for the session of the machine with @a strId. */
    51     void sigSessionStateChange(const QUuid &aId, const KSessionState state);
    52     /** Notifies about snapshot with @a strSnapshotId was taken for the machine with @a strId. */
    53     void sigSnapshotTake(const QUuid &sId, const QUuid &aSnapshotId);
    54     /** Notifies about snapshot with @a strSnapshotId was deleted for the machine with @a strId. */
    55     void sigSnapshotDelete(const QUuid &aId, const QUuid &aSnapshotId);
    56     /** Notifies about snapshot with @a strSnapshotId was changed for the machine with @a strId. */
    57     void sigSnapshotChange(const QUuid &aId, const QUuid &aSnapshotId);
    58     /** Notifies about snapshot with @a strSnapshotId was restored for the machine with @a strId. */
    59     void sigSnapshotRestore(const QUuid &aId, const QUuid &aSnapshotId);
     44    /** Notifies about @a state change event for the machine with @a uId. */
     45    void sigMachineStateChange(const QUuid &uId, const KMachineState state);
     46    /** Notifies about data change event for the machine with @a uId. */
     47    void sigMachineDataChange(const QUuid &uId);
     48    /** Notifies about machine with @a uId was @a fRegistered. */
     49    void sigMachineRegistered(const QUuid &uId, const bool fRegistered);
     50    /** Notifies about @a state change event for the session of the machine with @a uId. */
     51    void sigSessionStateChange(const QUuid &uId, const KSessionState state);
     52    /** Notifies about snapshot with @a uSnapshotId was taken for the machine with @a uId. */
     53    void sigSnapshotTake(const QUuid &uId, const QUuid &uSnapshotId);
     54    /** Notifies about snapshot with @a uSnapshotId was deleted for the machine with @a uId. */
     55    void sigSnapshotDelete(const QUuid &uId, const QUuid &uSnapshotId);
     56    /** Notifies about snapshot with @a uSnapshotId was changed for the machine with @a uId. */
     57    void sigSnapshotChange(const QUuid &uId, const QUuid &uSnapshotId);
     58    /** Notifies about snapshot with @a uSnapshotId was restored for the machine with @a uId. */
     59    void sigSnapshotRestore(const QUuid &uId, const QUuid &uSnapshotId);
    6060
    6161public:
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

    r74878 r74942  
    23622362}
    23632363
    2364 CSession VBoxGlobal::openSession(const QUuid &aId, KLockType lockType /* = KLockType_Shared */)
     2364CSession VBoxGlobal::openSession(const QUuid &uId, KLockType lockType /* = KLockType_Shared */)
    23652365{
    23662366    /* Prepare session: */
     
    23802380
    23812381        /* Search for the corresponding machine: */
    2382         CMachine comMachine = m_comVBox.FindMachine(aId.toString());
     2382        CMachine comMachine = m_comVBox.FindMachine(uId.toString());
    23832383        if (comMachine.isNull())
    23842384        {
    2385             msgCenter().cannotFindMachineById(m_comVBox, aId);
     2385            msgCenter().cannotFindMachineById(m_comVBox, uId);
    23862386            break;
    23872387        }
     
    24862486}
    24872487
    2488 UIMedium VBoxGlobal::medium(const QUuid &aMediumID) const
     2488UIMedium VBoxGlobal::medium(const QUuid &uMediumID) const
    24892489{
    24902490    if (m_meCleanupProtectionToken.tryLockForRead())
     
    24932493        UIMedium guiMedium;
    24942494        if (m_pMediumEnumerator)
    2495             guiMedium = m_pMediumEnumerator->medium(aMediumID);
     2495            guiMedium = m_pMediumEnumerator->medium(uMediumID);
    24962496        m_meCleanupProtectionToken.unlock();
    24972497        return guiMedium;
     
    25252525}
    25262526
    2527 void VBoxGlobal::deleteMedium(const QUuid &aMediumID)
     2527void VBoxGlobal::deleteMedium(const QUuid &uMediumID)
    25282528{
    25292529    if (m_meCleanupProtectionToken.tryLockForRead())
     
    25312531        /* Delete medium from medium-enumerator: */
    25322532        if (m_pMediumEnumerator)
    2533             m_pMediumEnumerator->deleteMedium(aMediumID);
     2533            m_pMediumEnumerator->deleteMedium(uMediumID);
    25342534        m_meCleanupProtectionToken.unlock();
    25352535    }
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

    r74878 r74942  
    9090    /** @name COM: Virtual Media stuff.
    9191     * @{ */
    92         /** Notifies listeners about medium with certain @a strMediumID created. */
    93         void sigMediumCreated(const QUuid &aMediumID);
    94         /** Notifies listeners about medium with certain @a strMediumID deleted. */
    95         void sigMediumDeleted(const QUuid &aMediumID);
     92        /** Notifies listeners about medium with certain @a uMediumID created. */
     93        void sigMediumCreated(const QUuid &uMediumID);
     94        /** Notifies listeners about medium with certain @a uMediumID deleted. */
     95        void sigMediumDeleted(const QUuid &uMediumID);
    9696
    9797        /** Notifies listeners about medium enumeration started. */
    9898        void sigMediumEnumerationStarted();
    99         /** Notifies listeners about medium with certain @a strMediumID enumerated. */
    100         void sigMediumEnumerated(const QUuid &aMediumID);
     99        /** Notifies listeners about medium with certain @a uMediumID enumerated. */
     100        void sigMediumEnumerated(const QUuid &uMediumID);
    101101        /** Notifies listeners about medium enumeration finished. */
    102102        void sigMediumEnumerationFinished();
     
    473473        bool launchMachine(CMachine &comMachine, LaunchMode enmLaunchMode = LaunchMode_Default);
    474474
    475         /** Opens session of certain @a enmLockType for VM with certain @a strId. */
    476         CSession openSession(const QUuid &aId, KLockType enmLockType = KLockType_Write);
    477         /** Opens session of KLockType_Shared type for VM with certain @a strId. */
    478         CSession openExistingSession(const QUuid &aId) { return openSession(aId, KLockType_Shared); }
     475        /** Opens session of certain @a enmLockType for VM with certain @a uId. */
     476        CSession openSession(const QUuid &uId, KLockType enmLockType = KLockType_Write);
     477        /** Opens session of KLockType_Shared type for VM with certain @a uId. */
     478        CSession openExistingSession(const QUuid &uId) { return openSession(uId, KLockType_Shared); }
    479479    /** @} */
    480480
     
    487487        /** Returns whether medium enumeration is in progress. */
    488488        bool isMediumEnumerationInProgress() const;
    489         /** Returns enumerated medium with certain @a strMediumID. */
    490         UIMedium medium(const QUuid &aMediumID) const;
     489        /** Returns enumerated medium with certain @a uMediumID. */
     490        UIMedium medium(const QUuid &uMediumID) const;
    491491        /** Returns enumerated medium IDs. */
    492492        QList<QUuid> mediumIDs() const;
    493493        /** Creates medium on the basis of passed @a guiMedium description. */
    494494        void createMedium(const UIMedium &guiMedium);
    495         /** Deletes medium with certain @a strMediumID. */
    496         void deleteMedium(const QUuid &aMediumID);
     495        /** Deletes medium with certain @a uMediumID. */
     496        void deleteMedium(const QUuid &uMediumID);
    497497
    498498        /** Opens external medium by passed @a strMediumLocation.
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.h

    r74878 r74942  
    5252    void sigToggleFinished();
    5353    /** Redirects signal from UIDetails to UIVirtualBoxManager. */
    54     void sigLinkClicked(const QString &strCategory, const QString &strControl, const QUuid &aId);
     54    void sigLinkClicked(const QString &strCategory, const QString &strControl, const QUuid &uId);
    5555
    5656public:
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

    r74925 r74942  
    611611void UIVirtualBoxManager::sltOpenMachineSettingsDialog(QString strCategory /* = QString() */,
    612612                                                       QString strControl /* = QString() */,
    613                                                        const QUuid &aID /* = QString() */)
     613                                                       const QUuid &uID /* = QString() */)
    614614{
    615615    /* Get current item: */
     
    644644        /* Create and execute corresponding VM settings window: */
    645645        QPointer<UISettingsDialogMachine> pDlg = new UISettingsDialogMachine(this,
    646                                                                              aID.isNull() ? pItem->id() : aID,
     646                                                                             uID.isNull() ? pItem->id() : uID,
    647647                                                                             strCategory, strControl);
    648648        pDlg->execute();
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

    r74878 r74942  
    119119    /** @name CVirtualBox event handling stuff.
    120120      * @{ */
    121         /** Handles CVirtualBox event about state change for machine with @a strID. */
    122         void sltHandleStateChange(const QUuid &aID);
     121        /** Handles CVirtualBox event about state change for machine with @a uID. */
     122        void sltHandleStateChange(const QUuid &uID);
    123123    /** @} */
    124124
     
    174174          * @param strCategory can bring the settings category to start from.
    175175          * @param strControl  can bring the widget of the page to focus.
    176           * @param strID       can bring the ID of machine to manage. */
     176          * @param uID       can bring the ID of machine to manage. */
    177177        void sltOpenMachineSettingsDialog(QString strCategory = QString(),
    178178                                          QString strControl = QString(),
    179                                           const QUuid &aID = QUuid());
     179                                          const QUuid &uID = QUuid());
    180180        /** Handles call to open Machine Settings dialog the default way. */
    181181        void sltOpenMachineSettingsDialogDefault() { sltOpenMachineSettingsDialog(); }
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.h

    r74878 r74942  
    5252
    5353    /** Notifies aboud Details-pane link clicked. */
    54     void sigMachineSettingsLinkClicked(const QString &strCategory, const QString &strControl, const QUuid &aId);
     54    void sigMachineSettingsLinkClicked(const QString &strCategory, const QString &strControl, const QUuid &uId);
    5555
    5656    /** Notifies about Tool type change. */
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.h

    r74878 r74942  
    174174        virtual void clearItems(UIChooserItemType enmType = UIChooserItemType_Any) = 0;
    175175
    176         /** Updates all children items with specified @a strId. */
    177         virtual void updateAllItems(const QUuid &aId) = 0;
    178         /** Removes all children items with specified @a strId. */
    179         virtual void removeAllItems(const QUuid &aId) = 0;
     176        /** Updates all children items with specified @a uId. */
     177        virtual void updateAllItems(const QUuid &uId) = 0;
     178        /** Removes all children items with specified @a uId. */
     179        virtual void removeAllItems(const QUuid &uId) = 0;
    180180
    181181        /** Searches for a first child item answering to specified @a strSearchTag and @a iItemSearchFlags. */
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.h

    r74878 r74942  
    115115        virtual void clearItems(UIChooserItemType enmType = UIChooserItemType_Any) /* override */;
    116116
    117         /** Updates all children items with specified @a strId. */
    118         virtual void updateAllItems(const QUuid &aId) /* override */;
    119         /** Removes all children items with specified @a strId. */
    120         virtual void removeAllItems(const QUuid &aId) /* override */;
     117        /** Updates all children items with specified @a uId. */
     118        virtual void updateAllItems(const QUuid &uId) /* override */;
     119        /** Removes all children items with specified @a uId. */
     120        virtual void removeAllItems(const QUuid &uId) /* override */;
    121121
    122122        /** Searches for a first child item answering to specified @a strSearchTag and @a iItemSearchFlags. */
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp

    r74878 r74942  
    657657}
    658658
    659 void UIChooserItemGroup::updateAllItems(const QUuid &aId)
     659void UIChooserItemGroup::updateAllItems(const QUuid &uId)
    660660{
    661661    /* Update all the required items recursively: */
    662662    foreach (UIChooserItem *pItem, items())
    663         pItem->updateAllItems(aId);
    664 }
    665 
    666 void UIChooserItemGroup::removeAllItems(const QUuid &aId)
     663        pItem->updateAllItems(uId);
     664}
     665
     666void UIChooserItemGroup::removeAllItems(const QUuid &uId)
    667667{
    668668    /* Remove all the required items recursively: */
    669669    foreach (UIChooserItem *pItem, items())
    670         pItem->removeAllItems(aId);
     670        pItem->removeAllItems(uId);
    671671}
    672672
     
    13191319}
    13201320
    1321 bool UIChooserItemGroup::isContainsMachine(const QUuid &aId) const
     1321bool UIChooserItemGroup::isContainsMachine(const QUuid &uId) const
    13221322{
    13231323    /* Check each machine-item: */
    13241324    foreach (UIChooserItem *pItem, m_machineItems)
    1325         if (pItem->toMachineItem()->id() == aId)
     1325        if (pItem->toMachineItem()->id() == uId)
    13261326            return true;
    13271327    /* Found nothing? */
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.h

    r74878 r74942  
    161161        virtual void clearItems(UIChooserItemType enmType = UIChooserItemType_Any) /* override */;
    162162
    163         /** Updates all children items with specified @a strId. */
    164         virtual void updateAllItems(const QUuid &aId) /* override */;
    165         /** Removes all children items with specified @a strId. */
    166         virtual void removeAllItems(const QUuid &aId) /* override */;
     163        /** Updates all children items with specified @a uId. */
     164        virtual void updateAllItems(const QUuid &uId) /* override */;
     165        /** Removes all children items with specified @a uId. */
     166        virtual void removeAllItems(const QUuid &uId) /* override */;
    167167
    168168        /** Searches for a first child item answering to specified @a strSearchTag and @a iItemSearchFlags. */
     
    280280    /** @name Children stuff.
    281281      * @{ */
    282         /** Returns whether group contains machine with @a strId. */
    283         bool isContainsMachine(const QUuid &aId) const;
     282        /** Returns whether group contains machine with @a uId. */
     283        bool isContainsMachine(const QUuid &uId) const;
    284284        /** Returns whether group contains locked machine. */
    285285        bool isContainsLockedMachine();
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp

    r74878 r74942  
    346346}
    347347
    348 void UIChooserItemMachine::updateAllItems(const QUuid &aId)
     348void UIChooserItemMachine::updateAllItems(const QUuid &uId)
    349349{
    350350    /* Skip other ids: */
    351     if (id() != QUuid(aId))
     351    if (id() != QUuid(uId))
    352352        return;
    353353
     
    365365}
    366366
    367 void UIChooserItemMachine::removeAllItems(const QUuid &aId)
     367void UIChooserItemMachine::removeAllItems(const QUuid &uId)
    368368{
    369369    /* Skip wrong id: */
    370     if (id() != QUuid(aId))
     370    if (id() != QUuid(uId))
    371371        return;
    372372
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.h

    r74878 r74942  
    131131        virtual void clearItems(UIChooserItemType enmType = UIChooserItemType_Any) /* override */;
    132132
    133         /** Updates all children items with specified @a strId. */
    134         virtual void updateAllItems(const QUuid &aId) /* override */;
    135         /** Removes all children items with specified @a strId. */
    136         virtual void removeAllItems(const QUuid &aId) /* override */;
     133        /** Updates all children items with specified @a uId. */
     134        virtual void updateAllItems(const QUuid &uId) /* override */;
     135        /** Removes all children items with specified @a uId. */
     136        virtual void removeAllItems(const QUuid &uId) /* override */;
    137137
    138138        /** Searches for a first child item answering to specified @a strSearchTag and @a iItemSearchFlags. */
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

    r74915 r74942  
    749749}
    750750
    751 void UIChooserModel::sltMachineStateChanged(const QUuid &aId, const KMachineState)
     751void UIChooserModel::sltMachineStateChanged(const QUuid &uId, const KMachineState)
    752752{
    753753    /* Update machine-items with passed id: */
    754     mainRoot()->updateAllItems(aId);
    755 }
    756 
    757 void UIChooserModel::sltMachineDataChanged(const QUuid &aId)
     754    mainRoot()->updateAllItems(uId);
     755}
     756
     757void UIChooserModel::sltMachineDataChanged(const QUuid &uId)
    758758{
    759759    /* Update machine-items with passed id: */
    760     mainRoot()->updateAllItems(aId);
    761 }
    762 
    763 void UIChooserModel::sltMachineRegistered(const QUuid &aId, const bool fRegistered)
     760    mainRoot()->updateAllItems(uId);
     761}
     762
     763void UIChooserModel::sltMachineRegistered(const QUuid &uId, const bool fRegistered)
    764764{
    765765    /* New VM registered? */
     
    767767    {
    768768        /* Search for corresponding machine: */
    769         CMachine comMachine = vboxGlobal().virtualBox().FindMachine(aId.toString());
     769        CMachine comMachine = vboxGlobal().virtualBox().FindMachine(uId.toString());
    770770        /* Should we show this machine? */
    771         if (gEDataManager->showMachineInSelectorChooser(aId))
     771        if (gEDataManager->showMachineInSelectorChooser(uId))
    772772        {
    773773            /* Add new machine-item: */
     
    777777            updateLayout();
    778778            /* Change current-item only if VM was created from the GUI side: */
    779             if (aId == m_uLastCreatedMachineId)
     779            if (uId == m_uLastCreatedMachineId)
    780780            {
    781781                setCurrentItem(mainRoot()->searchForItem(comMachine.GetName(),
     
    789789    {
    790790        /* Remove machine-items with passed id: */
    791         mainRoot()->removeAllItems(aId.toString());
     791        mainRoot()->removeAllItems(uId.toString());
    792792        /* Update model: */
    793793        cleanupGroupTree();
     
    805805}
    806806
    807 void UIChooserModel::sltSessionStateChanged(const QUuid &aId, const KSessionState)
     807void UIChooserModel::sltSessionStateChanged(const QUuid &uId, const KSessionState)
    808808{
    809809    /* Update machine-items with passed id: */
    810     mainRoot()->updateAllItems(aId);
    811 }
    812 
    813 void UIChooserModel::sltSnapshotChanged(const QUuid &aId, const QUuid &)
     810    mainRoot()->updateAllItems(uId);
     811}
     812
     813void UIChooserModel::sltSnapshotChanged(const QUuid &uId, const QUuid &)
    814814{
    815815    /* Update machine-items with passed id: */
    816     mainRoot()->updateAllItems(aId);
     816    mainRoot()->updateAllItems(uId);
    817817}
    818818
     
    10631063}
    10641064
    1065 void UIChooserModel::sltReloadMachine(const QUuid &aId)
     1065void UIChooserModel::sltReloadMachine(const QUuid &uId)
    10661066{
    10671067    /* Remove all the items first: */
    1068     mainRoot()->removeAllItems(aId);
     1068    mainRoot()->removeAllItems(uId);
    10691069    /* Wipe out empty groups: */
    10701070    cleanupGroupTree();
    10711071
    10721072    /* Show machine if we should: */
    1073     CMachine comMachine = vboxGlobal().virtualBox().FindMachine(aId.toString());
    1074     if (gEDataManager->showMachineInSelectorChooser(aId))
     1073    CMachine comMachine = vboxGlobal().virtualBox().FindMachine(uId.toString());
     1074    if (gEDataManager->showMachineInSelectorChooser(uId))
    10751075        addMachineIntoTheTree(comMachine);
    10761076
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h

    r74915 r74942  
    266266    /** @name Main event handling stuff.
    267267      * @{ */
    268         /** Handles machine @a enmState change for machine with certain @a strId. */
    269         void sltMachineStateChanged(const QUuid &aId, const KMachineState enmState);
    270         /** Handles machine data change for machine with certain @a strId. */
    271         void sltMachineDataChanged(const QUuid &aId);
    272         /** Handles machine registering/unregistering for machine with certain @a strId. */
    273         void sltMachineRegistered(const QUuid &aId, const bool fRegistered);
    274         /** Handles session @a enmState change for machine with certain @a strId. */
    275         void sltSessionStateChanged(const QUuid &aId, const KSessionState enmState);
    276         /** Handles snapshot change for machine/snapshot with certain @a strId / @a strSnapshotId. */
    277         void sltSnapshotChanged(const QUuid &aId, const QUuid &aSnapshotId);
     268        /** Handles machine @a enmState change for machine with certain @a uId. */
     269        void sltMachineStateChanged(const QUuid &uId, const KMachineState enmState);
     270        /** Handles machine data change for machine with certain @a uId. */
     271        void sltMachineDataChanged(const QUuid &uId);
     272        /** Handles machine registering/unregistering for machine with certain @a uId. */
     273        void sltMachineRegistered(const QUuid &uId, const bool fRegistered);
     274        /** Handles session @a enmState change for machine with certain @a uId. */
     275        void sltSessionStateChanged(const QUuid &uId, const KSessionState enmState);
     276        /** Handles snapshot change for machine/snapshot with certain @a uId / @a uSnapshotId. */
     277        void sltSnapshotChanged(const QUuid &uId, const QUuid &uSnapshotId);
    278278    /** @} */
    279279
     
    304304        /** Handles group selected machines request. */
    305305        void sltGroupSelectedMachines();
    306         /** Handles reload machine with certain @a strId request. */
    307         void sltReloadMachine(const QUuid &aId);
     306        /** Handles reload machine with certain @a uId request. */
     307        void sltReloadMachine(const QUuid &uId);
    308308        /** Handles sort parent group request. */
    309309        void sltSortParentGroup();
     
    537537signals:
    538538
    539     /** Notifies about machine with certain @a strId to be reloaded. */
    540     void sigReload(const QUuid &aId);
     539    /** Notifies about machine with certain @a uId to be reloaded. */
     540    void sigReload(const QUuid &uId);
    541541
    542542    /** Notifies about task is complete. */
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetails.h

    r74878 r74942  
    3838      * @param  strCategory  Brings link category.
    3939      * @param  strControl   Brings control name.
    40       * @param  strId        Brings machine ID. */
     40      * @param  uId        Brings machine ID. */
    4141    void sigLinkClicked(const QString &strCategory,
    4242                        const QString &strControl,
    43                         const QUuid &aId);
     43                        const QUuid &uId);
    4444
    4545    /** Notifies listeners about sliding started. */
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.h

    r74878 r74942  
    6363          * @param  strCategory  Brings the link category.
    6464          * @param  strControl   Brings the wanted settings control.
    65           * @param  strId        Brings the ID. */
    66         void sigLinkClicked(const QString &strCategory, const QString &strControl, const QUuid &strId);
     65          * @param  uId          Brings the ID. */
     66        void sigLinkClicked(const QString &strCategory, const QString &strControl, const QUuid &uId);
    6767    /** @} */
    6868
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp

    r74878 r74942  
    172172}
    173173
    174 void UIDetailsGroup::sltBuildStep(const QUuid &aStepId, int iStepNumber)
     174void UIDetailsGroup::sltBuildStep(const QUuid &uStepId, int iStepNumber)
    175175{
    176176    /* Cleanup build-step: */
     
    179179
    180180    /* Is step id valid? */
    181     if (aStepId != m_uGroupId)
     181    if (uStepId != m_uGroupId)
    182182        return;
    183183
     
    194194
    195195        /* Create next build-step: */
    196         m_pBuildStep = new UIPrepareStep(this, pSet, aStepId, iStepNumber + 1);
     196        m_pBuildStep = new UIPrepareStep(this, pSet, uStepId, iStepNumber + 1);
    197197
    198198        /* Build set: */
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.h

    r74878 r74942  
    8383      * @{ */
    8484        /** Handles request about starting step build.
    85           * @param  strStepId    Brings the step ID.
     85          * @param  uStepId    Brings the step ID.
    8686          * @param  iStepNumber  Brings the step number. */
    8787    /** @} */
    88     virtual void sltBuildStep(const QUuid &aStepId, int iStepNumber) /* override */;
     88    virtual void sltBuildStep(const QUuid &uStepId, int iStepNumber) /* override */;
    8989
    9090protected:
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsItem.cpp

    r74878 r74942  
    281281*********************************************************************************************************************************/
    282282
    283 UIPrepareStep::UIPrepareStep(QObject *pParent, QObject *pBuildObject, const QUuid &aStepId, int iStepNumber)
     283UIPrepareStep::UIPrepareStep(QObject *pParent, QObject *pBuildObject, const QUuid &uStepId, int iStepNumber)
    284284    : QObject(pParent)
    285     , m_uStepId(aStepId)
     285    , m_uStepId(uStepId)
    286286    , m_iStepNumber(iStepNumber)
    287287{
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsItem.h

    r74878 r74942  
    5757      * @{ */
    5858        /** Notifies listeners about step build should be started.
    59           * @param  strStepId    Brings the step ID.
     59          * @param  uStepId    Brings the step ID.
    6060          * @param  iStepNumber  Brings the step number. */
    61         void sigBuildStep(const QUuid &aStepId, int iStepNumber);
     61        void sigBuildStep(const QUuid &uStepId, int iStepNumber);
    6262        /** Notifies listeners about step build complete. */
    6363        void sigBuildDone();
     
    127127      * @{ */
    128128        /** Handles request about starting step build.
    129           * @param  strStepId    Brings the step ID.
     129          * @param  uStepId    Brings the step ID.
    130130          * @param  iStepNumber  Brings the step number. */
    131131    /** @} */
    132     virtual void sltBuildStep(const QUuid &aStepId, int iStepNumber);
     132    virtual void sltBuildStep(const QUuid &uStepId, int iStepNumber);
    133133
    134134protected:
     
    163163    /** Constructs step preparing object passing @a pParent to the base-class.
    164164      * @param  pBuildObject  Brings the build object reference.
    165       * @param  strStepId     Brings the step ID.
     165      * @param  uStepId       Brings the step ID.
    166166      * @param  iStepNumber   Brings the step number.*/
    167     UIPrepareStep(QObject *pParent, QObject *pBuildObject, const QUuid &aStepId, int iStepNumber);
     167    UIPrepareStep(QObject *pParent, QObject *pBuildObject, const QUuid &uStepId, int iStepNumber);
    168168
    169169private slots:
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsModel.h

    r74878 r74942  
    5454
    5555    /* Notifier: Link processing stuff: */
    56     void sigLinkClicked(const QString &strCategory, const QString &strControl, const QUuid &aId);
     56    void sigLinkClicked(const QString &strCategory, const QString &strControl, const QUuid &uId);
    5757
    5858public:
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp

    r74878 r74942  
    115115}
    116116
    117 void UIDetailsSet::sltBuildStep(const QUuid &aStepId, int iStepNumber)
     117void UIDetailsSet::sltBuildStep(const QUuid &uStepId, int iStepNumber)
    118118{
    119119    /* Cleanup build-step: */
     
    122122
    123123    /* Is step id valid? */
    124     if (aStepId != m_uSetId)
     124    if (uStepId != m_uSetId)
    125125        return;
    126126
     
    175175        {
    176176            /* Create next build-step: */
    177             m_pBuildStep = new UIPrepareStep(this, pElement, aStepId, iStepNumber + 1);
     177            m_pBuildStep = new UIPrepareStep(this, pElement, uStepId, iStepNumber + 1);
    178178
    179179            /* Build element: */
     
    184184        {
    185185            /* Just build next step: */
    186             sltBuildStep(aStepId, iStepNumber + 1);
     186            sltBuildStep(uStepId, iStepNumber + 1);
    187187        }
    188188    }
     
    541541}
    542542
    543 void UIDetailsSet::sltMachineStateChange(const QUuid &aId)
     543void UIDetailsSet::sltMachineStateChange(const QUuid &uId)
    544544{
    545545    /* Is this our VM changed? */
    546     if (m_machine.GetId() != aId)
     546    if (m_machine.GetId() != uId)
    547547        return;
    548548
     
    551551}
    552552
    553 void UIDetailsSet::sltMachineAttributesChange(const QUuid &aId)
     553void UIDetailsSet::sltMachineAttributesChange(const QUuid &uId)
    554554{
    555555    /* Is this our VM changed? */
    556     if (m_machine.GetId() != aId)
     556    if (m_machine.GetId() != uId)
    557557        return;
    558558
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.h

    r74878 r74942  
    6969      * @{ */
    7070        /** Handles request about starting step build.
    71           * @param  strStepId    Brings the step ID.
     71          * @param  uStepId    Brings the step ID.
    7272          * @param  iStepNumber  Brings the step number. */
    7373    /** @} */
    74     virtual void sltBuildStep(const QUuid &aStepId, int iStepNumber) /* override */;
     74    virtual void sltBuildStep(const QUuid &uStepId, int iStepNumber) /* override */;
    7575
    7676protected:
     
    124124    /** @name Event-handling stuff.
    125125      * @{ */
    126         /** Handles machine-state change for item with @a strId. */
    127         void sltMachineStateChange(const QUuid &aId);
    128         /** Handles machine-attribute change for item with @a strId. */
    129         void sltMachineAttributesChange(const QUuid &aId);
     126        /** Handles machine-state change for item with @a uId. */
     127        void sltMachineStateChange(const QUuid &uId);
     128        /** Handles machine-attribute change for item with @a uId. */
     129        void sltMachineAttributesChange(const QUuid &uId);
    130130    /** @} */
    131131
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIMachinePreview.cpp

    r74878 r74942  
    170170}
    171171
    172 void UIMachinePreview::sltMachineStateChange(const QUuid &aId)
     172void UIMachinePreview::sltMachineStateChange(const QUuid &uId)
    173173{
    174174    /* Make sure its the event for our machine: */
    175     if (m_machine.isNull() || m_machine.GetId() != aId)
     175    if (m_machine.isNull() || m_machine.GetId() != uId)
    176176        return;
    177177
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIMachinePreview.h

    r74878 r74942  
    6666
    6767    /* Handler: Global-event listener stuff: */
    68     void sltMachineStateChange(const QUuid &aId);
     68    void sltMachineStateChange(const QUuid &uId);
    6969
    7070    /* Handler: Preview recreator: */
  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.cpp

    r74878 r74942  
    571571
    572572/* static */
    573 QUuid UIMedium::normalizedID(const QUuid &aID)
     573QUuid UIMedium::normalizedID(const QUuid &uID)
    574574{
    575575    /// @todo wipe out!
    576     return aID;
     576    return uID;
    577577}
    578578
  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.h

    r74878 r74942  
    167167    /** Returns the medium cache key. */
    168168    QUuid key() const { return m_uKey; }
    169     /** Defines the medium cache @a strKey. */
    170     void setKey(const QUuid &aKey) { m_uKey = aKey; }
     169    /** Defines the medium cache @a uKey. */
     170    void setKey(const QUuid &uKey) { m_uKey = uKey; }
    171171
    172172    /** Returns the medium name.
     
    306306
    307307    /** Returns whether this medium is attached to the given machine in the current state. */
    308     bool isAttachedInCurStateTo(const QString &strMachineId) const { return m_curStateMachineIds.indexOf(strMachineId) >= 0; }
     308    bool isAttachedInCurStateTo(const QUuid &uMachineId) const { return m_curStateMachineIds.indexOf(uMachineId) >= 0; }
    309309
    310310    /** Returns a vector of IDs of all machines this medium is attached to. */
     
    317317    static QUuid nullID();
    318318
    319     /** Returns passed @a strID if it's valid or #nullID() overwise. */
    320     static QUuid normalizedID(const QUuid &aID);
     319    /** Returns passed @a uID if it's valid or #nullID() overwise. */
     320    static QUuid normalizedID(const QUuid &uID);
    321321
    322322    /** Determines if passed @a medium is attached to hidden machines only. */
  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp

    r74878 r74942  
    102102}
    103103
    104 UIMedium UIMediumEnumerator::medium(const QUuid &aMediumID)
     104UIMedium UIMediumEnumerator::medium(const QUuid &uMediumID)
    105105{
    106106    /* Search through current medium-map for the medium with passed ID: */
    107     if (m_media.contains(aMediumID))
    108         return m_media[aMediumID];
     107    if (m_media.contains(uMediumID))
     108        return m_media[uMediumID];
    109109    /* Return NULL medium otherwise: */
    110110    return UIMedium();
     
    130130}
    131131
    132 void UIMediumEnumerator::deleteMedium(const QUuid &aMediumID)
     132void UIMediumEnumerator::deleteMedium(const QUuid &uMediumID)
    133133{
    134134    /* Do not delete UIMedium(s) with incorrect ID: */
    135     AssertReturnVoid(!aMediumID.isNull());
    136     AssertReturnVoid(aMediumID != UIMedium::nullID());
     135    AssertReturnVoid(!uMediumID.isNull());
     136    AssertReturnVoid(uMediumID != UIMedium::nullID());
    137137    /* Make sure medium still exists: */
    138     AssertReturnVoid(m_media.contains(aMediumID));
     138    AssertReturnVoid(m_media.contains(uMediumID));
    139139
    140140    /* Remove medium: */
    141     m_media.remove(aMediumID);
    142     LogRel(("GUI: UIMediumEnumerator: Medium with key={%s} deleted\n", aMediumID.toString().toUtf8().constData()));
     141    m_media.remove(uMediumID);
     142    LogRel(("GUI: UIMediumEnumerator: Medium with key={%s} deleted\n", uMediumID.toString().toUtf8().constData()));
    143143
    144144    /* Notify listener: */
    145     emit sigMediumDeleted(aMediumID);
     145    emit sigMediumDeleted(uMediumID);
    146146}
    147147
     
    200200}
    201201
    202 void UIMediumEnumerator::sltHandleMachineUpdate(const QUuid &aMachineID)
     202void UIMediumEnumerator::sltHandleMachineUpdate(const QUuid &uMachineID)
    203203{
    204204    LogRel2(("GUI: UIMediumEnumerator: Machine (or snapshot) event received, ID = %s\n",
    205              aMachineID.toString().toUtf8().constData()));
     205             uMachineID.toString().toUtf8().constData()));
    206206
    207207    /* Gather previously used UIMedium IDs: */
    208208    QList<QUuid> previousUIMediumIDs;
    209     calculateCachedUsage(aMachineID, previousUIMediumIDs, true /* take into account current state only */);
     209    calculateCachedUsage(uMachineID, previousUIMediumIDs, true /* take into account current state only */);
    210210    LogRel2(("GUI: UIMediumEnumerator:  Old usage: %s\n",
    211211             previousUIMediumIDs.isEmpty() ? "<empty>" : toStringList(previousUIMediumIDs).join(", ").toUtf8().constData()));
     
    214214    CMediumMap currentCMediums;
    215215    QList<QUuid> currentCMediumIDs;
    216     calculateActualUsage(aMachineID, currentCMediums, currentCMediumIDs, true /* take into account current state only */);
     216    calculateActualUsage(uMachineID, currentCMediums, currentCMediumIDs, true /* take into account current state only */);
    217217    LogRel2(("GUI: UIMediumEnumerator:  New usage: %s\n",
    218218             currentCMediumIDs.isEmpty() ? "<empty>" : toStringList(currentCMediumIDs).join(", ").toUtf8().constData()));
     
    235235
    236236    LogRel2(("GUI: UIMediumEnumerator: Machine (or snapshot) event processed, ID = %s\n",
    237              aMachineID.toString().toUtf8().constData()));
    238 }
    239 
    240 void UIMediumEnumerator::sltHandleMachineRegistration(const QUuid &aMachineID, const bool fRegistered)
     237             uMachineID.toString().toUtf8().constData()));
     238}
     239
     240void UIMediumEnumerator::sltHandleMachineRegistration(const QUuid &uMachineID, const bool fRegistered)
    241241{
    242242    LogRel2(("GUI: UIMediumEnumerator: Machine %s event received, ID = %s\n",
    243243             fRegistered ? "registration" : "unregistration",
    244              aMachineID.toString().toUtf8().constData()));
     244             uMachineID.toString().toUtf8().constData()));
    245245
    246246    /* Machine was registered: */
     
    250250        CMediumMap currentCMediums;
    251251        QList<QUuid> currentCMediumIDs;
    252         calculateActualUsage(aMachineID, currentCMediums, currentCMediumIDs, false /* take into account current state only */);
     252        calculateActualUsage(uMachineID, currentCMediums, currentCMediumIDs, false /* take into account current state only */);
    253253        LogRel2(("GUI: UIMediumEnumerator:  New usage: %s\n",
    254254                 currentCMediumIDs.isEmpty() ? "<empty>" : toStringList(currentCMediumIDs).join(", ").toUtf8().constData()));
     
    261261        /* Gather previously used UIMedium IDs: */
    262262        QList<QUuid> previousUIMediumIDs;
    263         calculateCachedUsage(aMachineID, previousUIMediumIDs, false /* take into account current state only */);
     263        calculateCachedUsage(uMachineID, previousUIMediumIDs, false /* take into account current state only */);
    264264        LogRel2(("GUI: UIMediumEnumerator:  Old usage: %s\n",
    265265                 previousUIMediumIDs.isEmpty() ? "<empty>" : toStringList(previousUIMediumIDs).join(", ").toUtf8().constData()));
     
    270270    LogRel2(("GUI: UIMediumEnumerator: Machine %s event processed, ID = %s\n",
    271271             fRegistered ? "registration" : "unregistration",
    272              aMachineID.toString().toUtf8().constData()));
    273 }
    274 
    275 void UIMediumEnumerator::sltHandleSnapshotDeleted(const QUuid &aMachineID, const QUuid &aSnapshotID)
     272             uMachineID.toString().toUtf8().constData()));
     273}
     274
     275void UIMediumEnumerator::sltHandleSnapshotDeleted(const QUuid &uMachineID, const QUuid &uSnapshotID)
    276276{
    277277    LogRel2(("GUI: UIMediumEnumerator: Snapshot-deleted event received, Machine ID = {%s}, Snapshot ID = {%s}\n",
    278              aMachineID.toString().toUtf8().constData(), aSnapshotID.toString().toUtf8().constData()));
     278             uMachineID.toString().toUtf8().constData(), uSnapshotID.toString().toUtf8().constData()));
    279279
    280280    /* Gather previously used UIMedium IDs: */
    281281    QList<QUuid> previousUIMediumIDs;
    282     calculateCachedUsage(aMachineID, previousUIMediumIDs, false /* take into account current state only */);
     282    calculateCachedUsage(uMachineID, previousUIMediumIDs, false /* take into account current state only */);
    283283    LogRel2(("GUI: UIMediumEnumerator:  Old usage: %s\n",
    284284             previousUIMediumIDs.isEmpty() ? "<empty>" : toStringList(previousUIMediumIDs).join(", ").toUtf8().constData()));
     
    287287    CMediumMap currentCMediums;
    288288    QList<QUuid> currentCMediumIDs;
    289     calculateActualUsage(aMachineID, currentCMediums, currentCMediumIDs, true /* take into account current state only */);
     289    calculateActualUsage(uMachineID, currentCMediums, currentCMediumIDs, true /* take into account current state only */);
    290290    LogRel2(("GUI: UIMediumEnumerator:  New usage: %s\n",
    291291             currentCMediumIDs.isEmpty() ? "<empty>" : toStringList(currentCMediumIDs).join(", ").toUtf8().constData()));
     
    296296
    297297    LogRel2(("GUI: UIMediumEnumerator: Snapshot-deleted event processed, Machine ID = {%s}, Snapshot ID = {%s}\n",
    298              aMachineID.toString().toUtf8().constData(), aSnapshotID.toString().toUtf8().constData()));
     298             uMachineID.toString().toUtf8().constData(), uSnapshotID.toString().toUtf8().constData()));
    299299}
    300300
     
    419419/**
    420420 * Calculates last known UIMedium <i>usage</i> based on cached data.
    421  * @param strMachineID describes the machine we are calculating <i>usage</i> for.
     421 * @param uMachineID describes the machine we are calculating <i>usage</i> for.
    422422 * @param previousUIMediumIDs receives UIMedium IDs used in cached data.
    423423 * @param fTakeIntoAccountCurrentStateOnly defines whether we should take into accound current VM state only.
    424424 */
    425 void UIMediumEnumerator::calculateCachedUsage(const QUuid &aMachineID, QList<QUuid> &previousUIMediumIDs, const bool fTakeIntoAccountCurrentStateOnly) const
     425void UIMediumEnumerator::calculateCachedUsage(const QUuid &uMachineID, QList<QUuid> &previousUIMediumIDs, const bool fTakeIntoAccountCurrentStateOnly) const
    426426{
    427427    /* For each the UIMedium ID cache have: */
     
    435435                                           uimedium.curStateMachineIds() : uimedium.machineIds();
    436436        /* Add this UIMedium ID to previous usage if necessary: */
    437         if (machineIDs.contains(aMachineID))
     437        if (machineIDs.contains(uMachineID))
    438438            previousUIMediumIDs.append(uMediumID);
    439439    }
     
    442442/**
    443443 * Calculates new CMedium <i>usage</i> based on actual data.
    444  * @param strMachineID describes the machine we are calculating <i>usage</i> for.
     444 * @param uMachineID describes the machine we are calculating <i>usage</i> for.
    445445 * @param currentCMediums receives CMedium used in actual data.
    446446 * @param currentCMediumIDs receives CMedium IDs used in actual data.
    447447 * @param fTakeIntoAccountCurrentStateOnly defines whether we should take into accound current VM state only.
    448448 */
    449 void UIMediumEnumerator::calculateActualUsage(const QUuid &aMachineID, CMediumMap &currentCMediums, QList<QUuid> &currentCMediumIDs, const bool fTakeIntoAccountCurrentStateOnly) const
     449void UIMediumEnumerator::calculateActualUsage(const QUuid &uMachineID, CMediumMap &currentCMediums, QList<QUuid> &currentCMediumIDs, const bool fTakeIntoAccountCurrentStateOnly) const
    450450{
    451451    /* Search for corresponding machine: */
    452     CMachine machine = vboxGlobal().virtualBox().FindMachine(aMachineID.toString());
     452    CMachine machine = vboxGlobal().virtualBox().FindMachine(uMachineID.toString());
    453453    if (machine.isNull())
    454454    {
  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.h

    r74878 r74942  
    4444
    4545    /* Notifiers: Medium-operations stuff: */
    46     void sigMediumCreated(const QUuid &aMediumID);
    47     void sigMediumDeleted(const QUuid &aMediumID);
     46    void sigMediumCreated(const QUuid &uMediumID);
     47    void sigMediumDeleted(const QUuid &uMediumID);
    4848
    4949    /* Notifiers: Medium-enumeration stuff: */
    5050    void sigMediumEnumerationStarted();
    51     void sigMediumEnumerated(const QUuid &aMediumID);
     51    void sigMediumEnumerated(const QUuid &uMediumID);
    5252    void sigMediumEnumerationFinished();
    5353
     
    5959    /* API: Medium-access stuff: */
    6060    QList<QUuid> mediumIDs() const;
    61     UIMedium medium(const QUuid &aMediumID);
     61    UIMedium medium(const QUuid &uMediumID);
    6262    void createMedium(const UIMedium &medium);
    63     void deleteMedium(const QUuid &aMediumID);
     63    void deleteMedium(const QUuid &uMediumID);
    6464
    6565    /* API: Medium-enumeration stuff: */
     
    7171
    7272    /** Handles machine-data-change and snapshot-change events. */
    73     void sltHandleMachineUpdate(const QUuid &aMachineID);
     73    void sltHandleMachineUpdate(const QUuid &uMachineID);
    7474    /** Handles machine-[un]registration events. */
    75     void sltHandleMachineRegistration(const QUuid &aMachineID, const bool fRegistered);
     75    void sltHandleMachineRegistration(const QUuid &uMachineID, const bool fRegistered);
    7676    /** Handles snapshot-deleted events. */
    77     void sltHandleSnapshotDeleted(const QUuid &aMachineID, const QUuid &aSnapshotID);
     77    void sltHandleSnapshotDeleted(const QUuid &uMachineID, const QUuid &uSnapshotID);
    7878
    7979    /* Handler: Medium-enumeration stuff: */
     
    9191
    9292    /* Helpers: Medium re-caching stuff: */
    93     void calculateCachedUsage(const QUuid &aMachineID, QList<QUuid> &previousUIMediumIDs, const bool fTakeIntoAccountCurrentStateOnly) const;
    94     void calculateActualUsage(const QUuid &strMachineID, CMediumMap &currentCMediums, QList<QUuid> &currentCMediumIDs, const bool fTakeIntoAccountCurrentStateOnly) const;
     93    void calculateCachedUsage(const QUuid &uMachineID, QList<QUuid> &previousUIMediumIDs, const bool fTakeIntoAccountCurrentStateOnly) const;
     94    void calculateActualUsage(const QUuid &uMachineID, CMediumMap &currentCMediums, QList<QUuid> &currentCMediumIDs, const bool fTakeIntoAccountCurrentStateOnly) const;
    9595    void calculateActualUsage(const CSnapshot &snapshot, CMediumMap &currentCMediums, QList<QUuid> &currentCMediumIDs) const;
    9696    void calculateActualUsage(const CMachine &machine, CMediumMap &currentCMediums, QList<QUuid> &currentCMediumIDs) const;
  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumItem.cpp

    r74878 r74942  
    252252}
    253253
    254 bool UIMediumItem::releaseFrom(const QUuid &aMachineId)
     254bool UIMediumItem::releaseFrom(const QUuid &uMachineId)
    255255{
    256256    /* Open session: */
    257     CSession session = vboxGlobal().openSession(aMachineId);
     257    CSession session = vboxGlobal().openSession(uMachineId);
    258258    if (session.isNull())
    259259        return false;
  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumItem.h

    r74878 r74942  
    110110    void refresh();
    111111
    112     /** Releases UIMedium wrapped by <i>this</i> item from virtual machine with @a strMachineId. */
    113     bool releaseFrom(const QUuid &aMachineId);
     112    /** Releases UIMedium wrapped by <i>this</i> item from virtual machine with @a uMachineId. */
     113    bool releaseFrom(const QUuid &uMachineId);
    114114
    115115    /** Formats field text. */
  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

    r74894 r74942  
    6363
    6464
    65 /** Functor allowing to check if passed UIMediumItem is suitable by @a strID. */
     65/** Functor allowing to check if passed UIMediumItem is suitable by @a uID. */
    6666class CheckIfSuitableByID : public CheckIfSuitableBy
    6767{
    6868public:
    69     /** Constructor accepting @a strID to compare with. */
    70     CheckIfSuitableByID(const QUuid &aID) : m_uID(aID) {}
     69    /** Constructor accepting @a uID to compare with. */
     70    CheckIfSuitableByID(const QUuid &uID) : m_uID(uID) {}
    7171
    7272private:
    73     /** Determines whether passed UIMediumItem is suitable by @a strID. */
     73    /** Determines whether passed UIMediumItem is suitable by @a uID. */
    7474    bool isItSuitable(UIMediumItem *pItem) const { return pItem->id() == m_uID; }
    75     /** Holds the @a strID to compare to. */
     75    /** Holds the @a uID to compare to. */
    7676    QUuid m_uID;
    7777};
     
    383383}
    384384
    385 void UIMediumManagerWidget::sltHandleMediumCreated(const QUuid &aMediumID)
     385void UIMediumManagerWidget::sltHandleMediumCreated(const QUuid &uMediumID)
    386386{
    387387    /* Search for corresponding medium: */
    388     UIMedium medium = vboxGlobal().medium(aMediumID);
     388    UIMedium medium = vboxGlobal().medium(uMediumID);
    389389
    390390    /* Ignore non-interesting media: */
     
    414414}
    415415
    416 void UIMediumManagerWidget::sltHandleMediumDeleted(const QUuid &aMediumID)
     416void UIMediumManagerWidget::sltHandleMediumDeleted(const QUuid &uMediumID)
    417417{
    418418    /* Make sure corresponding medium-item deleted: */
    419     deleteMediumItem(aMediumID);
     419    deleteMediumItem(uMediumID);
    420420}
    421421
     
    459459}
    460460
    461 void UIMediumManagerWidget::sltHandleMediumEnumerated(const QUuid &aMediumID)
     461void UIMediumManagerWidget::sltHandleMediumEnumerated(const QUuid &uMediumID)
    462462{
    463463    /* Search for corresponding medium: */
    464     UIMedium medium = vboxGlobal().medium(aMediumID);
     464    UIMedium medium = vboxGlobal().medium(uMediumID);
    465465
    466466    /* Ignore non-interesting media: */
     
    12951295}
    12961296
    1297 void UIMediumManagerWidget::deleteMediumItem(const QUuid &aMediumID)
     1297void UIMediumManagerWidget::deleteMediumItem(const QUuid &uMediumID)
    12981298{
    12991299    /* Search for corresponding tree-widget: */
     
    13071307        pTreeWidget = treeWidget(type);
    13081308        /* Search for existing medium-item: */
    1309         pMediumItem = searchItem(pTreeWidget, CheckIfSuitableByID(aMediumID));
     1309        pMediumItem = searchItem(pTreeWidget, CheckIfSuitableByID(uMediumID));
    13101310        if (pMediumItem)
    13111311            break;
     
    13211321    /* Delete medium-item: */
    13221322    delete pMediumItem;
    1323     LogRel2(("UIMediumManager: Medium-item with ID={%s} deleted.\n", aMediumID.toString().toUtf8().constData()));
     1323    LogRel2(("UIMediumManager: Medium-item with ID={%s} deleted.\n", uMediumID.toString().toUtf8().constData()));
    13241324
    13251325    /* If there is no current medium-item now selected
  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h

    r74878 r74942  
    148148      * @{ */
    149149        /** Handles VBoxGlobal::sigMediumCreated signal. */
    150         void sltHandleMediumCreated(const QUuid &aMediumID);
     150        void sltHandleMediumCreated(const QUuid &uMediumID);
    151151        /** Handles VBoxGlobal::sigMediumDeleted signal. */
    152         void sltHandleMediumDeleted(const QUuid &aMediumID);
     152        void sltHandleMediumDeleted(const QUuid &uMediumID);
    153153    /** @} */
    154154
     
    158158        void sltHandleMediumEnumerationStart();
    159159        /** Handles VBoxGlobal::sigMediumEnumerated signal. */
    160         void sltHandleMediumEnumerated(const QUuid &aMediumID);
     160        void sltHandleMediumEnumerated(const QUuid &uMediumID);
    161161        /** Handles VBoxGlobal::sigMediumEnumerationFinished signal. */
    162162        void sltHandleMediumEnumerationFinish();
     
    248248        /** Updates UIMediumItem for corresponding @a medium. */
    249249        void updateMediumItem(const UIMedium &medium);
    250         /** Deletes UIMediumItem for corresponding @a strMediumID. */
    251         void deleteMediumItem(const QUuid &aMediumID);
     250        /** Deletes UIMediumItem for corresponding @a uMediumID. */
     251        void deleteMediumItem(const QUuid &uMediumID);
    252252
    253253        /** Returns tab for passed medium @a type. */
  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp

    r74878 r74942  
    545545}
    546546
    547 void UIMediumSelector::selectMedium(const QUuid &aMediumID)
     547void UIMediumSelector::selectMedium(const QUuid &uMediumID)
    548548{
    549549    if (!m_pTreeWidget)
    550550        return;
    551     UIMediumItem *pMediumItem = searchItem(0, aMediumID);
     551    UIMediumItem *pMediumItem = searchItem(0, uMediumID);
    552552    if (pMediumItem)
    553553    {
  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.h

    r74878 r74942  
    100100    /** Remember the default foreground brush of the tree so that we can reset tree items' foreground later */
    101101    void          saveDefaultForeground();
    102     void          selectMedium(const QUuid &aMediumID);
     102    void          selectMedium(const QUuid &uMediumID);
    103103
    104104    QVBoxLayout          *m_pMainLayout;
  • trunk/src/VBox/Frontends/VirtualBox/src/platform/UIDesktopServices.h

    r74878 r74942  
    2828{
    2929public:
    30     static bool createMachineShortcut(const QString &strSrcFile, const QString &strDstPath, const QString &strName, const QUuid &aUuid);
     30    static bool createMachineShortcut(const QString &strSrcFile, const QString &strDstPath, const QString &strName, const QUuid &uUuid);
    3131    static bool openInFileManager(const QString &strFile);
    3232};
  • trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIDesktopServices_darwin.cpp

    r74878 r74942  
    2424#include <QString>
    2525
    26 bool UIDesktopServices::createMachineShortcut(const QString &strSrcFile, const QString &strDstPath, const QString &strName, const QUuid &aUuid)
     26bool UIDesktopServices::createMachineShortcut(const QString &strSrcFile, const QString &strDstPath, const QString &strName, const QUuid &uUuid)
    2727{
    2828    return ::darwinCreateMachineShortcut(::darwinToNativeString(strSrcFile.toUtf8().constData()),
    2929                                         ::darwinToNativeString(strDstPath.toUtf8().constData()),
    3030                                         ::darwinToNativeString(strName.toUtf8().constData()),
    31                                          ::darwinToNativeString(aUuid.toString().toUtf8().constData()));
     31                                         ::darwinToNativeString(uUuid.toString().toUtf8().constData()));
    3232}
    3333
  • trunk/src/VBox/Frontends/VirtualBox/src/platform/win/UIDesktopServices_win.cpp

    r74878 r74942  
    3434
    3535
    36 bool UIDesktopServices::createMachineShortcut(const QString & /* strSrcFile */, const QString &strDstPath, const QString &strName, const QUuid &aUuid)
     36bool UIDesktopServices::createMachineShortcut(const QString & /* strSrcFile */, const QString &strDstPath, const QString &strName, const QUuid &uUuid)
    3737{
    3838    IShellLink *pShl = NULL;
     
    5252        if (FAILED(rc))
    5353            break;
    54         QString strArgs = QString("--comment \"%1\" --startvm \"%2\"").arg(strName).arg(aUuid.toString());
     54        QString strArgs = QString("--comment \"%1\" --startvm \"%2\"").arg(strName).arg(uUuid.toString());
    5555        rc = pShl->SetArguments(strArgs.utf16());
    5656        if (FAILED(rc))
  • trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/UIDesktopServices_x11.cpp

    r74878 r74942  
    3434
    3535
    36 bool UIDesktopServices::createMachineShortcut(const QString & /* strSrcFile */, const QString &strDstPath, const QString &strName, const QUuid &aUuid)
     36bool UIDesktopServices::createMachineShortcut(const QString & /* strSrcFile */, const QString &strDstPath, const QString &strName, const QUuid &uUuid)
    3737{
    3838    QFile link(strDstPath + QDir::separator() + strName + ".desktop");
     
    4848            << "Comment=Starts the VirtualBox machine " << strName << endl
    4949            << "Type=Application" << endl
    50             << "Exec=" << QCoreApplication::applicationFilePath() << " --comment \"" << strName << "\" --startvm \"" << aUuid.toString() << "\"" << endl
     50            << "Exec=" << QCoreApplication::applicationFilePath() << " --comment \"" << strName << "\" --startvm \"" << uUuid.toString() << "\"" << endl
    5151            << "Icon=virtualbox-vbox.png" << endl;
    5252        /* This would be a real file link entry, but then we could also simply
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

    r74878 r74942  
    12671267}
    12681268
    1269 void UIIndicatorsPool::sltHandleConfigurationChange(const QUuid &aMachineID)
     1269void UIIndicatorsPool::sltHandleConfigurationChange(const QUuid &uMachineID)
    12701270{
    12711271    /* Skip unrelated machine IDs: */
    1272     if (vboxGlobal().managedVMUuid() != aMachineID)
     1272    if (vboxGlobal().managedVMUuid() != uMachineID)
    12731273        return;
    12741274
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h

    r74878 r74942  
    6767
    6868    /** Handles configuration change. */
    69     void sltHandleConfigurationChange(const QUuid &aMachineID);
     69    void sltHandleConfigurationChange(const QUuid &uMachineID);
    7070
    7171    /** Handles indicator-states auto-update. */
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

    r74878 r74942  
    4343
    4444/* static */
    45 bool UIMachine::startMachine(const QUuid &aID)
     45bool UIMachine::startMachine(const QUuid &uID)
    4646{
    4747    /* Make sure machine is not created: */
     
    5252    {
    5353        /* Create temporary session: */
    54         CSession session = vboxGlobal().openSession(aID, KLockType_VM);
     54        CSession session = vboxGlobal().openSession(uID, KLockType_VM);
    5555        if (session.isNull())
    5656            return false;
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

    r74878 r74942  
    4747public:
    4848
    49     /** Static factory to start machine with passed @a strID.
     49    /** Static factory to start machine with passed @a uID.
    5050      * @return true if machine was started, false otherwise. */
    51     static bool startMachine(const QUuid &aID);
     51    static bool startMachine(const QUuid &uID);
    5252    /** Static constructor. */
    5353    static bool create();
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

    r74914 r74942  
    122122{
    123123    USBTarget() : attach(false), id(QUuid()) {}
    124     USBTarget(bool fAttach, const QUuid &aId)
    125         : attach(fAttach), id(aId) {}
     124    USBTarget(bool fAttach, const QUuid &uId)
     125        : attach(fAttach), id(uId) {}
    126126    bool attach;
    127127    QUuid id;
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

    r74885 r74942  
    501501}
    502502
    503 void UIMachineView::sltHandleScaleFactorChange(const QUuid &aMachineID)
     503void UIMachineView::sltHandleScaleFactorChange(const QUuid &uMachineID)
    504504{
    505505    /* Skip unrelated machine IDs: */
    506     if (aMachineID != vboxGlobal().managedVMUuid())
     506    if (uMachineID != vboxGlobal().managedVMUuid())
    507507        return;
    508508
     
    549549}
    550550
    551 void UIMachineView::sltHandleScalingOptimizationChange(const QUuid &aMachineID)
     551void UIMachineView::sltHandleScalingOptimizationChange(const QUuid &uMachineID)
    552552{
    553553    /* Skip unrelated machine IDs: */
    554     if (aMachineID != vboxGlobal().managedVMUuid())
     554    if (uMachineID != vboxGlobal().managedVMUuid())
    555555        return;
    556556
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h

    r74878 r74942  
    127127
    128128    /** Handles the scale-factor change. */
    129     void sltHandleScaleFactorChange(const QUuid &aMachineID);
     129    void sltHandleScaleFactorChange(const QUuid &uMachineID);
    130130
    131131    /** Handles the scaling-optimization change. */
    132     void sltHandleScalingOptimizationChange(const QUuid &aMachineID);
     132    void sltHandleScalingOptimizationChange(const QUuid &uMachineID);
    133133
    134134    /* Console callback handlers: */
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

    r74878 r74942  
    598598
    599599#ifdef RT_OS_DARWIN
    600 void UISession::sltHandleMenuBarConfigurationChange(const QUuid &aMachineID)
     600void UISession::sltHandleMenuBarConfigurationChange(const QUuid &uMachineID)
    601601{
    602602    /* Skip unrelated machine IDs: */
    603     if (vboxGlobal().managedVMUuid() != aMachineID)
     603    if (vboxGlobal().managedVMUuid() != uMachineID)
    604604        return;
    605605
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

    r74878 r74942  
    347347#ifdef RT_OS_DARWIN
    348348    /** Mac OS X: Handles menu-bar configuration-change. */
    349     void sltHandleMenuBarConfigurationChange(const QUuid &aMachineID);
     349    void sltHandleMenuBarConfigurationChange(const QUuid &uMachineID);
    350350#endif /* RT_OS_DARWIN */
    351351
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

    r74878 r74942  
    138138
    139139#ifndef RT_OS_DARWIN
    140 void UIMachineWindowNormal::sltHandleMenuBarConfigurationChange(const QUuid &aMachineID)
     140void UIMachineWindowNormal::sltHandleMenuBarConfigurationChange(const QUuid &uMachineID)
    141141{
    142142    /* Skip unrelated machine IDs: */
    143     if (vboxGlobal().managedVMUuid() != aMachineID)
     143    if (vboxGlobal().managedVMUuid() != uMachineID)
    144144        return;
    145145
     
    172172#endif /* !RT_OS_DARWIN */
    173173
    174 void UIMachineWindowNormal::sltHandleStatusBarConfigurationChange(const QUuid &aMachineID)
     174void UIMachineWindowNormal::sltHandleStatusBarConfigurationChange(const QUuid &uMachineID)
    175175{
    176176    /* Skip unrelated machine IDs: */
    177     if (vboxGlobal().managedVMUuid() != aMachineID)
     177    if (vboxGlobal().managedVMUuid() != uMachineID)
    178178        return;
    179179
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h

    r74878 r74942  
    6868#ifndef RT_OS_DARWIN
    6969    /** Handles menu-bar configuration-change. */
    70     void sltHandleMenuBarConfigurationChange(const QUuid &aMachineID);
     70    void sltHandleMenuBarConfigurationChange(const QUuid &uMachineID);
    7171    /** Handles menu-bar context-menu-request. */
    7272    void sltHandleMenuBarContextMenuRequest(const QPoint &position);
     
    7474
    7575    /** Handles status-bar configuration-change. */
    76     void sltHandleStatusBarConfigurationChange(const QUuid &aMachineID);
     76    void sltHandleStatusBarConfigurationChange(const QUuid &uMachineID);
    7777    /** Handles status-bar context-menu-request. */
    7878    void sltHandleStatusBarContextMenuRequest(const QPoint &position);
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

    r74925 r74942  
    669669void UISelectorWindow::sltOpenMachineSettingsDialog(const QString &strCategoryRef /* = QString() */,
    670670                                                    const QString &strControlRef /* = QString() */,
    671                                                     const QUuid &aID /* = QString() */)
     671                                                    const QUuid   &uID /* = QString() */)
    672672{
    673673    /* This slot should not be called when there is not selection: */
     
    707707    /* Create and execute corresponding VM settings window: */
    708708    UISettingsDialogMachine dialog(this,
    709                                    aID.isNull() ? currentItem()->id() : aID,
     709                                   uID.isNull() ? currentItem()->id() : uID,
    710710                                   strCategory, strControl);
    711711    dialog.execute();
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h

    r74878 r74942  
    117117    /** @name CVirtualBox event handling stuff.
    118118      * @{ */
    119         /** Handles CVirtualBox event about state change for machine with @a strID. */
    120         void sltHandleStateChange(const QUuid &aID);
     119        /** Handles CVirtualBox event about state change for machine with @a uID. */
     120        void sltHandleStateChange(const QUuid &uID);
    121121    /** @} */
    122122
     
    160160          * @param strCategory can bring the settings category to start from.
    161161          * @param strControl  can bring the widget of the page to focus.
    162           * @param strID       can bring the ID of machine to manage. */
     162          * @param uID       can bring the ID of machine to manage. */
    163163        void sltOpenMachineSettingsDialog(const QString &strCategory = QString(),
    164164                                          const QString &strControl = QString(),
    165                                           const QUuid &aID = QString());
     165                                          const QUuid   &uID = QString());
    166166        /** Handles call to open Clone Machine wizard. */
    167167        void sltOpenCloneMachineWizard();
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.h

    r74878 r74942  
    5353    void sigToggleFinished();
    5454    /** Redirects signal from UIGDetails to UISelectorWindow. */
    55     void sigLinkClicked(const QString &strCategory, const QString &strControl, const QUuid &aId);
     55    void sigLinkClicked(const QString &strCategory, const QString &strControl, const QUuid &uId);
    5656
    5757public:
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItem.h

    r74878 r74942  
    115115    virtual bool hasItems(UIGChooserItemType type = UIGChooserItemType_Any) const = 0;
    116116    virtual void clearItems(UIGChooserItemType type = UIGChooserItemType_Any) = 0;
    117     virtual void updateAll(const QUuid &aId) = 0;
    118     virtual void removeAll(const QUuid &aId) = 0;
     117    virtual void updateAll(const QUuid &uId) = 0;
     118    virtual void removeAll(const QUuid &uId) = 0;
    119119    virtual UIGChooserItem* searchForItem(const QString &strSearchTag, int iItemSearchFlags) = 0;
    120120    virtual UIGChooserItemMachine* firstMachineItem() = 0;
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.cpp

    r74878 r74942  
    259259}
    260260
    261 bool UIGChooserItemGroup::isContainsMachine(const QUuid &aId) const
     261bool UIGChooserItemGroup::isContainsMachine(const QUuid &uId) const
    262262{
    263263    /* Check each machine-item: */
    264264    foreach (UIGChooserItem *pItem, m_machineItems)
    265         if (pItem->toMachineItem()->id() == aId)
     265        if (pItem->toMachineItem()->id() == uId)
    266266            return true;
    267267    /* Found nothing? */
     
    934934}
    935935
    936 void UIGChooserItemGroup::updateAll(const QUuid &aId)
     936void UIGChooserItemGroup::updateAll(const QUuid &uId)
    937937{
    938938    /* Update all the required items recursively: */
    939939    foreach (UIGChooserItem *pItem, items())
    940         pItem->updateAll(aId);
    941 }
    942 
    943 void UIGChooserItemGroup::removeAll(const QUuid &aId)
     940        pItem->updateAll(uId);
     941}
     942
     943void UIGChooserItemGroup::removeAll(const QUuid &uId)
    944944{
    945945    /* Remove all the required items recursively: */
    946946    foreach (UIGChooserItem *pItem, items())
    947         pItem->removeAll(aId);
     947        pItem->removeAll(uId);
    948948}
    949949
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.h

    r74878 r74942  
    7979
    8080    /* API: Children stuff: */
    81     bool isContainsMachine(const QUuid &aId) const;
     81    bool isContainsMachine(const QUuid &uId) const;
    8282    bool isContainsLockedMachine();
    8383
     
    143143    bool hasItems(UIGChooserItemType type = UIGChooserItemType_Any) const;
    144144    void clearItems(UIGChooserItemType type = UIGChooserItemType_Any);
    145     void updateAll(const QUuid &aId);
    146     void removeAll(const QUuid &aId);
     145    void updateAll(const QUuid &uId);
     146    void removeAll(const QUuid &uId);
    147147    UIGChooserItem* searchForItem(const QString &strSearchTag, int iItemSearchFlags);
    148148    UIGChooserItemMachine* firstMachineItem();
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp

    r74878 r74942  
    544544}
    545545
    546 void UIGChooserItemMachine::updateAll(const QUuid &aId)
     546void UIGChooserItemMachine::updateAll(const QUuid &uId)
    547547{
    548548    /* Skip other ids: */
    549     if (id() != aId)
     549    if (id() != uId)
    550550        return;
    551551
     
    563563}
    564564
    565 void UIGChooserItemMachine::removeAll(const QUuid &aId)
     565void UIGChooserItemMachine::removeAll(const QUuid &uId)
    566566{
    567567    /* Skip wrong id: */
    568     if (id() != aId)
     568    if (id() != uId)
    569569        return;
    570570
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.h

    r74878 r74942  
    125125    bool hasItems(UIGChooserItemType type) const;
    126126    void clearItems(UIGChooserItemType type);
    127     void updateAll(const QUuid &aId);
    128     void removeAll(const QUuid &aId);
     127    void updateAll(const QUuid &uId);
     128    void removeAll(const QUuid &uId);
    129129    UIGChooserItem* searchForItem(const QString &strSearchTag, int iItemSearchFlags);
    130130    UIGChooserItemMachine* firstMachineItem();
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

    r74878 r74942  
    678678}
    679679
    680 void UIGChooserModel::sltMachineStateChanged(const QUuid &aId, const KMachineState)
     680void UIGChooserModel::sltMachineStateChanged(const QUuid &uId, const KMachineState)
    681681{
    682682    /* Update machine-items with passed id: */
    683     mainRoot()->updateAll(aId);
    684 }
    685 
    686 void UIGChooserModel::sltMachineDataChanged(const QUuid &aId)
     683    mainRoot()->updateAll(uId);
     684}
     685
     686void UIGChooserModel::sltMachineDataChanged(const QUuid &uId)
    687687{
    688688    /* Update machine-items with passed id: */
    689     mainRoot()->updateAll(aId);
    690 }
    691 
    692 void UIGChooserModel::sltMachineRegistered(const QUuid &aId, const bool fRegistered)
     689    mainRoot()->updateAll(uId);
     690}
     691
     692void UIGChooserModel::sltMachineRegistered(const QUuid &uId, const bool fRegistered)
    693693{
    694694    /* New VM registered? */
     
    696696    {
    697697        /* Search for corresponding machine: */
    698         CMachine machine = vboxGlobal().virtualBox().FindMachine(aId.toString());
     698        CMachine machine = vboxGlobal().virtualBox().FindMachine(uId.toString());
    699699        /* Should we show this machine? */
    700         if (gEDataManager->showMachineInSelectorChooser(aId))
     700        if (gEDataManager->showMachineInSelectorChooser(uId))
    701701        {
    702702            /* Add new machine-item: */
     
    706706            updateLayout();
    707707            /* Change current-item only if VM was created from the GUI side: */
    708             if (aId == m_uLastCreatedMachineId)
     708            if (uId == m_uLastCreatedMachineId)
    709709            {
    710710                setCurrentItem(mainRoot()->searchForItem(machine.GetName(),
     
    718718    {
    719719        /* Remove machine-items with passed id: */
    720         mainRoot()->removeAll(aId);
     720        mainRoot()->removeAll(uId);
    721721        /* Update model: */
    722722        cleanupGroupTree();
     
    734734}
    735735
    736 void UIGChooserModel::sltSessionStateChanged(const QUuid &aId, const KSessionState)
     736void UIGChooserModel::sltSessionStateChanged(const QUuid &uId, const KSessionState)
    737737{
    738738    /* Update machine-items with passed id: */
    739     mainRoot()->updateAll(aId);
    740 }
    741 
    742 void UIGChooserModel::sltSnapshotChanged(const QUuid &aId, const QUuid &)
     739    mainRoot()->updateAll(uId);
     740}
     741
     742void UIGChooserModel::sltSnapshotChanged(const QUuid &uId, const QUuid &)
    743743{
    744744    /* Update machine-items with passed id: */
    745     mainRoot()->updateAll(aId);
     745    mainRoot()->updateAll(uId);
    746746}
    747747
     
    997997}
    998998
    999 void UIGChooserModel::sltReloadMachine(const QUuid &aId)
     999void UIGChooserModel::sltReloadMachine(const QUuid &uId)
    10001000{
    10011001    /* Remove all the items first: */
    1002     mainRoot()->removeAll(aId);
     1002    mainRoot()->removeAll(uId);
    10031003    /* Wipe out empty groups: */
    10041004    cleanupGroupTree();
    10051005
    10061006    /* Show machine if we should: */
    1007     CMachine machine = vboxGlobal().virtualBox().FindMachine(aId.toString());
    1008     if (gEDataManager->showMachineInSelectorChooser(aId))
     1007    CMachine machine = vboxGlobal().virtualBox().FindMachine(uId.toString());
     1008    if (gEDataManager->showMachineInSelectorChooser(uId))
    10091009        addMachineIntoTheTree(machine);
    10101010
     
    10981098    {
    10991099        /* Get machine-item id: */
    1100         QUuid aId = pItem->toMachineItem()->id();
     1100        QUuid uId = pItem->toMachineItem()->id();
    11011101
    11021102        /* We already decided for that machine? */
    1103         if (verdicts.contains(aId))
     1103        if (verdicts.contains(uId))
    11041104        {
    11051105            /* To remove similar machine items? */
    1106             if (!verdicts[aId])
     1106            if (!verdicts[uId])
    11071107                itemsToRemove << pItem;
    11081108            continue;
     
    11121112        int iSelectedCopyCount = 0;
    11131113        foreach (UIGChooserItem *pSelectedItem, selectedMachineItemList)
    1114             if (pSelectedItem->toMachineItem()->id() == aId)
     1114            if (pSelectedItem->toMachineItem()->id() == uId)
    11151115                ++iSelectedCopyCount;
    11161116        /* Existing copy count: */
    11171117        int iExistingCopyCount = 0;
    11181118        foreach (UIGChooserItem *pExistingItem, existingMachineItemList)
    1119             if (pExistingItem->toMachineItem()->id() == aId)
     1119            if (pExistingItem->toMachineItem()->id() == uId)
    11201120                ++iExistingCopyCount;
    11211121        /* If selected copy count equal to existing copy count,
     
    11251125        verdicts.insert(aId, fVerdict);
    11261126        if (fVerdict)
    1127             machinesToUnregister.append(aId);
     1127            machinesToUnregister.append(uId);
    11281128        else
    11291129            itemsToRemove << pItem;
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.h

    r74878 r74942  
    160160
    161161    /* Handlers: Global events: */
    162     void sltMachineStateChanged(const QUuid &aId, const KMachineState state);
    163     void sltMachineDataChanged(const QUuid &aId);
    164     void sltMachineRegistered(const QUuid &aId, const bool fRegistered);
    165     void sltSessionStateChanged(const QUuid &aId, const KSessionState state);
    166     void sltSnapshotChanged(const QUuid &aId, const QUuid &aSnapshotId);
     162    void sltMachineStateChanged(const QUuid &uId, const KMachineState state);
     163    void sltMachineDataChanged(const QUuid &uId);
     164    void sltMachineRegistered(const QUuid &uId, const bool fRegistered);
     165    void sltSessionStateChanged(const QUuid &uId, const KSessionState state);
     166    void sltSnapshotChanged(const QUuid &uId, const QUuid &uSnapshotId);
    167167
    168168    /* Handler: Chooser-view stuff: */
     
    185185    void sltCreateNewMachine();
    186186    void sltGroupSelectedMachines();
    187     void sltReloadMachine(const QUuid &aId);
     187    void sltReloadMachine(const QUuid &uId);
    188188    void sltSortParentGroup();
    189189    void sltPerformRefreshAction();
     
    315315
    316316    /* Notifier: Reload stuff: */
    317     void sigReload(const QUuid &aId);
     317    void sigReload(const QUuid &uId);
    318318
    319319    /* Notifier: Complete stuff: */
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetails.h

    r74878 r74942  
    3636
    3737    /* Notifier: Link processing stuff: */
    38     void sigLinkClicked(const QString &strCategory, const QString &strControl, const QUuid &aId);
     38    void sigLinkClicked(const QString &strCategory, const QString &strControl, const QUuid &uId);
    3939
    4040    /* Notifier: Sliding stuff: */
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.h

    r74878 r74942  
    5959
    6060    /* Notifier: Link-click stuff: */
    61     void sigLinkClicked(const QString &strCategory, const QString &strControl, const QUuid &aId);
     61    void sigLinkClicked(const QString &strCategory, const QString &strControl, const QUuid &uId);
    6262
    6363public:
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsGroup.cpp

    r74878 r74942  
    8989}
    9090
    91 void UIGDetailsGroup::sltBuildStep(const QUuid &aStepId, const int iStepNumber)
     91void UIGDetailsGroup::sltBuildStep(const QUuid &uStepId, const int iStepNumber)
    9292{
    9393    /* Cleanup build-step: */
     
    9696
    9797    /* Is step id valid? */
    98     if (aStepId != m_uGroupId)
     98    if (uStepId != m_uGroupId)
    9999        return;
    100100
     
    111111
    112112        /* Create next build-step: */
    113         m_pBuildStep = new UIBuildStep(this, pSet, aStepId, iStepNumber + 1);
     113        m_pBuildStep = new UIBuildStep(this, pSet, uStepId, iStepNumber + 1);
    114114
    115115        /* Build set: */
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsGroup.h

    r74878 r74942  
    5656
    5757    /* Handler: Build stuff: */
    58     void sltBuildStep(const QUuid &aStepId, const int iStepNumber);
     58    void sltBuildStep(const QUuid &uStepId, const int iStepNumber);
    5959
    6060private:
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.cpp

    r74878 r74942  
    329329}
    330330
    331 UIBuildStep::UIBuildStep(QObject *pParent, QObject *pBuildObject, const QUuid &aStepId, int iStepNumber)
     331UIBuildStep::UIBuildStep(QObject *pParent, QObject *pBuildObject, const QUuid &uStepId, int iStepNumber)
    332332    : QObject(pParent)
    333     , m_uStepId(aStepId)
     333    , m_uStepId(uStepId)
    334334    , m_iStepNumber(iStepNumber)
    335335{
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.h

    r74878 r74942  
    5353
    5454    /* Notifiers: Build stuff: */
    55     void sigBuildStep(const QUuid &aStepId, const int iStepNumber);
     55    void sigBuildStep(const QUuid &uStepId, const int iStepNumber);
    5656    void sigBuildDone();
    5757
     
    121121
    122122    /* Notifier: Build stuff: */
    123     void sigStepDone(const QUuid &aStepId, const int iStepNumber);
     123    void sigStepDone(const QUuid &uStepId, const int iStepNumber);
    124124
    125125public:
    126126
    127127    /* Constructor: */
    128     UIBuildStep(QObject *pParent, QObject *pBuildObject, const QUuid &aStepId, int iStepNumber);
     128    UIBuildStep(QObject *pParent, QObject *pBuildObject, const QUuid &uStepId, int iStepNumber);
    129129
    130130private slots:
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsModel.h

    r74878 r74942  
    5454
    5555    /* Notifier: Link processing stuff: */
    56     void sigLinkClicked(const QString &strCategory, const QString &strControl, const QUuid &aId);
     56    void sigLinkClicked(const QString &strCategory, const QString &strControl, const QUuid &uId);
    5757
    5858public:
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.cpp

    r74878 r74942  
    113113}
    114114
    115 void UIGDetailsSet::sltBuildStep(const QUuid &aStepId, const int iStepNumber)
     115void UIGDetailsSet::sltBuildStep(const QUuid &uStepId, const int iStepNumber)
    116116{
    117117    /* Cleanup build-step: */
     
    120120
    121121    /* Is step id valid? */
    122     if (aStepId != m_uSetId)
     122    if (uStepId != m_uSetId)
    123123        return;
    124124
     
    173173        {
    174174            /* Create next build-step: */
    175             m_pBuildStep = new UIBuildStep(this, pElement, aStepId, iStepNumber + 1);
     175            m_pBuildStep = new UIBuildStep(this, pElement, uStepId, iStepNumber + 1);
    176176
    177177            /* Build element: */
     
    182182        {
    183183            /* Just build next step: */
    184             sltBuildStep(aStepId, iStepNumber + 1);
     184            sltBuildStep(uStepId, iStepNumber + 1);
    185185        }
    186186    }
     
    198198}
    199199
    200 void UIGDetailsSet::sltMachineStateChange(const QUuid &aId)
     200void UIGDetailsSet::sltMachineStateChange(const QUuid &uId)
    201201{
    202202    /* Is this our VM changed? */
    203     if (m_machine.GetId() != aId)
     203    if (m_machine.GetId() != uId)
    204204        return;
    205205
     
    208208}
    209209
    210 void UIGDetailsSet::sltMachineAttributesChange(const QUuid &aId)
     210void UIGDetailsSet::sltMachineAttributesChange(const QUuid &uId)
    211211{
    212212    /* Is this our VM changed? */
    213     if (m_machine.GetId() != aId)
     213    if (m_machine.GetId() != uId)
    214214        return;
    215215
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.h

    r74878 r74942  
    6363
    6464    /* Handler: Build stuff: */
    65     void sltBuildStep(const QUuid &aStepId, const int iStepNumber);
     65    void sltBuildStep(const QUuid &uStepId, const int iStepNumber);
    6666
    6767    /* Handlers: Global event stuff: */
    68     void sltMachineStateChange(const QUuid &aId);
    69     void sltMachineAttributesChange(const QUuid &aId);
     68    void sltMachineStateChange(const QUuid &uId);
     69    void sltMachineAttributesChange(const QUuid &uId);
    7070
    7171    /* Handler: Update stuff: */
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp

    r74878 r74942  
    170170}
    171171
    172 void UIGMachinePreview::sltMachineStateChange(const QUuid &aId)
     172void UIGMachinePreview::sltMachineStateChange(const QUuid &uId)
    173173{
    174174    /* Make sure its the event for our machine: */
    175     if (m_machine.isNull() || m_machine.GetId() != aId)
     175    if (m_machine.isNull() || m_machine.GetId() != uId)
    176176        return;
    177177
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.h

    r74878 r74942  
    6666
    6767    /* Handler: Global-event listener stuff: */
    68     void sltMachineStateChange(const QUuid &aId);
     68    void sltMachineStateChange(const QUuid &uId);
    6969
    7070    /* Handler: Preview recreator: */
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

    r74878 r74942  
    330330*********************************************************************************************************************************/
    331331
    332 UISettingsDialogMachine::UISettingsDialogMachine(QWidget *pParent, const QUuid &aMachineId,
     332UISettingsDialogMachine::UISettingsDialogMachine(QWidget *pParent, const QUuid &uMachineId,
    333333                                                 const QString &strCategory, const QString &strControl)
    334334    : UISettingsDialog(pParent)
    335     , m_uMachineId(aMachineId)
     335    , m_uMachineId(uMachineId)
    336336    , m_strCategory(strCategory)
    337337    , m_strControl(strControl)
     
    603603}
    604604
    605 void UISettingsDialogMachine::sltSessionStateChanged(const QUuid &aMachineId, const KSessionState enmSessionState)
     605void UISettingsDialogMachine::sltSessionStateChanged(const QUuid &uMachineId, const KSessionState enmSessionState)
    606606{
    607607    /* Ignore if serialization is in progress: */
     
    609609        return;
    610610    /* Ignore if thats NOT our VM: */
    611     if (aMachineId != m_uMachineId)
     611    if (uMachineId != m_uMachineId)
    612612        return;
    613613
     
    622622}
    623623
    624 void UISettingsDialogMachine::sltMachineStateChanged(const QUuid &aMachineId, const KMachineState enmMachineState)
     624void UISettingsDialogMachine::sltMachineStateChanged(const QUuid &uMachineId, const KMachineState enmMachineState)
    625625{
    626626    /* Ignore if serialization is in progress: */
     
    628628        return;
    629629    /* Ignore if thats NOT our VM: */
    630     if (aMachineId != m_uMachineId)
     630    if (uMachineId != m_uMachineId)
    631631        return;
    632632
     
    641641}
    642642
    643 void UISettingsDialogMachine::sltMachineDataChanged(const QUuid &aMachineId)
     643void UISettingsDialogMachine::sltMachineDataChanged(const QUuid &uMachineId)
    644644{
    645645    /* Ignore if serialization is in progress: */
     
    647647        return;
    648648    /* Ignore if thats NOT our VM: */
    649     if (aMachineId != m_uMachineId)
     649    if (uMachineId != m_uMachineId)
    650650        return;
    651651
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h

    r74878 r74942  
    8181
    8282    /** Constructs settings dialog passing @a pParent to the base-class.
    83       * @param  aMachineId    Brings the machine ID.
     83      * @param  uMachineId    Brings the machine ID.
    8484      * @param  strCategory   Brings the name of category to be opened.
    8585      * @param  strControl    Brings the name of control to be focused. */
    86     UISettingsDialogMachine(QWidget *pParent, const QUuid &aMachineId,
     86    UISettingsDialogMachine(QWidget *pParent, const QUuid &uMachineId,
    8787                            const QString &strCategory, const QString &strControl);
    8888
     
    117117private slots:
    118118
    119     /** Handles session state change for machine with certain @a aMachineId to @a enmSessionState. */
    120     void sltSessionStateChanged(const QUuid &aMachineId, const KSessionState enmSessionState);
    121     /** Handles machine state change for machine with certain @a aMachineId to @a enmMachineState. */
    122     void sltMachineStateChanged(const QUuid &aMachineId, const KMachineState enmMachineState);
    123     /** Handles machine data change for machine with certain @a aMachineId. */
    124     void sltMachineDataChanged(const QUuid &aMachineId);
     119    /** Handles session state change for machine with certain @a uMachineId to @a enmSessionState. */
     120    void sltSessionStateChanged(const QUuid &uMachineId, const KSessionState enmSessionState);
     121    /** Handles machine state change for machine with certain @a uMachineId to @a enmMachineState. */
     122    void sltMachineStateChanged(const QUuid &uMachineId, const KMachineState enmMachineState);
     123    /** Handles machine data change for machine with certain @a uMachineId. */
     124    void sltMachineDataChanged(const QUuid &uMachineId);
    125125
    126126    /** Handles request to allow to reset first run flag. */
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

    r74878 r74942  
    871871
    872872                    /* Get medium id for further activities: */
    873                     QUuid aMediumId;
     873                    QUuid uMediumId;
    874874                    if (fSuccess)
    875875                    {
    876                         aMediumId = comMedium.GetId();
     876                        uMediumId = comMedium.GetId();
    877877                        fSuccess = comMedium.isOk();
    878878                    }
     
    906906
    907907                        /* Check if old password exists/provided: */
    908                         const QString strOldPasswordId = encryptedMedium.key(aMediumId);
     908                        const QString strOldPasswordId = encryptedMedium.key(uMediumId);
    909909                        const QString strOldPassword = encryptionPasswords.value(strOldPasswordId);
    910910
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp

    r74878 r74942  
    134134
    135135
    136 UIMachineSettingsInterface::UIMachineSettingsInterface(const QUuid &aMachineId)
    137     : m_uMachineId(aMachineId)
     136UIMachineSettingsInterface::UIMachineSettingsInterface(const QUuid &uMachineId)
     137    : m_uMachineId(uMachineId)
    138138    , m_pActionPool(0)
    139139    , m_pCache(0)
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h

    r74878 r74942  
    3737
    3838    /** Constructs User Interface settings page. */
    39     UIMachineSettingsInterface(const QUuid &aMachineId);
     39    UIMachineSettingsInterface(const QUuid &uMachineId);
    4040    /** Destructs User Interface settings page. */
    4141    ~UIMachineSettingsInterface();
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

    r74878 r74942  
    609609}
    610610
    611 void AbstractItem::setMachineId (const QUuid &aMachineId)
    612 {
    613     mMachineId = aMachineId;
     611void AbstractItem::setMachineId (const QUuid &uMachineId)
     612{
     613    mMachineId = uMachineId;
    614614}
    615615
     
    649649}
    650650
    651 AbstractItem* RootItem::childItemById (const QUuid &aId) const
     651AbstractItem* RootItem::childItemById (const QUuid &uId) const
    652652{
    653653    for (int i = 0; i < childCount(); ++ i)
    654         if (mControllers [i]->id() == aId)
     654        if (mControllers [i]->id() == uId)
    655655            return mControllers [i];
    656656    return 0;
     
    847847}
    848848
    849 AbstractItem* ControllerItem::childItemById (const QUuid &aId) const
     849AbstractItem* ControllerItem::childItemById (const QUuid &uId) const
    850850{
    851851    for (int i = 0; i < childCount(); ++ i)
    852         if (mAttachments [i]->id() == aId)
     852        if (mAttachments [i]->id() == uId)
    853853            return mAttachments [i];
    854854    return 0;
     
    983983}
    984984
    985 void AttachmentItem::setAttMediumId (const QUuid &aAttMediumId)
     985void AttachmentItem::setAttMediumId (const QUuid &uAttMediumId)
    986986{
    987987    /// @todo is this required?
    988988    //AssertMsg(!aAttMediumId.isNull(), ("Medium ID value can't be null!\n"));
    989     mAttMediumId = vboxGlobal().medium(aAttMediumId).id();
     989    mAttMediumId = vboxGlobal().medium(uAttMediumId).id();
    990990    cache();
    991991}
     
    11051105}
    11061106
    1107 AbstractItem* AttachmentItem::childItemById (const QUuid& /* aId */) const
     1107AbstractItem* AttachmentItem::childItemById (const QUuid& /* uId */) const
    11081108{
    11091109    return 0;
     
    18241824}
    18251825
    1826 void StorageModel::delController (const QUuid &aCtrId)
    1827 {
    1828     if (AbstractItem *item = mRootItem->childItemById (aCtrId))
     1826void StorageModel::delController (const QUuid &uCtrId)
     1827{
     1828    if (AbstractItem *item = mRootItem->childItemById (uCtrId))
    18291829    {
    18301830        int itemPosition = mRootItem->posOfChild (item);
     
    18351835}
    18361836
    1837 QModelIndex StorageModel::addAttachment (const QUuid &aCtrId, KDeviceType aDeviceType, const QUuid &aMediumId)
    1838 {
    1839     if (AbstractItem *parent = mRootItem->childItemById (aCtrId))
     1837QModelIndex StorageModel::addAttachment (const QUuid &uCtrId, KDeviceType aDeviceType, const QUuid &uMediumId)
     1838{
     1839    if (AbstractItem *parent = mRootItem->childItemById (uCtrId))
    18401840    {
    18411841        int parentPosition = mRootItem->posOfChild (parent);
     
    18441844        AttachmentItem *pItem = new AttachmentItem (parent, aDeviceType);
    18451845        pItem->setAttIsHotPluggable(m_configurationAccessLevel != ConfigurationAccessLevel_Full);
    1846         pItem->setAttMediumId(aMediumId);
     1846        pItem->setAttMediumId(uMediumId);
    18471847        endInsertRows();
    18481848        return index (parent->childCount() - 1, 0, parentIndex);
     
    18511851}
    18521852
    1853 void StorageModel::delAttachment (const QUuid &aCtrId, const QUuid &aAttId)
    1854 {
    1855     if (AbstractItem *parent = mRootItem->childItemById (aCtrId))
     1853void StorageModel::delAttachment (const QUuid &uCtrId, const QUuid &uAttId)
     1854{
     1855    if (AbstractItem *parent = mRootItem->childItemById (uCtrId))
    18561856    {
    18571857        int parentPosition = mRootItem->posOfChild (parent);
    1858         if (AbstractItem *item = parent->childItemById (aAttId))
     1858        if (AbstractItem *item = parent->childItemById (uAttId))
    18591859        {
    18601860            int itemPosition = parent->posOfChild (item);
     
    18661866}
    18671867
    1868 void StorageModel::setMachineId (const QUuid &aMachineId)
    1869 {
    1870     mRootItem->setMachineId (aMachineId);
     1868void StorageModel::setMachineId (const QUuid &uMachineId)
     1869{
     1870    mRootItem->setMachineId (uMachineId);
    18711871}
    18721872
     
    21222122
    21232123    QUuid id() const { return m_uId; }
    2124     void setId(const QUuid &aId) { m_uId = aId; emit sigChanged(); }
     2124    void setId(const QUuid &uId) { m_uId = uId; emit sigChanged(); }
    21252125
    21262126    UIMediumDeviceType type() const { return m_type; }
     
    26282628}
    26292629
    2630 void UIMachineSettingsStorage::sltHandleMediumEnumerated(const QUuid &aMediumId)
     2630void UIMachineSettingsStorage::sltHandleMediumEnumerated(const QUuid &uMediumId)
    26312631{
    26322632    /* Search for corresponding medium: */
    2633     const UIMedium medium = vboxGlobal().medium(aMediumId);
     2633    const UIMedium medium = vboxGlobal().medium(uMediumId);
    26342634
    26352635    const QModelIndex rootIndex = m_pModelStorage->root();
     
    26522652}
    26532653
    2654 void UIMachineSettingsStorage::sltHandleMediumDeleted(const QUuid &aMediumId)
     2654void UIMachineSettingsStorage::sltHandleMediumDeleted(const QUuid &uMediumId)
    26552655{
    26562656    QModelIndex rootIndex = m_pModelStorage->root();
     
    26622662            QModelIndex attIndex = ctrIndex.child(j, 0);
    26632663            QUuid attMediumId = m_pModelStorage->data(attIndex, StorageModel::R_AttMediumId).toString();
    2664             if (attMediumId == aMediumId)
     2664            if (attMediumId == uMediumId)
    26652665            {
    26662666                m_pModelStorage->setData(attIndex, UIMedium().id(), StorageModel::R_AttMediumId);
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h

    r74878 r74942  
    274274    QUuid machineId() const;
    275275
    276     void setMachineId (const QUuid &aMchineId);
     276    void setMachineId (const QUuid &uMchineId);
    277277
    278278    virtual ItemType rtti() const = 0;
    279279    virtual AbstractItem* childItem (int aIndex) const = 0;
    280     virtual AbstractItem* childItemById (const QUuid &aId) const = 0;
     280    virtual AbstractItem* childItemById (const QUuid &uId) const = 0;
    281281    virtual int posOfChild (AbstractItem *aItem) const = 0;
    282282    virtual QString tip() const = 0;
     
    308308    ItemType rtti() const;
    309309    AbstractItem* childItem (int aIndex) const;
    310     AbstractItem* childItemById (const QUuid &aId) const;
     310    AbstractItem* childItemById (const QUuid &uId) const;
    311311    int posOfChild (AbstractItem *aItem) const;
    312312    int childCount() const;
     
    353353    ItemType rtti() const;
    354354    AbstractItem* childItem (int aIndex) const;
    355     AbstractItem* childItemById (const QUuid &aId) const;
     355    AbstractItem* childItemById (const QUuid &uId) const;
    356356    int posOfChild (AbstractItem *aItem) const;
    357357    int childCount() const;
     
    390390    void setAttSlot (const StorageSlot &aAttSlot);
    391391    void setAttDevice (KDeviceType aAttDeviceType);
    392     void setAttMediumId (const QUuid &aAttMediumId);
     392    void setAttMediumId (const QUuid &uAttMediumId);
    393393    void setAttIsPassthrough (bool aPassthrough);
    394394    void setAttIsTempEject (bool aTempEject);
     
    410410    ItemType rtti() const;
    411411    AbstractItem* childItem (int aIndex) const;
    412     AbstractItem* childItemById (const QUuid &aId) const;
     412    AbstractItem* childItemById (const QUuid &uId) const;
    413413    int posOfChild (AbstractItem *aItem) const;
    414414    int childCount() const;
     
    540540
    541541    QModelIndex addController (const QString &aCtrName, KStorageBus aBusType, KStorageControllerType aCtrType);
    542     void delController (const QUuid &aCtrId);
    543 
    544     QModelIndex addAttachment (const QUuid &aCtrId, KDeviceType aDeviceType, const QUuid &aMediumId);
    545     void delAttachment (const QUuid &aCtrId, const QUuid &aAttId);
    546 
    547     void setMachineId (const QUuid &aMachineId);
     542    void delController (const QUuid &uCtrId);
     543
     544    QModelIndex addAttachment (const QUuid &uCtrId, KDeviceType aDeviceType, const QUuid &uMediumId);
     545    void delAttachment (const QUuid &uCtrId, const QUuid &uAttId);
     546
     547    void setMachineId (const QUuid &uMachineId);
    548548
    549549    void sort(int iColumn = 0, Qt::SortOrder order = Qt::AscendingOrder);
     
    654654private slots:
    655655
    656     /** Handles enumeration of medium with @a strMediumId. */
    657     void sltHandleMediumEnumerated(const QUuid &aMediumId);
    658     /** Handles removing of medium with @a strMediumId. */
    659     void sltHandleMediumDeleted(const QUuid &aMediumId);
     656    /** Handles enumeration of medium with @a uMediumId. */
     657    void sltHandleMediumEnumerated(const QUuid &uMediumId);
     658    /** Handles removing of medium with @a uMediumId. */
     659    void sltHandleMediumDeleted(const QUuid &uMediumId);
    660660
    661661    /** Handles command to add controller. */
  • trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.cpp

    r74878 r74942  
    550550}
    551551
    552 void UISnapshotPane::sltHandleMachineDataChange(const QUuid &aMachineId)
     552void UISnapshotPane::sltHandleMachineDataChange(const QUuid &uMachineId)
    553553{
    554554    /* Make sure it's our VM: */
    555     if (aMachineId != m_uMachineId)
     555    if (uMachineId != m_uMachineId)
    556556        return;
    557557
     
    566566}
    567567
    568 void UISnapshotPane::sltHandleMachineStateChange(const QUuid &aMachineId, const KMachineState enmState)
     568void UISnapshotPane::sltHandleMachineStateChange(const QUuid &uMachineId, const KMachineState enmState)
    569569{
    570570    /* Make sure it's our VM: */
    571     if (aMachineId != m_uMachineId)
     571    if (uMachineId != m_uMachineId)
    572572        return;
    573573
     
    580580}
    581581
    582 void UISnapshotPane::sltHandleSessionStateChange(const QUuid &aMachineId, const KSessionState enmState)
     582void UISnapshotPane::sltHandleSessionStateChange(const QUuid &uMachineId, const KSessionState enmState)
    583583{
    584584    /* Make sure it's our VM: */
    585     if (aMachineId != m_uMachineId)
     585    if (uMachineId != m_uMachineId)
    586586        return;
    587587
     
    596596}
    597597
    598 void UISnapshotPane::sltHandleSnapshotTake(const QUuid &aMachineId, const QUuid &aSnapshotId)
     598void UISnapshotPane::sltHandleSnapshotTake(const QUuid &uMachineId, const QUuid &uSnapshotId)
    599599{
    600600    /* Make sure it's our VM: */
    601     if (aMachineId != m_uMachineId)
     601    if (uMachineId != m_uMachineId)
    602602        return;
    603603
    604604    LogRel(("GUI: Updating snapshot tree after TAKING snapshot with MachineID={%s}, SnapshotID={%s}...\n",
    605             aMachineId.toString().toUtf8().constData(), aSnapshotId.toString().toUtf8().constData()));
     605            uMachineId.toString().toUtf8().constData(), uSnapshotId.toString().toUtf8().constData()));
    606606
    607607    /* Prepare result: */
     
    612612
    613613        /* Search for corresponding snapshot: */
    614         CSnapshot comSnapshot = m_comMachine.FindSnapshot(aSnapshotId.toString());
     614        CSnapshot comSnapshot = m_comMachine.FindSnapshot(uSnapshotId.toString());
    615615        fSuccess = m_comMachine.isOk() && !comSnapshot.isNull();
    616616
    617617        /* Show error message if necessary: */
    618618        if (!fSuccess)
    619             msgCenter().cannotFindSnapshotById(m_comMachine, aSnapshotId, this);
     619            msgCenter().cannotFindSnapshotById(m_comMachine, uSnapshotId, this);
    620620        else
    621621        {
     
    692692}
    693693
    694 void UISnapshotPane::sltHandleSnapshotDelete(const QUuid &aMachineId, const QUuid &aSnapshotId)
     694void UISnapshotPane::sltHandleSnapshotDelete(const QUuid &uMachineId, const QUuid &uSnapshotId)
    695695{
    696696    /* Make sure it's our VM: */
    697     if (aMachineId != m_uMachineId)
     697    if (uMachineId != m_uMachineId)
    698698        return;
    699699
    700700    LogRel(("GUI: Updating snapshot tree after DELETING snapshot with MachineID={%s}, SnapshotID={%s}...\n",
    701             aMachineId.toString().toUtf8().constData(), aSnapshotId.toString().toUtf8().constData()));
     701            uMachineId.toString().toUtf8().constData(), uSnapshotId.toString().toUtf8().constData()));
    702702
    703703    /* Prepare result: */
     
    708708
    709709        /* Search for an existing item with such id: */
    710         UISnapshotItem *pItem = findItem(aSnapshotId);
     710        UISnapshotItem *pItem = findItem(uSnapshotId);
    711711        fSuccess = pItem;
    712712
     
    774774}
    775775
    776 void UISnapshotPane::sltHandleSnapshotChange(const QUuid &aMachineId, const QUuid &aSnapshotId)
     776void UISnapshotPane::sltHandleSnapshotChange(const QUuid &uMachineId, const QUuid &uSnapshotId)
    777777{
    778778    /* Make sure it's our VM: */
    779     if (aMachineId != m_uMachineId)
     779    if (uMachineId != m_uMachineId)
    780780        return;
    781781
    782782    LogRel(("GUI: Updating snapshot tree after CHANGING snapshot with MachineID={%s}, SnapshotID={%s}...\n",
    783             aMachineId.toString().toUtf8().constData(), aSnapshotId.toString().toUtf8().constData()));
     783            uMachineId.toString().toUtf8().constData(), uSnapshotId.toString().toUtf8().constData()));
    784784
    785785    /* Prepare result: */
     
    790790
    791791        /* Search for an existing item with such id: */
    792         UISnapshotItem *pItem = findItem(aSnapshotId);
     792        UISnapshotItem *pItem = findItem(uSnapshotId);
    793793        fSuccess = pItem;
    794794
     
    814814}
    815815
    816 void UISnapshotPane::sltHandleSnapshotRestore(const QUuid &aMachineId, const QUuid &aSnapshotId)
     816void UISnapshotPane::sltHandleSnapshotRestore(const QUuid &uMachineId, const QUuid &uSnapshotId)
    817817{
    818818    /* Make sure it's our VM: */
    819     if (aMachineId != m_uMachineId)
     819    if (uMachineId != m_uMachineId)
    820820        return;
    821821
    822822    LogRel(("GUI: Updating snapshot tree after RESTORING snapshot with MachineID={%s}, SnapshotID={%s}...\n",
    823             aMachineId.toString().toUtf8().constData(), aSnapshotId.toString().toUtf8().constData()));
     823            uMachineId.toString().toUtf8().constData(), uSnapshotId.toString().toUtf8().constData()));
    824824
    825825    /* Prepare result: */
     
    830830
    831831        /* Search for an existing item with such id: */
    832         UISnapshotItem *pItem = findItem(aSnapshotId);
     832        UISnapshotItem *pItem = findItem(uSnapshotId);
    833833        fSuccess = pItem;
    834834
     
    18131813}
    18141814
    1815 UISnapshotItem *UISnapshotPane::findItem(const QUuid &aSnapshotID) const
     1815UISnapshotItem *UISnapshotPane::findItem(const QUuid &uSnapshotID) const
    18161816{
    18171817    /* Search for the first item with required ID: */
     
    18201820    {
    18211821        UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(*it);
    1822         if (pSnapshotItem->snapshotID() == aSnapshotID)
     1822        if (pSnapshotItem->snapshotID() == uSnapshotID)
    18231823            return pSnapshotItem;
    18241824        ++it;
  • trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.h

    r74878 r74942  
    8686    /** @name Main event handlers.
    8787      * @{ */
    88         /** Handles machine data change for machine with @a strMachineId. */
    89         void sltHandleMachineDataChange(const QUuid &aMachineId);
    90         /** Handles machine @a enmState change for machine with @a strMachineId. */
    91         void sltHandleMachineStateChange(const QUuid &aMachineId, const KMachineState enmState);
    92 
    93         /** Handles session @a enmState change for machine with @a strMachineId. */
    94         void sltHandleSessionStateChange(const QUuid &aMachineId, const KSessionState enmState);
    95 
    96         /** Handles snapshot take event for machine with @a strMachineId. */
    97         void sltHandleSnapshotTake(const QUuid &aMachineId, const QUuid &aSnapshotId);
    98         /** Handles snapshot delete event for machine with @a strMachineId. */
    99         void sltHandleSnapshotDelete(const QUuid &aMachineId, const QUuid &aSnapshotId);
    100         /** Handles snapshot change event for machine with @a strMachineId. */
    101         void sltHandleSnapshotChange(const QUuid &aMachineId, const QUuid &aSnapshotId);
    102         /** Handles snapshot restore event for machine with @a strMachineId. */
    103         void sltHandleSnapshotRestore(const QUuid &aMachineId, const QUuid &aSnapshotId);
     88        /** Handles machine data change for machine with @a uMachineId. */
     89        void sltHandleMachineDataChange(const QUuid &uMachineId);
     90        /** Handles machine @a enmState change for machine with @a uMachineId. */
     91        void sltHandleMachineStateChange(const QUuid &uMachineId, const KMachineState enmState);
     92
     93        /** Handles session @a enmState change for machine with @a uMachineId. */
     94        void sltHandleSessionStateChange(const QUuid &uMachineId, const KSessionState enmState);
     95
     96        /** Handles snapshot take event for machine with @a uMachineId. */
     97        void sltHandleSnapshotTake(const QUuid &uMachineId, const QUuid &uSnapshotId);
     98        /** Handles snapshot delete event for machine with @a uMachineId. */
     99        void sltHandleSnapshotDelete(const QUuid &uMachineId, const QUuid &uSnapshotId);
     100        /** Handles snapshot change event for machine with @a uMachineId. */
     101        void sltHandleSnapshotChange(const QUuid &uMachineId, const QUuid &uSnapshotId);
     102        /** Handles snapshot restore event for machine with @a uMachineId. */
     103        void sltHandleSnapshotRestore(const QUuid &uMachineId, const QUuid &uSnapshotId);
    104104    /** @} */
    105105
     
    188188        void adjustTreeWidget();
    189189
    190         /** Searches for an item with corresponding @a strSnapshotID. */
    191         UISnapshotItem *findItem(const QUuid &aSnapshotID) const;
     190        /** Searches for an item with corresponding @a uSnapshotID. */
     191        UISnapshotItem *findItem(const QUuid &uSnapshotID) const;
    192192
    193193        /** Searches for smallest snapshot age starting with @a pItem as parent. */
  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAddDiskEncryptionPasswordDialog.cpp

    r74878 r74942  
    577577
    578578/* static */
    579 bool UIAddDiskEncryptionPasswordDialog::isPasswordValid(const QUuid &aMediumId, const QString strPassword)
     579bool UIAddDiskEncryptionPasswordDialog::isPasswordValid(const QUuid &uMediumId, const QString strPassword)
    580580{
    581581    /* Look for the medium with passed ID: */
    582     const UIMedium uimedium = vboxGlobal().medium(aMediumId);
     582    const UIMedium uimedium = vboxGlobal().medium(uMediumId);
    583583    if (!uimedium.isNull())
    584584    {
  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAddDiskEncryptionPasswordDialog.h

    r74878 r74942  
    7575    void prepare();
    7676
    77     /** Returns whether passed @a strPassword is valid for medium with passed @a strMediumId. */
    78     static bool isPasswordValid(const QUuid &aMediumId, const QString strPassword);
     77    /** Returns whether passed @a strPassword is valid for medium with passed @a uMediumId. */
     78    static bool isPasswordValid(const QUuid &uMediumId, const QString strPassword);
    7979
    8080    /** Holds the name of the machine we show this dialog for. */
  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediaComboBox.cpp

    r74878 r74942  
    7070}
    7171
    72 void UIMediaComboBox::setCurrentItem(const QUuid &aItemId)
    73 {
    74     m_uLastItemId = aItemId;
     72void UIMediaComboBox::setCurrentItem(const QUuid &uItemId)
     73{
     74    m_uLastItemId = uItemId;
    7575
    7676    int iIndex;
     
    7878    // Note that the media combo-box may be not populated here yet,
    7979    // so we don't assert..
    80     if (findMediaIndex(aItemId, iIndex))
     80    if (findMediaIndex(uItemId, iIndex))
    8181    {
    8282        QComboBox::setCurrentIndex(iIndex);
     
    107107}
    108108
    109 void UIMediaComboBox::sltHandleMediumCreated(const QUuid &aMediumId)
     109void UIMediaComboBox::sltHandleMediumCreated(const QUuid &uMediumId)
    110110{
    111111    /* Search for corresponding medium: */
    112     UIMedium guiMedium = vboxGlobal().medium(aMediumId);
     112    UIMedium guiMedium = vboxGlobal().medium(uMediumId);
    113113
    114114    /* Ignore media (and their children) which are
     
    136136}
    137137
    138 void UIMediaComboBox::sltHandleMediumEnumerated(const QUuid &aMediumId)
     138void UIMediaComboBox::sltHandleMediumEnumerated(const QUuid &uMediumId)
    139139{
    140140    /* Search for corresponding medium: */
    141     UIMedium guiMedium = vboxGlobal().medium(aMediumId);
     141    UIMedium guiMedium = vboxGlobal().medium(uMediumId);
    142142
    143143    /* Add only 1. NULL medium and 2. media of required type: */
     
    157157}
    158158
    159 void UIMediaComboBox::sltHandleMediumDeleted(const QUuid &aMediumId)
     159void UIMediaComboBox::sltHandleMediumDeleted(const QUuid &uMediumId)
    160160{
    161161    /* Search for corresponding item index: */
    162162    int iIndex;
    163     if (!findMediaIndex(aMediumId, iIndex))
     163    if (!findMediaIndex(uMediumId, iIndex))
    164164        return;
    165165
     
    256256}
    257257
    258 bool UIMediaComboBox::findMediaIndex(const QUuid &aId, int &iIndex)
     258bool UIMediaComboBox::findMediaIndex(const QUuid &uId, int &iIndex)
    259259{
    260260    iIndex = 0;
    261261
    262262    for (; iIndex < m_media.size(); ++ iIndex)
    263         if (m_media.at(iIndex).id == aId)
     263        if (m_media.at(iIndex).id == uId)
    264264            break;
    265265
  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediaComboBox.h

    r74878 r74942  
    5050    UIMediumDeviceType type() const { return m_enmMediaType; }
    5151
    52     /** Defines @a strMachineId. */
    53     void setMachineId(const QUuid &aMachineId) { m_uMachineId = aMachineId; }
     52    /** Defines @a uMachineId. */
     53    void setMachineId(const QUuid &uMachineId) { m_uMachineId = uMachineId; }
    5454
    55     /** Defines current item through @a strItemId. */
    56     void setCurrentItem(const QUuid &aItemId);
     55    /** Defines current item through @a uItemId. */
     56    void setCurrentItem(const QUuid &uItemId);
    5757
    5858    /** Returns id of item with certain @a iIndex. */
     
    6363protected slots:
    6464
    65     /** Habdles medium-created signal for medium with @a strMediumId. */
    66     void sltHandleMediumCreated(const QUuid &aMediumId);
    67     /** Habdles medium-enumerated signal for medium with @a strMediumId. */
    68     void sltHandleMediumEnumerated(const QUuid &aMediumId);
    69     /** Habdles medium-deleted signal for medium with @a strMediumId. */
    70     void sltHandleMediumDeleted(const QUuid &aMediumId);
     65    /** Habdles medium-created signal for medium with @a uMediumId. */
     66    void sltHandleMediumCreated(const QUuid &uMediumId);
     67    /** Habdles medium-enumerated signal for medium with @a uMediumId. */
     68    void sltHandleMediumEnumerated(const QUuid &uMediumId);
     69    /** Habdles medium-deleted signal for medium with @a uMediumId. */
     70    void sltHandleMediumDeleted(const QUuid &uMediumId);
    7171
    7272    /** Handles medium enumeration start. */
     
    9292    void replaceItem(int iPosition, const UIMedium &guiMedium);
    9393
    94     /** Searches for a @a iIndex of medium with certain @a strId. */
    95     bool findMediaIndex(const QUuid &aId, int &iIndex);
     94    /** Searches for a @a iIndex of medium with certain @a uId. */
     95    bool findMediaIndex(const QUuid &uId, int &iIndex);
    9696
    9797    /** Holds the media type. */
     
    105105    {
    106106        Medium() {}
    107         Medium(const QUuid &aId,
     107        Medium(const QUuid &uId,
    108108               const QString &strLocation,
    109109               const QString &strToolTip)
    110             : id(aId), location(strLocation), toolTip(strToolTip)
     110            : id(uId), location(strLocation), toolTip(strToolTip)
    111111        {}
    112112
  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBarEditorWindow.cpp

    r74914 r74942  
    327327UIMenuBarEditorWidget::UIMenuBarEditorWidget(QWidget *pParent,
    328328                                             bool fStartedFromVMSettings /* = true */,
    329                                              const QUuid &aMachineID /* = QUuid() */,
     329                                             const QUuid &uMachineID /* = QUuid() */,
    330330                                             UIActionPool *pActionPool /* = 0 */)
    331331    : QIWithRetranslateUI2<QWidget>(pParent)
    332332    , m_fPrepared(false)
    333333    , m_fStartedFromVMSettings(fStartedFromVMSettings)
    334     , m_uMachineID(aMachineID)
     334    , m_uMachineID(uMachineID)
    335335    , m_pActionPool(pActionPool)
    336336    , m_pMainLayout(0)
     
    359359}
    360360
    361 void UIMenuBarEditorWidget::setMachineID(const QUuid &aMachineID)
     361void UIMenuBarEditorWidget::setMachineID(const QUuid &uMachineID)
    362362{
    363363    /* Remember new machine ID: */
    364     m_uMachineID = aMachineID;
     364    m_uMachineID = uMachineID;
    365365    /* Prepare: */
    366366    prepare();
     
    747747}
    748748
    749 void UIMenuBarEditorWidget::sltHandleConfigurationChange(const QUuid &aMachineID)
     749void UIMenuBarEditorWidget::sltHandleConfigurationChange(const QUuid &uMachineID)
    750750{
    751751    /* Skip unrelated machine IDs: */
    752     if (machineID() != aMachineID)
     752    if (machineID() != uMachineID)
    753753        return;
    754754
  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBarEditorWindow.h

    r74878 r74942  
    7474    /** Constructs menu-bar editor widget passing @a pParent to the base-class.
    7575      * @param  fStartedFromVMSettings  Brings whether 'this' is a part of VM settings.
    76       * @param  strMachineID            Brings the machine ID to be used by the editor.
     76      * @param  uMachineID              Brings the machine ID to be used by the editor.
    7777      * @param  pActionPool             Brings the action-pool to be used by the editor. */
    7878    UIMenuBarEditorWidget(QWidget *pParent,
    7979                          bool fStartedFromVMSettings = true,
    80                           const QUuid &aMachineID = QUuid(),
     80                          const QUuid &uMachineID = QUuid(),
    8181                          UIActionPool *pActionPool = 0);
    8282
    8383    /** Returns the machine ID instance. */
    8484    const QUuid &machineID() const { return m_uMachineID; }
    85     /** Defines the @a strMachineID instance. */
    86     void setMachineID(const QUuid &aMachineID);
     85    /** Defines the @a uMachineID instance. */
     86    void setMachineID(const QUuid &uMachineID);
    8787
    8888    /** Returns the action-pool reference. */
     
    155155
    156156    /** Handles configuration change. */
    157     void sltHandleConfigurationChange(const QUuid &aMachineID);
     157    void sltHandleConfigurationChange(const QUuid &uMachineID);
    158158
    159159    /** Handles menu-bar menu click. */
  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp

    r74878 r74942  
    5858signals:
    5959
    60     /** Notifies about @a iPercent change for progress with @a strProgressId. */
    61     void sigProgressPercentageChange(const QUuid &aProgressId, const int iPercent);
    62     /** Notifies about task complete for progress with @a strProgressId. */
    63     void sigProgressTaskComplete(const QUuid &aProgressId);
     60    /** Notifies about @a iPercent change for progress with @a uProgressId. */
     61    void sigProgressPercentageChange(const QUuid &uProgressId, const int iPercent);
     62    /** Notifies about task complete for progress with @a uProgressId. */
     63    void sigProgressTaskComplete(const QUuid &uProgressId);
    6464
    6565public:
  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.h

    r74878 r74942  
    8888private slots:
    8989
    90     /** Handles percentage changed event for progress with @a strProgressId to @a iPercent. */
    91     void sltHandleProgressPercentageChange(const QUuid &aProgressId, const int iPercent);
    92     /** Handles task completed event for progress with @a strProgressId. */
    93     void sltHandleProgressTaskComplete(const QUuid &aProgressId);
     90    /** Handles percentage changed event for progress with @a uProgressId to @a iPercent. */
     91    void sltHandleProgressPercentageChange(const QUuid &uProgressId, const int iPercent);
     92    /** Handles task completed event for progress with @a uProgressId. */
     93    void sltHandleProgressTaskComplete(const QUuid &uProgressId);
    9494
    9595    /** Handles window stack changed signal. */
  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIStatusBarEditorWindow.cpp

    r74878 r74942  
    410410UIStatusBarEditorWidget::UIStatusBarEditorWidget(QWidget *pParent,
    411411                                                 bool fStartedFromVMSettings /* = true */,
    412                                                  const QUuid &aMachineID /* = QString() */)
     412                                                 const QUuid &uMachineID /* = QString() */)
    413413    : QIWithRetranslateUI2<QWidget>(pParent)
    414414    , m_fPrepared(false)
    415415    , m_fStartedFromVMSettings(fStartedFromVMSettings)
    416     , m_uMachineID(aMachineID)
     416    , m_uMachineID(uMachineID)
    417417    , m_pMainLayout(0), m_pButtonLayout(0)
    418418    , m_pButtonClose(0)
     
    425425}
    426426
    427 void UIStatusBarEditorWidget::setMachineID(const QUuid &aMachineID)
     427void UIStatusBarEditorWidget::setMachineID(const QUuid &uMachineID)
    428428{
    429429    /* Remember new machine ID: */
    430     m_uMachineID = aMachineID;
     430    m_uMachineID = uMachineID;
    431431    /* Prepare: */
    432432    prepare();
     
    690690}
    691691
    692 void UIStatusBarEditorWidget::sltHandleConfigurationChange(const QUuid &aMachineID)
     692void UIStatusBarEditorWidget::sltHandleConfigurationChange(const QUuid &uMachineID)
    693693{
    694694    /* Skip unrelated machine IDs: */
    695     if (machineID() != aMachineID)
     695    if (machineID() != uMachineID)
    696696        return;
    697697
  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIStatusBarEditorWindow.h

    r74878 r74942  
    7373    /** Constructs status-bar editor widget passing @a pParent to the base-class.
    7474      * @param  fStartedFromVMSettings  Brings whether 'this' is a part of VM settings.
    75       * @param  strMachineID            Brings the machine ID to be used by the editor. */
     75      * @param  uMachineID              Brings the machine ID to be used by the editor. */
    7676    UIStatusBarEditorWidget(QWidget *pParent,
    7777                            bool fStartedFromVMSettings = true,
    78                             const QUuid &aMachineID = QUuid());
     78                            const QUuid &uMachineID = QUuid());
    7979
    8080    /** Returns the machine ID instance. */
    8181    const QUuid &machineID() const { return m_uMachineID; }
    82     /** Defines the @a strMachineID instance. */
    83     void setMachineID(const QUuid &aMachineID);
     82    /** Defines the @a uMachineID instance. */
     83    void setMachineID(const QUuid &uMachineID);
    8484
    8585    /** Returns whether the status-bar enabled. */
     
    115115
    116116    /** Handles configuration change. */
    117     void sltHandleConfigurationChange(const QUuid &aMachineID);
     117    void sltHandleConfigurationChange(const QUuid &uMachineID);
    118118
    119119    /** Handles button click. */
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp

    r74878 r74942  
    439439}
    440440
    441 void UIWizardExportAppPage2::setProviderById(const QUuid &aId)
    442 {
    443     const int iIndex = m_pFormatComboBox->findData(aId, FormatData_ID);
     441void UIWizardExportAppPage2::setProviderById(const QUuid &uId)
     442{
     443    const int iIndex = m_pFormatComboBox->findData(uId, FormatData_ID);
    444444    AssertMsg(iIndex != -1, ("Data not found!"));
    445445    m_pFormatComboBox->setCurrentIndex(iIndex);
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h

    r74878 r74942  
    136136    bool isIncludeISOsSelected() const;
    137137
    138     /** Defines provider by @a strId. */
    139     void setProviderById(const QUuid &strId);
     138    /** Defines provider by @a uId. */
     139    void setProviderById(const QUuid &uId);
    140140    /** Returns provider ID. */
    141141    QUuid providerId() const;
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp

    r74878 r74942  
    5757}
    5858
    59 void UIWizardFirstRunPage::setId(const QUuid &aId)
     59void UIWizardFirstRunPage::setId(const QUuid &uId)
    6060{
    61     m_pMediaSelector->setCurrentItem(aId);
     61    m_pMediaSelector->setCurrentItem(uId);
    6262}
    6363
    64 UIWizardFirstRunPageBasic::UIWizardFirstRunPageBasic(const QUuid &aMachineId, bool fBootHardDiskWasSet)
     64UIWizardFirstRunPageBasic::UIWizardFirstRunPageBasic(const QUuid &uMachineId, bool fBootHardDiskWasSet)
    6565    : UIWizardFirstRunPage(fBootHardDiskWasSet)
    6666{
     
    7373            m_pMediaSelector = new UIMediaComboBox(this);
    7474            {
    75                 m_pMediaSelector->setMachineId(aMachineId);
     75                m_pMediaSelector->setMachineId(uMachineId);
    7676                m_pMediaSelector->setType(UIMediumDeviceType_DVD);
    7777                m_pMediaSelector->repopulate();
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.h

    r74878 r74942  
    4444    /* Stuff for 'id' field: */
    4545    QUuid id() const;
    46     void setId(const QUuid &aId);
     46    void setId(const QUuid &uId);
    4747
    4848    /* Variables: */
     
    6464
    6565    /* Constructor: */
    66     UIWizardFirstRunPageBasic(const QUuid &aMachineId, bool fBootHardDiskWasSet);
     66    UIWizardFirstRunPageBasic(const QUuid &uMachineId, bool fBootHardDiskWasSet);
    6767
    6868protected:
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.h

    r74878 r74942  
    5454    /* Stuff for 'virtualDiskId' field: */
    5555    QUuid virtualDiskId() const { return m_uVirtualDiskId; }
    56     void setVirtualDiskId(const QUuid &aVirtualDiskId) { m_uVirtualDiskId = aVirtualDiskId; }
     56    void setVirtualDiskId(const QUuid &uVirtualDiskId) { m_uVirtualDiskId = uVirtualDiskId; }
    5757
    5858    /* Stuff for 'virtualDiskName' field: */
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