Changeset 79883 in vbox

Timestamp:

Jul 19, 2019 12:05:53 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7720: A bit of cleanup for UINameAndSystemEditor.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UINameAndSystemEditor.cpp (modified) (8 diffs)
• UINameAndSystemEditor.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp

@@ -44 +44 @@
     , m_fSupportsHWVirtEx(false)
     , m_fSupportsLongMode(false)
+    , m_pNameLabel(0)
+    , m_pPathLabel(0)
     , m_pLabelFamily(0)
     , m_pLabelType(0)
     , m_pIconType(0)
-    , m_pNameLabel(0)
-    , m_pPathLabel(0)
     , m_pNameLineEdit(0)
     , m_pPathSelector(0)
@@ -54 +54 @@
     , m_pComboType(0)
 {
-    /* Prepare: */
     prepare();
+}
+
+void UINameAndSystemEditor::setName(const QString &strName)
+{
+    if (!m_pNameLineEdit)
+        return;
+    m_pNameLineEdit->setText(strName);
 }
 
@@ -70 +76 @@
         return uiCommon().virtualBox().GetSystemProperties().GetDefaultMachineFolder();
     return m_pPathSelector->path();
-}
-
-void UINameAndSystemEditor::setName(const QString &strName)
-{
-    if (!m_pNameLineEdit)
-        return;
-    m_pNameLineEdit->setText(strName);
 }
 
@@ -175 +174 @@
 }
 
-CGuestOSType UINameAndSystemEditor::type() const
-{
-    return uiCommon().vmGuestOSType(typeId(), familyId());
-}
-
 void UINameAndSystemEditor::setType(const CGuestOSType &enmType)
 {
@@ -193 +187 @@
 }
 
+CGuestOSType UINameAndSystemEditor::type() const
+{
+    return uiCommon().vmGuestOSType(typeId(), familyId());
+}
+
+void UINameAndSystemEditor::setNameFieldValidator(const QString &strValidator)
+{
+    if (!m_pNameLineEdit)
+        return;
+    m_pNameLineEdit->setValidator(new QRegExpValidator(QRegExp(strValidator), this));
+}
+
 void UINameAndSystemEditor::retranslateUi()
 {
@@ -284 +290 @@
 void UINameAndSystemEditor::prepare()
 {
-    /* Prepare this: */
     prepareThis();
-    /* Prepare widgets: */
     prepareWidgets();
-    /* Prepare connections: */
     prepareConnections();
-    /* Apply language settings: */
     retranslateUi();
 }
@@ -297 +299 @@
 {
     /* Check if host supports (AMD-V or VT-x) and long mode: */
-    CHost host = uiCommon().host();
-    m_fSupportsHWVirtEx = host.GetProcessorFeature(KProcessorFeature_HWVirtEx);
-    m_fSupportsLongMode = host.GetProcessorFeature(KProcessorFeature_LongMode);
+    CHost comHost = uiCommon().host();
+    m_fSupportsHWVirtEx = comHost.GetProcessorFeature(KProcessorFeature_HWVirtEx);
+    m_fSupportsLongMode = comHost.GetProcessorFeature(KProcessorFeature_LongMode);
 }
 
@@ -480 +482 @@
             this, &UINameAndSystemEditor::sltTypeChanged);
 }
-
-void UINameAndSystemEditor::setNameFieldValidator(const QString &strValidator)
-{
-    if (!m_pNameLineEdit)
-        return;
-    m_pNameLineEdit->setValidator(new QRegExpValidator(QRegExp(strValidator), this));
-}

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h

@@ -70 +70 @@
     UINameAndSystemEditor(QWidget *pParent, bool fChooseLocation = false);
 
+    /** Defines the VM @a strName. */
+    void setName(const QString &strName);
     /** Returns the VM name. */
     QString name() const;
+
     /** Returns path string selected by the user. */
     QString path() const;
-
-    /** Defines the VM @a strName. */
-    void setName(const QString &strName);
 
     /** Defines the VM OS @a strTypeId and @a strFamilyId if passed. */
@@ -85 +85 @@
     QString familyId() const;
 
+    /** Defines the VM OS @a enmType. */
+    void setType(const CGuestOSType &enmType);
     /** Returns the VM OS type. */
     CGuestOSType type() const;
-    /** Defines the VM OS @a enmType. */
-    void setType(const CGuestOSType &enmType);
 
     /** Defines the name-field @a strValidator. */
@@ -102 +102 @@
     /** Handles VM OS family @a iIndex change. */
     void sltFamilyChanged(int iIndex);
-
     /** Handles VM OS type @a iIndex change. */
     void sltTypeChanged(int iIndex);
@@ -135 +134 @@
     /** Holds the currently chosen OS type IDs on per-family basis. */
     QMap<QString, QString>  m_currentIds;
+
     /** Holds whether we should propose to choose a full path. */
-    bool                    m_fChooseLocation;
+    bool  m_fChooseLocation;
     /** Holds whether host supports hardware virtualization. */
-    bool                    m_fSupportsHWVirtEx;
+    bool  m_fSupportsHWVirtEx;
     /** Holds whether host supports long mode. */
-    bool                    m_fSupportsLongMode;
+    bool  m_fSupportsLongMode;
 
+    /** Holds the VM name label instance. */
+    QLabel *m_pNameLabel;
+    /** Holds the VM path label instance. */
+    QLabel *m_pPathLabel;
     /** Holds the VM OS family label instance. */
-    QLabel                 *m_pLabelFamily;
+    QLabel *m_pLabelFamily;
     /** Holds the VM OS type label instance. */
-    QLabel                 *m_pLabelType;
+    QLabel *m_pLabelType;
     /** Holds the VM OS type icon instance. */
-    QLabel                 *m_pIconType;
+    QLabel *m_pIconType;
 
-    QLabel                 *m_pNameLabel;
-    QLabel                 *m_pPathLabel;
-    QILineEdit             *m_pNameLineEdit;
-    UIFilePathSelector     *m_pPathSelector;
+    /** Holds the VM name editor instance. */
+    QILineEdit         *m_pNameLineEdit;
+    /** Holds the VM path editor instance. */
+    UIFilePathSelector *m_pPathSelector;
     /** Holds the VM OS family combo instance. */
-    QComboBox              *m_pComboFamily;
+    QComboBox          *m_pComboFamily;
     /** Holds the VM OS type combo instance. */
-    QComboBox              *m_pComboType;
-    QString                 m_strGroupName;
+    QComboBox          *m_pComboType;
 };