Changeset 66223 in vbox

Timestamp:

Mar 23, 2017 12:47:33 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

114141

Message:

FE/Qt: Global preferences: Refactoring (renaming and tuning).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/global

Files:

• UIGlobalSettingsDisplay.cpp (modified) (3 diffs)
• UIGlobalSettingsDisplay.h (modified) (1 diff)
• UIGlobalSettingsExtension.cpp (modified) (10 diffs)
• UIGlobalSettingsExtension.h (modified) (2 diffs)
• UIGlobalSettingsInput.h (modified) (1 diff)
• UIGlobalSettingsLanguage.cpp (modified) (8 diffs)
• UIGlobalSettingsLanguage.h (modified) (1 diff)
• UIGlobalSettingsNetwork.cpp (modified) (31 diffs)
• UIGlobalSettingsNetwork.h (modified) (3 diffs)
• UIGlobalSettingsProxy.cpp (modified) (3 diffs)
• UIGlobalSettingsProxy.h (modified) (1 diff)
• UIGlobalSettingsUpdate.cpp (modified) (6 diffs)
• UIGlobalSettingsUpdate.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp

@@ -193 +193 @@
 
     /* Populate combo-box: */
-    populate();
-}
-
-void UIGlobalSettingsDisplay::sltMaxResolutionComboActivated()
+    reloadMaximumGuestScreenSizePolicyComboBox();
+}
+
+void UIGlobalSettingsDisplay::sltHandleMaximumGuestScreenSizePolicyChange()
 {
     /* Get current resolution-combo tool-tip data: */
-    QString strCurrentComboItemTip = m_pMaxResolutionCombo->itemData(m_pMaxResolutionCombo->currentIndex(), Qt::ToolTipRole).toString();
+    const QString strCurrentComboItemTip = m_pMaxResolutionCombo->itemData(m_pMaxResolutionCombo->currentIndex(), Qt::ToolTipRole).toString();
     m_pMaxResolutionCombo->setWhatsThis(strCurrentComboItemTip);
 
     /* Get current resolution-combo item data: */
-    QString strCurrentComboItemData = m_pMaxResolutionCombo->itemData(m_pMaxResolutionCombo->currentIndex()).toString();
+    const QString strCurrentComboItemData = m_pMaxResolutionCombo->itemData(m_pMaxResolutionCombo->currentIndex()).toString();
     /* Is our combo in state for 'fixed' resolution? */
-    bool fCurrentResolutionStateFixed = strCurrentComboItemData == "fixed";
+    const bool fCurrentResolutionStateFixed = strCurrentComboItemData == "fixed";
     /* Should be combo-level widgets enabled? */
-    bool fComboLevelWidgetsEnabled = fCurrentResolutionStateFixed;
+    const bool fComboLevelWidgetsEnabled = fCurrentResolutionStateFixed;
     /* Enable/disable combo-level widgets: */
     m_pResolutionWidthLabel->setEnabled(fComboLevelWidgetsEnabled);
@@ -215 +215 @@
 }
 
-void UIGlobalSettingsDisplay::populate()
+void UIGlobalSettingsDisplay::reloadMaximumGuestScreenSizePolicyComboBox()
 {
     /* Remember current position: */
@@ -243 +243 @@
     /* Choose previous position: */
     m_pMaxResolutionCombo->setCurrentIndex(iCurrentPosition);
-    sltMaxResolutionComboActivated();
-}
-
+    sltHandleMaximumGuestScreenSizePolicyChange();
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.h

@@ -63 +63 @@
 
     /* Handler: Resolution-combo stuff: */
-    void sltMaxResolutionComboActivated();
+    void sltHandleMaximumGuestScreenSizePolicyChange();
 
 private:
 
     /* Helper: Resolution-combo stuff: */
-    void populate();
+    void reloadMaximumGuestScreenSizePolicyComboBox();
 
     /** Holds the page data cache instance. */

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp

@@ -193 +193 @@
             this, SLOT(sltHandleCurrentItemChange(QTreeWidgetItem*)));
     connect(m_pPackagesTree, SIGNAL(customContextMenuRequested(const QPoint&)),
-            this, SLOT(sltShowContextMenu(const QPoint&)));
+            this, SLOT(sltHandleContextMenuRequest(const QPoint&)));
 
     /* Determine icon metric: */
@@ -204 +204 @@
     m_pActionAdd = m_pPackagesToolbar->addAction(UIIconPool::iconSet(":/extension_pack_install_16px.png",
                                                                      ":/extension_pack_install_disabled_16px.png"),
-                                                 QString(), this, SLOT(sltInstallPackage()));
+                                                 QString(), this, SLOT(sltAddPackage()));
     m_pActionRemove = m_pPackagesToolbar->addAction(UIIconPool::iconSet(":/extension_pack_uninstall_16px.png",
                                                                         ":/extension_pack_uninstall_disabled_16px.png"),
@@ -248 +248 @@
     }
 
-    QString strPackName = extPackFile.GetName();
-    QString strPackDescription = extPackFile.GetDescription();
-    QString strPackVersion = QString("%1r%2%3").arg(extPackFile.GetVersion()).arg(extPackFile.GetRevision()).arg(extPackFile.GetEdition());
+    const QString strPackName = extPackFile.GetName();
+    const QString strPackDescription = extPackFile.GetDescription();
+    const QString strPackVersion = QString("%1r%2%3").arg(extPackFile.GetVersion()).arg(extPackFile.GetRevision()).arg(extPackFile.GetEdition());
 
     /*
@@ -334 +334 @@
     {
         UIDataSettingsGlobalExtensionItem item;
-        fetchData(packages[i], item);
+        loadData(packages[i], item);
         oldData.m_items << item;
     }
@@ -399 +399 @@
 }
 
-void UIGlobalSettingsExtension::sltShowContextMenu(const QPoint &position)
+void UIGlobalSettingsExtension::sltHandleContextMenuRequest(const QPoint &position)
 {
     QMenu menu;
@@ -414 +414 @@
 }
 
-void UIGlobalSettingsExtension::sltInstallPackage()
+void UIGlobalSettingsExtension::sltAddPackage()
 {
     /*
@@ -429 +429 @@
             strBaseFolder = QDir::homePath();
     }
-    QString strTitle = tr("Select an extension package file");
+    const QString strTitle = tr("Select an extension package file");
     QStringList extensions;
     for (int i = 0; i < VBoxExtPackFileExts.size(); ++i)
         extensions << QString("*.%1").arg(VBoxExtPackFileExts[i]);
-    QString strFilter = tr("Extension package files (%1)").arg(extensions.join(" "));
-
-    QStringList fileNames = QIFileDialog::getOpenFileNames(strBaseFolder, strFilter, this, strTitle, 0, true, true);
+    const QString strFilter = tr("Extension package files (%1)").arg(extensions.join(" "));
+
+    const QStringList fileNames = QIFileDialog::getOpenFileNames(strBaseFolder, strFilter, this, strTitle, 0, true, true);
 
     QString strFilePath;
@@ -483 +483 @@
             {
                 UIDataSettingsGlobalExtensionItem item;
-                fetchData(package, item);
+                loadData(package, item);
                 m_pCache->data().m_items << item;
 
@@ -505 +505 @@
     {
         /* Get name of current package: */
-        QString strSelectedPackageName = pItem->name();
+        const QString strSelectedPackageName = pItem->name();
         /* Ask the user about package removing: */
         if (msgCenter().confirmRemoveExtensionPack(strSelectedPackageName, this))
@@ -547 +547 @@
 }
 
-void UIGlobalSettingsExtension::fetchData(const CExtPack &package, UIDataSettingsGlobalExtensionItem &item) const
+void UIGlobalSettingsExtension::loadData(const CExtPack &package, UIDataSettingsGlobalExtensionItem &item) const
 {
     item.m_strName = package.GetName();

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.h

@@ -67 +67 @@
     /* Handlers: Tree-widget stuff: */
     void sltHandleCurrentItemChange(QTreeWidgetItem *pCurrentItem);
-    void sltShowContextMenu(const QPoint &position);
+    void sltHandleContextMenuRequest(const QPoint &position);
 
     /* Handlers: Package stuff: */
-    void sltInstallPackage();
+    void sltAddPackage();
     void sltRemovePackage();
 
@@ -76 +76 @@
 
     /* Prepare UIDataSettingsGlobalExtensionItem basing on CExtPack: */
-    void fetchData(const CExtPack &package, UIDataSettingsGlobalExtensionItem &item) const;
+    void loadData(const CExtPack &package, UIDataSettingsGlobalExtensionItem &item) const;
 
     /* Variables: Actions: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.h

@@ -39 +39 @@
 
     /* Hot-key table indexes: */
-    enum UIHotKeyTableIndex
-    {
-        UIHotKeyTableIndex_Selector = 0,
-        UIHotKeyTableIndex_Machine = 1
-    };
+    enum { UIHotKeyTableIndex_Selector, UIHotKeyTableIndex_Machine };
 
 public:

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp

@@ -223 +223 @@
     /* Setup connections: */
     connect(m_pLanguageTree, SIGNAL(painted(QTreeWidgetItem*, QPainter*)),
-            this, SLOT(sltLanguageItemPainted(QTreeWidgetItem*, QPainter*)));
+            this, SLOT(sltHandleItemPainting(QTreeWidgetItem*, QPainter*)));
     connect(m_pLanguageTree, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
-            this, SLOT(sltCurrentLanguageChanged(QTreeWidgetItem*)));
+            this, SLOT(sltHandleCurrentItemChange(QTreeWidgetItem*)));
 
     /* Apply language settings: */
@@ -265 +265 @@
 
     /* Load old data from cache: */
-    reload(oldData.m_strLanguageId);
+    reloadLanguageTree(oldData.m_strLanguageId);
 }
 
@@ -306 +306 @@
 
     /* Reload language tree: */
-    reload(VBoxGlobal::languageId());
+    reloadLanguageTree(VBoxGlobal::languageId());
 }
 
@@ -329 +329 @@
 }
 
-void UIGlobalSettingsLanguage::sltLanguageItemPainted(QTreeWidgetItem *pItem, QPainter *pPainter)
+void UIGlobalSettingsLanguage::sltHandleItemPainting(QTreeWidgetItem *pItem, QPainter *pPainter)
 {
     if (pItem && pItem->type() == QITreeWidgetItem::ItemType)
@@ -336 +336 @@
         if (pLanguageItem->isBuiltIn())
         {
-            QRect rect = m_pLanguageTree->visualItemRect(pLanguageItem);
+            const QRect rect = m_pLanguageTree->visualItemRect(pLanguageItem);
             pPainter->setPen(m_pLanguageTree->palette().color(QPalette::Mid));
             pPainter->drawLine(rect.x(), rect.y() + rect.height() - 1,
@@ -344 +344 @@
 }
 
-void UIGlobalSettingsLanguage::sltCurrentLanguageChanged(QTreeWidgetItem *pItem)
-{
-    if (!pItem) return;
+void UIGlobalSettingsLanguage::sltHandleCurrentItemChange(QTreeWidgetItem *pCurrentItem)
+{
+    if (!pCurrentItem)
+        return;
 
     /* Disable labels for the Default language item: */
-    bool fEnabled = !pItem->text (1).isNull();
+    const bool fEnabled = !pCurrentItem->text (1).isNull();
 
     m_pLanguageInfo->setEnabled(fEnabled);
@@ -357 +358 @@
                              "</table>")
                              .arg(tr("Language:"))
-                             .arg(pItem->text(2))
+                             .arg(pCurrentItem->text(2))
                              .arg(tr("Author(s):"))
-                             .arg(pItem->text(3)));
-}
-
-void UIGlobalSettingsLanguage::reload(const QString &strLangId)
+                             .arg(pCurrentItem->text(3)));
+}
+
+void UIGlobalSettingsLanguage::reloadLanguageTree(const QString &strLanguageId)
 {
     /* Clear languages tree: */
@@ -405 +406 @@
 
     /* Search for necessary language: */
-    QList<QTreeWidgetItem*> itemsList = m_pLanguageTree->findItems(strLangId, Qt::MatchExactly, 1);
+    QList<QTreeWidgetItem*> itemsList = m_pLanguageTree->findItems(strLanguageId, Qt::MatchExactly, 1);
     QTreeWidgetItem *pItem = itemsList.isEmpty() ? 0 : itemsList[0];
     if (!pItem)
     {
         /* Add an pItem for an invalid language to represent it in the list: */
-        pItem = new UILanguageItem(m_pLanguageTree, strLangId);
+        pItem = new UILanguageItem(m_pLanguageTree, strLanguageId);
         m_pLanguageTree->resizeColumnToContents(0);
     }

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.h

@@ -68 +68 @@
 
     /* Handler: List-painting stuff: */
-    void sltLanguageItemPainted(QTreeWidgetItem *pItem, QPainter *pPainter);
+    void sltHandleItemPainting(QTreeWidgetItem *pItem, QPainter *pPainter);
 
     /* Handler: Current-changed stuff: */
-    void sltCurrentLanguageChanged(QTreeWidgetItem *pItem);
+    void sltHandleCurrentItemChange(QTreeWidgetItem *pCurrentItem);
 
 private:
 
     /* Helper: List-loading stuff: */
-    void reload(const QString &strLangId);
+    void reloadLanguageTree(const QString &strLanguageId);
 
     /* Variables: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp

@@ -421 +421 @@
 
 UIGlobalSettingsNetwork::UIGlobalSettingsNetwork()
-    : m_pActionAddNetworkNAT(0), m_pActionEditNetworkNAT(0), m_pActionDelNetworkNAT(0)
-    , m_pActionAddNetworkHost(0), m_pActionEditNetworkHost(0), m_pActionDelNetworkHost(0)
+    : m_pActionAddNetworkNAT(0), m_pActionEditNetworkNAT(0), m_pActionRemoveNetworkNAT(0)
+    , m_pActionAddNetworkHost(0), m_pActionEditNetworkHost(0), m_pActionRemoveNetworkHost(0)
     , m_pCache(new UISettingsCacheGlobalNetwork)
 {
@@ -443 +443 @@
                 this, SLOT(sltHandleCurrentItemChangeNetworkNAT()));
         connect(m_pTreeNetworkNAT, SIGNAL(customContextMenuRequested(const QPoint&)),
-                this, SLOT(sltShowContextMenuNetworkNAT(const QPoint&)));
+                this, SLOT(sltHandleContextMenuRequestNetworkNAT(const QPoint&)));
         connect(m_pTreeNetworkNAT, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)),
                 this, SLOT(sltEditNetworkNAT()));
@@ -456 +456 @@
                 this, SLOT(sltHandleCurrentItemChangeNetworkHost()));
         connect(m_pTreeNetworkHost, SIGNAL(customContextMenuRequested(const QPoint&)),
-                this, SLOT(sltShowContextMenuNetworkHost(const QPoint&)));
+                this, SLOT(sltHandleContextMenuRequestNetworkHost(const QPoint&)));
         connect(m_pTreeNetworkHost, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)),
                 this, SLOT(sltEditNetworkHost()));
@@ -470 +470 @@
         connect(m_pActionAddNetworkNAT, SIGNAL(triggered(bool)), this, SLOT(sltAddNetworkNAT()));
     }
-    m_pActionDelNetworkNAT = new QAction(m_pTreeNetworkNAT);
-    {
-        m_pActionDelNetworkNAT->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-        m_pActionDelNetworkNAT->setShortcuts(QList<QKeySequence>() << QKeySequence("Del") << QKeySequence("Ctrl+R"));
-        m_pActionDelNetworkNAT->setIcon(UIIconPool::iconSet(":/remove_host_iface_16px.png",
+    m_pActionRemoveNetworkNAT = new QAction(m_pTreeNetworkNAT);
+    {
+        m_pActionRemoveNetworkNAT->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+        m_pActionRemoveNetworkNAT->setShortcuts(QList<QKeySequence>() << QKeySequence("Del") << QKeySequence("Ctrl+R"));
+        m_pActionRemoveNetworkNAT->setIcon(UIIconPool::iconSet(":/remove_host_iface_16px.png",
                                                             ":/remove_host_iface_disabled_16px.png"));
-        connect(m_pActionDelNetworkNAT, SIGNAL(triggered(bool)), this, SLOT(sltDelNetworkNAT()));
+        connect(m_pActionRemoveNetworkNAT, SIGNAL(triggered(bool)), this, SLOT(sltRemoveNetworkNAT()));
     }
     m_pActionEditNetworkNAT = new QAction(m_pTreeNetworkNAT);
@@ -494 +494 @@
         connect(m_pActionAddNetworkHost, SIGNAL(triggered(bool)), this, SLOT(sltAddNetworkHost()));
     }
-    m_pActionDelNetworkHost = new QAction(m_pTreeNetworkHost);
-    {
-        m_pActionDelNetworkHost->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-        m_pActionDelNetworkHost->setShortcuts(QList<QKeySequence>() << QKeySequence("Del") << QKeySequence("Ctrl+R"));
-        m_pActionDelNetworkHost->setIcon(UIIconPool::iconSet(":/remove_host_iface_16px.png",
+    m_pActionRemoveNetworkHost = new QAction(m_pTreeNetworkHost);
+    {
+        m_pActionRemoveNetworkHost->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+        m_pActionRemoveNetworkHost->setShortcuts(QList<QKeySequence>() << QKeySequence("Del") << QKeySequence("Ctrl+R"));
+        m_pActionRemoveNetworkHost->setIcon(UIIconPool::iconSet(":/remove_host_iface_16px.png",
                                                              ":/remove_host_iface_disabled_16px.png"));
-        connect(m_pActionDelNetworkHost, SIGNAL(triggered(bool)), this, SLOT(sltDelNetworkHost()));
+        connect(m_pActionRemoveNetworkHost, SIGNAL(triggered(bool)), this, SLOT(sltRemoveNetworkHost()));
     }
     m_pActionEditNetworkHost = new QAction(m_pTreeNetworkHost);
@@ -520 +520 @@
         m_pToolbarNetworkNAT->setOrientation(Qt::Vertical);
         m_pToolbarNetworkNAT->addAction(m_pActionAddNetworkNAT);
-        m_pToolbarNetworkNAT->addAction(m_pActionDelNetworkNAT);
+        m_pToolbarNetworkNAT->addAction(m_pActionRemoveNetworkNAT);
         m_pToolbarNetworkNAT->addAction(m_pActionEditNetworkNAT);
     }
@@ -528 +528 @@
         m_pToolbarNetworkHost->setOrientation(Qt::Vertical);
         m_pToolbarNetworkHost->addAction(m_pActionAddNetworkHost);
-        m_pToolbarNetworkHost->addAction(m_pActionDelNetworkHost);
+        m_pToolbarNetworkHost->addAction(m_pActionRemoveNetworkHost);
         m_pToolbarNetworkHost->addAction(m_pActionEditNetworkHost);
     }
@@ -564 +564 @@
     {
         UIDataSettingsGlobalNetworkNAT data;
-        generateDataNetworkNAT(network, data);
+        loadDataNetworkNAT(network, data);
         oldData.m_networksNAT << data;
     }
@@ -571 +571 @@
         {
             UIDataSettingsGlobalNetworkHost data;
-            generateDataNetworkHost(iface, data);
+            loadDataNetworkHost(iface, data);
             oldData.m_networksHost << data;
         }
@@ -640 +640 @@
         if (m_pCache->data().m_networksNAT != m_pCache->base().m_networksNAT)
             foreach (const UIDataSettingsGlobalNetworkNAT &data, m_pCache->data().m_networksNAT)
-                saveCacheItemNetworkNAT(data);
+                saveDataNetworkNAT(data);
         if (m_pCache->data().m_networksHost != m_pCache->base().m_networksHost)
             foreach (const UIDataSettingsGlobalNetworkHost &data, m_pCache->data().m_networksHost)
-                saveCacheItemNetworkHost(data);
+                saveDataNetworkHost(data);
     }
 
@@ -736 +736 @@
         /* Translate action text: */
         m_pActionAddNetworkNAT->setText(tr("Add NAT Network"));
-        m_pActionDelNetworkNAT->setText(tr("Remove NAT Network"));
+        m_pActionRemoveNetworkNAT->setText(tr("Remove NAT Network"));
         m_pActionEditNetworkNAT->setText(tr("Edit NAT Network"));
 
         m_pActionAddNetworkNAT->setWhatsThis(tr("Adds new NAT network."));
-        m_pActionDelNetworkNAT->setWhatsThis(tr("Removes selected NAT network."));
+        m_pActionRemoveNetworkNAT->setWhatsThis(tr("Removes selected NAT network."));
         m_pActionEditNetworkNAT->setWhatsThis(tr("Edits selected NAT network."));
 
         m_pActionAddNetworkNAT->setToolTip(m_pActionAddNetworkNAT->whatsThis());
-        m_pActionDelNetworkNAT->setToolTip(m_pActionDelNetworkNAT->whatsThis());
+        m_pActionRemoveNetworkNAT->setToolTip(m_pActionRemoveNetworkNAT->whatsThis());
         m_pActionEditNetworkNAT->setToolTip(m_pActionEditNetworkNAT->whatsThis());
     }
@@ -752 +752 @@
         /* Translate action text: */
         m_pActionAddNetworkHost->setText(tr("Add Host-only Network"));
-        m_pActionDelNetworkHost->setText(tr("Remove Host-only Network"));
+        m_pActionRemoveNetworkHost->setText(tr("Remove Host-only Network"));
         m_pActionEditNetworkHost->setText(tr("Edit Host-only Network"));
 
         m_pActionAddNetworkHost->setWhatsThis(tr("Adds new host-only network."));
-        m_pActionDelNetworkHost->setWhatsThis(tr("Removes selected host-only network."));
+        m_pActionRemoveNetworkHost->setWhatsThis(tr("Removes selected host-only network."));
         m_pActionEditNetworkHost->setWhatsThis(tr("Edits selected host-only network."));
 
         m_pActionAddNetworkHost->setToolTip(m_pActionAddNetworkHost->whatsThis());
-        m_pActionDelNetworkHost->setToolTip(m_pActionDelNetworkHost->whatsThis());
+        m_pActionRemoveNetworkHost->setToolTip(m_pActionRemoveNetworkHost->whatsThis());
         m_pActionEditNetworkHost->setToolTip(m_pActionEditNetworkHost->whatsThis());
     }
@@ -783 +783 @@
     foreach (const QString &strName, names)
     {
-        QRegExp regExp(strNameTemplate.arg("([\\d]*)"));
+        const QRegExp regExp(strNameTemplate.arg("([\\d]*)"));
         if (regExp.indexIn(strName) != -1)
             iMaximumIndex = qMax(iMaximumIndex, regExp.cap(1).toInt());
@@ -789 +789 @@
 
     /* Create NAT network: */
-    QString strIndex(iMaximumIndex == -1 ? QString() : QString::number(iMaximumIndex + 1));
-    CNATNetwork network = vbox.CreateNATNetwork(strNameTemplate.arg(strIndex));
+    const QString strIndex(iMaximumIndex == -1 ? QString() : QString::number(iMaximumIndex + 1));
+    const CNATNetwork network = vbox.CreateNATNetwork(strNameTemplate.arg(strIndex));
     if (!vbox.isOk())
         return msgCenter().cannotCreateNATNetwork(vbox, this);
@@ -797 +797 @@
     /* Update tree: */
     UIDataSettingsGlobalNetworkNAT data;
-    generateDataNetworkNAT(network, data);
+    loadDataNetworkNAT(network, data);
     createTreeItemNetworkNAT(data, true);
     m_pTreeNetworkNAT->sortByColumn(1, Qt::AscendingOrder);
@@ -822 +822 @@
 }
 
-void UIGlobalSettingsNetwork::sltDelNetworkNAT()
+void UIGlobalSettingsNetwork::sltRemoveNetworkNAT()
 {
     /* Get network item: */
@@ -865 +865 @@
     UIItemNetworkNAT *pItem = static_cast<UIItemNetworkNAT*>(m_pTreeNetworkNAT->currentItem());
     /* Update availability: */
-    m_pActionDelNetworkNAT->setEnabled(pItem);
+    m_pActionRemoveNetworkNAT->setEnabled(pItem);
     m_pActionEditNetworkNAT->setEnabled(pItem);
 }
 
-void UIGlobalSettingsNetwork::sltShowContextMenuNetworkNAT(const QPoint &pos)
+void UIGlobalSettingsNetwork::sltHandleContextMenuRequestNetworkNAT(const QPoint &pos)
 {
     /* Compose temporary context-menu: */
@@ -876 +876 @@
     {
         menu.addAction(m_pActionEditNetworkNAT);
-        menu.addAction(m_pActionDelNetworkNAT);
+        menu.addAction(m_pActionRemoveNetworkNAT);
     }
     else
@@ -914 +914 @@
     /* Update tree: */
     UIDataSettingsGlobalNetworkHost data;
-    generateDataNetworkHost(iface, data);
+    loadDataNetworkHost(iface, data);
     createTreeItemNetworkHost(data, true);
     m_pTreeNetworkHost->sortByColumn(0, Qt::AscendingOrder);
@@ -939 +939 @@
 }
 
-void UIGlobalSettingsNetwork::sltDelNetworkHost()
+void UIGlobalSettingsNetwork::sltRemoveNetworkHost()
 {
     /* Get network item: */
@@ -960 +960 @@
 
     /* Remove DHCP server if any: */
-    CDHCPServer dhcp = vbox.FindDHCPServerByNetworkName(iface.GetNetworkName());
+    const CDHCPServer &dhcp = vbox.FindDHCPServerByNetworkName(iface.GetNetworkName());
     if (vbox.isOk() && !dhcp.isNull())
     {
@@ -985 +985 @@
     UIItemNetworkHost *pItem = static_cast<UIItemNetworkHost*>(m_pTreeNetworkHost->currentItem());
     /* Update availability: */
-    m_pActionDelNetworkHost->setEnabled(pItem);
+    m_pActionRemoveNetworkHost->setEnabled(pItem);
     m_pActionEditNetworkHost->setEnabled(pItem);
 }
 
-void UIGlobalSettingsNetwork::sltShowContextMenuNetworkHost(const QPoint &pos)
+void UIGlobalSettingsNetwork::sltHandleContextMenuRequestNetworkHost(const QPoint &pos)
 {
     /* Compose temporary context-menu: */
@@ -996 +996 @@
     {
         menu.addAction(m_pActionEditNetworkHost);
-        menu.addAction(m_pActionDelNetworkHost);
+        menu.addAction(m_pActionRemoveNetworkHost);
     }
     else
@@ -1006 +1006 @@
 }
 
-void UIGlobalSettingsNetwork::generateDataNetworkNAT(const CNATNetwork &network, UIDataSettingsGlobalNetworkNAT &data)
+void UIGlobalSettingsNetwork::loadDataNetworkNAT(const CNATNetwork &network, UIDataSettingsGlobalNetworkNAT &data)
 {
     /* Load NAT network settings: */
@@ -1018 +1018 @@
 
     /* Load IPv4 rules: */
-    QVector<QString> ipv4rules = network.GetPortForwardRules4();
-    foreach (QString strIPv4Rule, ipv4rules)
+    foreach (QString strIPv4Rule, network.GetPortForwardRules4())
     {
         /* Replace all ':' with ',' first: */
@@ -1037 +1036 @@
 
     /* Load IPv6 rules: */
-    QVector<QString> ipv6rules = network.GetPortForwardRules6();
-    foreach (QString strIPv6Rule, ipv6rules)
+    foreach (QString strIPv6Rule, network.GetPortForwardRules6())
     {
         /* Replace all ':' with ',' first: */
@@ -1066 +1064 @@
 }
 
-void UIGlobalSettingsNetwork::saveCacheItemNetworkNAT(const UIDataSettingsGlobalNetworkNAT &data)
+void UIGlobalSettingsNetwork::saveDataNetworkNAT(const UIDataSettingsGlobalNetworkNAT &data)
 {
     /* Make sure corresponding NAT network exists: */
@@ -1082 +1080 @@
 
     /* Rewrite IPv4 rules: */
-    QVector<QString> oldIPv4Rules = network.GetPortForwardRules4();
-    foreach (const QString &strRule, oldIPv4Rules)
+    foreach (const QString &strRule, network.GetPortForwardRules4())
         network.RemovePortForwardRule(false, strRule.section(':', 0, 0));
     foreach (const UIPortForwardingData &newRule, data.m_ipv4rules)
@@ -1092 +1089 @@
 
     /* Rewrite IPv6 rules: */
-    QVector<QString> oldIPv6Rules = network.GetPortForwardRules6();
-    foreach (const QString &strRule, oldIPv6Rules)
+    foreach (const QString &strRule, network.GetPortForwardRules6())
         network.RemovePortForwardRule(true, strRule.section(':', 0, 0));
     foreach (const UIPortForwardingData &newRule, data.m_ipv6rules)
@@ -1119 +1115 @@
 }
 
-void UIGlobalSettingsNetwork::generateDataNetworkHost(const CHostNetworkInterface &iface, UIDataSettingsGlobalNetworkHost &data)
+void UIGlobalSettingsNetwork::loadDataNetworkHost(const CHostNetworkInterface &iface, UIDataSettingsGlobalNetworkHost &data)
 {
     /* Get DHCP server (create if necessary): */
@@ -1155 +1151 @@
 }
 
-void UIGlobalSettingsNetwork::saveCacheItemNetworkHost(const UIDataSettingsGlobalNetworkHost &data)
+void UIGlobalSettingsNetwork::saveDataNetworkHost(const UIDataSettingsGlobalNetworkHost &data)
 {
     /* Make sure corresponding Host interface exists: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h

@@ -75 +75 @@
     void sltAddNetworkNAT();
     void sltEditNetworkNAT();
-    void sltDelNetworkNAT();
+    void sltRemoveNetworkNAT();
     void sltHandleItemChangeNetworkNAT(QTreeWidgetItem *pChangedItem);
     void sltHandleCurrentItemChangeNetworkNAT();
-    void sltShowContextMenuNetworkNAT(const QPoint &pos);
+    void sltHandleContextMenuRequestNetworkNAT(const QPoint &position);
 
     /* Handlers: Host network stuff: */
     void sltAddNetworkHost();
     void sltEditNetworkHost();
-    void sltDelNetworkHost();
+    void sltRemoveNetworkHost();
     void sltHandleCurrentItemChangeNetworkHost();
-    void sltShowContextMenuNetworkHost(const QPoint &pos);
+    void sltHandleContextMenuRequestNetworkHost(const QPoint &position);
 
 private:
 
     /* Helpers: NAT network cache stuff: */
-    void generateDataNetworkNAT(const CNATNetwork &network, UIDataSettingsGlobalNetworkNAT &data);
-    void saveCacheItemNetworkNAT(const UIDataSettingsGlobalNetworkNAT &data);
+    void loadDataNetworkNAT(const CNATNetwork &network, UIDataSettingsGlobalNetworkNAT &data);
+    void saveDataNetworkNAT(const UIDataSettingsGlobalNetworkNAT &data);
 
     /* Helpers: NAT network tree stuff: */
@@ -98 +98 @@
 
     /* Helpers: Host network cache stuff: */
-    void generateDataNetworkHost(const CHostNetworkInterface &iface, UIDataSettingsGlobalNetworkHost &data);
-    void saveCacheItemNetworkHost(const UIDataSettingsGlobalNetworkHost &data);
+    void loadDataNetworkHost(const CHostNetworkInterface &iface, UIDataSettingsGlobalNetworkHost &data);
+    void saveDataNetworkHost(const UIDataSettingsGlobalNetworkHost &data);
 
     /* Helpers: Host network tree stuff: */
@@ -108 +108 @@
     QAction *m_pActionAddNetworkNAT;
     QAction *m_pActionEditNetworkNAT;
-    QAction *m_pActionDelNetworkNAT;
+    QAction *m_pActionRemoveNetworkNAT;
 
     /* Variables: Host network actions: */
     QAction *m_pActionAddNetworkHost;
     QAction *m_pActionEditNetworkHost;
-    QAction *m_pActionDelNetworkHost;
+    QAction *m_pActionRemoveNetworkHost;
 
     /** Holds the page data cache instance. */

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp

@@ -81 +81 @@
 
     /* Setup connections: */
-    connect(pButtonGroup, SIGNAL(buttonClicked(QAbstractButton*)), this, SLOT(sltProxyToggled()));
+    connect(pButtonGroup, SIGNAL(buttonClicked(QAbstractButton*)), this, SLOT(sltHandleProxyToggle()));
     connect(m_pHostEditor, SIGNAL(textEdited(const QString&)), this, SLOT(revalidate()));
     connect(m_pPortEditor, SIGNAL(textEdited(const QString&)), this, SLOT(revalidate()));
@@ -134 +134 @@
     m_pHostEditor->setText(oldData.m_strProxyHost);
     m_pPortEditor->setText(oldData.m_strProxyPort);
-    sltProxyToggled();
+    sltHandleProxyToggle();
 
     /* Revalidate: */
@@ -215 +215 @@
 }
 
-void UIGlobalSettingsProxy::sltProxyToggled()
+void UIGlobalSettingsProxy::sltHandleProxyToggle()
 {
     /* Update widgets availability: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.h

@@ -67 +67 @@
 
     /* Handler: Proxy-checkbox stuff: */
-    void sltProxyToggled();
+    void sltHandleProxyToggle();
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp

@@ -74 +74 @@
 
     /* Setup connections: */
-    connect(m_pCheckBoxUpdate, SIGNAL(toggled(bool)), this, SLOT(sltUpdaterToggled(bool)));
-    connect(m_pComboBoxUpdatePeriod, SIGNAL(activated(int)), this, SLOT(sltPeriodActivated()));
+    connect(m_pCheckBoxUpdate, SIGNAL(toggled(bool)), this, SLOT(sltHandleUpdateToggle(bool)));
+    connect(m_pComboBoxUpdatePeriod, SIGNAL(activated(int)), this, SLOT(sltHandleUpdatePeriodChange()));
 
     /* Apply language settings: */
@@ -131 +131 @@
     }
     m_pUpdateDateText->setText(oldData.m_strDate);
-    sltUpdaterToggled(oldData.m_fCheckEnabled);
+    sltHandleUpdateToggle(oldData.m_fCheckEnabled);
 }
 
@@ -187 +187 @@
 }
 
-void UIGlobalSettingsUpdate::sltUpdaterToggled(bool fEnabled)
+void UIGlobalSettingsUpdate::sltHandleUpdateToggle(bool fEnabled)
 {
     /* Update activity status: */
@@ -193 +193 @@
 
     /* Update time of next check: */
-    sltPeriodActivated();
+    sltHandleUpdatePeriodChange();
 
     /* Temporary remember branch type if was switched off: */
@@ -207 +207 @@
 }
 
-void UIGlobalSettingsUpdate::sltPeriodActivated()
-{
-    VBoxUpdateData data(periodType(), branchType());
+void UIGlobalSettingsUpdate::sltHandleUpdatePeriodChange()
+{
+    const VBoxUpdateData data(periodType(), branchType());
     m_pUpdateDateText->setText(data.date());
 }
@@ -215 +215 @@
 VBoxUpdateData::PeriodType UIGlobalSettingsUpdate::periodType() const
 {
-    VBoxUpdateData::PeriodType result = m_pCheckBoxUpdate->isChecked() ?
+    const VBoxUpdateData::PeriodType result = m_pCheckBoxUpdate->isChecked() ?
         (VBoxUpdateData::PeriodType)m_pComboBoxUpdatePeriod->currentIndex() : VBoxUpdateData::PeriodNever;
     return result == VBoxUpdateData::PeriodUndefined ? VBoxUpdateData::Period1Day : result;

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.h

@@ -67 +67 @@
 
     /* Handlers: */
-    void sltUpdaterToggled(bool fEnabled);
-    void sltPeriodActivated();
+    void sltHandleUpdateToggle(bool fEnabled);
+    void sltHandleUpdatePeriodChange();
 
 private: