Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 51927)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 51928)
@@ -158,5 +158,5 @@
 }
 
-QStringList UIExtraDataManager::suppressedMessages() const
+QStringList UIExtraDataManager::suppressedMessages()
 {
     return extraDataStringList(GUI_SuppressMessages);
@@ -168,5 +168,5 @@
 }
 
-QStringList UIExtraDataManager::messagesWithInvertedOption() const
+QStringList UIExtraDataManager::messagesWithInvertedOption()
 {
     return extraDataStringList(GUI_InvertMessageOption);
@@ -174,5 +174,5 @@
 
 #if !defined(VBOX_BLEEDING_EDGE) && !defined(DEBUG)
-QString UIExtraDataManager::preventBetaBuildWarningForVersion() const
+QString UIExtraDataManager::preventBetaBuildWarningForVersion()
 {
     return extraDataString(GUI_PreventBetaWarning);
@@ -181,5 +181,5 @@
 
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-bool UIExtraDataManager::applicationUpdateEnabled() const
+bool UIExtraDataManager::applicationUpdateEnabled()
 {
     /* 'True' unless 'restriction' feature allowed: */
@@ -187,5 +187,5 @@
 }
 
-QString UIExtraDataManager::applicationUpdateData() const
+QString UIExtraDataManager::applicationUpdateData()
 {
     return extraDataString(GUI_UpdateDate);
@@ -197,5 +197,5 @@
 }
 
-qulonglong UIExtraDataManager::applicationUpdateCheckCounter() const
+qulonglong UIExtraDataManager::applicationUpdateCheckCounter()
 {
     /* Read subsequent update check counter value: */
@@ -219,5 +219,5 @@
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
-QList<GlobalSettingsPageType> UIExtraDataManager::restrictedGlobalSettingsPages() const
+QList<GlobalSettingsPageType> UIExtraDataManager::restrictedGlobalSettingsPages()
 {
     /* Prepare result: */
@@ -234,5 +234,5 @@
 }
 
-QList<MachineSettingsPageType> UIExtraDataManager::restrictedMachineSettingsPages(const QString &strID) const
+QList<MachineSettingsPageType> UIExtraDataManager::restrictedMachineSettingsPages(const QString &strID)
 {
     /* Prepare result: */
@@ -249,5 +249,5 @@
 }
 
-QStringList UIExtraDataManager::shortcutOverrides(const QString &strPoolExtraDataID) const
+QStringList UIExtraDataManager::shortcutOverrides(const QString &strPoolExtraDataID)
 {
     if (strPoolExtraDataID == GUI_Input_SelectorShortcuts)
@@ -258,15 +258,15 @@
 }
 
-QString UIExtraDataManager::recentFolderForHardDrives() const
+QString UIExtraDataManager::recentFolderForHardDrives()
 {
     return extraDataString(GUI_RecentFolderHD);
 }
 
-QString UIExtraDataManager::recentFolderForOpticalDisks() const
+QString UIExtraDataManager::recentFolderForOpticalDisks()
 {
     return extraDataString(GUI_RecentFolderCD);
 }
 
-QString UIExtraDataManager::recentFolderForFloppyDisks() const
+QString UIExtraDataManager::recentFolderForFloppyDisks()
 {
     return extraDataString(GUI_RecentFolderFD);
@@ -288,15 +288,15 @@
 }
 
-QStringList UIExtraDataManager::recentListOfHardDrives() const
+QStringList UIExtraDataManager::recentListOfHardDrives()
 {
     return extraDataStringList(GUI_RecentListHD);
 }
 
-QStringList UIExtraDataManager::recentListOfOpticalDisks() const
+QStringList UIExtraDataManager::recentListOfOpticalDisks()
 {
     return extraDataStringList(GUI_RecentListCD);
 }
 
-QStringList UIExtraDataManager::recentListOfFloppyDisks() const
+QStringList UIExtraDataManager::recentListOfFloppyDisks()
 {
     return extraDataStringList(GUI_RecentListFD);
@@ -318,5 +318,5 @@
 }
 
-QRect UIExtraDataManager::selectorWindowGeometry(QWidget *pWidget) const
+QRect UIExtraDataManager::selectorWindowGeometry(QWidget *pWidget)
 {
     /* Get corresponding extra-data: */
@@ -361,5 +361,5 @@
 }
 
-bool UIExtraDataManager::selectorWindowShouldBeMaximized() const
+bool UIExtraDataManager::selectorWindowShouldBeMaximized()
 {
     /* Get corresponding extra-data: */
@@ -385,5 +385,5 @@
 }
 
-QList<int> UIExtraDataManager::selectorWindowSplitterHints() const
+QList<int> UIExtraDataManager::selectorWindowSplitterHints()
 {
     /* Get corresponding extra-data: */
@@ -410,5 +410,5 @@
 }
 
-bool UIExtraDataManager::selectorWindowToolBarVisible() const
+bool UIExtraDataManager::selectorWindowToolBarVisible()
 {
     /* 'True' unless feature restricted: */
@@ -422,5 +422,5 @@
 }
 
-bool UIExtraDataManager::selectorWindowStatusBarVisible() const
+bool UIExtraDataManager::selectorWindowStatusBarVisible()
 {
     /* 'True' unless feature restricted: */
@@ -436,13 +436,11 @@
 void UIExtraDataManager::clearSelectorWindowGroupsDefinitions()
 {
-    /* Read-only access global extra-data map: */
-    const ExtraDataMap &data = m_data[GlobalID];
     /* Wipe-out each the group definition record: */
-    foreach (const QString &strKey, data.keys())
+    foreach (const QString &strKey, m_data.value(GlobalID).keys())
         if (strKey.startsWith(GUI_GroupDefinitions))
             setExtraDataString(strKey, QString());
 }
 
-QStringList UIExtraDataManager::selectorWindowGroupsDefinitions(const QString &strGroupID) const
+QStringList UIExtraDataManager::selectorWindowGroupsDefinitions(const QString &strGroupID)
 {
     return extraDataStringList(GUI_GroupDefinitions + strGroupID);
@@ -454,5 +452,5 @@
 }
 
-QString UIExtraDataManager::selectorWindowLastItemChosen() const
+QString UIExtraDataManager::selectorWindowLastItemChosen()
 {
     return extraDataString(GUI_LastItemSelected);
@@ -506,5 +504,5 @@
 }
 
-PreviewUpdateIntervalType UIExtraDataManager::selectorWindowPreviewUpdateInterval() const
+PreviewUpdateIntervalType UIExtraDataManager::selectorWindowPreviewUpdateInterval()
 {
     return gpConverter->fromInternalString<PreviewUpdateIntervalType>(extraDataString(GUI_PreviewUpdate));
@@ -544,5 +542,5 @@
 }
 
-bool UIExtraDataManager::showMachineInSelectorChooser(const QString &strID) const
+bool UIExtraDataManager::showMachineInSelectorChooser(const QString &strID)
 {
     /* 'True' unless 'restriction' feature allowed: */
@@ -550,5 +548,5 @@
 }
 
-bool UIExtraDataManager::showMachineInSelectorDetails(const QString &strID) const
+bool UIExtraDataManager::showMachineInSelectorDetails(const QString &strID)
 {
     /* 'True' unless 'restriction' feature allowed: */
@@ -556,5 +554,5 @@
 }
 
-bool UIExtraDataManager::machineReconfigurationEnabled(const QString &strID) const
+bool UIExtraDataManager::machineReconfigurationEnabled(const QString &strID)
 {
     /* 'True' unless 'restriction' feature allowed: */
@@ -562,5 +560,5 @@
 }
 
-bool UIExtraDataManager::machineSnapshotOperationsEnabled(const QString &strID) const
+bool UIExtraDataManager::machineSnapshotOperationsEnabled(const QString &strID)
 {
     /* 'True' unless 'restriction' feature allowed: */
@@ -568,5 +566,5 @@
 }
 
-bool UIExtraDataManager::machineFirstTimeStarted(const QString &strID) const
+bool UIExtraDataManager::machineFirstTimeStarted(const QString &strID)
 {
     /* 'True' only if feature is allowed: */
@@ -581,10 +579,10 @@
 
 #ifndef Q_WS_MAC
-QStringList UIExtraDataManager::machineWindowIconNames(const QString &strID) const
+QStringList UIExtraDataManager::machineWindowIconNames(const QString &strID)
 {
     return extraDataStringList(GUI_MachineWindowIcons, strID);
 }
 
-QString UIExtraDataManager::machineWindowNamePostfix(const QString &strID) const
+QString UIExtraDataManager::machineWindowNamePostfix(const QString &strID)
 {
     return extraDataString(GUI_MachineWindowNamePostfix, strID);
@@ -592,5 +590,5 @@
 #endif /* !Q_WS_MAC */
 
-QRect UIExtraDataManager::machineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QString &strID) const
+QRect UIExtraDataManager::machineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QString &strID)
 {
     /* Choose corresponding key: */
@@ -626,5 +624,5 @@
 }
 
-bool UIExtraDataManager::machineWindowShouldBeMaximized(UIVisualStateType visualStateType, ulong uScreenIndex, const QString &strID) const
+bool UIExtraDataManager::machineWindowShouldBeMaximized(UIVisualStateType visualStateType, ulong uScreenIndex, const QString &strID)
 {
     /* Choose corresponding key: */
@@ -668,5 +666,5 @@
 }
 
-RuntimeMenuType UIExtraDataManager::restrictedRuntimeMenuTypes(const QString &strID) const
+RuntimeMenuType UIExtraDataManager::restrictedRuntimeMenuTypes(const QString &strID)
 {
     /* Prepare result: */
@@ -684,5 +682,5 @@
 
 #ifdef Q_WS_MAC
-RuntimeMenuApplicationActionType UIExtraDataManager::restrictedRuntimeMenuApplicationActionTypes(const QString &strID) const
+RuntimeMenuApplicationActionType UIExtraDataManager::restrictedRuntimeMenuApplicationActionTypes(const QString &strID)
 {
     /* Prepare result: */
@@ -700,5 +698,5 @@
 #endif /* Q_WS_MAC */
 
-RuntimeMenuMachineActionType UIExtraDataManager::restrictedRuntimeMenuMachineActionTypes(const QString &strID) const
+RuntimeMenuMachineActionType UIExtraDataManager::restrictedRuntimeMenuMachineActionTypes(const QString &strID)
 {
     /* Prepare result: */
@@ -715,5 +713,5 @@
 }
 
-RuntimeMenuViewActionType UIExtraDataManager::restrictedRuntimeMenuViewActionTypes(const QString &strID) const
+RuntimeMenuViewActionType UIExtraDataManager::restrictedRuntimeMenuViewActionTypes(const QString &strID)
 {
     /* Prepare result: */
@@ -730,5 +728,5 @@
 }
 
-RuntimeMenuDevicesActionType UIExtraDataManager::restrictedRuntimeMenuDevicesActionTypes(const QString &strID) const
+RuntimeMenuDevicesActionType UIExtraDataManager::restrictedRuntimeMenuDevicesActionTypes(const QString &strID)
 {
     /* Prepare result: */
@@ -746,5 +744,5 @@
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
-RuntimeMenuDebuggerActionType UIExtraDataManager::restrictedRuntimeMenuDebuggerActionTypes(const QString &strID) const
+RuntimeMenuDebuggerActionType UIExtraDataManager::restrictedRuntimeMenuDebuggerActionTypes(const QString &strID)
 {
     /* Prepare result: */
@@ -762,5 +760,5 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-RuntimeMenuHelpActionType UIExtraDataManager::restrictedRuntimeMenuHelpActionTypes(const QString &strID) const
+RuntimeMenuHelpActionType UIExtraDataManager::restrictedRuntimeMenuHelpActionTypes(const QString &strID)
 {
     /* Prepare result: */
@@ -777,5 +775,5 @@
 }
 
-UIVisualStateType UIExtraDataManager::restrictedVisualStates(const QString &strID) const
+UIVisualStateType UIExtraDataManager::restrictedVisualStates(const QString &strID)
 {
     /* Prepare result: */
@@ -792,5 +790,5 @@
 }
 
-UIVisualStateType UIExtraDataManager::requestedVisualState(const QString &strID) const
+UIVisualStateType UIExtraDataManager::requestedVisualState(const QString &strID)
 {
     if (isFeatureAllowed(GUI_Fullscreen, strID)) return UIVisualStateType_Fullscreen;
@@ -807,5 +805,5 @@
 }
 
-bool UIExtraDataManager::guestScreenAutoResizeEnabled(const QString &strID) const
+bool UIExtraDataManager::guestScreenAutoResizeEnabled(const QString &strID)
 {
     /* 'True' unless feature restricted: */
@@ -819,5 +817,5 @@
 }
 
-QSize UIExtraDataManager::lastGuestSizeHint(ulong uScreenIndex, const QString &strID) const
+QSize UIExtraDataManager::lastGuestSizeHint(ulong uScreenIndex, const QString &strID)
 {
     /* Choose corresponding key: */
@@ -857,5 +855,5 @@
 }
 
-bool UIExtraDataManager::wasLastGuestSizeHintForFullScreen(ulong uScreenIndex, const QString &strID) const
+bool UIExtraDataManager::wasLastGuestSizeHintForFullScreen(ulong uScreenIndex, const QString &strID)
 {
     /* Choose corresponding key: */
@@ -898,5 +896,5 @@
 }
 
-bool UIExtraDataManager::autoMountGuestScreensEnabled(const QString &strID) const
+bool UIExtraDataManager::autoMountGuestScreensEnabled(const QString &strID)
 {
     /* Show only if 'allowed' flag is set: */
@@ -905,5 +903,5 @@
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
-bool UIExtraDataManager::useLinearStretch(const QString &strID) const
+bool UIExtraDataManager::useLinearStretch(const QString &strID)
 {
     /* 'True' unless feature restricted: */
@@ -911,5 +909,5 @@
 }
 
-bool UIExtraDataManager::usePixelFormatYV12(const QString &strID) const
+bool UIExtraDataManager::usePixelFormatYV12(const QString &strID)
 {
     /* 'True' unless feature restricted: */
@@ -917,5 +915,5 @@
 }
 
-bool UIExtraDataManager::usePixelFormatUYVY(const QString &strID) const
+bool UIExtraDataManager::usePixelFormatUYVY(const QString &strID)
 {
     /* 'True' unless feature restricted: */
@@ -923,5 +921,5 @@
 }
 
-bool UIExtraDataManager::usePixelFormatYUY2(const QString &strID) const
+bool UIExtraDataManager::usePixelFormatYUY2(const QString &strID)
 {
     /* 'True' unless feature restricted: */
@@ -929,5 +927,5 @@
 }
 
-bool UIExtraDataManager::usePixelFormatAYUV(const QString &strID) const
+bool UIExtraDataManager::usePixelFormatAYUV(const QString &strID)
 {
     /* 'True' unless feature restricted: */
@@ -936,10 +934,10 @@
 #endif /* VBOX_WITH_VIDEOHWACCEL */
 
-HiDPIOptimizationType UIExtraDataManager::hiDPIOptimizationType(const QString &strID) const
+HiDPIOptimizationType UIExtraDataManager::hiDPIOptimizationType(const QString &strID)
 {
     return gpConverter->fromInternalString<HiDPIOptimizationType>(extraDataString(GUI_HiDPI_Optimization, strID));
 }
 
-bool UIExtraDataManager::miniToolbarEnabled(const QString &strID) const
+bool UIExtraDataManager::miniToolbarEnabled(const QString &strID)
 {
     /* 'True' unless feature restricted: */
@@ -953,5 +951,5 @@
 }
 
-bool UIExtraDataManager::autoHideMiniToolbar(const QString &strID) const
+bool UIExtraDataManager::autoHideMiniToolbar(const QString &strID)
 {
     /* 'True' unless feature restricted: */
@@ -965,5 +963,5 @@
 }
 
-Qt::AlignmentFlag UIExtraDataManager::miniToolbarAlignment(const QString &strID) const
+Qt::AlignmentFlag UIExtraDataManager::miniToolbarAlignment(const QString &strID)
 {
     /* Return Qt::AlignBottom unless MiniToolbarAlignment_Top specified separately: */
@@ -987,5 +985,5 @@
 }
 
-QList<IndicatorType> UIExtraDataManager::restrictedStatusBarIndicators(const QString &strID) const
+QList<IndicatorType> UIExtraDataManager::restrictedStatusBarIndicators(const QString &strID)
 {
     /* Prepare result: */
@@ -1003,5 +1001,5 @@
 
 #ifdef Q_WS_MAC
-bool UIExtraDataManager::presentationModeEnabled(const QString &strID) const
+bool UIExtraDataManager::presentationModeEnabled(const QString &strID)
 {
     /* 'False' unless feature allowed: */
@@ -1009,5 +1007,5 @@
 }
 
-bool UIExtraDataManager::realtimeDockIconUpdateEnabled(const QString &strID) const
+bool UIExtraDataManager::realtimeDockIconUpdateEnabled(const QString &strID)
 {
     /* 'True' unless feature restricted: */
@@ -1021,5 +1019,5 @@
 }
 
-int UIExtraDataManager::realtimeDockIconUpdateMonitor(const QString &strID) const
+int UIExtraDataManager::realtimeDockIconUpdateMonitor(const QString &strID)
 {
     return extraDataString(GUI_RealtimeDockIconUpdateMonitor, strID).toInt();
@@ -1032,5 +1030,5 @@
 #endif /* Q_WS_MAC */
 
-bool UIExtraDataManager::passCADtoGuest(const QString &strID) const
+bool UIExtraDataManager::passCADtoGuest(const QString &strID)
 {
     /* 'False' unless feature allowed: */
@@ -1038,10 +1036,10 @@
 }
 
-GuruMeditationHandlerType UIExtraDataManager::guruMeditationHandlerType(const QString &strID) const
+GuruMeditationHandlerType UIExtraDataManager::guruMeditationHandlerType(const QString &strID)
 {
     return gpConverter->fromInternalString<GuruMeditationHandlerType>(extraDataString(GUI_GuruMeditationHandler, strID));
 }
 
-bool UIExtraDataManager::hidLedsSyncState(const QString &strID) const
+bool UIExtraDataManager::hidLedsSyncState(const QString &strID)
 {
     /* 'True' unless feature restricted: */
@@ -1049,5 +1047,5 @@
 }
 
-QRect UIExtraDataManager::informationWindowGeometry(QWidget *pWidget, QWidget *pParentWidget, const QString &strID) const
+QRect UIExtraDataManager::informationWindowGeometry(QWidget *pWidget, QWidget *pParentWidget, const QString &strID)
 {
     /* Get corresponding extra-data: */
@@ -1092,5 +1090,5 @@
 }
 
-bool UIExtraDataManager::informationWindowShouldBeMaximized(const QString &strID) const
+bool UIExtraDataManager::informationWindowShouldBeMaximized(const QString &strID)
 {
     /* Get corresponding extra-data: */
@@ -1116,10 +1114,10 @@
 }
 
-MachineCloseAction UIExtraDataManager::defaultMachineCloseAction(const QString &strID) const
+MachineCloseAction UIExtraDataManager::defaultMachineCloseAction(const QString &strID)
 {
     return gpConverter->fromInternalString<MachineCloseAction>(extraDataString(GUI_DefaultCloseAction, strID));
 }
 
-MachineCloseAction UIExtraDataManager::restrictedMachineCloseActions(const QString &strID) const
+MachineCloseAction UIExtraDataManager::restrictedMachineCloseActions(const QString &strID)
 {
     /* Prepare result: */
@@ -1136,5 +1134,5 @@
 }
 
-MachineCloseAction UIExtraDataManager::lastMachineCloseAction(const QString &strID) const
+MachineCloseAction UIExtraDataManager::lastMachineCloseAction(const QString &strID)
 {
     return gpConverter->fromInternalString<MachineCloseAction>(extraDataString(GUI_LastCloseAction, strID));
@@ -1146,5 +1144,5 @@
 }
 
-QString UIExtraDataManager::machineCloseHookScript(const QString &strID) const
+QString UIExtraDataManager::machineCloseHookScript(const QString &strID)
 {
     return extraDataString(GUI_CloseActionHook, strID);
@@ -1152,5 +1150,5 @@
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
-QString UIExtraDataManager::debugFlagValue(const QString &strDebugFlagKey) const
+QString UIExtraDataManager::debugFlagValue(const QString &strDebugFlagKey)
 {
     return extraDataString(strDebugFlagKey).toLower().trimmed();
@@ -1277,5 +1275,5 @@
 }
 
-void UIExtraDataManager::hotloadMachineExtraDataMap(const QString &strID) const
+void UIExtraDataManager::hotloadMachineExtraDataMap(const QString &strID)
 {
     /* Make sure it is valid ID: */
@@ -1302,5 +1300,5 @@
 }
 
-bool UIExtraDataManager::isFeatureAllowed(const QString &strKey, const QString &strID /* = GlobalID */) const
+bool UIExtraDataManager::isFeatureAllowed(const QString &strKey, const QString &strID /* = GlobalID */)
 {
     /* Hot-load machine extra-data map if necessary: */
@@ -1308,6 +1306,6 @@
         hotloadMachineExtraDataMap(strID);
 
-    /* Access corresponding map: */
-    ExtraDataMap &data = m_data[strID];
+    /* Read-only access corresponding map: */
+    const ExtraDataMap data = m_data.value(strID);
 
     /* 'false' if value was not set: */
@@ -1323,5 +1321,5 @@
 }
 
-bool UIExtraDataManager::isFeatureRestricted(const QString &strKey, const QString &strID /* = GlobalID */) const
+bool UIExtraDataManager::isFeatureRestricted(const QString &strKey, const QString &strID /* = GlobalID */)
 {
     /* Hot-load machine extra-data map if necessary: */
@@ -1329,6 +1327,6 @@
         hotloadMachineExtraDataMap(strID);
 
-    /* Access corresponding map: */
-    ExtraDataMap &data = m_data[strID];
+    /* Read-only access corresponding map: */
+    const ExtraDataMap data = m_data.value(strID);
 
     /* 'false' if value was not set: */
@@ -1354,5 +1352,5 @@
 }
 
-QString UIExtraDataManager::extraDataString(const QString &strKey, const QString &strID /* = GlobalID */) const
+QString UIExtraDataManager::extraDataString(const QString &strKey, const QString &strID /* = GlobalID */)
 {
     /* Hot-load machine extra-data map if necessary: */
@@ -1403,5 +1401,5 @@
 }
 
-QStringList UIExtraDataManager::extraDataStringList(const QString &strKey, const QString &strID /* = GlobalID */) const
+QStringList UIExtraDataManager::extraDataStringList(const QString &strKey, const QString &strID /* = GlobalID */)
 {
     /* Hot-load machine extra-data map if necessary: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h	(revision 51927)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h	(revision 51928)
@@ -79,14 +79,14 @@
       * @{ */
         /** Returns the list of supressed messages for the Message/Popup center frameworks. */
-        QStringList suppressedMessages() const;
+        QStringList suppressedMessages();
         /** Defines the @a list of supressed messages for the Message/Popup center frameworks. */
         void setSuppressedMessages(const QStringList &list);
 
         /** Returns the list of messages for the Message/Popup center frameworks with inverted check-box state. */
-        QStringList messagesWithInvertedOption() const;
+        QStringList messagesWithInvertedOption();
 
 #if !defined(VBOX_BLEEDING_EDGE) && !defined(DEBUG)
         /** Returns version for which user wants to prevent BETA build warning. */
-        QString preventBetaBuildWarningForVersion() const;
+        QString preventBetaBuildWarningForVersion();
 #endif /* !defined(VBOX_BLEEDING_EDGE) && !defined(DEBUG) */
     /** @} */
@@ -96,13 +96,13 @@
       * @{ */
         /** Returns whether Application Update functionality enabled. */
-        bool applicationUpdateEnabled() const;
+        bool applicationUpdateEnabled();
 
         /** Returns Application Update data. */
-        QString applicationUpdateData() const;
+        QString applicationUpdateData();
         /** Defines Application Update data as @a strValue. */
         void setApplicationUpdateData(const QString &strValue);
 
         /** Returns Application Update check counter. */
-        qulonglong applicationUpdateCheckCounter() const;
+        qulonglong applicationUpdateCheckCounter();
         /** Increments Application Update check counter. */
         void incrementApplicationUpdateCheckCounter();
@@ -113,7 +113,7 @@
       * @{ */
         /** Returns restricted global settings pages. */
-        QList<GlobalSettingsPageType> restrictedGlobalSettingsPages() const;
+        QList<GlobalSettingsPageType> restrictedGlobalSettingsPages();
         /** Returns restricted machine settings pages. */
-        QList<MachineSettingsPageType> restrictedMachineSettingsPages(const QString &strID) const;
+        QList<MachineSettingsPageType> restrictedMachineSettingsPages(const QString &strID);
     /** @} */
 
@@ -121,5 +121,5 @@
       * @{ */
         /** Returns shortcut overrides for shortcut-pool with @a strPoolExtraDataID. */
-        QStringList shortcutOverrides(const QString &strPoolExtraDataID) const;
+        QStringList shortcutOverrides(const QString &strPoolExtraDataID);
     /** @} */
 
@@ -127,9 +127,9 @@
       * @{ */
         /** Returns recent folder for hard-drives. */
-        QString recentFolderForHardDrives() const;
+        QString recentFolderForHardDrives();
         /** Returns recent folder for optical-disks. */
-        QString recentFolderForOpticalDisks() const;
+        QString recentFolderForOpticalDisks();
         /** Returns recent folder for floppy-disks. */
-        QString recentFolderForFloppyDisks() const;
+        QString recentFolderForFloppyDisks();
         /** Defines recent folder for hard-drives as @a strValue. */
         void setRecentFolderForHardDrives(const QString &strValue);
@@ -140,9 +140,9 @@
 
         /** Returns the list of recently used hard-drives. */
-        QStringList recentListOfHardDrives() const;
+        QStringList recentListOfHardDrives();
         /** Returns the list of recently used optical-disk. */
-        QStringList recentListOfOpticalDisks() const;
+        QStringList recentListOfOpticalDisks();
         /** Returns the list of recently used floppy-disk. */
-        QStringList recentListOfFloppyDisks() const;
+        QStringList recentListOfFloppyDisks();
         /** Defines the list of recently used hard-drives as @a value. */
         void setRecentListOfHardDrives(const QStringList &value);
@@ -156,22 +156,22 @@
       * @{ */
         /** Returns selector-window geometry using @a pWidget as the hint. */
-        QRect selectorWindowGeometry(QWidget *pWidget) const;
+        QRect selectorWindowGeometry(QWidget *pWidget);
         /** Returns whether selector-window should be maximized. */
-        bool selectorWindowShouldBeMaximized() const;
+        bool selectorWindowShouldBeMaximized();
         /** Defines selector-window @a geometry and @a fMaximized state. */
         void setSelectorWindowGeometry(const QRect &geometry, bool fMaximized);
 
         /** Returns selector-window splitter hints. */
-        QList<int> selectorWindowSplitterHints() const;
+        QList<int> selectorWindowSplitterHints();
         /** Defines selector-window splitter @a hints. */
         void setSelectorWindowSplitterHints(const QList<int> &hints);
 
         /** Returns whether selector-window tool-bar visible. */
-        bool selectorWindowToolBarVisible() const;
+        bool selectorWindowToolBarVisible();
         /** Defines whether selector-window tool-bar @a fVisible. */
         void setSelectorWindowToolBarVisible(bool fVisible);
 
         /** Returns whether selector-window status-bar visible. */
-        bool selectorWindowStatusBarVisible() const;
+        bool selectorWindowStatusBarVisible();
         /** Defines whether selector-window status-bar @a fVisible. */
         void setSelectorWindowStatusBarVisible(bool fVisible);
@@ -180,10 +180,10 @@
         void clearSelectorWindowGroupsDefinitions();
         /** Returns selector-window chooser-pane' groups definitions for passed @a strGroupID. */
-        QStringList selectorWindowGroupsDefinitions(const QString &strGroupID) const;
+        QStringList selectorWindowGroupsDefinitions(const QString &strGroupID);
         /** Defines selector-window chooser-pane' groups @a definitions for passed @a strGroupID. */
         void setSelectorWindowGroupsDefinitions(const QString &strGroupID, const QStringList &definitions);
 
         /** Returns last-item ID of the item chosen in selector-window chooser-pane. */
-        QString selectorWindowLastItemChosen() const;
+        QString selectorWindowLastItemChosen();
         /** Defines @a lastItemID of the item chosen in selector-window chooser-pane. */
         void setSelectorWindowLastItemChosen(const QString &strItemID);
@@ -195,5 +195,5 @@
 
         /** Returns selector-window details-pane' preview update interval. */
-        PreviewUpdateIntervalType selectorWindowPreviewUpdateInterval() const;
+        PreviewUpdateIntervalType selectorWindowPreviewUpdateInterval();
         /** Defines selector-window details-pane' preview update @a interval. */
         void setSelectorWindowPreviewUpdateInterval(PreviewUpdateIntervalType interval);
@@ -211,15 +211,15 @@
       * @{ */
         /** Returns whether machine should be shown in selector-window chooser-pane. */
-        bool showMachineInSelectorChooser(const QString &strID) const;
+        bool showMachineInSelectorChooser(const QString &strID);
         /** Returns whether machine should be shown in selector-window details-pane. */
-        bool showMachineInSelectorDetails(const QString &strID) const;
+        bool showMachineInSelectorDetails(const QString &strID);
 
         /** Returns whether machine reconfiguration enabled. */
-        bool machineReconfigurationEnabled(const QString &strID) const;
+        bool machineReconfigurationEnabled(const QString &strID);
         /** Returns whether machine snapshot operations enabled. */
-        bool machineSnapshotOperationsEnabled(const QString &strID) const;
+        bool machineSnapshotOperationsEnabled(const QString &strID);
 
         /** Returns whether this machine is first time started. */
-        bool machineFirstTimeStarted(const QString &strID) const;
+        bool machineFirstTimeStarted(const QString &strID);
         /** Returns whether this machine is fFirstTimeStarted. */
         void setMachineFirstTimeStarted(bool fFirstTimeStarted, const QString &strID);
@@ -227,54 +227,54 @@
 #ifndef Q_WS_MAC
         /** Except Mac OS X: Returns redefined machine-window icon names. */
-        QStringList machineWindowIconNames(const QString &strID) const;
+        QStringList machineWindowIconNames(const QString &strID);
         /** Except Mac OS X: Returns redefined machine-window name postfix. */
-        QString machineWindowNamePostfix(const QString &strID) const;
+        QString machineWindowNamePostfix(const QString &strID);
 #endif /* !Q_WS_MAC */
 
         /** Returns geometry for machine-window with @a uScreenIndex in @a visualStateType. */
-        QRect machineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QString &strID) const;
+        QRect machineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QString &strID);
         /** Returns whether machine-window with @a uScreenIndex in @a visualStateType should be maximized. */
-        bool machineWindowShouldBeMaximized(UIVisualStateType visualStateType, ulong uScreenIndex, const QString &strID) const;
+        bool machineWindowShouldBeMaximized(UIVisualStateType visualStateType, ulong uScreenIndex, const QString &strID);
         /** Defines @a geometry and @a fMaximized state for machine-window with @a uScreenIndex in @a visualStateType. */
         void setMachineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QRect &geometry, bool fMaximized, const QString &strID);
 
         /** Returns restricted Runtime UI menu types. */
-        RuntimeMenuType restrictedRuntimeMenuTypes(const QString &strID) const;
+        RuntimeMenuType restrictedRuntimeMenuTypes(const QString &strID);
     #ifdef Q_WS_MAC
         /** Mac OS X: Returns restricted Runtime UI action types for Application menu. */
-        RuntimeMenuApplicationActionType restrictedRuntimeMenuApplicationActionTypes(const QString &strID) const;
+        RuntimeMenuApplicationActionType restrictedRuntimeMenuApplicationActionTypes(const QString &strID);
     #endif /* Q_WS_MAC */
         /** Returns restricted Runtime UI action types for Machine menu. */
-        RuntimeMenuMachineActionType restrictedRuntimeMenuMachineActionTypes(const QString &strID) const;
+        RuntimeMenuMachineActionType restrictedRuntimeMenuMachineActionTypes(const QString &strID);
         /** Returns restricted Runtime UI action types for View menu. */
-        RuntimeMenuViewActionType restrictedRuntimeMenuViewActionTypes(const QString &strID) const;
+        RuntimeMenuViewActionType restrictedRuntimeMenuViewActionTypes(const QString &strID);
         /** Returns restricted Runtime UI action types for Devices menu. */
-        RuntimeMenuDevicesActionType restrictedRuntimeMenuDevicesActionTypes(const QString &strID) const;
+        RuntimeMenuDevicesActionType restrictedRuntimeMenuDevicesActionTypes(const QString &strID);
     #ifdef VBOX_WITH_DEBUGGER_GUI
         /** Returns restricted Runtime UI action types for Debugger menu. */
-        RuntimeMenuDebuggerActionType restrictedRuntimeMenuDebuggerActionTypes(const QString &strID) const;
+        RuntimeMenuDebuggerActionType restrictedRuntimeMenuDebuggerActionTypes(const QString &strID);
     #endif /* VBOX_WITH_DEBUGGER_GUI */
         /** Returns restricted Runtime UI action types for Help menu. */
-        RuntimeMenuHelpActionType restrictedRuntimeMenuHelpActionTypes(const QString &strID) const;
+        RuntimeMenuHelpActionType restrictedRuntimeMenuHelpActionTypes(const QString &strID);
 
         /** Returns restricted Runtime UI visual-states. */
-        UIVisualStateType restrictedVisualStates(const QString &strID) const;
+        UIVisualStateType restrictedVisualStates(const QString &strID);
 
         /** Returns requested Runtime UI visual-state. */
-        UIVisualStateType requestedVisualState(const QString &strID) const;
+        UIVisualStateType requestedVisualState(const QString &strID);
         /** Defines requested Runtime UI visual-state as @a visualState. */
         void setRequestedVisualState(UIVisualStateType visualState, const QString &strID);
 
         /** Returns whether guest-screen auto-resize according machine-window size is enabled. */
-        bool guestScreenAutoResizeEnabled(const QString &strID) const;
+        bool guestScreenAutoResizeEnabled(const QString &strID);
         /** Defines whether guest-screen auto-resize according machine-window size is @a fEnabled. */
         void setGuestScreenAutoResizeEnabled(bool fEnabled, const QString &strID);
 
         /** Returns last guest-screen size-hint for screen with @a uScreenIndex. */
-        QSize lastGuestSizeHint(ulong uScreenIndex, const QString &strID) const;
+        QSize lastGuestSizeHint(ulong uScreenIndex, const QString &strID);
         /** Defines last guest-screen @a sizeHint for screen with @a uScreenIndex. */
         void setLastGuestSizeHint(ulong uScreenIndex, const QSize &sizeHint, const QString &strID);
         /** Returns whether guest size-hint was for full or seamless screen with @a uScreenIndex. */
-        bool wasLastGuestSizeHintForFullScreen(ulong uScreenIndex, const QString &strID) const;
+        bool wasLastGuestSizeHintForFullScreen(ulong uScreenIndex, const QString &strID);
         /** Defines whether guest size-hint @a fWas for full or seamless screen with @a uScreenIndex. */
         void markLastGuestSizeHintAsFullScreen(ulong uScreenIndex, bool fWas, const QString &strID);
@@ -286,51 +286,51 @@
 
         /** Returns whether automatic mounting/unmounting of guest-screens enabled. */
-        bool autoMountGuestScreensEnabled(const QString &strID) const;
+        bool autoMountGuestScreensEnabled(const QString &strID);
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
         /** Returns whether 2D acceleration should use linear sretch. */
-        bool useLinearStretch(const QString &strID) const;
+        bool useLinearStretch(const QString &strID);
         /** Returns whether 2D acceleration should use YV12 pixel format. */
-        bool usePixelFormatYV12(const QString &strID) const;
+        bool usePixelFormatYV12(const QString &strID);
         /** Returns whether 2D acceleration should use UYVY pixel format. */
-        bool usePixelFormatUYVY(const QString &strID) const;
+        bool usePixelFormatUYVY(const QString &strID);
         /** Returns whether 2D acceleration should use YUY2 pixel format. */
-        bool usePixelFormatYUY2(const QString &strID) const;
+        bool usePixelFormatYUY2(const QString &strID);
         /** Returns whether 2D acceleration should use AYUV pixel format. */
-        bool usePixelFormatAYUV(const QString &strID) const;
+        bool usePixelFormatAYUV(const QString &strID);
 #endif /* VBOX_WITH_VIDEOHWACCEL */
 
         /** Returns Runtime UI HiDPI optimization type. */
-        HiDPIOptimizationType hiDPIOptimizationType(const QString &strID) const;
+        HiDPIOptimizationType hiDPIOptimizationType(const QString &strID);
 
         /** Returns whether mini-toolbar is enabled for full and seamless screens. */
-        bool miniToolbarEnabled(const QString &strID) const;
+        bool miniToolbarEnabled(const QString &strID);
         /** Defines whether mini-toolbar is @a fEnabled for full and seamless screens. */
         void setMiniToolbarEnabled(bool fEnabled, const QString &strID);
 
         /** Returns whether mini-toolbar should auto-hide itself. */
-        bool autoHideMiniToolbar(const QString &strID) const;
+        bool autoHideMiniToolbar(const QString &strID);
         /** Defines whether mini-toolbar should @a fAutoHide itself. */
         void setAutoHideMiniToolbar(bool fAutoHide, const QString &strID);
 
         /** Returns mini-toolbar alignment. */
-        Qt::AlignmentFlag miniToolbarAlignment(const QString &strID) const;
+        Qt::AlignmentFlag miniToolbarAlignment(const QString &strID);
         /** Returns mini-toolbar @a alignment. */
         void setMiniToolbarAlignment(Qt::AlignmentFlag alignment, const QString &strID);
 
         /** Returns restricted Runtime UI status-bar indicators. */
-        QList<IndicatorType> restrictedStatusBarIndicators(const QString &strID) const;
+        QList<IndicatorType> restrictedStatusBarIndicators(const QString &strID);
 
 #ifdef Q_WS_MAC
         /** Mac OS X: Returns whether 'presentation mode' enabled. */
-        bool presentationModeEnabled(const QString &strID) const;
+        bool presentationModeEnabled(const QString &strID);
 
         /** Mac OS X: Returns whether Dock icon should be updated at runtime. */
-        bool realtimeDockIconUpdateEnabled(const QString &strID) const;
+        bool realtimeDockIconUpdateEnabled(const QString &strID);
         /** Mac OS X: Defines whether Dock icon update should be fEnabled at runtime. */
         void setRealtimeDockIconUpdateEnabled(bool fEnabled, const QString &strID);
 
         /** Mac OS X: Returns guest-screen which Dock icon should reflect at runtime. */
-        int realtimeDockIconUpdateMonitor(const QString &strID) const;
+        int realtimeDockIconUpdateMonitor(const QString &strID);
         /** Mac OS X: Defines guest-screen @a iIndex which Dock icon should reflect at runtime. */
         void setRealtimeDockIconUpdateMonitor(int iIndex, const QString &strID);
@@ -338,11 +338,11 @@
 
         /** Returns whether machine should pass CAD to guest. */
-        bool passCADtoGuest(const QString &strID) const;
+        bool passCADtoGuest(const QString &strID);
 
         /** Returns redefined guru-meditation handler type. */
-        GuruMeditationHandlerType guruMeditationHandlerType(const QString &strID) const;
+        GuruMeditationHandlerType guruMeditationHandlerType(const QString &strID);
 
         /** Returns whether machine should perform HID LEDs synchronization. */
-        bool hidLedsSyncState(const QString &strID) const;
+        bool hidLedsSyncState(const QString &strID);
     /** @} */
 
@@ -350,7 +350,7 @@
       * @{ */
         /** Returns information-window geometry using @a pWidget and @a pParentWidget as hints. */
-        QRect informationWindowGeometry(QWidget *pWidget, QWidget *pParentWidget, const QString &strID) const;
+        QRect informationWindowGeometry(QWidget *pWidget, QWidget *pParentWidget, const QString &strID);
         /** Returns whether information-window should be maximized or not. */
-        bool informationWindowShouldBeMaximized(const QString &strID) const;
+        bool informationWindowShouldBeMaximized(const QString &strID);
         /** Defines information-window @a geometry and @a fMaximized state. */
         void setInformationWindowGeometry(const QRect &geometry, bool fMaximized, const QString &strID);
@@ -360,15 +360,15 @@
       * @{ */
         /** Returns default machine close action. */
-        MachineCloseAction defaultMachineCloseAction(const QString &strID) const;
+        MachineCloseAction defaultMachineCloseAction(const QString &strID);
         /** Returns restricted machine close actions. */
-        MachineCloseAction restrictedMachineCloseActions(const QString &strID) const;
+        MachineCloseAction restrictedMachineCloseActions(const QString &strID);
 
         /** Returns last machine close action. */
-        MachineCloseAction lastMachineCloseAction(const QString &strID) const;
+        MachineCloseAction lastMachineCloseAction(const QString &strID);
         /** Defines last @a machineCloseAction. */
         void setLastMachineCloseAction(MachineCloseAction machineCloseAction, const QString &strID);
 
         /** Returns machine close hook script name as simple string. */
-        QString machineCloseHookScript(const QString &strID) const;
+        QString machineCloseHookScript(const QString &strID);
     /** @} */
 
@@ -377,5 +377,5 @@
       * @{ */
         /** Returns debug flag value for passed @a strDebugFlagKey. */
-        QString debugFlagValue(const QString &strDebugFlagKey) const;
+        QString debugFlagValue(const QString &strDebugFlagKey);
     /** @} */
 #endif /* VBOX_WITH_DEBUGGER_GUI */
@@ -407,12 +407,12 @@
 
     /** Hot-load machine extra-data map. */
-    void hotloadMachineExtraDataMap(const QString &strID) const;
+    void hotloadMachineExtraDataMap(const QString &strID);
 
     /** Determines whether feature corresponding to passed @a strKey is allowed.
       * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
-    bool isFeatureAllowed(const QString &strKey, const QString &strID = GlobalID) const;
+    bool isFeatureAllowed(const QString &strKey, const QString &strID = GlobalID);
     /** Determines whether feature corresponding to passed @a strKey is restricted.
       * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
-    bool isFeatureRestricted(const QString &strKey, const QString &strID = GlobalID) const;
+    bool isFeatureRestricted(const QString &strKey, const QString &strID = GlobalID);
 
     /** Translates bool flag into 'allowed' value. */
@@ -423,5 +423,5 @@
     /** Returns extra-data value corresponding to passed @a strKey as QString.
       * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
-    QString extraDataString(const QString &strKey, const QString &strID = GlobalID) const;
+    QString extraDataString(const QString &strKey, const QString &strID = GlobalID);
     /** Defines extra-data value corresponding to passed @a strKey as strValue.
       * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
@@ -430,5 +430,5 @@
     /** Returns extra-data value corresponding to passed @a strKey as QStringList.
       * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
-    QStringList extraDataStringList(const QString &strKey, const QString &strID = GlobalID) const;
+    QStringList extraDataStringList(const QString &strKey, const QString &strID = GlobalID);
     /** Defines extra-data value corresponding to passed @a strKey as strValue.
       * If valid @a strID is set => applies to machine extra-data, otherwise => to global one. */
@@ -448,5 +448,5 @@
 
     /** Holds extra-data map instance. */
-    mutable QMap<QString, ExtraDataMap> m_data;
+    QMap<QString, ExtraDataMap> m_data;
 };