- Timestamp:
- Oct 19, 2018 12:51:20 PM (6 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src
- Files:
-
- 104 edited
-
extradata/UIExtraDataManager.cpp (modified) (86 diffs)
-
extradata/UIExtraDataManager.h (modified) (12 diffs)
-
globals/UIActionPoolRuntime.cpp (modified) (5 diffs)
-
globals/UIActionPoolRuntime.h (modified) (1 diff)
-
globals/UIMainEventListener.h (modified) (2 diffs)
-
globals/UIMessageCenter.cpp (modified) (2 diffs)
-
globals/UIMessageCenter.h (modified) (2 diffs)
-
globals/UIVirtualBoxEventHandler.cpp (modified) (1 diff)
-
globals/UIVirtualBoxEventHandler.h (modified) (1 diff)
-
globals/VBoxGlobal.cpp (modified) (6 diffs)
-
globals/VBoxGlobal.h (modified) (3 diffs)
-
manager/UIToolPaneMachine.h (modified) (1 diff)
-
manager/UIVirtualBoxManager.cpp (modified) (2 diffs)
-
manager/UIVirtualBoxManager.h (modified) (2 diffs)
-
manager/UIVirtualBoxManagerWidget.h (modified) (1 diff)
-
manager/chooser/UIChooserItem.h (modified) (1 diff)
-
manager/chooser/UIChooserItemGlobal.h (modified) (1 diff)
-
manager/chooser/UIChooserItemGroup.cpp (modified) (2 diffs)
-
manager/chooser/UIChooserItemGroup.h (modified) (2 diffs)
-
manager/chooser/UIChooserItemMachine.cpp (modified) (2 diffs)
-
manager/chooser/UIChooserItemMachine.h (modified) (1 diff)
-
manager/chooser/UIChooserModel.cpp (modified) (6 diffs)
-
manager/chooser/UIChooserModel.h (modified) (3 diffs)
-
manager/details/UIDetails.h (modified) (1 diff)
-
manager/details/UIDetailsElement.h (modified) (1 diff)
-
manager/details/UIDetailsGroup.cpp (modified) (3 diffs)
-
manager/details/UIDetailsGroup.h (modified) (1 diff)
-
manager/details/UIDetailsItem.cpp (modified) (1 diff)
-
manager/details/UIDetailsItem.h (modified) (3 diffs)
-
manager/details/UIDetailsModel.h (modified) (1 diff)
-
manager/details/UIDetailsSet.cpp (modified) (6 diffs)
-
manager/details/UIDetailsSet.h (modified) (2 diffs)
-
manager/details/UIMachinePreview.cpp (modified) (1 diff)
-
manager/details/UIMachinePreview.h (modified) (1 diff)
-
medium/UIMedium.cpp (modified) (1 diff)
-
medium/UIMedium.h (modified) (3 diffs)
-
medium/UIMediumEnumerator.cpp (modified) (13 diffs)
-
medium/UIMediumEnumerator.h (modified) (4 diffs)
-
medium/UIMediumItem.cpp (modified) (1 diff)
-
medium/UIMediumItem.h (modified) (1 diff)
-
medium/UIMediumManager.cpp (modified) (7 diffs)
-
medium/UIMediumManager.h (modified) (3 diffs)
-
medium/UIMediumSelector.cpp (modified) (1 diff)
-
medium/UIMediumSelector.h (modified) (1 diff)
-
platform/UIDesktopServices.h (modified) (1 diff)
-
platform/darwin/UIDesktopServices_darwin.cpp (modified) (1 diff)
-
platform/win/UIDesktopServices_win.cpp (modified) (2 diffs)
-
platform/x11/UIDesktopServices_x11.cpp (modified) (2 diffs)
-
runtime/UIIndicatorsPool.cpp (modified) (1 diff)
-
runtime/UIIndicatorsPool.h (modified) (1 diff)
-
runtime/UIMachine.cpp (modified) (2 diffs)
-
runtime/UIMachine.h (modified) (1 diff)
-
runtime/UIMachineLogic.cpp (modified) (1 diff)
-
runtime/UIMachineView.cpp (modified) (2 diffs)
-
runtime/UIMachineView.h (modified) (1 diff)
-
runtime/UISession.cpp (modified) (1 diff)
-
runtime/UISession.h (modified) (1 diff)
-
runtime/normal/UIMachineWindowNormal.cpp (modified) (2 diffs)
-
runtime/normal/UIMachineWindowNormal.h (modified) (2 diffs)
-
selector/UISelectorWindow.cpp (modified) (2 diffs)
-
selector/UISelectorWindow.h (modified) (2 diffs)
-
selector/UIToolsPaneMachine.h (modified) (1 diff)
-
selector/graphics/chooser/UIGChooserItem.h (modified) (1 diff)
-
selector/graphics/chooser/UIGChooserItemGroup.cpp (modified) (2 diffs)
-
selector/graphics/chooser/UIGChooserItemGroup.h (modified) (2 diffs)
-
selector/graphics/chooser/UIGChooserItemMachine.cpp (modified) (2 diffs)
-
selector/graphics/chooser/UIGChooserItemMachine.h (modified) (1 diff)
-
selector/graphics/chooser/UIGChooserModel.cpp (modified) (9 diffs)
-
selector/graphics/chooser/UIGChooserModel.h (modified) (3 diffs)
-
selector/graphics/details/UIGDetails.h (modified) (1 diff)
-
selector/graphics/details/UIGDetailsElement.h (modified) (1 diff)
-
selector/graphics/details/UIGDetailsGroup.cpp (modified) (3 diffs)
-
selector/graphics/details/UIGDetailsGroup.h (modified) (1 diff)
-
selector/graphics/details/UIGDetailsItem.cpp (modified) (1 diff)
-
selector/graphics/details/UIGDetailsItem.h (modified) (2 diffs)
-
selector/graphics/details/UIGDetailsModel.h (modified) (1 diff)
-
selector/graphics/details/UIGDetailsSet.cpp (modified) (6 diffs)
-
selector/graphics/details/UIGDetailsSet.h (modified) (1 diff)
-
selector/graphics/details/UIGMachinePreview.cpp (modified) (1 diff)
-
selector/graphics/details/UIGMachinePreview.h (modified) (1 diff)
-
settings/UISettingsDialogSpecific.cpp (modified) (7 diffs)
-
settings/UISettingsDialogSpecific.h (modified) (2 diffs)
-
settings/machine/UIMachineSettingsGeneral.cpp (modified) (2 diffs)
-
settings/machine/UIMachineSettingsInterface.cpp (modified) (1 diff)
-
settings/machine/UIMachineSettingsInterface.h (modified) (1 diff)
-
settings/machine/UIMachineSettingsStorage.cpp (modified) (14 diffs)
-
settings/machine/UIMachineSettingsStorage.h (modified) (7 diffs)
-
snapshots/UISnapshotPane.cpp (modified) (13 diffs)
-
snapshots/UISnapshotPane.h (modified) (2 diffs)
-
widgets/UIAddDiskEncryptionPasswordDialog.cpp (modified) (1 diff)
-
widgets/UIAddDiskEncryptionPasswordDialog.h (modified) (1 diff)
-
widgets/UIMediaComboBox.cpp (modified) (6 diffs)
-
widgets/UIMediaComboBox.h (modified) (4 diffs)
-
widgets/UIMenuBarEditorWindow.cpp (modified) (3 diffs)
-
widgets/UIMenuBarEditorWindow.h (modified) (2 diffs)
-
widgets/UIProgressDialog.cpp (modified) (1 diff)
-
widgets/UIProgressDialog.h (modified) (1 diff)
-
widgets/UIStatusBarEditorWindow.cpp (modified) (3 diffs)
-
widgets/UIStatusBarEditorWindow.h (modified) (2 diffs)
-
wizards/exportappliance/UIWizardExportAppPageBasic2.cpp (modified) (1 diff)
-
wizards/exportappliance/UIWizardExportAppPageBasic2.h (modified) (1 diff)
-
wizards/firstrun/UIWizardFirstRunPageBasic.cpp (modified) (2 diffs)
-
wizards/firstrun/UIWizardFirstRunPageBasic.h (modified) (2 diffs)
-
wizards/newvm/UIWizardNewVMPageBasic3.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
r74914 r74942 93 93 94 94 /** 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); 96 96 97 97 public: … … 105 105 106 106 /** 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); 108 108 /** 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); 110 110 111 111 protected: … … 244 244 } 245 245 246 void UIExtraDataEventHandler::sltPreprocessExtraDataCanChange(const QUuid & aMachineID, const QString &strKey, const QString &/* strValue */, bool & /* fVeto */, QString & /* strVetoReason */)246 void UIExtraDataEventHandler::sltPreprocessExtraDataCanChange(const QUuid &uMachineID, const QString &strKey, const QString &/* strValue */, bool & /* fVeto */, QString & /* strVetoReason */) 247 247 { 248 248 /* Preprocess global 'extra-data can change' event: */ 249 if ( aMachineID.isNull())249 if (uMachineID.isNull()) 250 250 { 251 251 if (strKey.startsWith("GUI/")) … … 259 259 } 260 260 261 void UIExtraDataEventHandler::sltPreprocessExtraDataChange(const QUuid & aMachineID, const QString &strKey, const QString &strValue)261 void UIExtraDataEventHandler::sltPreprocessExtraDataChange(const QUuid &uMachineID, const QString &strKey, const QString &strValue) 262 262 { 263 263 /* Preprocess global 'extra-data change' event: */ 264 if ( aMachineID.isNull())264 if (uMachineID.isNull()) 265 265 { 266 266 if (strKey.startsWith("GUI/")) … … 275 275 276 276 /* Motify listener about 'extra-data change' event: */ 277 emit sigExtraDataChange( aMachineID, strKey, strValue);277 emit sigExtraDataChange(uMachineID, strKey, strValue); 278 278 } 279 279 … … 494 494 * @{ */ 495 495 /** Handles extra-data map acknowledging. */ 496 void sltExtraDataMapAcknowledging(const QUuid & aID);496 void sltExtraDataMapAcknowledging(const QUuid &uID); 497 497 /** 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); 499 499 /** @} */ 500 500 … … 504 504 * @{ */ 505 505 /** Handles machine (un)registration. */ 506 void sltMachineRegistered(const QUuid & aID, bool fAdded);506 void sltMachineRegistered(const QUuid &uID, bool fAdded); 507 507 /** @} */ 508 508 … … 614 614 615 615 /** Adds chooser item. */ 616 void addChooserItem(const QUuid & aID,616 void addChooserItem(const QUuid &uID, 617 617 const QString &strName, 618 618 const QString &strOsTypeID, … … 622 622 const int iPosition = -1); 623 623 /** Adds chooser item by ID. */ 624 void addChooserItemByID(const QUuid & aID,624 void addChooserItemByID(const QUuid &uID, 625 625 const int iPosition = -1); 626 626 … … 752 752 } 753 753 754 void UIExtraDataManagerWindow::sltMachineRegistered(const QUuid & aID, bool fRegistered)754 void UIExtraDataManagerWindow::sltMachineRegistered(const QUuid &uID, bool fRegistered) 755 755 { 756 756 /* Machine registered: */ … … 771 771 const QUuid uIteratedID = machine.GetId(); 772 772 /* If 'iterated ID' equal to 'added ID' => break now: */ 773 if (uIteratedID == aID)773 if (uIteratedID == uID) 774 774 break; 775 775 /* If 'iterated ID' is 'known ID' => remember it: */ … … 779 779 780 780 /* Add new chooser item into source-model: */ 781 addChooserItemByID( aID, knownIDs.indexOf(uPositionID) + 1);781 addChooserItemByID(uID, knownIDs.indexOf(uPositionID) + 1); 782 782 /* And sort proxy-model: */ 783 783 m_pModelProxyOfChooser->sort(0, Qt::AscendingOrder); … … 790 790 /* Remove chooser item with 'removed ID' if it is among 'known IDs': */ 791 791 for (int iRow = 0; iRow < m_pModelSourceOfChooser->rowCount(); ++iRow) 792 if (chooserID(iRow) == aID)792 if (chooserID(iRow) == uID) 793 793 m_pModelSourceOfChooser->removeRow(iRow); 794 794 } 795 795 } 796 796 797 void UIExtraDataManagerWindow::sltExtraDataMapAcknowledging(const QUuid & aID)797 void UIExtraDataManagerWindow::sltExtraDataMapAcknowledging(const QUuid &uID) 798 798 { 799 799 /* Update item with 'changed ID' if it is among 'known IDs': */ 800 800 for (int iRow = 0; iRow < m_pModelSourceOfChooser->rowCount(); ++iRow) 801 if (chooserID(iRow) == aID)801 if (chooserID(iRow) == uID) 802 802 m_pModelSourceOfChooser->itemFromIndex(chooserIndex(iRow))->setData(true, Field_Known); 803 803 } 804 804 805 void UIExtraDataManagerWindow::sltExtraDataChange(const QUuid & aID, const QString &strKey, const QString &strValue)805 void UIExtraDataManagerWindow::sltExtraDataChange(const QUuid &uID, const QString &strKey, const QString &strValue) 806 806 { 807 807 /* Skip unrelated IDs: */ 808 if (currentChooserID() != aID)808 if (currentChooserID() != uID) 809 809 return; 810 810 … … 834 834 /* Look for the proper place for 'changed key': */ 835 835 QString strPositionKey; 836 foreach (const QString &strIteratedKey, gEDataManager->map( aID).keys())836 foreach (const QString &strIteratedKey, gEDataManager->map(uID).keys()) 837 837 { 838 838 /* If 'iterated key' equal to 'changed key' => break now: */ … … 1821 1821 } 1822 1822 1823 void UIExtraDataManagerWindow::addChooserItem(const QUuid & aID,1823 void UIExtraDataManagerWindow::addChooserItem(const QUuid &uID, 1824 1824 const QString &strName, 1825 1825 const QString &strOsTypeID, … … 1833 1833 pItem->setEditable(false); 1834 1834 /* Contains passed ID: */ 1835 pItem->setData( aID, Field_ID);1835 pItem->setData(uID, Field_ID); 1836 1836 /* Contains passed name: */ 1837 1837 pItem->setData(strName, Field_Name); … … 1839 1839 pItem->setData(strOsTypeID, Field_OsTypeID); 1840 1840 /* 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); 1842 1842 /* If insert position defined: */ 1843 1843 if (iPosition != -1) … … 1863 1863 } 1864 1864 1865 void UIExtraDataManagerWindow::addChooserItemByID(const QUuid & aID,1865 void UIExtraDataManagerWindow::addChooserItemByID(const QUuid &uID, 1866 1866 const int iPosition /* = -1 */) 1867 1867 { 1868 1868 /* 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); 1871 1871 1872 1872 /* Search for the corresponding machine by ID: */ 1873 1873 CVirtualBox vbox = vboxGlobal().virtualBox(); 1874 const CMachine machine = vbox.FindMachine( aID.toString());1874 const CMachine machine = vbox.FindMachine(uID.toString()); 1875 1875 /* Make sure VM is accessible: */ 1876 1876 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); 1878 1878 } 1879 1879 … … 2086 2086 #endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */ 2087 2087 2088 void UIExtraDataManager::hotloadMachineExtraDataMap(const QUuid & aID)2088 void UIExtraDataManager::hotloadMachineExtraDataMap(const QUuid &uID) 2089 2089 { 2090 2090 /* 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())); 2093 2093 /* Which is not loaded yet: */ 2094 AssertReturnVoid(!m_data.contains( aID));2094 AssertReturnVoid(!m_data.contains(uID)); 2095 2095 2096 2096 /* Search for corresponding machine: */ 2097 2097 CVirtualBox vbox = vboxGlobal().virtualBox(); 2098 CMachine machine = vbox.FindMachine( aID.toString());2098 CMachine machine = vbox.FindMachine(uID.toString()); 2099 2099 AssertReturnVoid(vbox.isOk() && !machine.isNull()); 2100 2100 2101 2101 /* Make sure at least empty map is created: */ 2102 m_data[ aID] = ExtraDataMap();2102 m_data[uID] = ExtraDataMap(); 2103 2103 2104 2104 /* Do not handle inaccessible machine: */ … … 2108 2108 /* Load machine extra-data map: */ 2109 2109 foreach (const QString &strKey, machine.GetExtraDataKeys()) 2110 m_data[ aID][strKey] = machine.GetExtraData(strKey);2110 m_data[uID][strKey] = machine.GetExtraData(strKey); 2111 2111 2112 2112 /* 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 2116 QString UIExtraDataManager::extraDataString(const QString &strKey, const QUuid &uID /* = GlobalID */) 2117 2117 { 2118 2118 /* Get the value. Return 'QString()' if not found: */ 2119 const QString strValue = extraDataStringUnion(strKey, aID);2119 const QString strValue = extraDataStringUnion(strKey, uID); 2120 2120 if (strValue.isNull()) 2121 2121 return QString(); … … 2125 2125 } 2126 2126 2127 void UIExtraDataManager::setExtraDataString(const QString &strKey, const QString &strValue, const QUuid & aID /* = GlobalID */)2127 void UIExtraDataManager::setExtraDataString(const QString &strKey, const QString &strValue, const QUuid &uID /* = GlobalID */) 2128 2128 { 2129 2129 /* Make sure VBoxSVC is available: */ … … 2132 2132 2133 2133 /* 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); 2136 2136 2137 2137 /* Access corresponding map: */ 2138 ExtraDataMap &data = m_data[ aID];2138 ExtraDataMap &data = m_data[uID]; 2139 2139 2140 2140 /* [Re]cache passed value: */ … … 2142 2142 2143 2143 /* Global extra-data: */ 2144 if ( aID == GlobalID)2144 if (uID == GlobalID) 2145 2145 { 2146 2146 /* Get global object: */ … … 2156 2156 /* Search for corresponding machine: */ 2157 2157 CVirtualBox vbox = vboxGlobal().virtualBox(); 2158 const CMachine machine = vbox.FindMachine( aID.toString());2158 const CMachine machine = vbox.FindMachine(uID.toString()); 2159 2159 AssertReturnVoid(vbox.isOk() && !machine.isNull()); 2160 2160 /* Check the configuration access-level: */ … … 2165 2165 CSession session; 2166 2166 if (cLevel == ConfigurationAccessLevel_Full) 2167 session = vboxGlobal().openSession( aID);2167 session = vboxGlobal().openSession(uID); 2168 2168 else 2169 session = vboxGlobal().openExistingSession( aID);2169 session = vboxGlobal().openExistingSession(uID); 2170 2170 AssertReturnVoid(!session.isNull()); 2171 2171 /* Get machine from that session: */ … … 2179 2179 } 2180 2180 2181 QStringList UIExtraDataManager::extraDataStringList(const QString &strKey, const QUuid & aID /* = GlobalID */)2181 QStringList UIExtraDataManager::extraDataStringList(const QString &strKey, const QUuid &uID /* = GlobalID */) 2182 2182 { 2183 2183 /* Get the value. Return 'QStringList()' if not found: */ 2184 const QString strValue = extraDataStringUnion(strKey, aID);2184 const QString strValue = extraDataStringUnion(strKey, uID); 2185 2185 if (strValue.isNull()) 2186 2186 return QStringList(); … … 2191 2191 } 2192 2192 2193 void UIExtraDataManager::setExtraDataStringList(const QString &strKey, const QStringList &value, const QUuid & aID /* = GlobalID */)2193 void UIExtraDataManager::setExtraDataStringList(const QString &strKey, const QStringList &value, const QUuid &uID /* = GlobalID */) 2194 2194 { 2195 2195 /* Make sure VBoxSVC is available: */ … … 2198 2198 2199 2199 /* 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); 2202 2202 2203 2203 /* Access corresponding map: */ 2204 ExtraDataMap &data = m_data[ aID];2204 ExtraDataMap &data = m_data[uID]; 2205 2205 2206 2206 /* [Re]cache passed value: */ … … 2208 2208 2209 2209 /* Global extra-data: */ 2210 if ( aID == GlobalID)2210 if (uID == GlobalID) 2211 2211 { 2212 2212 /* Get global object: */ … … 2222 2222 /* Search for corresponding machine: */ 2223 2223 CVirtualBox vbox = vboxGlobal().virtualBox(); 2224 const CMachine machine = vbox.FindMachine( aID.toString());2224 const CMachine machine = vbox.FindMachine(uID.toString()); 2225 2225 AssertReturnVoid(vbox.isOk() && !machine.isNull()); 2226 2226 /* Check the configuration access-level: */ … … 2231 2231 CSession session; 2232 2232 if (cLevel == ConfigurationAccessLevel_Full) 2233 session = vboxGlobal().openSession( aID);2233 session = vboxGlobal().openSession(uID); 2234 2234 else 2235 session = vboxGlobal().openExistingSession( aID);2235 session = vboxGlobal().openExistingSession(uID); 2236 2236 AssertReturnVoid(!session.isNull()); 2237 2237 /* Get machine from that session: */ … … 2263 2263 } 2264 2264 2265 QStringList UIExtraDataManager::suppressedMessages(const QUuid & aID /* = GlobalID */)2266 { 2267 return extraDataStringList(GUI_SuppressMessages, aID);2265 QStringList UIExtraDataManager::suppressedMessages(const QUuid &uID /* = GlobalID */) 2266 { 2267 return extraDataStringList(GUI_SuppressMessages, uID); 2268 2268 } 2269 2269 … … 2355 2355 } 2356 2356 2357 QList<MachineSettingsPageType> UIExtraDataManager::restrictedMachineSettingsPages(const QUuid & aID)2357 QList<MachineSettingsPageType> UIExtraDataManager::restrictedMachineSettingsPages(const QUuid &uID) 2358 2358 { 2359 2359 /* Prepare result: */ 2360 2360 QList<MachineSettingsPageType> result; 2361 2361 /* Get restricted machine-settings-pages: */ 2362 foreach (const QString &strValue, extraDataStringList(GUI_RestrictedMachineSettingsPages, aID))2362 foreach (const QString &strValue, extraDataStringList(GUI_RestrictedMachineSettingsPages, uID)) 2363 2363 { 2364 2364 MachineSettingsPageType value = gpConverter->fromInternalString<MachineSettingsPageType>(strValue); … … 2977 2977 } 2978 2978 2979 bool UIExtraDataManager::showMachineInSelectorChooser(const QUuid & aID)2979 bool UIExtraDataManager::showMachineInSelectorChooser(const QUuid &uID) 2980 2980 { 2981 2981 /* '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 2985 bool UIExtraDataManager::showMachineInSelectorDetails(const QUuid &uID) 2986 2986 { 2987 2987 /* '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 2991 bool UIExtraDataManager::machineReconfigurationEnabled(const QUuid &uID) 2992 2992 { 2993 2993 /* '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 2997 bool UIExtraDataManager::machineSnapshotOperationsEnabled(const QUuid &uID) 2998 2998 { 2999 2999 /* '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 3003 bool UIExtraDataManager::machineFirstTimeStarted(const QUuid &uID) 3004 3004 { 3005 3005 /* '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 3009 void UIExtraDataManager::setMachineFirstTimeStarted(bool fFirstTimeStarted, const QUuid &uID) 3010 3010 { 3011 3011 /* '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 3015 QStringList UIExtraDataManager::machineWindowIconNames(const QUuid &uID) 3016 { 3017 return extraDataStringList(GUI_MachineWindowIcons, uID); 3018 3018 } 3019 3019 3020 3020 #ifndef VBOX_WS_MAC 3021 QString UIExtraDataManager::machineWindowNamePostfix(const QUuid & aID)3022 { 3023 return extraDataString(GUI_MachineWindowNamePostfix, aID);3021 QString UIExtraDataManager::machineWindowNamePostfix(const QUuid &uID) 3022 { 3023 return extraDataString(GUI_MachineWindowNamePostfix, uID); 3024 3024 } 3025 3025 #endif /* !VBOX_WS_MAC */ 3026 3026 3027 QRect UIExtraDataManager::machineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QUuid & aID)3027 QRect UIExtraDataManager::machineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QUuid &uID) 3028 3028 { 3029 3029 /* Choose corresponding key: */ … … 3037 3037 3038 3038 /* Get corresponding extra-data: */ 3039 const QStringList data = extraDataStringList(strKey, aID);3039 const QStringList data = extraDataStringList(strKey, uID); 3040 3040 3041 3041 /* Parse loaded data: */ … … 3059 3059 } 3060 3060 3061 bool UIExtraDataManager::machineWindowShouldBeMaximized(UIVisualStateType visualStateType, ulong uScreenIndex, const QUuid & aID)3061 bool UIExtraDataManager::machineWindowShouldBeMaximized(UIVisualStateType visualStateType, ulong uScreenIndex, const QUuid &uID) 3062 3062 { 3063 3063 /* Choose corresponding key: */ … … 3071 3071 3072 3072 /* Get corresponding extra-data: */ 3073 const QStringList data = extraDataStringList(strKey, aID);3073 const QStringList data = extraDataStringList(strKey, uID); 3074 3074 3075 3075 /* Make sure 5th item has required value: */ … … 3077 3077 } 3078 3078 3079 void UIExtraDataManager::setMachineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QRect &geometry, bool fMaximized, const QUuid & aID)3079 void UIExtraDataManager::setMachineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QRect &geometry, bool fMaximized, const QUuid &uID) 3080 3080 { 3081 3081 /* Choose corresponding key: */ … … 3098 3098 3099 3099 /* Re-cache corresponding extra-data: */ 3100 setExtraDataStringList(strKey, data, aID);3100 setExtraDataStringList(strKey, data, uID); 3101 3101 } 3102 3102 3103 3103 #ifndef VBOX_WS_MAC 3104 bool UIExtraDataManager::menuBarEnabled(const QUuid & aID)3104 bool UIExtraDataManager::menuBarEnabled(const QUuid &uID) 3105 3105 { 3106 3106 /* '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 3110 void UIExtraDataManager::setMenuBarEnabled(bool fEnabled, const QUuid &uID) 3111 3111 { 3112 3112 /* 'False' if feature restricted, null-string otherwise: */ 3113 setExtraDataString(GUI_MenuBar_Enabled, toFeatureRestricted(!fEnabled), aID);3113 setExtraDataString(GUI_MenuBar_Enabled, toFeatureRestricted(!fEnabled), uID); 3114 3114 } 3115 3115 #endif /* !VBOX_WS_MAC */ 3116 3116 3117 bool UIExtraDataManager::menuBarContextMenuEnabled(const QUuid & aID)3117 bool UIExtraDataManager::menuBarContextMenuEnabled(const QUuid &uID) 3118 3118 { 3119 3119 /* '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 3123 void UIExtraDataManager::setMenuBarContextMenuEnabled(bool fEnabled, const QUuid &uID) 3124 3124 { 3125 3125 /* '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 3129 UIExtraDataMetaDefs::MenuType UIExtraDataManager::restrictedRuntimeMenuTypes(const QUuid &uID) 3130 3130 { 3131 3131 /* Prepare result: */ 3132 3132 UIExtraDataMetaDefs::MenuType result = UIExtraDataMetaDefs::MenuType_Invalid; 3133 3133 /* Get restricted runtime-menu-types: */ 3134 foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeMenus, aID))3134 foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeMenus, uID)) 3135 3135 { 3136 3136 UIExtraDataMetaDefs::MenuType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::MenuType>(strValue); … … 3142 3142 } 3143 3143 3144 void UIExtraDataManager::setRestrictedRuntimeMenuTypes(UIExtraDataMetaDefs::MenuType types, const QUuid & aID)3144 void UIExtraDataManager::setRestrictedRuntimeMenuTypes(UIExtraDataMetaDefs::MenuType types, const QUuid &uID) 3145 3145 { 3146 3146 /* We have MenuType enum registered, so we can enumerate it: */ … … 3171 3171 } 3172 3172 /* 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 3176 UIExtraDataMetaDefs::MenuApplicationActionType UIExtraDataManager::restrictedRuntimeMenuApplicationActionTypes(const QUuid &uID) 3177 3177 { 3178 3178 /* Prepare result: */ 3179 3179 UIExtraDataMetaDefs::MenuApplicationActionType result = UIExtraDataMetaDefs::MenuApplicationActionType_Invalid; 3180 3180 /* 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)) 3182 3182 { 3183 3183 UIExtraDataMetaDefs::MenuApplicationActionType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::MenuApplicationActionType>(strValue); … … 3189 3189 } 3190 3190 3191 void UIExtraDataManager::setRestrictedRuntimeMenuApplicationActionTypes(UIExtraDataMetaDefs::MenuApplicationActionType types, const QUuid & aID)3191 void UIExtraDataManager::setRestrictedRuntimeMenuApplicationActionTypes(UIExtraDataMetaDefs::MenuApplicationActionType types, const QUuid &uID) 3192 3192 { 3193 3193 /* We have MenuApplicationActionType enum registered, so we can enumerate it: */ … … 3218 3218 } 3219 3219 /* 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 3223 UIExtraDataMetaDefs::RuntimeMenuMachineActionType UIExtraDataManager::restrictedRuntimeMenuMachineActionTypes(const QUuid &uID) 3224 3224 { 3225 3225 /* Prepare result: */ 3226 3226 UIExtraDataMetaDefs::RuntimeMenuMachineActionType result = UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Invalid; 3227 3227 /* 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)) 3229 3229 { 3230 3230 UIExtraDataMetaDefs::RuntimeMenuMachineActionType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::RuntimeMenuMachineActionType>(strValue); … … 3248 3248 } 3249 3249 3250 void UIExtraDataManager::setRestrictedRuntimeMenuMachineActionTypes(UIExtraDataMetaDefs::RuntimeMenuMachineActionType types, const QUuid & aID)3250 void UIExtraDataManager::setRestrictedRuntimeMenuMachineActionTypes(UIExtraDataMetaDefs::RuntimeMenuMachineActionType types, const QUuid &uID) 3251 3251 { 3252 3252 /* We have RuntimeMenuMachineActionType enum registered, so we can enumerate it: */ … … 3281 3281 result << gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Nothing); 3282 3282 /* 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 3286 UIExtraDataMetaDefs::RuntimeMenuViewActionType UIExtraDataManager::restrictedRuntimeMenuViewActionTypes(const QUuid &uID) 3287 3287 { 3288 3288 /* Prepare result: */ 3289 3289 UIExtraDataMetaDefs::RuntimeMenuViewActionType result = UIExtraDataMetaDefs::RuntimeMenuViewActionType_Invalid; 3290 3290 /* 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)) 3292 3292 { 3293 3293 UIExtraDataMetaDefs::RuntimeMenuViewActionType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::RuntimeMenuViewActionType>(strValue); … … 3299 3299 } 3300 3300 3301 void UIExtraDataManager::setRestrictedRuntimeMenuViewActionTypes(UIExtraDataMetaDefs::RuntimeMenuViewActionType types, const QUuid & aID)3301 void UIExtraDataManager::setRestrictedRuntimeMenuViewActionTypes(UIExtraDataMetaDefs::RuntimeMenuViewActionType types, const QUuid &uID) 3302 3302 { 3303 3303 /* We have RuntimeMenuViewActionType enum registered, so we can enumerate it: */ … … 3328 3328 } 3329 3329 /* 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 3333 UIExtraDataMetaDefs::RuntimeMenuInputActionType UIExtraDataManager::restrictedRuntimeMenuInputActionTypes(const QUuid &uID) 3334 3334 { 3335 3335 /* Prepare result: */ 3336 3336 UIExtraDataMetaDefs::RuntimeMenuInputActionType result = UIExtraDataMetaDefs::RuntimeMenuInputActionType_Invalid; 3337 3337 /* 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)) 3339 3339 { 3340 3340 UIExtraDataMetaDefs::RuntimeMenuInputActionType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::RuntimeMenuInputActionType>(strValue); … … 3346 3346 } 3347 3347 3348 void UIExtraDataManager::setRestrictedRuntimeMenuInputActionTypes(UIExtraDataMetaDefs::RuntimeMenuInputActionType types, const QUuid & aID)3348 void UIExtraDataManager::setRestrictedRuntimeMenuInputActionTypes(UIExtraDataMetaDefs::RuntimeMenuInputActionType types, const QUuid &uID) 3349 3349 { 3350 3350 /* We have RuntimeMenuInputActionType enum registered, so we can enumerate it: */ … … 3375 3375 } 3376 3376 /* 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 3380 UIExtraDataMetaDefs::RuntimeMenuDevicesActionType UIExtraDataManager::restrictedRuntimeMenuDevicesActionTypes(const QUuid &uID) 3381 3381 { 3382 3382 /* Prepare result: */ 3383 3383 UIExtraDataMetaDefs::RuntimeMenuDevicesActionType result = UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_Invalid; 3384 3384 /* 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)) 3386 3386 { 3387 3387 UIExtraDataMetaDefs::RuntimeMenuDevicesActionType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::RuntimeMenuDevicesActionType>(strValue); … … 3404 3404 } 3405 3405 3406 void UIExtraDataManager::setRestrictedRuntimeMenuDevicesActionTypes(UIExtraDataMetaDefs::RuntimeMenuDevicesActionType types, const QUuid & aID)3406 void UIExtraDataManager::setRestrictedRuntimeMenuDevicesActionTypes(UIExtraDataMetaDefs::RuntimeMenuDevicesActionType types, const QUuid &uID) 3407 3407 { 3408 3408 /* We have RuntimeMenuDevicesActionType enum registered, so we can enumerate it: */ … … 3437 3437 result << gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_Nothing); 3438 3438 /* Save result: */ 3439 setExtraDataStringList(GUI_RestrictedRuntimeDevicesMenuActions, result, aID);3439 setExtraDataStringList(GUI_RestrictedRuntimeDevicesMenuActions, result, uID); 3440 3440 } 3441 3441 3442 3442 #ifdef VBOX_WITH_DEBUGGER_GUI 3443 UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType UIExtraDataManager::restrictedRuntimeMenuDebuggerActionTypes(const QUuid & aID)3443 UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType UIExtraDataManager::restrictedRuntimeMenuDebuggerActionTypes(const QUuid &uID) 3444 3444 { 3445 3445 /* Prepare result: */ 3446 3446 UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType result = UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType_Invalid; 3447 3447 /* 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)) 3449 3449 { 3450 3450 UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType>(strValue); … … 3456 3456 } 3457 3457 3458 void UIExtraDataManager::setRestrictedRuntimeMenuDebuggerActionTypes(UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType types, const QUuid & aID)3458 void UIExtraDataManager::setRestrictedRuntimeMenuDebuggerActionTypes(UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType types, const QUuid &uID) 3459 3459 { 3460 3460 /* We have RuntimeMenuDebuggerActionType enum registered, so we can enumerate it: */ … … 3485 3485 } 3486 3486 /* Save result: */ 3487 setExtraDataStringList(GUI_RestrictedRuntimeDebuggerMenuActions, result, aID);3487 setExtraDataStringList(GUI_RestrictedRuntimeDebuggerMenuActions, result, uID); 3488 3488 } 3489 3489 #endif /* VBOX_WITH_DEBUGGER_GUI */ 3490 3490 3491 3491 #ifdef VBOX_WS_MAC 3492 UIExtraDataMetaDefs::MenuWindowActionType UIExtraDataManager::restrictedRuntimeMenuWindowActionTypes(const QUuid & aID)3492 UIExtraDataMetaDefs::MenuWindowActionType UIExtraDataManager::restrictedRuntimeMenuWindowActionTypes(const QUuid &uID) 3493 3493 { 3494 3494 /* Prepare result: */ 3495 3495 UIExtraDataMetaDefs::MenuWindowActionType result = UIExtraDataMetaDefs::MenuWindowActionType_Invalid; 3496 3496 /* 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)) 3498 3498 { 3499 3499 UIExtraDataMetaDefs::MenuWindowActionType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::MenuWindowActionType>(strValue); … … 3505 3505 } 3506 3506 3507 void UIExtraDataManager::setRestrictedRuntimeMenuWindowActionTypes(UIExtraDataMetaDefs::MenuWindowActionType types, const QUuid & aID)3507 void UIExtraDataManager::setRestrictedRuntimeMenuWindowActionTypes(UIExtraDataMetaDefs::MenuWindowActionType types, const QUuid &uID) 3508 3508 { 3509 3509 /* We have MenuWindowActionType enum registered, so we can enumerate it: */ … … 3534 3534 } 3535 3535 /* Save result: */ 3536 setExtraDataStringList(GUI_RestrictedRuntimeWindowMenuActions, result, aID);3536 setExtraDataStringList(GUI_RestrictedRuntimeWindowMenuActions, result, uID); 3537 3537 } 3538 3538 #endif /* VBOX_WS_MAC */ 3539 3539 3540 UIExtraDataMetaDefs::MenuHelpActionType UIExtraDataManager::restrictedRuntimeMenuHelpActionTypes(const QUuid & aID)3540 UIExtraDataMetaDefs::MenuHelpActionType UIExtraDataManager::restrictedRuntimeMenuHelpActionTypes(const QUuid &uID) 3541 3541 { 3542 3542 /* Prepare result: */ 3543 3543 UIExtraDataMetaDefs::MenuHelpActionType result = UIExtraDataMetaDefs::MenuHelpActionType_Invalid; 3544 3544 /* 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)) 3546 3546 { 3547 3547 UIExtraDataMetaDefs::MenuHelpActionType value = gpConverter->fromInternalString<UIExtraDataMetaDefs::MenuHelpActionType>(strValue); … … 3553 3553 } 3554 3554 3555 void UIExtraDataManager::setRestrictedRuntimeMenuHelpActionTypes(UIExtraDataMetaDefs::MenuHelpActionType types, const QUuid & aID)3555 void UIExtraDataManager::setRestrictedRuntimeMenuHelpActionTypes(UIExtraDataMetaDefs::MenuHelpActionType types, const QUuid &uID) 3556 3556 { 3557 3557 /* We have MenuHelpActionType enum registered, so we can enumerate it: */ … … 3582 3582 } 3583 3583 /* 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 3587 UIVisualStateType UIExtraDataManager::restrictedVisualStates(const QUuid &uID) 3588 3588 { 3589 3589 /* Prepare result: */ 3590 3590 UIVisualStateType result = UIVisualStateType_Invalid; 3591 3591 /* Get restricted visual-state-types: */ 3592 foreach (const QString &strValue, extraDataStringList(GUI_RestrictedVisualStates, aID))3592 foreach (const QString &strValue, extraDataStringList(GUI_RestrictedVisualStates, uID)) 3593 3593 { 3594 3594 UIVisualStateType value = gpConverter->fromInternalString<UIVisualStateType>(strValue); … … 3600 3600 } 3601 3601 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;3602 UIVisualStateType 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; 3607 3607 return UIVisualStateType_Normal; 3608 3608 } 3609 3609 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);3610 void 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); 3615 3615 } 3616 3616 … … 3622 3622 } 3623 3623 3624 bool UIExtraDataManager::distinguishMachineWindowGroups(const QUuid & aID)3624 bool UIExtraDataManager::distinguishMachineWindowGroups(const QUuid &uID) 3625 3625 { 3626 3626 /* '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 3630 void UIExtraDataManager::setDistinguishMachineWindowGroups(const QUuid &uID, bool fEnabled) 3631 3631 { 3632 3632 /* 'True' if feature allowed, null-string otherwise: */ 3633 setExtraDataString(GUI_DistinguishMachineWindowGroups, toFeatureAllowed(fEnabled), aID);3633 setExtraDataString(GUI_DistinguishMachineWindowGroups, toFeatureAllowed(fEnabled), uID); 3634 3634 } 3635 3635 #endif /* VBOX_WS_X11 */ 3636 3636 3637 bool UIExtraDataManager::guestScreenAutoResizeEnabled(const QUuid & aID)3637 bool UIExtraDataManager::guestScreenAutoResizeEnabled(const QUuid &uID) 3638 3638 { 3639 3639 /* '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 3643 void UIExtraDataManager::setGuestScreenAutoResizeEnabled(bool fEnabled, const QUuid &uID) 3644 3644 { 3645 3645 /* '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 3649 bool UIExtraDataManager::lastGuestScreenVisibilityStatus(ulong uScreenIndex, const QUuid &uID) 3650 3650 { 3651 3651 /* Not for primary screen: */ … … 3656 3656 3657 3657 /* '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 3661 void UIExtraDataManager::setLastGuestScreenVisibilityStatus(ulong uScreenIndex, bool fEnabled, const QUuid &uID) 3662 3662 { 3663 3663 /* Not for primary screen: */ … … 3668 3668 3669 3669 /* '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 3673 QSize UIExtraDataManager::lastGuestScreenSizeHint(ulong uScreenIndex, const QUuid &uID) 3674 3674 { 3675 3675 /* Choose corresponding key: */ … … 3677 3677 3678 3678 /* Get corresponding extra-data: */ 3679 const QStringList data = extraDataStringList(strKey, aID);3679 const QStringList data = extraDataStringList(strKey, uID); 3680 3680 3681 3681 /* Parse loaded data: */ … … 3695 3695 } 3696 3696 3697 void UIExtraDataManager::setLastGuestScreenSizeHint(ulong uScreenIndex, const QSize &sizeHint, const QUuid & aID)3697 void UIExtraDataManager::setLastGuestScreenSizeHint(ulong uScreenIndex, const QSize &sizeHint, const QUuid &uID) 3698 3698 { 3699 3699 /* Choose corresponding key: */ … … 3706 3706 3707 3707 /* 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 3711 int UIExtraDataManager::hostScreenForPassedGuestScreen(int iGuestScreenIndex, const QUuid &uID) 3712 3712 { 3713 3713 /* Choose corresponding key: */ … … 3715 3715 3716 3716 /* Get value and convert it to index: */ 3717 const QString strValue = extraDataString(strKey, aID);3717 const QString strValue = extraDataString(strKey, uID); 3718 3718 bool fOk = false; 3719 3719 const int iHostScreenIndex = strValue.toULong(&fOk); … … 3723 3723 } 3724 3724 3725 void UIExtraDataManager::setHostScreenForPassedGuestScreen(int iGuestScreenIndex, int iHostScreenIndex, const QUuid & aID)3725 void UIExtraDataManager::setHostScreenForPassedGuestScreen(int iGuestScreenIndex, int iHostScreenIndex, const QUuid &uID) 3726 3726 { 3727 3727 /* Choose corresponding key: */ … … 3729 3729 3730 3730 /* 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 3734 bool UIExtraDataManager::autoMountGuestScreensEnabled(const QUuid &uID) 3735 3735 { 3736 3736 /* Show only if 'allowed' flag is set: */ 3737 return isFeatureAllowed(GUI_AutomountGuestScreens, aID);3737 return isFeatureAllowed(GUI_AutomountGuestScreens, uID); 3738 3738 } 3739 3739 3740 3740 #ifdef VBOX_WITH_VIDEOHWACCEL 3741 bool UIExtraDataManager::useLinearStretch(const QUuid & aID)3741 bool UIExtraDataManager::useLinearStretch(const QUuid &uID) 3742 3742 { 3743 3743 /* '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 3747 bool UIExtraDataManager::usePixelFormatYV12(const QUuid &uID) 3748 3748 { 3749 3749 /* '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 3753 bool UIExtraDataManager::usePixelFormatUYVY(const QUuid &uID) 3754 3754 { 3755 3755 /* '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 3759 bool UIExtraDataManager::usePixelFormatYUY2(const QUuid &uID) 3760 3760 { 3761 3761 /* '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 3765 bool UIExtraDataManager::usePixelFormatAYUV(const QUuid &uID) 3766 3766 { 3767 3767 /* 'True' unless feature restricted: */ 3768 return !isFeatureRestricted(GUI_Accelerate2D_PixformatAYUV, aID);3768 return !isFeatureRestricted(GUI_Accelerate2D_PixformatAYUV, uID); 3769 3769 } 3770 3770 #endif /* VBOX_WITH_VIDEOHWACCEL */ 3771 3771 3772 3772 #ifndef VBOX_WS_MAC 3773 bool UIExtraDataManager::miniToolbarEnabled(const QUuid & aID)3773 bool UIExtraDataManager::miniToolbarEnabled(const QUuid &uID) 3774 3774 { 3775 3775 /* '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 3779 void UIExtraDataManager::setMiniToolbarEnabled(bool fEnabled, const QUuid &uID) 3780 3780 { 3781 3781 /* '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 3785 bool UIExtraDataManager::autoHideMiniToolbar(const QUuid &uID) 3786 3786 { 3787 3787 /* '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 3791 void UIExtraDataManager::setAutoHideMiniToolbar(bool fAutoHide, const QUuid &uID) 3792 3792 { 3793 3793 /* '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 3797 Qt::AlignmentFlag UIExtraDataManager::miniToolbarAlignment(const QUuid &uID) 3798 3798 { 3799 3799 /* 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))) 3801 3801 { 3802 3802 case MiniToolbarAlignment_Top: return Qt::AlignTop; … … 3806 3806 } 3807 3807 3808 void UIExtraDataManager::setMiniToolbarAlignment(Qt::AlignmentFlag alignment, const QUuid & aID)3808 void UIExtraDataManager::setMiniToolbarAlignment(Qt::AlignmentFlag alignment, const QUuid &uID) 3809 3809 { 3810 3810 /* Remove record unless Qt::AlignTop specified separately: */ 3811 3811 switch (alignment) 3812 3812 { 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; 3814 3814 default: break; 3815 3815 } 3816 setExtraDataString(GUI_MiniToolBarAlignment, QString(), aID);3816 setExtraDataString(GUI_MiniToolBarAlignment, QString(), uID); 3817 3817 } 3818 3818 #endif /* VBOX_WS_MAC */ 3819 3819 3820 bool UIExtraDataManager::statusBarEnabled(const QUuid & aID)3820 bool UIExtraDataManager::statusBarEnabled(const QUuid &uID) 3821 3821 { 3822 3822 /* '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 3826 void UIExtraDataManager::setStatusBarEnabled(bool fEnabled, const QUuid &uID) 3827 3827 { 3828 3828 /* '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 3832 bool UIExtraDataManager::statusBarContextMenuEnabled(const QUuid &uID) 3833 3833 { 3834 3834 /* '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 3838 void UIExtraDataManager::setStatusBarContextMenuEnabled(bool fEnabled, const QUuid &uID) 3839 3839 { 3840 3840 /* '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 3844 QList<IndicatorType> UIExtraDataManager::restrictedStatusBarIndicators(const QUuid &uID) 3845 3845 { 3846 3846 /* Prepare result: */ 3847 3847 QList<IndicatorType> result; 3848 3848 /* Get restricted status-bar indicators: */ 3849 foreach (const QString &strValue, extraDataStringList(GUI_RestrictedStatusBarIndicators, aID))3849 foreach (const QString &strValue, extraDataStringList(GUI_RestrictedStatusBarIndicators, uID)) 3850 3850 { 3851 3851 const IndicatorType value = gpConverter->fromInternalString<IndicatorType>(strValue); … … 3857 3857 } 3858 3858 3859 void UIExtraDataManager::setRestrictedStatusBarIndicators(const QList<IndicatorType> &list, const QUuid & aID)3859 void UIExtraDataManager::setRestrictedStatusBarIndicators(const QList<IndicatorType> &list, const QUuid &uID) 3860 3860 { 3861 3861 /* Parse passed list: */ … … 3865 3865 3866 3866 /* 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 3870 QList<IndicatorType> UIExtraDataManager::statusBarIndicatorOrder(const QUuid &uID) 3871 3871 { 3872 3872 /* Prepare result: */ 3873 3873 QList<IndicatorType> result; 3874 3874 /* 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)) 3876 3876 { 3877 3877 const IndicatorType value = gpConverter->fromInternalString<IndicatorType>(strValue); … … 3915 3915 } 3916 3916 3917 void UIExtraDataManager::setStatusBarIndicatorOrder(const QList<IndicatorType> &list, const QUuid & aID)3917 void UIExtraDataManager::setStatusBarIndicatorOrder(const QList<IndicatorType> &list, const QUuid &uID) 3918 3918 { 3919 3919 /* Parse passed list: */ … … 3923 3923 3924 3924 /* Re-cache corresponding extra-data: */ 3925 setExtraDataStringList(GUI_StatusBar_IndicatorOrder, data, aID);3925 setExtraDataStringList(GUI_StatusBar_IndicatorOrder, data, uID); 3926 3926 } 3927 3927 3928 3928 #ifdef VBOX_WS_MAC 3929 bool UIExtraDataManager::realtimeDockIconUpdateEnabled(const QUuid & aID)3929 bool UIExtraDataManager::realtimeDockIconUpdateEnabled(const QUuid &uID) 3930 3930 { 3931 3931 /* '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 3935 void UIExtraDataManager::setRealtimeDockIconUpdateEnabled(bool fEnabled, const QUuid &uID) 3936 3936 { 3937 3937 /* '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 3941 int UIExtraDataManager::realtimeDockIconUpdateMonitor(const QUuid &uID) 3942 { 3943 return extraDataString(GUI_RealtimeDockIconUpdateMonitor, uID).toInt(); 3944 } 3945 3946 void UIExtraDataManager::setRealtimeDockIconUpdateMonitor(int iIndex, const QUuid &uID) 3947 { 3948 setExtraDataString(GUI_RealtimeDockIconUpdateMonitor, iIndex ? QString::number(iIndex) : QString(), uID); 3949 } 3950 3951 bool UIExtraDataManager::dockIconDisableOverlay(const QUuid &uID) 3952 3952 { 3953 3953 /* '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 3957 void UIExtraDataManager::setDockIconDisableOverlay(bool fDisabled, const QUuid &uID) 3958 3958 { 3959 3959 /* 'True' if feature allowed, null-string otherwise: */ 3960 setExtraDataString(GUI_DockIconDisableOverlay, toFeatureAllowed(fDisabled), aID);3960 setExtraDataString(GUI_DockIconDisableOverlay, toFeatureAllowed(fDisabled), uID); 3961 3961 } 3962 3962 #endif /* VBOX_WS_MAC */ 3963 3963 3964 bool UIExtraDataManager::passCADtoGuest(const QUuid & aID)3964 bool UIExtraDataManager::passCADtoGuest(const QUuid &uID) 3965 3965 { 3966 3966 /* '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 3970 MouseCapturePolicy UIExtraDataManager::mouseCapturePolicy(const QUuid &uID) 3971 { 3972 return gpConverter->fromInternalString<MouseCapturePolicy>(extraDataString(GUI_MouseCapturePolicy, uID)); 3973 } 3974 3975 GuruMeditationHandlerType UIExtraDataManager::guruMeditationHandlerType(const QUuid &uID) 3976 { 3977 return gpConverter->fromInternalString<GuruMeditationHandlerType>(extraDataString(GUI_GuruMeditationHandler, uID)); 3978 } 3979 3980 bool UIExtraDataManager::hidLedsSyncState(const QUuid &uID) 3981 3981 { 3982 3982 /* '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 3986 double UIExtraDataManager::scaleFactor(const QUuid &uID, const int uScreenIndex) 3987 3987 { 3988 3988 /* Get corresponding extra-data for this machine: */ 3989 QStringList data = extraDataStringList(GUI_ScaleFactor, aID);3989 QStringList data = extraDataStringList(GUI_ScaleFactor, uID); 3990 3990 3991 3991 /* 1.0 is default scale factor: */ … … 4005 4005 } 4006 4006 4007 QList<double> UIExtraDataManager::scaleFactors(const QUuid & aID)4007 QList<double> UIExtraDataManager::scaleFactors(const QUuid &uID) 4008 4008 { 4009 4009 /* Look for the scale factor for this machine first: */ 4010 QStringList data = extraDataStringList(GUI_ScaleFactor, aID);4010 QStringList data = extraDataStringList(GUI_ScaleFactor, uID); 4011 4011 4012 4012 QList<double> scaleFactorList; … … 4030 4030 } 4031 4031 4032 void UIExtraDataManager::setScaleFactor(double dScaleFactor, const QUuid & aID, const int uScreenIndex)4033 { 4034 QStringList data = extraDataStringList(GUI_ScaleFactor, aID);4032 void UIExtraDataManager::setScaleFactor(double dScaleFactor, const QUuid &uID, const int uScreenIndex) 4033 { 4034 QStringList data = extraDataStringList(GUI_ScaleFactor, uID); 4035 4035 4036 4036 /* Just make sure that we have corresponding data item: */ … … 4043 4043 4044 4044 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 4048 void UIExtraDataManager::setScaleFactors(const QList<double> &scaleFactors, const QUuid &uID) 4049 4049 { 4050 4050 QStringList data; 4051 4051 for (int i = 0; i < scaleFactors.size(); ++i) 4052 4052 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 4056 ScalingOptimizationType UIExtraDataManager::scalingOptimizationType(const QUuid &uID) 4057 { 4058 return gpConverter->fromInternalString<ScalingOptimizationType>(extraDataString(GUI_Scaling_Optimization, uID)); 4059 } 4060 4061 QRect UIExtraDataManager::informationWindowGeometry(QWidget *pWidget, QWidget *pParentWidget, const QUuid &uID) 4062 4062 { 4063 4063 /* Get corresponding extra-data: */ 4064 const QStringList data = extraDataStringList(GUI_InformationWindowGeometry, aID);4064 const QStringList data = extraDataStringList(GUI_InformationWindowGeometry, uID); 4065 4065 4066 4066 /* Parse loaded data: */ … … 4109 4109 } 4110 4110 4111 bool UIExtraDataManager::informationWindowShouldBeMaximized(const QUuid & aID)4111 bool UIExtraDataManager::informationWindowShouldBeMaximized(const QUuid &uID) 4112 4112 { 4113 4113 /* Get corresponding extra-data: */ 4114 const QStringList data = extraDataStringList(GUI_InformationWindowGeometry, aID);4114 const QStringList data = extraDataStringList(GUI_InformationWindowGeometry, uID); 4115 4115 4116 4116 /* Make sure 5th item has required value: */ … … 4118 4118 } 4119 4119 4120 void UIExtraDataManager::setInformationWindowGeometry(const QRect &geometry, bool fMaximized, const QUuid & aID)4120 void UIExtraDataManager::setInformationWindowGeometry(const QRect &geometry, bool fMaximized, const QUuid &uID) 4121 4121 { 4122 4122 /* Serialize passed values: */ … … 4130 4130 4131 4131 /* Re-cache corresponding extra-data: */ 4132 setExtraDataStringList(GUI_InformationWindowGeometry, data, aID);4132 setExtraDataStringList(GUI_InformationWindowGeometry, data, uID); 4133 4133 } 4134 4134 … … 4224 4224 } 4225 4225 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)4226 MachineCloseAction UIExtraDataManager::defaultMachineCloseAction(const QUuid &uID) 4227 { 4228 return gpConverter->fromInternalString<MachineCloseAction>(extraDataString(GUI_DefaultCloseAction, uID)); 4229 } 4230 4231 MachineCloseAction UIExtraDataManager::restrictedMachineCloseActions(const QUuid &uID) 4232 4232 { 4233 4233 /* Prepare result: */ 4234 4234 MachineCloseAction result = MachineCloseAction_Invalid; 4235 4235 /* Get restricted machine-close-actions: */ 4236 foreach (const QString &strValue, extraDataStringList(GUI_RestrictedCloseActions, aID))4236 foreach (const QString &strValue, extraDataStringList(GUI_RestrictedCloseActions, uID)) 4237 4237 { 4238 4238 MachineCloseAction value = gpConverter->fromInternalString<MachineCloseAction>(strValue); … … 4244 4244 } 4245 4245 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);4246 MachineCloseAction UIExtraDataManager::lastMachineCloseAction(const QUuid &uID) 4247 { 4248 return gpConverter->fromInternalString<MachineCloseAction>(extraDataString(GUI_LastCloseAction, uID)); 4249 } 4250 4251 void UIExtraDataManager::setLastMachineCloseAction(MachineCloseAction machineCloseAction, const QUuid &uID) 4252 { 4253 setExtraDataString(GUI_LastCloseAction, gpConverter->toInternalString(machineCloseAction), uID); 4254 } 4255 4256 QString UIExtraDataManager::machineCloseHookScript(const QUuid &uID) 4257 { 4258 return extraDataString(GUI_CloseActionHook, uID); 4259 4259 } 4260 4260 … … 4512 4512 } 4513 4513 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))4514 void 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)) 4518 4518 { 4519 4519 if (!strValue.isEmpty()) 4520 m_data[ aMachineID][strKey] = strValue;4520 m_data[uMachineID][strKey] = strValue; 4521 4521 else 4522 m_data[ aMachineID].remove(strKey);4522 m_data[uMachineID].remove(strKey); 4523 4523 } 4524 4524 4525 4525 /* Global extra-data 'change' event: */ 4526 if ( aMachineID == GlobalID)4526 if (uMachineID == GlobalID) 4527 4527 { 4528 4528 if (strKey.startsWith("GUI/")) … … 4547 4547 /* Current VM only: */ 4548 4548 if ( vboxGlobal().isVMConsoleProcess() 4549 && aMachineID == vboxGlobal().managedVMUuid())4549 && uMachineID == vboxGlobal().managedVMUuid()) 4550 4550 { 4551 4551 /* HID LEDs sync state changed (allowed if not restricted)? */ 4552 4552 if (strKey == GUI_HidLedsSync) 4553 emit sigHidLedsSyncStateChange(!isFeatureRestricted(strKey, aMachineID));4553 emit sigHidLedsSyncStateChange(!isFeatureRestricted(strKey, uMachineID)); 4554 4554 #ifdef VBOX_WS_MAC 4555 4555 /* 'Dock icon' appearance changed (allowed if not restricted)? */ 4556 4556 else if (strKey == GUI_RealtimeDockIconUpdateEnabled || 4557 4557 strKey == GUI_RealtimeDockIconUpdateMonitor) 4558 emit sigDockIconAppearanceChange(!isFeatureRestricted(strKey, aMachineID));4558 emit sigDockIconAppearanceChange(!isFeatureRestricted(strKey, uMachineID)); 4559 4559 /* 'Dock icon overlay' appearance changed (restricted if not allowed)? */ 4560 4560 else if (strKey == GUI_DockIconDisableOverlay) 4561 emit sigDockIconOverlayAppearanceChange(isFeatureAllowed(strKey, aMachineID));4561 emit sigDockIconOverlayAppearanceChange(isFeatureAllowed(strKey, uMachineID)); 4562 4562 #endif /* VBOX_WS_MAC */ 4563 4563 } … … 4581 4581 #endif /* VBOX_WS_MAC */ 4582 4582 strKey == GUI_RestrictedRuntimeHelpMenuActions) 4583 emit sigMenuBarConfigurationChange( aMachineID);4583 emit sigMenuBarConfigurationChange(uMachineID); 4584 4584 /* Status-bar configuration change: */ 4585 4585 else if (strKey == GUI_StatusBar_Enabled || 4586 4586 strKey == GUI_RestrictedStatusBarIndicators || 4587 4587 strKey == GUI_StatusBar_IndicatorOrder) 4588 emit sigStatusBarConfigurationChange( aMachineID);4588 emit sigStatusBarConfigurationChange(uMachineID); 4589 4589 /* Scale-factor change: */ 4590 else if (strKey == GUI_ScaleFactor)4591 emit sigScaleFactorChange( aMachineID);4590 else if (strKey == GUI_ScaleFactor) 4591 emit sigScaleFactorChange(uMachineID); 4592 4592 /* Scaling optimization type change: */ 4593 4593 else if (strKey == GUI_Scaling_Optimization) 4594 emit sigScalingOptimizationTypeChange( aMachineID);4594 emit sigScalingOptimizationTypeChange(uMachineID); 4595 4595 } 4596 4596 4597 4597 /* Notify listeners: */ 4598 emit sigExtraDataChange( aMachineID, strKey, strValue);4598 emit sigExtraDataChange(uMachineID, strKey, strValue); 4599 4599 } 4600 4600 … … 4677 4677 #endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */ 4678 4678 4679 QString UIExtraDataManager::extraDataStringUnion(const QString &strKey, const QUuid & aID)4680 { 4681 /* If passed strID differs from the GlobalID: */4682 if ( aID != GlobalID)4679 QString UIExtraDataManager::extraDataStringUnion(const QString &strKey, const QUuid &uID) 4680 { 4681 /* If passed uID differs from the GlobalID: */ 4682 if (uID != GlobalID) 4683 4683 { 4684 4684 /* 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); 4686 4686 /* Hot-load machine extra-data map if necessary: */ 4687 4687 if (itMap == m_data.constEnd()) 4688 4688 { 4689 hotloadMachineExtraDataMap( aID);4690 itMap = m_data.constFind( aID);4689 hotloadMachineExtraDataMap(uID); 4690 itMap = m_data.constFind(uID); 4691 4691 } 4692 4692 if (itMap != m_data.constEnd()) … … 4713 4713 } 4714 4714 4715 bool UIExtraDataManager::isFeatureAllowed(const QString &strKey, const QUuid & aID /* = GlobalID */)4715 bool UIExtraDataManager::isFeatureAllowed(const QString &strKey, const QUuid &uID /* = GlobalID */) 4716 4716 { 4717 4717 /* Get the value. Return 'false' if not found: */ 4718 const QString strValue = extraDataStringUnion(strKey, aID);4718 const QString strValue = extraDataStringUnion(strKey, uID); 4719 4719 if (strValue.isNull()) 4720 4720 return false; … … 4727 4727 } 4728 4728 4729 bool UIExtraDataManager::isFeatureRestricted(const QString &strKey, const QUuid & aID /* = GlobalID */)4729 bool UIExtraDataManager::isFeatureRestricted(const QString &strKey, const QUuid &uID /* = GlobalID */) 4730 4730 { 4731 4731 /* Get the value. Return 'false' if not found: */ 4732 const QString strValue = extraDataStringUnion(strKey, aID);4732 const QString strValue = extraDataStringUnion(strKey, uID); 4733 4733 if (strValue.isNull()) 4734 4734 return false; -
trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h
r74914 r74942 57 57 58 58 /** Notifies about extra-data map acknowledging. */ 59 void sigExtraDataMapAcknowledging(const QUuid & aID);59 void sigExtraDataMapAcknowledging(const QUuid &uID); 60 60 61 61 /** 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); 63 63 64 64 /** Notifies about GUI language change. */ … … 73 73 74 74 /** Notifies about menu-bar configuration change. */ 75 void sigMenuBarConfigurationChange(const QUuid & aMachineID);75 void sigMenuBarConfigurationChange(const QUuid &uMachineID); 76 76 /** Notifies about status-bar configuration change. */ 77 void sigStatusBarConfigurationChange(const QUuid & aMachineID);77 void sigStatusBarConfigurationChange(const QUuid &uMachineID); 78 78 79 79 /** Notifies about HID LEDs synchronization state change. */ … … 81 81 82 82 /** Notifies about the scale-factor change. */ 83 void sigScaleFactorChange(const QUuid & aMachineID);83 void sigScaleFactorChange(const QUuid &uMachineID); 84 84 85 85 /** Notifies about the scaling optimization type change. */ 86 void sigScalingOptimizationTypeChange(const QUuid & aMachineID);86 void sigScalingOptimizationTypeChange(const QUuid &uMachineID); 87 87 88 88 #ifdef VBOX_WS_MAC 89 89 /** Notifies about the HiDPI optimization type change. */ 90 void sigHiDPIOptimizationTypeChange(const QUuid & aMachineID);90 void sigHiDPIOptimizationTypeChange(const QUuid &uMachineID); 91 91 92 92 /** Mac OS X: Notifies about 'dock icon' appearance change. */ … … 113 113 /** @name Base 114 114 * @{ */ 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); } 119 119 120 120 /** Hot-load machine extra-data map. */ 121 void hotloadMachineExtraDataMap(const QUuid & aID);121 void hotloadMachineExtraDataMap(const QUuid &uID); 122 122 123 123 /** 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); 126 126 /** 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); 129 129 130 130 /** 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); 133 133 /** 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); 136 136 /** @} */ 137 137 … … 145 145 * @{ */ 146 146 /** 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); 148 148 /** Defines the @a list of supressed messages for the Message/Popup center frameworks. */ 149 149 void setSuppressedMessages(const QStringList &list); … … 190 190 QList<GlobalSettingsPageType> restrictedGlobalSettingsPages(); 191 191 /** Returns restricted machine settings pages. */ 192 QList<MachineSettingsPageType> restrictedMachineSettingsPages(const QUuid & aID);192 QList<MachineSettingsPageType> restrictedMachineSettingsPages(const QUuid &uID); 193 193 /** @} */ 194 194 … … 396 396 * @{ */ 397 397 /** Returns whether machine should be shown in selector-window chooser-pane. */ 398 bool showMachineInSelectorChooser(const QUuid & aID);398 bool showMachineInSelectorChooser(const QUuid &uID); 399 399 /** Returns whether machine should be shown in selector-window details-pane. */ 400 bool showMachineInSelectorDetails(const QUuid & aID);400 bool showMachineInSelectorDetails(const QUuid &uID); 401 401 402 402 /** Returns whether machine reconfiguration enabled. */ 403 bool machineReconfigurationEnabled(const QUuid & aID);403 bool machineReconfigurationEnabled(const QUuid &uID); 404 404 /** Returns whether machine snapshot operations enabled. */ 405 bool machineSnapshotOperationsEnabled(const QUuid & aID);405 bool machineSnapshotOperationsEnabled(const QUuid &uID); 406 406 407 407 /** Returns whether this machine is first time started. */ 408 bool machineFirstTimeStarted(const QUuid & aID);408 bool machineFirstTimeStarted(const QUuid &uID); 409 409 /** Returns whether this machine is fFirstTimeStarted. */ 410 void setMachineFirstTimeStarted(bool fFirstTimeStarted, const QUuid & aID);410 void setMachineFirstTimeStarted(bool fFirstTimeStarted, const QUuid &uID); 411 411 412 412 /** Except Mac OS X: Returns redefined machine-window icon names. */ 413 QStringList machineWindowIconNames(const QUuid & aID);413 QStringList machineWindowIconNames(const QUuid &uID); 414 414 #ifndef VBOX_WS_MAC 415 415 /** Except Mac OS X: Returns redefined machine-window name postfix. */ 416 QString machineWindowNamePostfix(const QUuid & aID);416 QString machineWindowNamePostfix(const QUuid &uID); 417 417 #endif 418 418 419 419 /** 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); 421 421 /** 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); 423 423 /** 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); 425 425 426 426 #ifndef VBOX_WS_MAC 427 427 /** Returns whether Runtime UI menu-bar is enabled. */ 428 bool menuBarEnabled(const QUuid & aID);428 bool menuBarEnabled(const QUuid &uID); 429 429 /** 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); 431 431 #endif /* !VBOX_WS_MAC */ 432 432 433 433 /** Returns whether Runtime UI menu-bar context-menu is enabled. */ 434 bool menuBarContextMenuEnabled(const QUuid & aID);434 bool menuBarContextMenuEnabled(const QUuid &uID); 435 435 /** 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); 437 437 438 438 /** Returns restricted Runtime UI menu types. */ 439 UIExtraDataMetaDefs::MenuType restrictedRuntimeMenuTypes(const QUuid & aID);439 UIExtraDataMetaDefs::MenuType restrictedRuntimeMenuTypes(const QUuid &uID); 440 440 /** Defines restricted Runtime UI menu types. */ 441 void setRestrictedRuntimeMenuTypes(UIExtraDataMetaDefs::MenuType types, const QUuid & aID);441 void setRestrictedRuntimeMenuTypes(UIExtraDataMetaDefs::MenuType types, const QUuid &uID); 442 442 443 443 /** Returns restricted Runtime UI action types for Application menu. */ 444 UIExtraDataMetaDefs::MenuApplicationActionType restrictedRuntimeMenuApplicationActionTypes(const QUuid & aID);444 UIExtraDataMetaDefs::MenuApplicationActionType restrictedRuntimeMenuApplicationActionTypes(const QUuid &uID); 445 445 /** 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); 447 447 448 448 /** Returns restricted Runtime UI action types for Machine menu. */ 449 UIExtraDataMetaDefs::RuntimeMenuMachineActionType restrictedRuntimeMenuMachineActionTypes(const QUuid & aID);449 UIExtraDataMetaDefs::RuntimeMenuMachineActionType restrictedRuntimeMenuMachineActionTypes(const QUuid &uID); 450 450 /** 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); 452 452 453 453 /** Returns restricted Runtime UI action types for View menu. */ 454 UIExtraDataMetaDefs::RuntimeMenuViewActionType restrictedRuntimeMenuViewActionTypes(const QUuid & aID);454 UIExtraDataMetaDefs::RuntimeMenuViewActionType restrictedRuntimeMenuViewActionTypes(const QUuid &uID); 455 455 /** 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); 457 457 458 458 /** Returns restricted Runtime UI action types for Input menu. */ 459 UIExtraDataMetaDefs::RuntimeMenuInputActionType restrictedRuntimeMenuInputActionTypes(const QUuid & aID);459 UIExtraDataMetaDefs::RuntimeMenuInputActionType restrictedRuntimeMenuInputActionTypes(const QUuid &uID); 460 460 /** 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); 462 462 463 463 /** Returns restricted Runtime UI action types for Devices menu. */ 464 UIExtraDataMetaDefs::RuntimeMenuDevicesActionType restrictedRuntimeMenuDevicesActionTypes(const QUuid & aID);464 UIExtraDataMetaDefs::RuntimeMenuDevicesActionType restrictedRuntimeMenuDevicesActionTypes(const QUuid &uID); 465 465 /** 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); 467 467 468 468 #ifdef VBOX_WITH_DEBUGGER_GUI 469 469 /** Returns restricted Runtime UI action types for Debugger menu. */ 470 UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType restrictedRuntimeMenuDebuggerActionTypes(const QUuid & aID);470 UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType restrictedRuntimeMenuDebuggerActionTypes(const QUuid &uID); 471 471 /** 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); 473 473 #endif /* VBOX_WITH_DEBUGGER_GUI */ 474 474 475 475 #ifdef VBOX_WS_MAC 476 476 /** 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); 478 478 /** 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); 480 480 #endif /* VBOX_WS_MAC */ 481 481 482 482 /** Returns restricted Runtime UI action types for Help menu. */ 483 UIExtraDataMetaDefs::MenuHelpActionType restrictedRuntimeMenuHelpActionTypes(const QUuid & aID);483 UIExtraDataMetaDefs::MenuHelpActionType restrictedRuntimeMenuHelpActionTypes(const QUuid &uID); 484 484 /** 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); 486 486 487 487 /** Returns restricted Runtime UI visual-states. */ 488 UIVisualStateType restrictedVisualStates(const QUuid & aID);488 UIVisualStateType restrictedVisualStates(const QUuid &uID); 489 489 490 490 /** Returns requested Runtime UI visual-state. */ 491 UIVisualStateType requestedVisualState(const QUuid & aID);491 UIVisualStateType requestedVisualState(const QUuid &uID); 492 492 /** 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); 494 494 495 495 #ifdef VBOX_WS_X11 … … 498 498 499 499 /** Returns whether internal machine-window name should be unique. */ 500 bool distinguishMachineWindowGroups(const QUuid & aID);500 bool distinguishMachineWindowGroups(const QUuid &uID); 501 501 /** 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); 503 503 #endif /* VBOX_WS_X11 */ 504 504 505 505 /** Returns whether guest-screen auto-resize according machine-window size is enabled. */ 506 bool guestScreenAutoResizeEnabled(const QUuid & aID);506 bool guestScreenAutoResizeEnabled(const QUuid &uID); 507 507 /** 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); 509 509 510 510 /** 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); 512 512 /** 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); 514 514 515 515 /** 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); 517 517 /** 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); 519 519 520 520 /** 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); 522 522 /** 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); 524 524 525 525 /** Returns whether automatic mounting/unmounting of guest-screens enabled. */ 526 bool autoMountGuestScreensEnabled(const QUuid & aID);526 bool autoMountGuestScreensEnabled(const QUuid &uID); 527 527 528 528 #ifdef VBOX_WITH_VIDEOHWACCEL 529 529 /** Returns whether 2D acceleration should use linear sretch. */ 530 bool useLinearStretch(const QUuid & aID);530 bool useLinearStretch(const QUuid &uID); 531 531 /** Returns whether 2D acceleration should use YV12 pixel format. */ 532 bool usePixelFormatYV12(const QUuid & aID);532 bool usePixelFormatYV12(const QUuid &uID); 533 533 /** Returns whether 2D acceleration should use UYVY pixel format. */ 534 bool usePixelFormatUYVY(const QUuid & aID);534 bool usePixelFormatUYVY(const QUuid &uID); 535 535 /** Returns whether 2D acceleration should use YUY2 pixel format. */ 536 bool usePixelFormatYUY2(const QUuid & aID);536 bool usePixelFormatYUY2(const QUuid &uID); 537 537 /** Returns whether 2D acceleration should use AYUV pixel format. */ 538 bool usePixelFormatAYUV(const QUuid & aID);538 bool usePixelFormatAYUV(const QUuid &uID); 539 539 #endif /* VBOX_WITH_VIDEOHWACCEL */ 540 540 541 541 #ifndef VBOX_WS_MAC 542 542 /** Returns whether mini-toolbar is enabled for full and seamless screens. */ 543 bool miniToolbarEnabled(const QUuid & aID);543 bool miniToolbarEnabled(const QUuid &uID); 544 544 /** 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); 546 546 547 547 /** Returns whether mini-toolbar should auto-hide itself. */ 548 bool autoHideMiniToolbar(const QUuid & aID);548 bool autoHideMiniToolbar(const QUuid &uID); 549 549 /** Defines whether mini-toolbar should @a fAutoHide itself. */ 550 void setAutoHideMiniToolbar(bool fAutoHide, const QUuid & aID);550 void setAutoHideMiniToolbar(bool fAutoHide, const QUuid &uID); 551 551 552 552 /** Returns mini-toolbar alignment. */ 553 Qt::AlignmentFlag miniToolbarAlignment(const QUuid & aID);553 Qt::AlignmentFlag miniToolbarAlignment(const QUuid &uID); 554 554 /** Returns mini-toolbar @a alignment. */ 555 void setMiniToolbarAlignment(Qt::AlignmentFlag alignment, const QUuid & aID);555 void setMiniToolbarAlignment(Qt::AlignmentFlag alignment, const QUuid &uID); 556 556 #endif /* VBOX_WS_MAC */ 557 557 558 558 /** Returns whether Runtime UI status-bar is enabled. */ 559 bool statusBarEnabled(const QUuid & aID);559 bool statusBarEnabled(const QUuid &uID); 560 560 /** 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); 562 562 563 563 /** Returns whether Runtime UI status-bar context-menu is enabled. */ 564 bool statusBarContextMenuEnabled(const QUuid & aID);564 bool statusBarContextMenuEnabled(const QUuid &uID); 565 565 /** 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); 567 567 568 568 /** Returns restricted Runtime UI status-bar indicator list. */ 569 QList<IndicatorType> restrictedStatusBarIndicators(const QUuid & aID);569 QList<IndicatorType> restrictedStatusBarIndicators(const QUuid &uID); 570 570 /** 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); 572 572 573 573 /** Returns Runtime UI status-bar indicator order list. */ 574 QList<IndicatorType> statusBarIndicatorOrder(const QUuid & aID);574 QList<IndicatorType> statusBarIndicatorOrder(const QUuid &uID); 575 575 /** 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); 577 577 578 578 #ifdef VBOX_WS_MAC 579 579 /** Mac OS X: Returns whether Dock icon should be updated at runtime. */ 580 bool realtimeDockIconUpdateEnabled(const QUuid & aID);580 bool realtimeDockIconUpdateEnabled(const QUuid &uID); 581 581 /** 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); 583 583 584 584 /** 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); 586 586 /** 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); 588 588 589 589 /** Mac OS X: Returns whether Dock icon overlay is disabled. */ 590 bool dockIconDisableOverlay(const QUuid & aID);590 bool dockIconDisableOverlay(const QUuid &uID); 591 591 /** 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); 593 593 #endif /* VBOX_WS_MAC */ 594 594 595 595 /** Returns whether machine should pass CAD to guest. */ 596 bool passCADtoGuest(const QUuid & aID);596 bool passCADtoGuest(const QUuid &uID); 597 597 598 598 /** Returns the mouse-capture policy. */ 599 MouseCapturePolicy mouseCapturePolicy(const QUuid & aID);599 MouseCapturePolicy mouseCapturePolicy(const QUuid &uID); 600 600 601 601 /** Returns redefined guru-meditation handler type. */ 602 GuruMeditationHandlerType guruMeditationHandlerType(const QUuid & aID);602 GuruMeditationHandlerType guruMeditationHandlerType(const QUuid &uID); 603 603 604 604 /** Returns whether machine should perform HID LEDs synchronization. */ 605 bool hidLedsSyncState(const QUuid & aID);605 bool hidLedsSyncState(const QUuid &uID); 606 606 607 607 /** 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); 610 610 /** Saves the @a dScaleFactor for the monitor with @a uScreenIndex. If the existing scale factor 611 611 * list (from extra data) does not have scale factors for the screens with ids in [0, uScreenIndex) 612 612 * 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); 616 616 617 617 /** Returns the scaling optimization type. */ 618 ScalingOptimizationType scalingOptimizationType(const QUuid & aID);618 ScalingOptimizationType scalingOptimizationType(const QUuid &uID); 619 619 /** @} */ 620 620 … … 622 622 * @{ */ 623 623 /** 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); 625 625 /** Returns whether information-window should be maximized or not. */ 626 bool informationWindowShouldBeMaximized(const QUuid & aID);626 bool informationWindowShouldBeMaximized(const QUuid &uID); 627 627 /** 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); 629 629 630 630 /** Returns information-window elements. */ … … 641 641 * @{ */ 642 642 /** Returns default machine close action. */ 643 MachineCloseAction defaultMachineCloseAction(const QUuid & aID);643 MachineCloseAction defaultMachineCloseAction(const QUuid &uID); 644 644 /** Returns restricted machine close actions. */ 645 MachineCloseAction restrictedMachineCloseActions(const QUuid & aID);645 MachineCloseAction restrictedMachineCloseActions(const QUuid &uID); 646 646 647 647 /** Returns last machine close action. */ 648 MachineCloseAction lastMachineCloseAction(const QUuid & aID);648 MachineCloseAction lastMachineCloseAction(const QUuid &uID); 649 649 /** Defines last @a machineCloseAction. */ 650 void setLastMachineCloseAction(MachineCloseAction machineCloseAction, const QUuid & aID);650 void setLastMachineCloseAction(MachineCloseAction machineCloseAction, const QUuid &uID); 651 651 652 652 /** Returns machine close hook script name as simple string. */ 653 QString machineCloseHookScript(const QUuid & aID);653 QString machineCloseHookScript(const QUuid &uID); 654 654 /** @} */ 655 655 … … 703 703 704 704 /** 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); 706 706 707 707 private: … … 734 734 /** Retrieves an extra-data key from both machine and global sources. 735 735 * 736 * If @a strID isn't #GlobalID, this will first check the extra-data associated737 * 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. 738 738 * 739 739 * @returns String value if found, null string if not. 740 740 * @param strKey The extra-data key to get. 741 * @param aID Machine UUID or #GlobalID.741 * @param uID Machine UUID or #GlobalID. 742 742 * @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); 744 744 /** 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, 746 746 * 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); 748 748 /** 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, 750 750 * 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); 752 752 753 753 /** Translates bool flag into QString value. */ -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp
r74914 r74942 3102 3102 #endif /* VBOX_WITH_DEBUGGER_GUI */ 3103 3103 3104 void UIActionPoolRuntime::sltHandleConfigurationChange(const QUuid & aMachineID)3104 void UIActionPoolRuntime::sltHandleConfigurationChange(const QUuid &uMachineID) 3105 3105 { 3106 3106 /* Skip unrelated machine IDs: */ 3107 if (vboxGlobal().managedVMUuid() != aMachineID)3107 if (vboxGlobal().managedVMUuid() != uMachineID) 3108 3108 return; 3109 3109 … … 3309 3309 { 3310 3310 /* Get machine ID: */ 3311 const QUuid aMachineID = vboxGlobal().managedVMUuid();3312 if ( aMachineID.isNull())3311 const QUuid uMachineID = vboxGlobal().managedVMUuid(); 3312 if (uMachineID.isNull()) 3313 3313 return; 3314 3314 3315 3315 /* 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); 3322 3322 #ifdef VBOX_WITH_DEBUGGER_GUI 3323 m_restrictedActionsMenuDebug[UIActionRestrictionLevel_Base] = gEDataManager->restrictedRuntimeMenuDebuggerActionTypes( aMachineID);3323 m_restrictedActionsMenuDebug[UIActionRestrictionLevel_Base] = gEDataManager->restrictedRuntimeMenuDebuggerActionTypes(uMachineID); 3324 3324 #endif /* VBOX_WITH_DEBUGGER_GUI */ 3325 3325 #ifdef VBOX_WS_MAC 3326 m_restrictedActionsMenuWindow[UIActionRestrictionLevel_Base] = gEDataManager->restrictedRuntimeMenuWindowActionTypes( aMachineID);3326 m_restrictedActionsMenuWindow[UIActionRestrictionLevel_Base] = gEDataManager->restrictedRuntimeMenuWindowActionTypes(uMachineID); 3327 3327 #endif /* VBOX_WS_MAC */ 3328 m_restrictedActionsMenuHelp[UIActionRestrictionLevel_Base] = gEDataManager->restrictedRuntimeMenuHelpActionTypes( aMachineID);3328 m_restrictedActionsMenuHelp[UIActionRestrictionLevel_Base] = gEDataManager->restrictedRuntimeMenuHelpActionTypes(uMachineID); 3329 3329 3330 3330 /* Recache visual state action restrictions: */ 3331 UIVisualStateType restrictedVisualStates = gEDataManager->restrictedVisualStates( aMachineID);3331 UIVisualStateType restrictedVisualStates = gEDataManager->restrictedVisualStates(uMachineID); 3332 3332 { 3333 3333 if (restrictedVisualStates & UIVisualStateType_Fullscreen) … … 3343 3343 3344 3344 /* Recache reconfiguration action restrictions: */ 3345 bool fReconfigurationAllowed = gEDataManager->machineReconfigurationEnabled( aMachineID);3345 bool fReconfigurationAllowed = gEDataManager->machineReconfigurationEnabled(uMachineID); 3346 3346 if (!fReconfigurationAllowed) 3347 3347 { … … 3363 3363 3364 3364 /* Recache snapshot related action restrictions: */ 3365 bool fSnapshotOperationsAllowed = gEDataManager->machineSnapshotOperationsEnabled( aMachineID);3365 bool fSnapshotOperationsAllowed = gEDataManager->machineSnapshotOperationsEnabled(uMachineID); 3366 3366 if (!fSnapshotOperationsAllowed) 3367 3367 { … … 3384 3384 3385 3385 /* Recache close related action restrictions: */ 3386 MachineCloseAction restrictedCloseActions = gEDataManager->restrictedMachineCloseActions( aMachineID);3386 MachineCloseAction restrictedCloseActions = gEDataManager->restrictedMachineCloseActions(uMachineID); 3387 3387 bool fAllCloseActionsRestricted = (!vboxGlobal().isSeparateProcess() || (restrictedCloseActions & MachineCloseAction_Detach)) 3388 3388 && (restrictedCloseActions & MachineCloseAction_SaveState) -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.h
r74914 r74942 200 200 201 201 /** Handles configuration-change. */ 202 void sltHandleConfigurationChange(const QUuid & aMachineID);202 void sltHandleConfigurationChange(const QUuid &uMachineID); 203 203 204 204 /** Handles 'View' : 'Scale Factor' menu : @a pAction trigger. */ -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.h
r74878 r74942 75 75 /** @name VirtualBox related signals 76 76 * @{ */ 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); 93 93 /** @} */ 94 94 95 95 /** @name VirtualBox Extra-data related signals 96 96 * @{ */ 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); 101 101 /** @} */ 102 102 … … 148 148 /** @name Progress related signals 149 149 * @{ */ 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); 154 154 /** @} */ 155 155 -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp
r74923 r74942 522 522 } 523 523 524 void UIMessageCenter::cannotFindMachineById(const CVirtualBox &vbox, const QUuid & aId) const524 void UIMessageCenter::cannotFindMachineById(const CVirtualBox &vbox, const QUuid &uId) const 525 525 { 526 526 error(0, MessageType_Error, 527 527 tr("There is no virtual machine with the identifier <b>%1</b>.") 528 .arg( aId.toString()),528 .arg(uId.toString()), 529 529 UIErrorString::formatErrorInfo(vbox)); 530 530 } … … 1021 1021 1022 1022 void UIMessageCenter::cannotFindSnapshotById(const CMachine &comMachine, 1023 const QUuid & aId,1023 const QUuid &uId, 1024 1024 QWidget *pParent /* = 0 */) const 1025 1025 { 1026 1026 error(pParent, MessageType_Error, 1027 1027 tr("Can't find snapshot with ID=<b>%1</b>.") 1028 .arg( aId.toString()),1028 .arg(uId.toString()), 1029 1029 UIErrorString::formatErrorInfo(comMachine)); 1030 1030 } -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h
r74923 r74942 251 251 void cannotLoadLanguage(const QString &strLangFile) const; 252 252 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; 254 254 void cannotOpenSession(const CSession &session) const; 255 255 void cannotOpenSession(const CMachine &machine) const; … … 301 301 void cannotChangeSnapshot(const CSnapshot &comSnapshot, const QString &strSnapshotName, const QString &strMachineName) const; 302 302 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; 304 304 void cannotAcquireSnapshotAttributes(const CSnapshot &comSnapshot, QWidget *pParent = 0); 305 305 -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVirtualBoxEventHandler.cpp
r74878 r74942 46 46 void sigVBoxSVCAvailabilityChange(bool fAvailable); 47 47 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); 64 64 65 65 public: -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVirtualBoxEventHandler.h
r74878 r74942 42 42 void sigVBoxSVCAvailabilityChange(bool fAvailable); 43 43 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); 60 60 61 61 public: -
trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
r74878 r74942 2362 2362 } 2363 2363 2364 CSession VBoxGlobal::openSession(const QUuid & aId, KLockType lockType /* = KLockType_Shared */)2364 CSession VBoxGlobal::openSession(const QUuid &uId, KLockType lockType /* = KLockType_Shared */) 2365 2365 { 2366 2366 /* Prepare session: */ … … 2380 2380 2381 2381 /* Search for the corresponding machine: */ 2382 CMachine comMachine = m_comVBox.FindMachine( aId.toString());2382 CMachine comMachine = m_comVBox.FindMachine(uId.toString()); 2383 2383 if (comMachine.isNull()) 2384 2384 { 2385 msgCenter().cannotFindMachineById(m_comVBox, aId);2385 msgCenter().cannotFindMachineById(m_comVBox, uId); 2386 2386 break; 2387 2387 } … … 2486 2486 } 2487 2487 2488 UIMedium VBoxGlobal::medium(const QUuid & aMediumID) const2488 UIMedium VBoxGlobal::medium(const QUuid &uMediumID) const 2489 2489 { 2490 2490 if (m_meCleanupProtectionToken.tryLockForRead()) … … 2493 2493 UIMedium guiMedium; 2494 2494 if (m_pMediumEnumerator) 2495 guiMedium = m_pMediumEnumerator->medium( aMediumID);2495 guiMedium = m_pMediumEnumerator->medium(uMediumID); 2496 2496 m_meCleanupProtectionToken.unlock(); 2497 2497 return guiMedium; … … 2525 2525 } 2526 2526 2527 void VBoxGlobal::deleteMedium(const QUuid & aMediumID)2527 void VBoxGlobal::deleteMedium(const QUuid &uMediumID) 2528 2528 { 2529 2529 if (m_meCleanupProtectionToken.tryLockForRead()) … … 2531 2531 /* Delete medium from medium-enumerator: */ 2532 2532 if (m_pMediumEnumerator) 2533 m_pMediumEnumerator->deleteMedium( aMediumID);2533 m_pMediumEnumerator->deleteMedium(uMediumID); 2534 2534 m_meCleanupProtectionToken.unlock(); 2535 2535 } -
trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h
r74878 r74942 90 90 /** @name COM: Virtual Media stuff. 91 91 * @{ */ 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); 96 96 97 97 /** Notifies listeners about medium enumeration started. */ 98 98 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); 101 101 /** Notifies listeners about medium enumeration finished. */ 102 102 void sigMediumEnumerationFinished(); … … 473 473 bool launchMachine(CMachine &comMachine, LaunchMode enmLaunchMode = LaunchMode_Default); 474 474 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); } 479 479 /** @} */ 480 480 … … 487 487 /** Returns whether medium enumeration is in progress. */ 488 488 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; 491 491 /** Returns enumerated medium IDs. */ 492 492 QList<QUuid> mediumIDs() const; 493 493 /** Creates medium on the basis of passed @a guiMedium description. */ 494 494 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); 497 497 498 498 /** Opens external medium by passed @a strMediumLocation. -
trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.h
r74878 r74942 52 52 void sigToggleFinished(); 53 53 /** 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); 55 55 56 56 public: -
trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
r74925 r74942 611 611 void UIVirtualBoxManager::sltOpenMachineSettingsDialog(QString strCategory /* = QString() */, 612 612 QString strControl /* = QString() */, 613 const QUuid & aID /* = QString() */)613 const QUuid &uID /* = QString() */) 614 614 { 615 615 /* Get current item: */ … … 644 644 /* Create and execute corresponding VM settings window: */ 645 645 QPointer<UISettingsDialogMachine> pDlg = new UISettingsDialogMachine(this, 646 aID.isNull() ? pItem->id() : aID,646 uID.isNull() ? pItem->id() : uID, 647 647 strCategory, strControl); 648 648 pDlg->execute(); -
trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h
r74878 r74942 119 119 /** @name CVirtualBox event handling stuff. 120 120 * @{ */ 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); 123 123 /** @} */ 124 124 … … 174 174 * @param strCategory can bring the settings category to start from. 175 175 * @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. */ 177 177 void sltOpenMachineSettingsDialog(QString strCategory = QString(), 178 178 QString strControl = QString(), 179 const QUuid & aID = QUuid());179 const QUuid &uID = QUuid()); 180 180 /** Handles call to open Machine Settings dialog the default way. */ 181 181 void sltOpenMachineSettingsDialogDefault() { sltOpenMachineSettingsDialog(); } -
trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.h
r74878 r74942 52 52 53 53 /** 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); 55 55 56 56 /** Notifies about Tool type change. */ -
trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.h
r74878 r74942 174 174 virtual void clearItems(UIChooserItemType enmType = UIChooserItemType_Any) = 0; 175 175 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; 180 180 181 181 /** 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 115 115 virtual void clearItems(UIChooserItemType enmType = UIChooserItemType_Any) /* override */; 116 116 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 */; 121 121 122 122 /** 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 657 657 } 658 658 659 void UIChooserItemGroup::updateAllItems(const QUuid & aId)659 void UIChooserItemGroup::updateAllItems(const QUuid &uId) 660 660 { 661 661 /* Update all the required items recursively: */ 662 662 foreach (UIChooserItem *pItem, items()) 663 pItem->updateAllItems( aId);664 } 665 666 void UIChooserItemGroup::removeAllItems(const QUuid & aId)663 pItem->updateAllItems(uId); 664 } 665 666 void UIChooserItemGroup::removeAllItems(const QUuid &uId) 667 667 { 668 668 /* Remove all the required items recursively: */ 669 669 foreach (UIChooserItem *pItem, items()) 670 pItem->removeAllItems( aId);670 pItem->removeAllItems(uId); 671 671 } 672 672 … … 1319 1319 } 1320 1320 1321 bool UIChooserItemGroup::isContainsMachine(const QUuid & aId) const1321 bool UIChooserItemGroup::isContainsMachine(const QUuid &uId) const 1322 1322 { 1323 1323 /* Check each machine-item: */ 1324 1324 foreach (UIChooserItem *pItem, m_machineItems) 1325 if (pItem->toMachineItem()->id() == aId)1325 if (pItem->toMachineItem()->id() == uId) 1326 1326 return true; 1327 1327 /* Found nothing? */ -
trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.h
r74878 r74942 161 161 virtual void clearItems(UIChooserItemType enmType = UIChooserItemType_Any) /* override */; 162 162 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 */; 167 167 168 168 /** Searches for a first child item answering to specified @a strSearchTag and @a iItemSearchFlags. */ … … 280 280 /** @name Children stuff. 281 281 * @{ */ 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; 284 284 /** Returns whether group contains locked machine. */ 285 285 bool isContainsLockedMachine(); -
trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
r74878 r74942 346 346 } 347 347 348 void UIChooserItemMachine::updateAllItems(const QUuid & aId)348 void UIChooserItemMachine::updateAllItems(const QUuid &uId) 349 349 { 350 350 /* Skip other ids: */ 351 if (id() != QUuid( aId))351 if (id() != QUuid(uId)) 352 352 return; 353 353 … … 365 365 } 366 366 367 void UIChooserItemMachine::removeAllItems(const QUuid & aId)367 void UIChooserItemMachine::removeAllItems(const QUuid &uId) 368 368 { 369 369 /* Skip wrong id: */ 370 if (id() != QUuid( aId))370 if (id() != QUuid(uId)) 371 371 return; 372 372 -
trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.h
r74878 r74942 131 131 virtual void clearItems(UIChooserItemType enmType = UIChooserItemType_Any) /* override */; 132 132 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 */; 137 137 138 138 /** 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 749 749 } 750 750 751 void UIChooserModel::sltMachineStateChanged(const QUuid & aId, const KMachineState)751 void UIChooserModel::sltMachineStateChanged(const QUuid &uId, const KMachineState) 752 752 { 753 753 /* 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 757 void UIChooserModel::sltMachineDataChanged(const QUuid &uId) 758 758 { 759 759 /* 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 763 void UIChooserModel::sltMachineRegistered(const QUuid &uId, const bool fRegistered) 764 764 { 765 765 /* New VM registered? */ … … 767 767 { 768 768 /* Search for corresponding machine: */ 769 CMachine comMachine = vboxGlobal().virtualBox().FindMachine( aId.toString());769 CMachine comMachine = vboxGlobal().virtualBox().FindMachine(uId.toString()); 770 770 /* Should we show this machine? */ 771 if (gEDataManager->showMachineInSelectorChooser( aId))771 if (gEDataManager->showMachineInSelectorChooser(uId)) 772 772 { 773 773 /* Add new machine-item: */ … … 777 777 updateLayout(); 778 778 /* Change current-item only if VM was created from the GUI side: */ 779 if ( aId == m_uLastCreatedMachineId)779 if (uId == m_uLastCreatedMachineId) 780 780 { 781 781 setCurrentItem(mainRoot()->searchForItem(comMachine.GetName(), … … 789 789 { 790 790 /* Remove machine-items with passed id: */ 791 mainRoot()->removeAllItems( aId.toString());791 mainRoot()->removeAllItems(uId.toString()); 792 792 /* Update model: */ 793 793 cleanupGroupTree(); … … 805 805 } 806 806 807 void UIChooserModel::sltSessionStateChanged(const QUuid & aId, const KSessionState)807 void UIChooserModel::sltSessionStateChanged(const QUuid &uId, const KSessionState) 808 808 { 809 809 /* 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 813 void UIChooserModel::sltSnapshotChanged(const QUuid &uId, const QUuid &) 814 814 { 815 815 /* Update machine-items with passed id: */ 816 mainRoot()->updateAllItems( aId);816 mainRoot()->updateAllItems(uId); 817 817 } 818 818 … … 1063 1063 } 1064 1064 1065 void UIChooserModel::sltReloadMachine(const QUuid & aId)1065 void UIChooserModel::sltReloadMachine(const QUuid &uId) 1066 1066 { 1067 1067 /* Remove all the items first: */ 1068 mainRoot()->removeAllItems( aId);1068 mainRoot()->removeAllItems(uId); 1069 1069 /* Wipe out empty groups: */ 1070 1070 cleanupGroupTree(); 1071 1071 1072 1072 /* 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)) 1075 1075 addMachineIntoTheTree(comMachine); 1076 1076 -
trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h
r74915 r74942 266 266 /** @name Main event handling stuff. 267 267 * @{ */ 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); 278 278 /** @} */ 279 279 … … 304 304 /** Handles group selected machines request. */ 305 305 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); 308 308 /** Handles sort parent group request. */ 309 309 void sltSortParentGroup(); … … 537 537 signals: 538 538 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); 541 541 542 542 /** Notifies about task is complete. */ -
trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetails.h
r74878 r74942 38 38 * @param strCategory Brings link category. 39 39 * @param strControl Brings control name. 40 * @param strId Brings machine ID. */40 * @param uId Brings machine ID. */ 41 41 void sigLinkClicked(const QString &strCategory, 42 42 const QString &strControl, 43 const QUuid & aId);43 const QUuid &uId); 44 44 45 45 /** Notifies listeners about sliding started. */ -
trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.h
r74878 r74942 63 63 * @param strCategory Brings the link category. 64 64 * @param strControl Brings the wanted settings control. 65 * @param strIdBrings 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); 67 67 /** @} */ 68 68 -
trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp
r74878 r74942 172 172 } 173 173 174 void UIDetailsGroup::sltBuildStep(const QUuid & aStepId, int iStepNumber)174 void UIDetailsGroup::sltBuildStep(const QUuid &uStepId, int iStepNumber) 175 175 { 176 176 /* Cleanup build-step: */ … … 179 179 180 180 /* Is step id valid? */ 181 if ( aStepId != m_uGroupId)181 if (uStepId != m_uGroupId) 182 182 return; 183 183 … … 194 194 195 195 /* Create next build-step: */ 196 m_pBuildStep = new UIPrepareStep(this, pSet, aStepId, iStepNumber + 1);196 m_pBuildStep = new UIPrepareStep(this, pSet, uStepId, iStepNumber + 1); 197 197 198 198 /* Build set: */ -
trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.h
r74878 r74942 83 83 * @{ */ 84 84 /** Handles request about starting step build. 85 * @param strStepId Brings the step ID.85 * @param uStepId Brings the step ID. 86 86 * @param iStepNumber Brings the step number. */ 87 87 /** @} */ 88 virtual void sltBuildStep(const QUuid & aStepId, int iStepNumber) /* override */;88 virtual void sltBuildStep(const QUuid &uStepId, int iStepNumber) /* override */; 89 89 90 90 protected: -
trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsItem.cpp
r74878 r74942 281 281 *********************************************************************************************************************************/ 282 282 283 UIPrepareStep::UIPrepareStep(QObject *pParent, QObject *pBuildObject, const QUuid & aStepId, int iStepNumber)283 UIPrepareStep::UIPrepareStep(QObject *pParent, QObject *pBuildObject, const QUuid &uStepId, int iStepNumber) 284 284 : QObject(pParent) 285 , m_uStepId( aStepId)285 , m_uStepId(uStepId) 286 286 , m_iStepNumber(iStepNumber) 287 287 { -
trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsItem.h
r74878 r74942 57 57 * @{ */ 58 58 /** Notifies listeners about step build should be started. 59 * @param strStepId Brings the step ID.59 * @param uStepId Brings the step ID. 60 60 * @param iStepNumber Brings the step number. */ 61 void sigBuildStep(const QUuid & aStepId, int iStepNumber);61 void sigBuildStep(const QUuid &uStepId, int iStepNumber); 62 62 /** Notifies listeners about step build complete. */ 63 63 void sigBuildDone(); … … 127 127 * @{ */ 128 128 /** Handles request about starting step build. 129 * @param strStepId Brings the step ID.129 * @param uStepId Brings the step ID. 130 130 * @param iStepNumber Brings the step number. */ 131 131 /** @} */ 132 virtual void sltBuildStep(const QUuid & aStepId, int iStepNumber);132 virtual void sltBuildStep(const QUuid &uStepId, int iStepNumber); 133 133 134 134 protected: … … 163 163 /** Constructs step preparing object passing @a pParent to the base-class. 164 164 * @param pBuildObject Brings the build object reference. 165 * @param strStepIdBrings the step ID.165 * @param uStepId Brings the step ID. 166 166 * @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); 168 168 169 169 private slots: -
trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsModel.h
r74878 r74942 54 54 55 55 /* 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); 57 57 58 58 public: -
trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp
r74878 r74942 115 115 } 116 116 117 void UIDetailsSet::sltBuildStep(const QUuid & aStepId, int iStepNumber)117 void UIDetailsSet::sltBuildStep(const QUuid &uStepId, int iStepNumber) 118 118 { 119 119 /* Cleanup build-step: */ … … 122 122 123 123 /* Is step id valid? */ 124 if ( aStepId != m_uSetId)124 if (uStepId != m_uSetId) 125 125 return; 126 126 … … 175 175 { 176 176 /* Create next build-step: */ 177 m_pBuildStep = new UIPrepareStep(this, pElement, aStepId, iStepNumber + 1);177 m_pBuildStep = new UIPrepareStep(this, pElement, uStepId, iStepNumber + 1); 178 178 179 179 /* Build element: */ … … 184 184 { 185 185 /* Just build next step: */ 186 sltBuildStep( aStepId, iStepNumber + 1);186 sltBuildStep(uStepId, iStepNumber + 1); 187 187 } 188 188 } … … 541 541 } 542 542 543 void UIDetailsSet::sltMachineStateChange(const QUuid & aId)543 void UIDetailsSet::sltMachineStateChange(const QUuid &uId) 544 544 { 545 545 /* Is this our VM changed? */ 546 if (m_machine.GetId() != aId)546 if (m_machine.GetId() != uId) 547 547 return; 548 548 … … 551 551 } 552 552 553 void UIDetailsSet::sltMachineAttributesChange(const QUuid & aId)553 void UIDetailsSet::sltMachineAttributesChange(const QUuid &uId) 554 554 { 555 555 /* Is this our VM changed? */ 556 if (m_machine.GetId() != aId)556 if (m_machine.GetId() != uId) 557 557 return; 558 558 -
trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.h
r74878 r74942 69 69 * @{ */ 70 70 /** Handles request about starting step build. 71 * @param strStepId Brings the step ID.71 * @param uStepId Brings the step ID. 72 72 * @param iStepNumber Brings the step number. */ 73 73 /** @} */ 74 virtual void sltBuildStep(const QUuid & aStepId, int iStepNumber) /* override */;74 virtual void sltBuildStep(const QUuid &uStepId, int iStepNumber) /* override */; 75 75 76 76 protected: … … 124 124 /** @name Event-handling stuff. 125 125 * @{ */ 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); 130 130 /** @} */ 131 131 -
trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIMachinePreview.cpp
r74878 r74942 170 170 } 171 171 172 void UIMachinePreview::sltMachineStateChange(const QUuid & aId)172 void UIMachinePreview::sltMachineStateChange(const QUuid &uId) 173 173 { 174 174 /* 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) 176 176 return; 177 177 -
trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIMachinePreview.h
r74878 r74942 66 66 67 67 /* Handler: Global-event listener stuff: */ 68 void sltMachineStateChange(const QUuid & aId);68 void sltMachineStateChange(const QUuid &uId); 69 69 70 70 /* Handler: Preview recreator: */ -
trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.cpp
r74878 r74942 571 571 572 572 /* static */ 573 QUuid UIMedium::normalizedID(const QUuid & aID)573 QUuid UIMedium::normalizedID(const QUuid &uID) 574 574 { 575 575 /// @todo wipe out! 576 return aID;576 return uID; 577 577 } 578 578 -
trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.h
r74878 r74942 167 167 /** Returns the medium cache key. */ 168 168 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; } 171 171 172 172 /** Returns the medium name. … … 306 306 307 307 /** Returns whether this medium is attached to the given machine in the current state. */ 308 bool isAttachedInCurStateTo(const Q String &strMachineId) const { return m_curStateMachineIds.indexOf(strMachineId) >= 0; }308 bool isAttachedInCurStateTo(const QUuid &uMachineId) const { return m_curStateMachineIds.indexOf(uMachineId) >= 0; } 309 309 310 310 /** Returns a vector of IDs of all machines this medium is attached to. */ … … 317 317 static QUuid nullID(); 318 318 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); 321 321 322 322 /** Determines if passed @a medium is attached to hidden machines only. */ -
trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp
r74878 r74942 102 102 } 103 103 104 UIMedium UIMediumEnumerator::medium(const QUuid & aMediumID)104 UIMedium UIMediumEnumerator::medium(const QUuid &uMediumID) 105 105 { 106 106 /* 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]; 109 109 /* Return NULL medium otherwise: */ 110 110 return UIMedium(); … … 130 130 } 131 131 132 void UIMediumEnumerator::deleteMedium(const QUuid & aMediumID)132 void UIMediumEnumerator::deleteMedium(const QUuid &uMediumID) 133 133 { 134 134 /* 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()); 137 137 /* Make sure medium still exists: */ 138 AssertReturnVoid(m_media.contains( aMediumID));138 AssertReturnVoid(m_media.contains(uMediumID)); 139 139 140 140 /* 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())); 143 143 144 144 /* Notify listener: */ 145 emit sigMediumDeleted( aMediumID);145 emit sigMediumDeleted(uMediumID); 146 146 } 147 147 … … 200 200 } 201 201 202 void UIMediumEnumerator::sltHandleMachineUpdate(const QUuid & aMachineID)202 void UIMediumEnumerator::sltHandleMachineUpdate(const QUuid &uMachineID) 203 203 { 204 204 LogRel2(("GUI: UIMediumEnumerator: Machine (or snapshot) event received, ID = %s\n", 205 aMachineID.toString().toUtf8().constData()));205 uMachineID.toString().toUtf8().constData())); 206 206 207 207 /* Gather previously used UIMedium IDs: */ 208 208 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 */); 210 210 LogRel2(("GUI: UIMediumEnumerator: Old usage: %s\n", 211 211 previousUIMediumIDs.isEmpty() ? "<empty>" : toStringList(previousUIMediumIDs).join(", ").toUtf8().constData())); … … 214 214 CMediumMap currentCMediums; 215 215 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 */); 217 217 LogRel2(("GUI: UIMediumEnumerator: New usage: %s\n", 218 218 currentCMediumIDs.isEmpty() ? "<empty>" : toStringList(currentCMediumIDs).join(", ").toUtf8().constData())); … … 235 235 236 236 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 240 void UIMediumEnumerator::sltHandleMachineRegistration(const QUuid &uMachineID, const bool fRegistered) 241 241 { 242 242 LogRel2(("GUI: UIMediumEnumerator: Machine %s event received, ID = %s\n", 243 243 fRegistered ? "registration" : "unregistration", 244 aMachineID.toString().toUtf8().constData()));244 uMachineID.toString().toUtf8().constData())); 245 245 246 246 /* Machine was registered: */ … … 250 250 CMediumMap currentCMediums; 251 251 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 */); 253 253 LogRel2(("GUI: UIMediumEnumerator: New usage: %s\n", 254 254 currentCMediumIDs.isEmpty() ? "<empty>" : toStringList(currentCMediumIDs).join(", ").toUtf8().constData())); … … 261 261 /* Gather previously used UIMedium IDs: */ 262 262 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 */); 264 264 LogRel2(("GUI: UIMediumEnumerator: Old usage: %s\n", 265 265 previousUIMediumIDs.isEmpty() ? "<empty>" : toStringList(previousUIMediumIDs).join(", ").toUtf8().constData())); … … 270 270 LogRel2(("GUI: UIMediumEnumerator: Machine %s event processed, ID = %s\n", 271 271 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 275 void UIMediumEnumerator::sltHandleSnapshotDeleted(const QUuid &uMachineID, const QUuid &uSnapshotID) 276 276 { 277 277 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())); 279 279 280 280 /* Gather previously used UIMedium IDs: */ 281 281 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 */); 283 283 LogRel2(("GUI: UIMediumEnumerator: Old usage: %s\n", 284 284 previousUIMediumIDs.isEmpty() ? "<empty>" : toStringList(previousUIMediumIDs).join(", ").toUtf8().constData())); … … 287 287 CMediumMap currentCMediums; 288 288 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 */); 290 290 LogRel2(("GUI: UIMediumEnumerator: New usage: %s\n", 291 291 currentCMediumIDs.isEmpty() ? "<empty>" : toStringList(currentCMediumIDs).join(", ").toUtf8().constData())); … … 296 296 297 297 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())); 299 299 } 300 300 … … 419 419 /** 420 420 * 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. 422 422 * @param previousUIMediumIDs receives UIMedium IDs used in cached data. 423 423 * @param fTakeIntoAccountCurrentStateOnly defines whether we should take into accound current VM state only. 424 424 */ 425 void UIMediumEnumerator::calculateCachedUsage(const QUuid & aMachineID, QList<QUuid> &previousUIMediumIDs, const bool fTakeIntoAccountCurrentStateOnly) const425 void UIMediumEnumerator::calculateCachedUsage(const QUuid &uMachineID, QList<QUuid> &previousUIMediumIDs, const bool fTakeIntoAccountCurrentStateOnly) const 426 426 { 427 427 /* For each the UIMedium ID cache have: */ … … 435 435 uimedium.curStateMachineIds() : uimedium.machineIds(); 436 436 /* Add this UIMedium ID to previous usage if necessary: */ 437 if (machineIDs.contains( aMachineID))437 if (machineIDs.contains(uMachineID)) 438 438 previousUIMediumIDs.append(uMediumID); 439 439 } … … 442 442 /** 443 443 * 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. 445 445 * @param currentCMediums receives CMedium used in actual data. 446 446 * @param currentCMediumIDs receives CMedium IDs used in actual data. 447 447 * @param fTakeIntoAccountCurrentStateOnly defines whether we should take into accound current VM state only. 448 448 */ 449 void UIMediumEnumerator::calculateActualUsage(const QUuid & aMachineID, CMediumMap ¤tCMediums, QList<QUuid> ¤tCMediumIDs, const bool fTakeIntoAccountCurrentStateOnly) const449 void UIMediumEnumerator::calculateActualUsage(const QUuid &uMachineID, CMediumMap ¤tCMediums, QList<QUuid> ¤tCMediumIDs, const bool fTakeIntoAccountCurrentStateOnly) const 450 450 { 451 451 /* Search for corresponding machine: */ 452 CMachine machine = vboxGlobal().virtualBox().FindMachine( aMachineID.toString());452 CMachine machine = vboxGlobal().virtualBox().FindMachine(uMachineID.toString()); 453 453 if (machine.isNull()) 454 454 { -
trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.h
r74878 r74942 44 44 45 45 /* 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); 48 48 49 49 /* Notifiers: Medium-enumeration stuff: */ 50 50 void sigMediumEnumerationStarted(); 51 void sigMediumEnumerated(const QUuid & aMediumID);51 void sigMediumEnumerated(const QUuid &uMediumID); 52 52 void sigMediumEnumerationFinished(); 53 53 … … 59 59 /* API: Medium-access stuff: */ 60 60 QList<QUuid> mediumIDs() const; 61 UIMedium medium(const QUuid & aMediumID);61 UIMedium medium(const QUuid &uMediumID); 62 62 void createMedium(const UIMedium &medium); 63 void deleteMedium(const QUuid & aMediumID);63 void deleteMedium(const QUuid &uMediumID); 64 64 65 65 /* API: Medium-enumeration stuff: */ … … 71 71 72 72 /** Handles machine-data-change and snapshot-change events. */ 73 void sltHandleMachineUpdate(const QUuid & aMachineID);73 void sltHandleMachineUpdate(const QUuid &uMachineID); 74 74 /** Handles machine-[un]registration events. */ 75 void sltHandleMachineRegistration(const QUuid & aMachineID, const bool fRegistered);75 void sltHandleMachineRegistration(const QUuid &uMachineID, const bool fRegistered); 76 76 /** Handles snapshot-deleted events. */ 77 void sltHandleSnapshotDeleted(const QUuid & aMachineID, const QUuid &aSnapshotID);77 void sltHandleSnapshotDeleted(const QUuid &uMachineID, const QUuid &uSnapshotID); 78 78 79 79 /* Handler: Medium-enumeration stuff: */ … … 91 91 92 92 /* 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 ¤tCMediums, QList<QUuid> ¤tCMediumIDs, const bool fTakeIntoAccountCurrentStateOnly) const;93 void calculateCachedUsage(const QUuid &uMachineID, QList<QUuid> &previousUIMediumIDs, const bool fTakeIntoAccountCurrentStateOnly) const; 94 void calculateActualUsage(const QUuid &uMachineID, CMediumMap ¤tCMediums, QList<QUuid> ¤tCMediumIDs, const bool fTakeIntoAccountCurrentStateOnly) const; 95 95 void calculateActualUsage(const CSnapshot &snapshot, CMediumMap ¤tCMediums, QList<QUuid> ¤tCMediumIDs) const; 96 96 void calculateActualUsage(const CMachine &machine, CMediumMap ¤tCMediums, QList<QUuid> ¤tCMediumIDs) const; -
trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumItem.cpp
r74878 r74942 252 252 } 253 253 254 bool UIMediumItem::releaseFrom(const QUuid & aMachineId)254 bool UIMediumItem::releaseFrom(const QUuid &uMachineId) 255 255 { 256 256 /* Open session: */ 257 CSession session = vboxGlobal().openSession( aMachineId);257 CSession session = vboxGlobal().openSession(uMachineId); 258 258 if (session.isNull()) 259 259 return false; -
trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumItem.h
r74878 r74942 110 110 void refresh(); 111 111 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); 114 114 115 115 /** Formats field text. */ -
trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp
r74894 r74942 63 63 64 64 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. */ 66 66 class CheckIfSuitableByID : public CheckIfSuitableBy 67 67 { 68 68 public: 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) {} 71 71 72 72 private: 73 /** Determines whether passed UIMediumItem is suitable by @a strID. */73 /** Determines whether passed UIMediumItem is suitable by @a uID. */ 74 74 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. */ 76 76 QUuid m_uID; 77 77 }; … … 383 383 } 384 384 385 void UIMediumManagerWidget::sltHandleMediumCreated(const QUuid & aMediumID)385 void UIMediumManagerWidget::sltHandleMediumCreated(const QUuid &uMediumID) 386 386 { 387 387 /* Search for corresponding medium: */ 388 UIMedium medium = vboxGlobal().medium( aMediumID);388 UIMedium medium = vboxGlobal().medium(uMediumID); 389 389 390 390 /* Ignore non-interesting media: */ … … 414 414 } 415 415 416 void UIMediumManagerWidget::sltHandleMediumDeleted(const QUuid & aMediumID)416 void UIMediumManagerWidget::sltHandleMediumDeleted(const QUuid &uMediumID) 417 417 { 418 418 /* Make sure corresponding medium-item deleted: */ 419 deleteMediumItem( aMediumID);419 deleteMediumItem(uMediumID); 420 420 } 421 421 … … 459 459 } 460 460 461 void UIMediumManagerWidget::sltHandleMediumEnumerated(const QUuid & aMediumID)461 void UIMediumManagerWidget::sltHandleMediumEnumerated(const QUuid &uMediumID) 462 462 { 463 463 /* Search for corresponding medium: */ 464 UIMedium medium = vboxGlobal().medium( aMediumID);464 UIMedium medium = vboxGlobal().medium(uMediumID); 465 465 466 466 /* Ignore non-interesting media: */ … … 1295 1295 } 1296 1296 1297 void UIMediumManagerWidget::deleteMediumItem(const QUuid & aMediumID)1297 void UIMediumManagerWidget::deleteMediumItem(const QUuid &uMediumID) 1298 1298 { 1299 1299 /* Search for corresponding tree-widget: */ … … 1307 1307 pTreeWidget = treeWidget(type); 1308 1308 /* Search for existing medium-item: */ 1309 pMediumItem = searchItem(pTreeWidget, CheckIfSuitableByID( aMediumID));1309 pMediumItem = searchItem(pTreeWidget, CheckIfSuitableByID(uMediumID)); 1310 1310 if (pMediumItem) 1311 1311 break; … … 1321 1321 /* Delete medium-item: */ 1322 1322 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())); 1324 1324 1325 1325 /* If there is no current medium-item now selected -
trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h
r74878 r74942 148 148 * @{ */ 149 149 /** Handles VBoxGlobal::sigMediumCreated signal. */ 150 void sltHandleMediumCreated(const QUuid & aMediumID);150 void sltHandleMediumCreated(const QUuid &uMediumID); 151 151 /** Handles VBoxGlobal::sigMediumDeleted signal. */ 152 void sltHandleMediumDeleted(const QUuid & aMediumID);152 void sltHandleMediumDeleted(const QUuid &uMediumID); 153 153 /** @} */ 154 154 … … 158 158 void sltHandleMediumEnumerationStart(); 159 159 /** Handles VBoxGlobal::sigMediumEnumerated signal. */ 160 void sltHandleMediumEnumerated(const QUuid & aMediumID);160 void sltHandleMediumEnumerated(const QUuid &uMediumID); 161 161 /** Handles VBoxGlobal::sigMediumEnumerationFinished signal. */ 162 162 void sltHandleMediumEnumerationFinish(); … … 248 248 /** Updates UIMediumItem for corresponding @a medium. */ 249 249 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); 252 252 253 253 /** Returns tab for passed medium @a type. */ -
trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp
r74878 r74942 545 545 } 546 546 547 void UIMediumSelector::selectMedium(const QUuid & aMediumID)547 void UIMediumSelector::selectMedium(const QUuid &uMediumID) 548 548 { 549 549 if (!m_pTreeWidget) 550 550 return; 551 UIMediumItem *pMediumItem = searchItem(0, aMediumID);551 UIMediumItem *pMediumItem = searchItem(0, uMediumID); 552 552 if (pMediumItem) 553 553 { -
trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.h
r74878 r74942 100 100 /** Remember the default foreground brush of the tree so that we can reset tree items' foreground later */ 101 101 void saveDefaultForeground(); 102 void selectMedium(const QUuid & aMediumID);102 void selectMedium(const QUuid &uMediumID); 103 103 104 104 QVBoxLayout *m_pMainLayout; -
trunk/src/VBox/Frontends/VirtualBox/src/platform/UIDesktopServices.h
r74878 r74942 28 28 { 29 29 public: 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); 31 31 static bool openInFileManager(const QString &strFile); 32 32 }; -
trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIDesktopServices_darwin.cpp
r74878 r74942 24 24 #include <QString> 25 25 26 bool UIDesktopServices::createMachineShortcut(const QString &strSrcFile, const QString &strDstPath, const QString &strName, const QUuid & aUuid)26 bool UIDesktopServices::createMachineShortcut(const QString &strSrcFile, const QString &strDstPath, const QString &strName, const QUuid &uUuid) 27 27 { 28 28 return ::darwinCreateMachineShortcut(::darwinToNativeString(strSrcFile.toUtf8().constData()), 29 29 ::darwinToNativeString(strDstPath.toUtf8().constData()), 30 30 ::darwinToNativeString(strName.toUtf8().constData()), 31 ::darwinToNativeString( aUuid.toString().toUtf8().constData()));31 ::darwinToNativeString(uUuid.toString().toUtf8().constData())); 32 32 } 33 33 -
trunk/src/VBox/Frontends/VirtualBox/src/platform/win/UIDesktopServices_win.cpp
r74878 r74942 34 34 35 35 36 bool UIDesktopServices::createMachineShortcut(const QString & /* strSrcFile */, const QString &strDstPath, const QString &strName, const QUuid & aUuid)36 bool UIDesktopServices::createMachineShortcut(const QString & /* strSrcFile */, const QString &strDstPath, const QString &strName, const QUuid &uUuid) 37 37 { 38 38 IShellLink *pShl = NULL; … … 52 52 if (FAILED(rc)) 53 53 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()); 55 55 rc = pShl->SetArguments(strArgs.utf16()); 56 56 if (FAILED(rc)) -
trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/UIDesktopServices_x11.cpp
r74878 r74942 34 34 35 35 36 bool UIDesktopServices::createMachineShortcut(const QString & /* strSrcFile */, const QString &strDstPath, const QString &strName, const QUuid & aUuid)36 bool UIDesktopServices::createMachineShortcut(const QString & /* strSrcFile */, const QString &strDstPath, const QString &strName, const QUuid &uUuid) 37 37 { 38 38 QFile link(strDstPath + QDir::separator() + strName + ".desktop"); … … 48 48 << "Comment=Starts the VirtualBox machine " << strName << endl 49 49 << "Type=Application" << endl 50 << "Exec=" << QCoreApplication::applicationFilePath() << " --comment \"" << strName << "\" --startvm \"" << aUuid.toString() << "\"" << endl50 << "Exec=" << QCoreApplication::applicationFilePath() << " --comment \"" << strName << "\" --startvm \"" << uUuid.toString() << "\"" << endl 51 51 << "Icon=virtualbox-vbox.png" << endl; 52 52 /* 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 1267 1267 } 1268 1268 1269 void UIIndicatorsPool::sltHandleConfigurationChange(const QUuid & aMachineID)1269 void UIIndicatorsPool::sltHandleConfigurationChange(const QUuid &uMachineID) 1270 1270 { 1271 1271 /* Skip unrelated machine IDs: */ 1272 if (vboxGlobal().managedVMUuid() != aMachineID)1272 if (vboxGlobal().managedVMUuid() != uMachineID) 1273 1273 return; 1274 1274 -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h
r74878 r74942 67 67 68 68 /** Handles configuration change. */ 69 void sltHandleConfigurationChange(const QUuid & aMachineID);69 void sltHandleConfigurationChange(const QUuid &uMachineID); 70 70 71 71 /** Handles indicator-states auto-update. */ -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp
r74878 r74942 43 43 44 44 /* static */ 45 bool UIMachine::startMachine(const QUuid & aID)45 bool UIMachine::startMachine(const QUuid &uID) 46 46 { 47 47 /* Make sure machine is not created: */ … … 52 52 { 53 53 /* Create temporary session: */ 54 CSession session = vboxGlobal().openSession( aID, KLockType_VM);54 CSession session = vboxGlobal().openSession(uID, KLockType_VM); 55 55 if (session.isNull()) 56 56 return false; -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h
r74878 r74942 47 47 public: 48 48 49 /** Static factory to start machine with passed @a strID.49 /** Static factory to start machine with passed @a uID. 50 50 * @return true if machine was started, false otherwise. */ 51 static bool startMachine(const QUuid & aID);51 static bool startMachine(const QUuid &uID); 52 52 /** Static constructor. */ 53 53 static bool create(); -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
r74914 r74942 122 122 { 123 123 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) {} 126 126 bool attach; 127 127 QUuid id; -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp
r74885 r74942 501 501 } 502 502 503 void UIMachineView::sltHandleScaleFactorChange(const QUuid & aMachineID)503 void UIMachineView::sltHandleScaleFactorChange(const QUuid &uMachineID) 504 504 { 505 505 /* Skip unrelated machine IDs: */ 506 if ( aMachineID != vboxGlobal().managedVMUuid())506 if (uMachineID != vboxGlobal().managedVMUuid()) 507 507 return; 508 508 … … 549 549 } 550 550 551 void UIMachineView::sltHandleScalingOptimizationChange(const QUuid & aMachineID)551 void UIMachineView::sltHandleScalingOptimizationChange(const QUuid &uMachineID) 552 552 { 553 553 /* Skip unrelated machine IDs: */ 554 if ( aMachineID != vboxGlobal().managedVMUuid())554 if (uMachineID != vboxGlobal().managedVMUuid()) 555 555 return; 556 556 -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h
r74878 r74942 127 127 128 128 /** Handles the scale-factor change. */ 129 void sltHandleScaleFactorChange(const QUuid & aMachineID);129 void sltHandleScaleFactorChange(const QUuid &uMachineID); 130 130 131 131 /** Handles the scaling-optimization change. */ 132 void sltHandleScalingOptimizationChange(const QUuid & aMachineID);132 void sltHandleScalingOptimizationChange(const QUuid &uMachineID); 133 133 134 134 /* Console callback handlers: */ -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp
r74878 r74942 598 598 599 599 #ifdef RT_OS_DARWIN 600 void UISession::sltHandleMenuBarConfigurationChange(const QUuid & aMachineID)600 void UISession::sltHandleMenuBarConfigurationChange(const QUuid &uMachineID) 601 601 { 602 602 /* Skip unrelated machine IDs: */ 603 if (vboxGlobal().managedVMUuid() != aMachineID)603 if (vboxGlobal().managedVMUuid() != uMachineID) 604 604 return; 605 605 -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h
r74878 r74942 347 347 #ifdef RT_OS_DARWIN 348 348 /** Mac OS X: Handles menu-bar configuration-change. */ 349 void sltHandleMenuBarConfigurationChange(const QUuid & aMachineID);349 void sltHandleMenuBarConfigurationChange(const QUuid &uMachineID); 350 350 #endif /* RT_OS_DARWIN */ 351 351 -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp
r74878 r74942 138 138 139 139 #ifndef RT_OS_DARWIN 140 void UIMachineWindowNormal::sltHandleMenuBarConfigurationChange(const QUuid & aMachineID)140 void UIMachineWindowNormal::sltHandleMenuBarConfigurationChange(const QUuid &uMachineID) 141 141 { 142 142 /* Skip unrelated machine IDs: */ 143 if (vboxGlobal().managedVMUuid() != aMachineID)143 if (vboxGlobal().managedVMUuid() != uMachineID) 144 144 return; 145 145 … … 172 172 #endif /* !RT_OS_DARWIN */ 173 173 174 void UIMachineWindowNormal::sltHandleStatusBarConfigurationChange(const QUuid & aMachineID)174 void UIMachineWindowNormal::sltHandleStatusBarConfigurationChange(const QUuid &uMachineID) 175 175 { 176 176 /* Skip unrelated machine IDs: */ 177 if (vboxGlobal().managedVMUuid() != aMachineID)177 if (vboxGlobal().managedVMUuid() != uMachineID) 178 178 return; 179 179 -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h
r74878 r74942 68 68 #ifndef RT_OS_DARWIN 69 69 /** Handles menu-bar configuration-change. */ 70 void sltHandleMenuBarConfigurationChange(const QUuid & aMachineID);70 void sltHandleMenuBarConfigurationChange(const QUuid &uMachineID); 71 71 /** Handles menu-bar context-menu-request. */ 72 72 void sltHandleMenuBarContextMenuRequest(const QPoint &position); … … 74 74 75 75 /** Handles status-bar configuration-change. */ 76 void sltHandleStatusBarConfigurationChange(const QUuid & aMachineID);76 void sltHandleStatusBarConfigurationChange(const QUuid &uMachineID); 77 77 /** Handles status-bar context-menu-request. */ 78 78 void sltHandleStatusBarContextMenuRequest(const QPoint &position); -
trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
r74925 r74942 669 669 void UISelectorWindow::sltOpenMachineSettingsDialog(const QString &strCategoryRef /* = QString() */, 670 670 const QString &strControlRef /* = QString() */, 671 const QUuid &aID /* = QString() */)671 const QUuid &uID /* = QString() */) 672 672 { 673 673 /* This slot should not be called when there is not selection: */ … … 707 707 /* Create and execute corresponding VM settings window: */ 708 708 UISettingsDialogMachine dialog(this, 709 aID.isNull() ? currentItem()->id() : aID,709 uID.isNull() ? currentItem()->id() : uID, 710 710 strCategory, strControl); 711 711 dialog.execute(); -
trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h
r74878 r74942 117 117 /** @name CVirtualBox event handling stuff. 118 118 * @{ */ 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); 121 121 /** @} */ 122 122 … … 160 160 * @param strCategory can bring the settings category to start from. 161 161 * @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. */ 163 163 void sltOpenMachineSettingsDialog(const QString &strCategory = QString(), 164 164 const QString &strControl = QString(), 165 const QUuid &aID = QString());165 const QUuid &uID = QString()); 166 166 /** Handles call to open Clone Machine wizard. */ 167 167 void sltOpenCloneMachineWizard(); -
trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.h
r74878 r74942 53 53 void sigToggleFinished(); 54 54 /** 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); 56 56 57 57 public: -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItem.h
r74878 r74942 115 115 virtual bool hasItems(UIGChooserItemType type = UIGChooserItemType_Any) const = 0; 116 116 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; 119 119 virtual UIGChooserItem* searchForItem(const QString &strSearchTag, int iItemSearchFlags) = 0; 120 120 virtual UIGChooserItemMachine* firstMachineItem() = 0; -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.cpp
r74878 r74942 259 259 } 260 260 261 bool UIGChooserItemGroup::isContainsMachine(const QUuid & aId) const261 bool UIGChooserItemGroup::isContainsMachine(const QUuid &uId) const 262 262 { 263 263 /* Check each machine-item: */ 264 264 foreach (UIGChooserItem *pItem, m_machineItems) 265 if (pItem->toMachineItem()->id() == aId)265 if (pItem->toMachineItem()->id() == uId) 266 266 return true; 267 267 /* Found nothing? */ … … 934 934 } 935 935 936 void UIGChooserItemGroup::updateAll(const QUuid & aId)936 void UIGChooserItemGroup::updateAll(const QUuid &uId) 937 937 { 938 938 /* Update all the required items recursively: */ 939 939 foreach (UIGChooserItem *pItem, items()) 940 pItem->updateAll( aId);941 } 942 943 void UIGChooserItemGroup::removeAll(const QUuid & aId)940 pItem->updateAll(uId); 941 } 942 943 void UIGChooserItemGroup::removeAll(const QUuid &uId) 944 944 { 945 945 /* Remove all the required items recursively: */ 946 946 foreach (UIGChooserItem *pItem, items()) 947 pItem->removeAll( aId);947 pItem->removeAll(uId); 948 948 } 949 949 -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.h
r74878 r74942 79 79 80 80 /* API: Children stuff: */ 81 bool isContainsMachine(const QUuid & aId) const;81 bool isContainsMachine(const QUuid &uId) const; 82 82 bool isContainsLockedMachine(); 83 83 … … 143 143 bool hasItems(UIGChooserItemType type = UIGChooserItemType_Any) const; 144 144 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); 147 147 UIGChooserItem* searchForItem(const QString &strSearchTag, int iItemSearchFlags); 148 148 UIGChooserItemMachine* firstMachineItem(); -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp
r74878 r74942 544 544 } 545 545 546 void UIGChooserItemMachine::updateAll(const QUuid & aId)546 void UIGChooserItemMachine::updateAll(const QUuid &uId) 547 547 { 548 548 /* Skip other ids: */ 549 if (id() != aId)549 if (id() != uId) 550 550 return; 551 551 … … 563 563 } 564 564 565 void UIGChooserItemMachine::removeAll(const QUuid & aId)565 void UIGChooserItemMachine::removeAll(const QUuid &uId) 566 566 { 567 567 /* Skip wrong id: */ 568 if (id() != aId)568 if (id() != uId) 569 569 return; 570 570 -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.h
r74878 r74942 125 125 bool hasItems(UIGChooserItemType type) const; 126 126 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); 129 129 UIGChooserItem* searchForItem(const QString &strSearchTag, int iItemSearchFlags); 130 130 UIGChooserItemMachine* firstMachineItem(); -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp
r74878 r74942 678 678 } 679 679 680 void UIGChooserModel::sltMachineStateChanged(const QUuid & aId, const KMachineState)680 void UIGChooserModel::sltMachineStateChanged(const QUuid &uId, const KMachineState) 681 681 { 682 682 /* 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 686 void UIGChooserModel::sltMachineDataChanged(const QUuid &uId) 687 687 { 688 688 /* 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 692 void UIGChooserModel::sltMachineRegistered(const QUuid &uId, const bool fRegistered) 693 693 { 694 694 /* New VM registered? */ … … 696 696 { 697 697 /* Search for corresponding machine: */ 698 CMachine machine = vboxGlobal().virtualBox().FindMachine( aId.toString());698 CMachine machine = vboxGlobal().virtualBox().FindMachine(uId.toString()); 699 699 /* Should we show this machine? */ 700 if (gEDataManager->showMachineInSelectorChooser( aId))700 if (gEDataManager->showMachineInSelectorChooser(uId)) 701 701 { 702 702 /* Add new machine-item: */ … … 706 706 updateLayout(); 707 707 /* Change current-item only if VM was created from the GUI side: */ 708 if ( aId == m_uLastCreatedMachineId)708 if (uId == m_uLastCreatedMachineId) 709 709 { 710 710 setCurrentItem(mainRoot()->searchForItem(machine.GetName(), … … 718 718 { 719 719 /* Remove machine-items with passed id: */ 720 mainRoot()->removeAll( aId);720 mainRoot()->removeAll(uId); 721 721 /* Update model: */ 722 722 cleanupGroupTree(); … … 734 734 } 735 735 736 void UIGChooserModel::sltSessionStateChanged(const QUuid & aId, const KSessionState)736 void UIGChooserModel::sltSessionStateChanged(const QUuid &uId, const KSessionState) 737 737 { 738 738 /* 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 742 void UIGChooserModel::sltSnapshotChanged(const QUuid &uId, const QUuid &) 743 743 { 744 744 /* Update machine-items with passed id: */ 745 mainRoot()->updateAll( aId);745 mainRoot()->updateAll(uId); 746 746 } 747 747 … … 997 997 } 998 998 999 void UIGChooserModel::sltReloadMachine(const QUuid & aId)999 void UIGChooserModel::sltReloadMachine(const QUuid &uId) 1000 1000 { 1001 1001 /* Remove all the items first: */ 1002 mainRoot()->removeAll( aId);1002 mainRoot()->removeAll(uId); 1003 1003 /* Wipe out empty groups: */ 1004 1004 cleanupGroupTree(); 1005 1005 1006 1006 /* 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)) 1009 1009 addMachineIntoTheTree(machine); 1010 1010 … … 1098 1098 { 1099 1099 /* Get machine-item id: */ 1100 QUuid aId = pItem->toMachineItem()->id();1100 QUuid uId = pItem->toMachineItem()->id(); 1101 1101 1102 1102 /* We already decided for that machine? */ 1103 if (verdicts.contains( aId))1103 if (verdicts.contains(uId)) 1104 1104 { 1105 1105 /* To remove similar machine items? */ 1106 if (!verdicts[ aId])1106 if (!verdicts[uId]) 1107 1107 itemsToRemove << pItem; 1108 1108 continue; … … 1112 1112 int iSelectedCopyCount = 0; 1113 1113 foreach (UIGChooserItem *pSelectedItem, selectedMachineItemList) 1114 if (pSelectedItem->toMachineItem()->id() == aId)1114 if (pSelectedItem->toMachineItem()->id() == uId) 1115 1115 ++iSelectedCopyCount; 1116 1116 /* Existing copy count: */ 1117 1117 int iExistingCopyCount = 0; 1118 1118 foreach (UIGChooserItem *pExistingItem, existingMachineItemList) 1119 if (pExistingItem->toMachineItem()->id() == aId)1119 if (pExistingItem->toMachineItem()->id() == uId) 1120 1120 ++iExistingCopyCount; 1121 1121 /* If selected copy count equal to existing copy count, … … 1125 1125 verdicts.insert(aId, fVerdict); 1126 1126 if (fVerdict) 1127 machinesToUnregister.append( aId);1127 machinesToUnregister.append(uId); 1128 1128 else 1129 1129 itemsToRemove << pItem; -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.h
r74878 r74942 160 160 161 161 /* 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); 167 167 168 168 /* Handler: Chooser-view stuff: */ … … 185 185 void sltCreateNewMachine(); 186 186 void sltGroupSelectedMachines(); 187 void sltReloadMachine(const QUuid & aId);187 void sltReloadMachine(const QUuid &uId); 188 188 void sltSortParentGroup(); 189 189 void sltPerformRefreshAction(); … … 315 315 316 316 /* Notifier: Reload stuff: */ 317 void sigReload(const QUuid & aId);317 void sigReload(const QUuid &uId); 318 318 319 319 /* Notifier: Complete stuff: */ -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetails.h
r74878 r74942 36 36 37 37 /* 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); 39 39 40 40 /* Notifier: Sliding stuff: */ -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.h
r74878 r74942 59 59 60 60 /* 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); 62 62 63 63 public: -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsGroup.cpp
r74878 r74942 89 89 } 90 90 91 void UIGDetailsGroup::sltBuildStep(const QUuid & aStepId, const int iStepNumber)91 void UIGDetailsGroup::sltBuildStep(const QUuid &uStepId, const int iStepNumber) 92 92 { 93 93 /* Cleanup build-step: */ … … 96 96 97 97 /* Is step id valid? */ 98 if ( aStepId != m_uGroupId)98 if (uStepId != m_uGroupId) 99 99 return; 100 100 … … 111 111 112 112 /* Create next build-step: */ 113 m_pBuildStep = new UIBuildStep(this, pSet, aStepId, iStepNumber + 1);113 m_pBuildStep = new UIBuildStep(this, pSet, uStepId, iStepNumber + 1); 114 114 115 115 /* Build set: */ -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsGroup.h
r74878 r74942 56 56 57 57 /* Handler: Build stuff: */ 58 void sltBuildStep(const QUuid & aStepId, const int iStepNumber);58 void sltBuildStep(const QUuid &uStepId, const int iStepNumber); 59 59 60 60 private: -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.cpp
r74878 r74942 329 329 } 330 330 331 UIBuildStep::UIBuildStep(QObject *pParent, QObject *pBuildObject, const QUuid & aStepId, int iStepNumber)331 UIBuildStep::UIBuildStep(QObject *pParent, QObject *pBuildObject, const QUuid &uStepId, int iStepNumber) 332 332 : QObject(pParent) 333 , m_uStepId( aStepId)333 , m_uStepId(uStepId) 334 334 , m_iStepNumber(iStepNumber) 335 335 { -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.h
r74878 r74942 53 53 54 54 /* Notifiers: Build stuff: */ 55 void sigBuildStep(const QUuid & aStepId, const int iStepNumber);55 void sigBuildStep(const QUuid &uStepId, const int iStepNumber); 56 56 void sigBuildDone(); 57 57 … … 121 121 122 122 /* Notifier: Build stuff: */ 123 void sigStepDone(const QUuid & aStepId, const int iStepNumber);123 void sigStepDone(const QUuid &uStepId, const int iStepNumber); 124 124 125 125 public: 126 126 127 127 /* Constructor: */ 128 UIBuildStep(QObject *pParent, QObject *pBuildObject, const QUuid & aStepId, int iStepNumber);128 UIBuildStep(QObject *pParent, QObject *pBuildObject, const QUuid &uStepId, int iStepNumber); 129 129 130 130 private slots: -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsModel.h
r74878 r74942 54 54 55 55 /* 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); 57 57 58 58 public: -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.cpp
r74878 r74942 113 113 } 114 114 115 void UIGDetailsSet::sltBuildStep(const QUuid & aStepId, const int iStepNumber)115 void UIGDetailsSet::sltBuildStep(const QUuid &uStepId, const int iStepNumber) 116 116 { 117 117 /* Cleanup build-step: */ … … 120 120 121 121 /* Is step id valid? */ 122 if ( aStepId != m_uSetId)122 if (uStepId != m_uSetId) 123 123 return; 124 124 … … 173 173 { 174 174 /* Create next build-step: */ 175 m_pBuildStep = new UIBuildStep(this, pElement, aStepId, iStepNumber + 1);175 m_pBuildStep = new UIBuildStep(this, pElement, uStepId, iStepNumber + 1); 176 176 177 177 /* Build element: */ … … 182 182 { 183 183 /* Just build next step: */ 184 sltBuildStep( aStepId, iStepNumber + 1);184 sltBuildStep(uStepId, iStepNumber + 1); 185 185 } 186 186 } … … 198 198 } 199 199 200 void UIGDetailsSet::sltMachineStateChange(const QUuid & aId)200 void UIGDetailsSet::sltMachineStateChange(const QUuid &uId) 201 201 { 202 202 /* Is this our VM changed? */ 203 if (m_machine.GetId() != aId)203 if (m_machine.GetId() != uId) 204 204 return; 205 205 … … 208 208 } 209 209 210 void UIGDetailsSet::sltMachineAttributesChange(const QUuid & aId)210 void UIGDetailsSet::sltMachineAttributesChange(const QUuid &uId) 211 211 { 212 212 /* Is this our VM changed? */ 213 if (m_machine.GetId() != aId)213 if (m_machine.GetId() != uId) 214 214 return; 215 215 -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.h
r74878 r74942 63 63 64 64 /* Handler: Build stuff: */ 65 void sltBuildStep(const QUuid & aStepId, const int iStepNumber);65 void sltBuildStep(const QUuid &uStepId, const int iStepNumber); 66 66 67 67 /* 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); 70 70 71 71 /* Handler: Update stuff: */ -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp
r74878 r74942 170 170 } 171 171 172 void UIGMachinePreview::sltMachineStateChange(const QUuid & aId)172 void UIGMachinePreview::sltMachineStateChange(const QUuid &uId) 173 173 { 174 174 /* 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) 176 176 return; 177 177 -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.h
r74878 r74942 66 66 67 67 /* Handler: Global-event listener stuff: */ 68 void sltMachineStateChange(const QUuid & aId);68 void sltMachineStateChange(const QUuid &uId); 69 69 70 70 /* Handler: Preview recreator: */ -
trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
r74878 r74942 330 330 *********************************************************************************************************************************/ 331 331 332 UISettingsDialogMachine::UISettingsDialogMachine(QWidget *pParent, const QUuid & aMachineId,332 UISettingsDialogMachine::UISettingsDialogMachine(QWidget *pParent, const QUuid &uMachineId, 333 333 const QString &strCategory, const QString &strControl) 334 334 : UISettingsDialog(pParent) 335 , m_uMachineId( aMachineId)335 , m_uMachineId(uMachineId) 336 336 , m_strCategory(strCategory) 337 337 , m_strControl(strControl) … … 603 603 } 604 604 605 void UISettingsDialogMachine::sltSessionStateChanged(const QUuid & aMachineId, const KSessionState enmSessionState)605 void UISettingsDialogMachine::sltSessionStateChanged(const QUuid &uMachineId, const KSessionState enmSessionState) 606 606 { 607 607 /* Ignore if serialization is in progress: */ … … 609 609 return; 610 610 /* Ignore if thats NOT our VM: */ 611 if ( aMachineId != m_uMachineId)611 if (uMachineId != m_uMachineId) 612 612 return; 613 613 … … 622 622 } 623 623 624 void UISettingsDialogMachine::sltMachineStateChanged(const QUuid & aMachineId, const KMachineState enmMachineState)624 void UISettingsDialogMachine::sltMachineStateChanged(const QUuid &uMachineId, const KMachineState enmMachineState) 625 625 { 626 626 /* Ignore if serialization is in progress: */ … … 628 628 return; 629 629 /* Ignore if thats NOT our VM: */ 630 if ( aMachineId != m_uMachineId)630 if (uMachineId != m_uMachineId) 631 631 return; 632 632 … … 641 641 } 642 642 643 void UISettingsDialogMachine::sltMachineDataChanged(const QUuid & aMachineId)643 void UISettingsDialogMachine::sltMachineDataChanged(const QUuid &uMachineId) 644 644 { 645 645 /* Ignore if serialization is in progress: */ … … 647 647 return; 648 648 /* Ignore if thats NOT our VM: */ 649 if ( aMachineId != m_uMachineId)649 if (uMachineId != m_uMachineId) 650 650 return; 651 651 -
trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
r74878 r74942 81 81 82 82 /** Constructs settings dialog passing @a pParent to the base-class. 83 * @param aMachineId Brings the machine ID.83 * @param uMachineId Brings the machine ID. 84 84 * @param strCategory Brings the name of category to be opened. 85 85 * @param strControl Brings the name of control to be focused. */ 86 UISettingsDialogMachine(QWidget *pParent, const QUuid & aMachineId,86 UISettingsDialogMachine(QWidget *pParent, const QUuid &uMachineId, 87 87 const QString &strCategory, const QString &strControl); 88 88 … … 117 117 private slots: 118 118 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); 125 125 126 126 /** Handles request to allow to reset first run flag. */ -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp
r74878 r74942 871 871 872 872 /* Get medium id for further activities: */ 873 QUuid aMediumId;873 QUuid uMediumId; 874 874 if (fSuccess) 875 875 { 876 aMediumId = comMedium.GetId();876 uMediumId = comMedium.GetId(); 877 877 fSuccess = comMedium.isOk(); 878 878 } … … 906 906 907 907 /* Check if old password exists/provided: */ 908 const QString strOldPasswordId = encryptedMedium.key( aMediumId);908 const QString strOldPasswordId = encryptedMedium.key(uMediumId); 909 909 const QString strOldPassword = encryptionPasswords.value(strOldPasswordId); 910 910 -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp
r74878 r74942 134 134 135 135 136 UIMachineSettingsInterface::UIMachineSettingsInterface(const QUuid & aMachineId)137 : m_uMachineId( aMachineId)136 UIMachineSettingsInterface::UIMachineSettingsInterface(const QUuid &uMachineId) 137 : m_uMachineId(uMachineId) 138 138 , m_pActionPool(0) 139 139 , m_pCache(0) -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h
r74878 r74942 37 37 38 38 /** Constructs User Interface settings page. */ 39 UIMachineSettingsInterface(const QUuid & aMachineId);39 UIMachineSettingsInterface(const QUuid &uMachineId); 40 40 /** Destructs User Interface settings page. */ 41 41 ~UIMachineSettingsInterface(); -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp
r74878 r74942 609 609 } 610 610 611 void AbstractItem::setMachineId (const QUuid & aMachineId)612 { 613 mMachineId = aMachineId;611 void AbstractItem::setMachineId (const QUuid &uMachineId) 612 { 613 mMachineId = uMachineId; 614 614 } 615 615 … … 649 649 } 650 650 651 AbstractItem* RootItem::childItemById (const QUuid & aId) const651 AbstractItem* RootItem::childItemById (const QUuid &uId) const 652 652 { 653 653 for (int i = 0; i < childCount(); ++ i) 654 if (mControllers [i]->id() == aId)654 if (mControllers [i]->id() == uId) 655 655 return mControllers [i]; 656 656 return 0; … … 847 847 } 848 848 849 AbstractItem* ControllerItem::childItemById (const QUuid & aId) const849 AbstractItem* ControllerItem::childItemById (const QUuid &uId) const 850 850 { 851 851 for (int i = 0; i < childCount(); ++ i) 852 if (mAttachments [i]->id() == aId)852 if (mAttachments [i]->id() == uId) 853 853 return mAttachments [i]; 854 854 return 0; … … 983 983 } 984 984 985 void AttachmentItem::setAttMediumId (const QUuid & aAttMediumId)985 void AttachmentItem::setAttMediumId (const QUuid &uAttMediumId) 986 986 { 987 987 /// @todo is this required? 988 988 //AssertMsg(!aAttMediumId.isNull(), ("Medium ID value can't be null!\n")); 989 mAttMediumId = vboxGlobal().medium( aAttMediumId).id();989 mAttMediumId = vboxGlobal().medium(uAttMediumId).id(); 990 990 cache(); 991 991 } … … 1105 1105 } 1106 1106 1107 AbstractItem* AttachmentItem::childItemById (const QUuid& /* aId */) const1107 AbstractItem* AttachmentItem::childItemById (const QUuid& /* uId */) const 1108 1108 { 1109 1109 return 0; … … 1824 1824 } 1825 1825 1826 void StorageModel::delController (const QUuid & aCtrId)1827 { 1828 if (AbstractItem *item = mRootItem->childItemById ( aCtrId))1826 void StorageModel::delController (const QUuid &uCtrId) 1827 { 1828 if (AbstractItem *item = mRootItem->childItemById (uCtrId)) 1829 1829 { 1830 1830 int itemPosition = mRootItem->posOfChild (item); … … 1835 1835 } 1836 1836 1837 QModelIndex StorageModel::addAttachment (const QUuid & aCtrId, KDeviceType aDeviceType, const QUuid &aMediumId)1838 { 1839 if (AbstractItem *parent = mRootItem->childItemById ( aCtrId))1837 QModelIndex StorageModel::addAttachment (const QUuid &uCtrId, KDeviceType aDeviceType, const QUuid &uMediumId) 1838 { 1839 if (AbstractItem *parent = mRootItem->childItemById (uCtrId)) 1840 1840 { 1841 1841 int parentPosition = mRootItem->posOfChild (parent); … … 1844 1844 AttachmentItem *pItem = new AttachmentItem (parent, aDeviceType); 1845 1845 pItem->setAttIsHotPluggable(m_configurationAccessLevel != ConfigurationAccessLevel_Full); 1846 pItem->setAttMediumId( aMediumId);1846 pItem->setAttMediumId(uMediumId); 1847 1847 endInsertRows(); 1848 1848 return index (parent->childCount() - 1, 0, parentIndex); … … 1851 1851 } 1852 1852 1853 void StorageModel::delAttachment (const QUuid & aCtrId, const QUuid &aAttId)1854 { 1855 if (AbstractItem *parent = mRootItem->childItemById ( aCtrId))1853 void StorageModel::delAttachment (const QUuid &uCtrId, const QUuid &uAttId) 1854 { 1855 if (AbstractItem *parent = mRootItem->childItemById (uCtrId)) 1856 1856 { 1857 1857 int parentPosition = mRootItem->posOfChild (parent); 1858 if (AbstractItem *item = parent->childItemById ( aAttId))1858 if (AbstractItem *item = parent->childItemById (uAttId)) 1859 1859 { 1860 1860 int itemPosition = parent->posOfChild (item); … … 1866 1866 } 1867 1867 1868 void StorageModel::setMachineId (const QUuid & aMachineId)1869 { 1870 mRootItem->setMachineId ( aMachineId);1868 void StorageModel::setMachineId (const QUuid &uMachineId) 1869 { 1870 mRootItem->setMachineId (uMachineId); 1871 1871 } 1872 1872 … … 2122 2122 2123 2123 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(); } 2125 2125 2126 2126 UIMediumDeviceType type() const { return m_type; } … … 2628 2628 } 2629 2629 2630 void UIMachineSettingsStorage::sltHandleMediumEnumerated(const QUuid & aMediumId)2630 void UIMachineSettingsStorage::sltHandleMediumEnumerated(const QUuid &uMediumId) 2631 2631 { 2632 2632 /* Search for corresponding medium: */ 2633 const UIMedium medium = vboxGlobal().medium( aMediumId);2633 const UIMedium medium = vboxGlobal().medium(uMediumId); 2634 2634 2635 2635 const QModelIndex rootIndex = m_pModelStorage->root(); … … 2652 2652 } 2653 2653 2654 void UIMachineSettingsStorage::sltHandleMediumDeleted(const QUuid & aMediumId)2654 void UIMachineSettingsStorage::sltHandleMediumDeleted(const QUuid &uMediumId) 2655 2655 { 2656 2656 QModelIndex rootIndex = m_pModelStorage->root(); … … 2662 2662 QModelIndex attIndex = ctrIndex.child(j, 0); 2663 2663 QUuid attMediumId = m_pModelStorage->data(attIndex, StorageModel::R_AttMediumId).toString(); 2664 if (attMediumId == aMediumId)2664 if (attMediumId == uMediumId) 2665 2665 { 2666 2666 m_pModelStorage->setData(attIndex, UIMedium().id(), StorageModel::R_AttMediumId); -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h
r74878 r74942 274 274 QUuid machineId() const; 275 275 276 void setMachineId (const QUuid & aMchineId);276 void setMachineId (const QUuid &uMchineId); 277 277 278 278 virtual ItemType rtti() const = 0; 279 279 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; 281 281 virtual int posOfChild (AbstractItem *aItem) const = 0; 282 282 virtual QString tip() const = 0; … … 308 308 ItemType rtti() const; 309 309 AbstractItem* childItem (int aIndex) const; 310 AbstractItem* childItemById (const QUuid & aId) const;310 AbstractItem* childItemById (const QUuid &uId) const; 311 311 int posOfChild (AbstractItem *aItem) const; 312 312 int childCount() const; … … 353 353 ItemType rtti() const; 354 354 AbstractItem* childItem (int aIndex) const; 355 AbstractItem* childItemById (const QUuid & aId) const;355 AbstractItem* childItemById (const QUuid &uId) const; 356 356 int posOfChild (AbstractItem *aItem) const; 357 357 int childCount() const; … … 390 390 void setAttSlot (const StorageSlot &aAttSlot); 391 391 void setAttDevice (KDeviceType aAttDeviceType); 392 void setAttMediumId (const QUuid & aAttMediumId);392 void setAttMediumId (const QUuid &uAttMediumId); 393 393 void setAttIsPassthrough (bool aPassthrough); 394 394 void setAttIsTempEject (bool aTempEject); … … 410 410 ItemType rtti() const; 411 411 AbstractItem* childItem (int aIndex) const; 412 AbstractItem* childItemById (const QUuid & aId) const;412 AbstractItem* childItemById (const QUuid &uId) const; 413 413 int posOfChild (AbstractItem *aItem) const; 414 414 int childCount() const; … … 540 540 541 541 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); 548 548 549 549 void sort(int iColumn = 0, Qt::SortOrder order = Qt::AscendingOrder); … … 654 654 private slots: 655 655 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); 660 660 661 661 /** Handles command to add controller. */ -
trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.cpp
r74878 r74942 550 550 } 551 551 552 void UISnapshotPane::sltHandleMachineDataChange(const QUuid & aMachineId)552 void UISnapshotPane::sltHandleMachineDataChange(const QUuid &uMachineId) 553 553 { 554 554 /* Make sure it's our VM: */ 555 if ( aMachineId != m_uMachineId)555 if (uMachineId != m_uMachineId) 556 556 return; 557 557 … … 566 566 } 567 567 568 void UISnapshotPane::sltHandleMachineStateChange(const QUuid & aMachineId, const KMachineState enmState)568 void UISnapshotPane::sltHandleMachineStateChange(const QUuid &uMachineId, const KMachineState enmState) 569 569 { 570 570 /* Make sure it's our VM: */ 571 if ( aMachineId != m_uMachineId)571 if (uMachineId != m_uMachineId) 572 572 return; 573 573 … … 580 580 } 581 581 582 void UISnapshotPane::sltHandleSessionStateChange(const QUuid & aMachineId, const KSessionState enmState)582 void UISnapshotPane::sltHandleSessionStateChange(const QUuid &uMachineId, const KSessionState enmState) 583 583 { 584 584 /* Make sure it's our VM: */ 585 if ( aMachineId != m_uMachineId)585 if (uMachineId != m_uMachineId) 586 586 return; 587 587 … … 596 596 } 597 597 598 void UISnapshotPane::sltHandleSnapshotTake(const QUuid & aMachineId, const QUuid &aSnapshotId)598 void UISnapshotPane::sltHandleSnapshotTake(const QUuid &uMachineId, const QUuid &uSnapshotId) 599 599 { 600 600 /* Make sure it's our VM: */ 601 if ( aMachineId != m_uMachineId)601 if (uMachineId != m_uMachineId) 602 602 return; 603 603 604 604 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())); 606 606 607 607 /* Prepare result: */ … … 612 612 613 613 /* Search for corresponding snapshot: */ 614 CSnapshot comSnapshot = m_comMachine.FindSnapshot( aSnapshotId.toString());614 CSnapshot comSnapshot = m_comMachine.FindSnapshot(uSnapshotId.toString()); 615 615 fSuccess = m_comMachine.isOk() && !comSnapshot.isNull(); 616 616 617 617 /* Show error message if necessary: */ 618 618 if (!fSuccess) 619 msgCenter().cannotFindSnapshotById(m_comMachine, aSnapshotId, this);619 msgCenter().cannotFindSnapshotById(m_comMachine, uSnapshotId, this); 620 620 else 621 621 { … … 692 692 } 693 693 694 void UISnapshotPane::sltHandleSnapshotDelete(const QUuid & aMachineId, const QUuid &aSnapshotId)694 void UISnapshotPane::sltHandleSnapshotDelete(const QUuid &uMachineId, const QUuid &uSnapshotId) 695 695 { 696 696 /* Make sure it's our VM: */ 697 if ( aMachineId != m_uMachineId)697 if (uMachineId != m_uMachineId) 698 698 return; 699 699 700 700 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())); 702 702 703 703 /* Prepare result: */ … … 708 708 709 709 /* Search for an existing item with such id: */ 710 UISnapshotItem *pItem = findItem( aSnapshotId);710 UISnapshotItem *pItem = findItem(uSnapshotId); 711 711 fSuccess = pItem; 712 712 … … 774 774 } 775 775 776 void UISnapshotPane::sltHandleSnapshotChange(const QUuid & aMachineId, const QUuid &aSnapshotId)776 void UISnapshotPane::sltHandleSnapshotChange(const QUuid &uMachineId, const QUuid &uSnapshotId) 777 777 { 778 778 /* Make sure it's our VM: */ 779 if ( aMachineId != m_uMachineId)779 if (uMachineId != m_uMachineId) 780 780 return; 781 781 782 782 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())); 784 784 785 785 /* Prepare result: */ … … 790 790 791 791 /* Search for an existing item with such id: */ 792 UISnapshotItem *pItem = findItem( aSnapshotId);792 UISnapshotItem *pItem = findItem(uSnapshotId); 793 793 fSuccess = pItem; 794 794 … … 814 814 } 815 815 816 void UISnapshotPane::sltHandleSnapshotRestore(const QUuid & aMachineId, const QUuid &aSnapshotId)816 void UISnapshotPane::sltHandleSnapshotRestore(const QUuid &uMachineId, const QUuid &uSnapshotId) 817 817 { 818 818 /* Make sure it's our VM: */ 819 if ( aMachineId != m_uMachineId)819 if (uMachineId != m_uMachineId) 820 820 return; 821 821 822 822 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())); 824 824 825 825 /* Prepare result: */ … … 830 830 831 831 /* Search for an existing item with such id: */ 832 UISnapshotItem *pItem = findItem( aSnapshotId);832 UISnapshotItem *pItem = findItem(uSnapshotId); 833 833 fSuccess = pItem; 834 834 … … 1813 1813 } 1814 1814 1815 UISnapshotItem *UISnapshotPane::findItem(const QUuid & aSnapshotID) const1815 UISnapshotItem *UISnapshotPane::findItem(const QUuid &uSnapshotID) const 1816 1816 { 1817 1817 /* Search for the first item with required ID: */ … … 1820 1820 { 1821 1821 UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(*it); 1822 if (pSnapshotItem->snapshotID() == aSnapshotID)1822 if (pSnapshotItem->snapshotID() == uSnapshotID) 1823 1823 return pSnapshotItem; 1824 1824 ++it; -
trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.h
r74878 r74942 86 86 /** @name Main event handlers. 87 87 * @{ */ 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); 104 104 /** @} */ 105 105 … … 188 188 void adjustTreeWidget(); 189 189 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; 192 192 193 193 /** Searches for smallest snapshot age starting with @a pItem as parent. */ -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAddDiskEncryptionPasswordDialog.cpp
r74878 r74942 577 577 578 578 /* static */ 579 bool UIAddDiskEncryptionPasswordDialog::isPasswordValid(const QUuid & aMediumId, const QString strPassword)579 bool UIAddDiskEncryptionPasswordDialog::isPasswordValid(const QUuid &uMediumId, const QString strPassword) 580 580 { 581 581 /* Look for the medium with passed ID: */ 582 const UIMedium uimedium = vboxGlobal().medium( aMediumId);582 const UIMedium uimedium = vboxGlobal().medium(uMediumId); 583 583 if (!uimedium.isNull()) 584 584 { -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAddDiskEncryptionPasswordDialog.h
r74878 r74942 75 75 void prepare(); 76 76 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); 79 79 80 80 /** Holds the name of the machine we show this dialog for. */ -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediaComboBox.cpp
r74878 r74942 70 70 } 71 71 72 void UIMediaComboBox::setCurrentItem(const QUuid & aItemId)73 { 74 m_uLastItemId = aItemId;72 void UIMediaComboBox::setCurrentItem(const QUuid &uItemId) 73 { 74 m_uLastItemId = uItemId; 75 75 76 76 int iIndex; … … 78 78 // Note that the media combo-box may be not populated here yet, 79 79 // so we don't assert.. 80 if (findMediaIndex( aItemId, iIndex))80 if (findMediaIndex(uItemId, iIndex)) 81 81 { 82 82 QComboBox::setCurrentIndex(iIndex); … … 107 107 } 108 108 109 void UIMediaComboBox::sltHandleMediumCreated(const QUuid & aMediumId)109 void UIMediaComboBox::sltHandleMediumCreated(const QUuid &uMediumId) 110 110 { 111 111 /* Search for corresponding medium: */ 112 UIMedium guiMedium = vboxGlobal().medium( aMediumId);112 UIMedium guiMedium = vboxGlobal().medium(uMediumId); 113 113 114 114 /* Ignore media (and their children) which are … … 136 136 } 137 137 138 void UIMediaComboBox::sltHandleMediumEnumerated(const QUuid & aMediumId)138 void UIMediaComboBox::sltHandleMediumEnumerated(const QUuid &uMediumId) 139 139 { 140 140 /* Search for corresponding medium: */ 141 UIMedium guiMedium = vboxGlobal().medium( aMediumId);141 UIMedium guiMedium = vboxGlobal().medium(uMediumId); 142 142 143 143 /* Add only 1. NULL medium and 2. media of required type: */ … … 157 157 } 158 158 159 void UIMediaComboBox::sltHandleMediumDeleted(const QUuid & aMediumId)159 void UIMediaComboBox::sltHandleMediumDeleted(const QUuid &uMediumId) 160 160 { 161 161 /* Search for corresponding item index: */ 162 162 int iIndex; 163 if (!findMediaIndex( aMediumId, iIndex))163 if (!findMediaIndex(uMediumId, iIndex)) 164 164 return; 165 165 … … 256 256 } 257 257 258 bool UIMediaComboBox::findMediaIndex(const QUuid & aId, int &iIndex)258 bool UIMediaComboBox::findMediaIndex(const QUuid &uId, int &iIndex) 259 259 { 260 260 iIndex = 0; 261 261 262 262 for (; iIndex < m_media.size(); ++ iIndex) 263 if (m_media.at(iIndex).id == aId)263 if (m_media.at(iIndex).id == uId) 264 264 break; 265 265 -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediaComboBox.h
r74878 r74942 50 50 UIMediumDeviceType type() const { return m_enmMediaType; } 51 51 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; } 54 54 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); 57 57 58 58 /** Returns id of item with certain @a iIndex. */ … … 63 63 protected slots: 64 64 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); 71 71 72 72 /** Handles medium enumeration start. */ … … 92 92 void replaceItem(int iPosition, const UIMedium &guiMedium); 93 93 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); 96 96 97 97 /** Holds the media type. */ … … 105 105 { 106 106 Medium() {} 107 Medium(const QUuid & aId,107 Medium(const QUuid &uId, 108 108 const QString &strLocation, 109 109 const QString &strToolTip) 110 : id( aId), location(strLocation), toolTip(strToolTip)110 : id(uId), location(strLocation), toolTip(strToolTip) 111 111 {} 112 112 -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBarEditorWindow.cpp
r74914 r74942 327 327 UIMenuBarEditorWidget::UIMenuBarEditorWidget(QWidget *pParent, 328 328 bool fStartedFromVMSettings /* = true */, 329 const QUuid & aMachineID /* = QUuid() */,329 const QUuid &uMachineID /* = QUuid() */, 330 330 UIActionPool *pActionPool /* = 0 */) 331 331 : QIWithRetranslateUI2<QWidget>(pParent) 332 332 , m_fPrepared(false) 333 333 , m_fStartedFromVMSettings(fStartedFromVMSettings) 334 , m_uMachineID( aMachineID)334 , m_uMachineID(uMachineID) 335 335 , m_pActionPool(pActionPool) 336 336 , m_pMainLayout(0) … … 359 359 } 360 360 361 void UIMenuBarEditorWidget::setMachineID(const QUuid & aMachineID)361 void UIMenuBarEditorWidget::setMachineID(const QUuid &uMachineID) 362 362 { 363 363 /* Remember new machine ID: */ 364 m_uMachineID = aMachineID;364 m_uMachineID = uMachineID; 365 365 /* Prepare: */ 366 366 prepare(); … … 747 747 } 748 748 749 void UIMenuBarEditorWidget::sltHandleConfigurationChange(const QUuid & aMachineID)749 void UIMenuBarEditorWidget::sltHandleConfigurationChange(const QUuid &uMachineID) 750 750 { 751 751 /* Skip unrelated machine IDs: */ 752 if (machineID() != aMachineID)752 if (machineID() != uMachineID) 753 753 return; 754 754 -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBarEditorWindow.h
r74878 r74942 74 74 /** Constructs menu-bar editor widget passing @a pParent to the base-class. 75 75 * @param fStartedFromVMSettings Brings whether 'this' is a part of VM settings. 76 * @param strMachineIDBrings the machine ID to be used by the editor.76 * @param uMachineID Brings the machine ID to be used by the editor. 77 77 * @param pActionPool Brings the action-pool to be used by the editor. */ 78 78 UIMenuBarEditorWidget(QWidget *pParent, 79 79 bool fStartedFromVMSettings = true, 80 const QUuid & aMachineID = QUuid(),80 const QUuid &uMachineID = QUuid(), 81 81 UIActionPool *pActionPool = 0); 82 82 83 83 /** Returns the machine ID instance. */ 84 84 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); 87 87 88 88 /** Returns the action-pool reference. */ … … 155 155 156 156 /** Handles configuration change. */ 157 void sltHandleConfigurationChange(const QUuid & aMachineID);157 void sltHandleConfigurationChange(const QUuid &uMachineID); 158 158 159 159 /** Handles menu-bar menu click. */ -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp
r74878 r74942 58 58 signals: 59 59 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); 64 64 65 65 public: -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.h
r74878 r74942 88 88 private slots: 89 89 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); 94 94 95 95 /** Handles window stack changed signal. */ -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIStatusBarEditorWindow.cpp
r74878 r74942 410 410 UIStatusBarEditorWidget::UIStatusBarEditorWidget(QWidget *pParent, 411 411 bool fStartedFromVMSettings /* = true */, 412 const QUuid & aMachineID /* = QString() */)412 const QUuid &uMachineID /* = QString() */) 413 413 : QIWithRetranslateUI2<QWidget>(pParent) 414 414 , m_fPrepared(false) 415 415 , m_fStartedFromVMSettings(fStartedFromVMSettings) 416 , m_uMachineID( aMachineID)416 , m_uMachineID(uMachineID) 417 417 , m_pMainLayout(0), m_pButtonLayout(0) 418 418 , m_pButtonClose(0) … … 425 425 } 426 426 427 void UIStatusBarEditorWidget::setMachineID(const QUuid & aMachineID)427 void UIStatusBarEditorWidget::setMachineID(const QUuid &uMachineID) 428 428 { 429 429 /* Remember new machine ID: */ 430 m_uMachineID = aMachineID;430 m_uMachineID = uMachineID; 431 431 /* Prepare: */ 432 432 prepare(); … … 690 690 } 691 691 692 void UIStatusBarEditorWidget::sltHandleConfigurationChange(const QUuid & aMachineID)692 void UIStatusBarEditorWidget::sltHandleConfigurationChange(const QUuid &uMachineID) 693 693 { 694 694 /* Skip unrelated machine IDs: */ 695 if (machineID() != aMachineID)695 if (machineID() != uMachineID) 696 696 return; 697 697 -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIStatusBarEditorWindow.h
r74878 r74942 73 73 /** Constructs status-bar editor widget passing @a pParent to the base-class. 74 74 * @param fStartedFromVMSettings Brings whether 'this' is a part of VM settings. 75 * @param strMachineIDBrings the machine ID to be used by the editor. */75 * @param uMachineID Brings the machine ID to be used by the editor. */ 76 76 UIStatusBarEditorWidget(QWidget *pParent, 77 77 bool fStartedFromVMSettings = true, 78 const QUuid & aMachineID = QUuid());78 const QUuid &uMachineID = QUuid()); 79 79 80 80 /** Returns the machine ID instance. */ 81 81 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); 84 84 85 85 /** Returns whether the status-bar enabled. */ … … 115 115 116 116 /** Handles configuration change. */ 117 void sltHandleConfigurationChange(const QUuid & aMachineID);117 void sltHandleConfigurationChange(const QUuid &uMachineID); 118 118 119 119 /** Handles button click. */ -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp
r74878 r74942 439 439 } 440 440 441 void UIWizardExportAppPage2::setProviderById(const QUuid & aId)442 { 443 const int iIndex = m_pFormatComboBox->findData( aId, FormatData_ID);441 void UIWizardExportAppPage2::setProviderById(const QUuid &uId) 442 { 443 const int iIndex = m_pFormatComboBox->findData(uId, FormatData_ID); 444 444 AssertMsg(iIndex != -1, ("Data not found!")); 445 445 m_pFormatComboBox->setCurrentIndex(iIndex); -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h
r74878 r74942 136 136 bool isIncludeISOsSelected() const; 137 137 138 /** Defines provider by @a strId. */139 void setProviderById(const QUuid & strId);138 /** Defines provider by @a uId. */ 139 void setProviderById(const QUuid &uId); 140 140 /** Returns provider ID. */ 141 141 QUuid providerId() const; -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp
r74878 r74942 57 57 } 58 58 59 void UIWizardFirstRunPage::setId(const QUuid & aId)59 void UIWizardFirstRunPage::setId(const QUuid &uId) 60 60 { 61 m_pMediaSelector->setCurrentItem( aId);61 m_pMediaSelector->setCurrentItem(uId); 62 62 } 63 63 64 UIWizardFirstRunPageBasic::UIWizardFirstRunPageBasic(const QUuid & aMachineId, bool fBootHardDiskWasSet)64 UIWizardFirstRunPageBasic::UIWizardFirstRunPageBasic(const QUuid &uMachineId, bool fBootHardDiskWasSet) 65 65 : UIWizardFirstRunPage(fBootHardDiskWasSet) 66 66 { … … 73 73 m_pMediaSelector = new UIMediaComboBox(this); 74 74 { 75 m_pMediaSelector->setMachineId( aMachineId);75 m_pMediaSelector->setMachineId(uMachineId); 76 76 m_pMediaSelector->setType(UIMediumDeviceType_DVD); 77 77 m_pMediaSelector->repopulate(); -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.h
r74878 r74942 44 44 /* Stuff for 'id' field: */ 45 45 QUuid id() const; 46 void setId(const QUuid & aId);46 void setId(const QUuid &uId); 47 47 48 48 /* Variables: */ … … 64 64 65 65 /* Constructor: */ 66 UIWizardFirstRunPageBasic(const QUuid & aMachineId, bool fBootHardDiskWasSet);66 UIWizardFirstRunPageBasic(const QUuid &uMachineId, bool fBootHardDiskWasSet); 67 67 68 68 protected: -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.h
r74878 r74942 54 54 /* Stuff for 'virtualDiskId' field: */ 55 55 QUuid virtualDiskId() const { return m_uVirtualDiskId; } 56 void setVirtualDiskId(const QUuid & aVirtualDiskId) { m_uVirtualDiskId = aVirtualDiskId; }56 void setVirtualDiskId(const QUuid &uVirtualDiskId) { m_uVirtualDiskId = uVirtualDiskId; } 57 57 58 58 /* Stuff for 'virtualDiskName' field: */
Note:
See TracChangeset
for help on using the changeset viewer.

