Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp	(revision 60695)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp	(revision 60696)
@@ -122,7 +122,7 @@
 }
 
-QLineEdit* UINameAndSystemEditor::nameEditor() const
-{
-    return m_pEditorName;
+QString UINameAndSystemEditor::name() const
+{
+    return m_pEditorName->text();
 }
 
@@ -132,7 +132,7 @@
 }
 
-QString UINameAndSystemEditor::name() const
-{
-    return m_pEditorName->text();
+CGuestOSType UINameAndSystemEditor::type() const
+{
+    return m_type;
 }
 
@@ -156,17 +156,12 @@
 }
 
-CGuestOSType UINameAndSystemEditor::type() const
-{
-    return m_type;
-}
-
 void UINameAndSystemEditor::retranslateUi()
 {
     m_pLabelName->setText(tr("N&ame:"));
+    m_pLabelFamily->setText(tr("&Type:"));
+    m_pLabelType->setText(tr("&Version:"));
     m_pEditorName->setWhatsThis(tr("Holds the name of the virtual machine."));
-    m_pLabelFamily->setText(tr("&Type:"));
     m_pComboFamily->setWhatsThis(tr("Selects the operating system family that "
                                     "you plan to install into this virtual machine."));
-    m_pLabelType->setText(tr("&Version:"));
     m_pComboType->setWhatsThis(tr("Selects the operating system type that "
                                   "you plan to install into this virtual machine "
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h	(revision 60695)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h	(revision 60696)
@@ -52,15 +52,15 @@
 
     /** Returns the VM name editor. */
-    QLineEdit* nameEditor() const;
+    QLineEdit* nameEditor() const { return m_pEditorName; }
 
+    /** Returns the VM name. */
+    QString name() const;
     /** Defines the VM @a strName. */
     void setName(const QString &strName);
-    /** Returns the VM name. */
-    QString name() const;
 
+    /** Returns the VM OS type. */
+    CGuestOSType type() const;
     /** Defines the VM OS @a type. */
     void setType(const CGuestOSType &type);
-    /** Returns the VM OS type. */
-    CGuestOSType type() const;
 
 protected: