Changeset 90155 in vbox

Timestamp:

Jul 12, 2021 8:18:16 AM (4 years ago)

Author:

vboxsync

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

145658

Message:

FE/Qt: bugref:9996: Refactoring

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/wizards/editors/UIHostnameDomainNameEditor.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIHostnameDomainEditor.cpp ) (14 diffs)
• src/wizards/editors/UIHostnameDomainNameEditor.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIHostnameDomainEditor.h ) (5 diffs)
• src/wizards/newvm/UIWizardNewVMUnattendedPageBasic.cpp (modified) (6 diffs)
• src/wizards/newvm/UIWizardNewVMUnattendedPageBasic.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk ¶

@@ -650 +650 @@
         src/wizards/addcloudvm/UIWizardAddCloudVMPageBasic1.h \
         src/wizards/addcloudvm/UIWizardAddCloudVMPageExpert.h \
-        src/wizards/editors/UIHostnameDomainEditor.h \
+        src/wizards/editors/UIHostnameDomainNameEditor.h \
         src/wizards/editors/UIUserNamePasswordEditor.h \
         src/wizards/newcloudvm/UIWizardNewCloudVM.h \
@@ -1148 +1148 @@
         src/wizards/addcloudvm/UIWizardAddCloudVMPageBasic1.cpp \
         src/wizards/addcloudvm/UIWizardAddCloudVMPageExpert.cpp \
-        src/wizards/editors/UIHostnameDomainEditor.cpp \
+        src/wizards/editors/UIHostnameDomainNameEditor.cpp \
         src/wizards/editors/UIUserNamePasswordEditor.cpp \
         src/wizards/newcloudvm/UIWizardNewCloudVM.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIHostnameDomainNameEditor.cpp ¶

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIHostnameDomainEditor class implementation.
+ * VBox Qt GUI - UIHostnameDomainNameEditor class implementation.
  */
 
@@ -30 +30 @@
 #include "UICommon.h"
 #include "UIIconPool.h"
-#include "UIHostnameDomainEditor.h"
+#include "UIHostnameDomainNameEditor.h"
 #include "UIWizardNewVM.h"
 
 
 
-UIHostnameDomainEditor::UIHostnameDomainEditor(QWidget *pParent /*  = 0 */)
+UIHostnameDomainNameEditor::UIHostnameDomainNameEditor(QWidget *pParent /*  = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_pHostnameLineEdit(0)
@@ -45 +45 @@
 }
 
-QString UIHostnameDomainEditor::hostname() const
+QString UIHostnameDomainNameEditor::hostname() const
 {
     if (m_pHostnameLineEdit)
@@ -52 +52 @@
 }
 
-bool UIHostnameDomainEditor::isComplete() const
+bool UIHostnameDomainNameEditor::isComplete() const
 {
     return m_pHostnameLineEdit && m_pHostnameLineEdit->hasAcceptableInput() &&
@@ -58 +58 @@
 }
 
-void UIHostnameDomainEditor::setHostname(const QString &strHostname)
+void UIHostnameDomainNameEditor::setHostname(const QString &strHostname)
 {
     if (m_pHostnameLineEdit)
@@ -64 +64 @@
 }
 
-QString UIHostnameDomainEditor::domain() const
+QString UIHostnameDomainNameEditor::domain() const
 {
     if (m_pDomainLineEdit)
@@ -71 +71 @@
 }
 
-void UIHostnameDomainEditor::setDomain(const QString &strDomain)
+void UIHostnameDomainNameEditor::setDomain(const QString &strDomain)
 {
     if (m_pDomainLineEdit)
@@ -77 +77 @@
 }
 
-QString UIHostnameDomainEditor::hostnameDomain() const
+QString UIHostnameDomainNameEditor::hostnameDomain() const
 {
     if (m_pHostnameLineEdit && m_pDomainLineEdit)
@@ -84 +84 @@
 }
 
-void UIHostnameDomainEditor::retranslateUi()
+void UIHostnameDomainNameEditor::retranslateUi()
 {
     QString strHostnameTooltip(tr("Type the hostname which will be used in attended install:"));
@@ -103 +103 @@
 }
 
-void UIHostnameDomainEditor::addLineEdit(int &iRow, QLabel *&pLabel, QILineEdit *&pLineEdit, QGridLayout *pLayout)
+void UIHostnameDomainNameEditor::addLineEdit(int &iRow, QLabel *&pLabel, QILineEdit *&pLineEdit, QGridLayout *pLayout)
 {
     AssertReturnVoid(pLayout);
@@ -129 +129 @@
 }
 
-void UIHostnameDomainEditor::prepare()
+void UIHostnameDomainNameEditor::prepare()
 {
     QGridLayout *pMainLayout = new QGridLayout;
@@ -143 +143 @@
 
     connect(m_pHostnameLineEdit, &QILineEdit::textChanged,
-            this, &UIHostnameDomainEditor::sltHostnameChanged);
+            this, &UIHostnameDomainNameEditor::sltHostnameChanged);
     connect(m_pDomainLineEdit, &QILineEdit::textChanged,
-            this, &UIHostnameDomainEditor::sltDomainChanged);
+            this, &UIHostnameDomainNameEditor::sltDomainChanged);
 
 
@@ -151 +151 @@
 }
 
-void UIHostnameDomainEditor::sltHostnameChanged()
+void UIHostnameDomainNameEditor::sltHostnameChanged()
 {
     m_pHostnameLineEdit->mark(!m_pHostnameLineEdit->hasAcceptableInput(),
@@ -158 +158 @@
 }
 
-void UIHostnameDomainEditor::sltDomainChanged()
+void UIHostnameDomainNameEditor::sltDomainChanged()
 {
     m_pDomainLineEdit->mark(!m_pDomainLineEdit->hasAcceptableInput(),

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIHostnameDomainNameEditor.h ¶

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIHostnameDomainEditor class declaration.
+ * VBox Qt GUI - UIHostnameDomainNameEditor class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_wizards_editors_UIHostnameDomainEditor_h
-#define FEQT_INCLUDED_SRC_wizards_editors_UIHostnameDomainEditor_h
+#ifndef FEQT_INCLUDED_SRC_wizards_editors_UIHostnameDomainNameEditor_h
+#define FEQT_INCLUDED_SRC_wizards_editors_UIHostnameDomainNameEditor_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -35 +35 @@
 class UIPasswordLineEdit;
 
-class UIHostnameDomainEditor : public QIWithRetranslateUI<QWidget>
+class UIHostnameDomainNameEditor : public QIWithRetranslateUI<QWidget>
 {
 
@@ -46 +46 @@
 public:
 
-    UIHostnameDomainEditor(QWidget *pParent = 0);
+    UIHostnameDomainNameEditor(QWidget *pParent = 0);
 
     QString hostname() const;
@@ -80 +80 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_wizards_editors_UIHostnameDomainEditor_h */
+#endif /* !FEQT_INCLUDED_SRC_wizards_editors_UIHostnameDomainNameEditor_h */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMUnattendedPageBasic.cpp ¶

@@ -32 +32 @@
 #include "UIIconPool.h"
 #include "UIUserNamePasswordEditor.h"
-#include "UIHostnameDomainEditor.h"
+#include "UIHostnameDomainNameEditor.h"
 #include "UIWizardNewVMUnattendedPageBasic.h"
 #include "UIWizardNewVM.h"
@@ -62 +62 @@
     , m_pStartHeadlessCheckBox(0)
     , m_pUserNamePasswordEditor(0)
-    , m_pHostnameDomainEditor(0)
+    , m_pHostnameDomainNameEditor(0)
     , m_pGAISOPathLabel(0)
     , m_pGAISOFilePathSelector(0)
@@ -101 +101 @@
         connect(m_pGAInstallationISOContainer, &QGroupBox::toggled,
                 this, &UIWizardNewVMUnattendedPageBasic::sltInstallGACheckBoxToggle);
-    if (m_pHostnameDomainEditor)
-        connect(m_pHostnameDomainEditor, &UIHostnameDomainEditor::sigHostnameDomainChanged,
+    if (m_pHostnameDomainNameEditor)
+        connect(m_pHostnameDomainNameEditor, &UIHostnameDomainNameEditor::sigHostnameDomainChanged,
                 this, &UIWizardNewVMUnattendedPageBasic::sltHostnameDomainChanged);
     if (m_pProductKeyLineEdit)
@@ -163 +163 @@
         m_pUserNamePasswordEditor->blockSignals(false);
     }
-    if (m_pHostnameDomainEditor)
-    {
-        m_pHostnameDomainEditor->blockSignals(true);
+    if (m_pHostnameDomainNameEditor)
+    {
+        m_pHostnameDomainNameEditor->blockSignals(true);
 
         if (!m_userModifiedParameters.contains("HostnameDomain"))
         {
-            m_pHostnameDomainEditor->setHostname(pWizard->machineBaseName());
-            m_pHostnameDomainEditor->setDomain("myguest.virtualbox.org");
+            m_pHostnameDomainNameEditor->setHostname(pWizard->machineBaseName());
+            m_pHostnameDomainNameEditor->setDomain("myguest.virtualbox.org");
             /* Initialize unattended hostname here since we cannot get the efault value from CUnattended this early (unlike username etc): */
-            newVMWizardPropertySet(HostnameDomain, m_pHostnameDomainEditor->hostnameDomain());
+            newVMWizardPropertySet(HostnameDomain, m_pHostnameDomainNameEditor->hostnameDomain());
         }
 
-        m_pHostnameDomainEditor->blockSignals(false);
+        m_pHostnameDomainNameEditor->blockSignals(false);
     }
     if (m_pGAInstallationISOContainer && !m_userModifiedParameters.contains("InstallGuestAdditions"))
@@ -201 +201 @@
     if (m_pUserNamePasswordEditor && !m_pUserNamePasswordEditor->isComplete())
         return false;
-    if (m_pHostnameDomainEditor && !m_pHostnameDomainEditor->isComplete())
+    if (m_pHostnameDomainNameEditor && !m_pHostnameDomainNameEditor->isComplete())
         return false;
     return true;
@@ -312 +312 @@
     }
 
-    m_pHostnameDomainEditor = new UIHostnameDomainEditor;
-    if (m_pHostnameDomainEditor)
-        pAdditionalOptionsContainerLayout->addWidget(m_pHostnameDomainEditor, 1, 0, 2, 3);
+    m_pHostnameDomainNameEditor = new UIHostnameDomainNameEditor;
+    if (m_pHostnameDomainNameEditor)
+        pAdditionalOptionsContainerLayout->addWidget(m_pHostnameDomainNameEditor, 1, 0, 2, 3);
 
     m_pStartHeadlessCheckBox = new QCheckBox;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMUnattendedPageBasic.h ¶

@@ -35 +35 @@
 class UIFilePathSelector;
 class UIUserNamePasswordEditor;
-class UIHostnameDomainEditor;
+class UIHostnameDomainNameEditor;
 struct UIUnattendedInstallData;
 
@@ -94 +94 @@
         QCheckBox *m_pStartHeadlessCheckBox;
         UIUserNamePasswordEditor *m_pUserNamePasswordEditor;
-        UIHostnameDomainEditor *m_pHostnameDomainEditor;
+        UIHostnameDomainNameEditor *m_pHostnameDomainNameEditor;
         QLabel    *m_pGAISOPathLabel;
         UIFilePathSelector *m_pGAISOFilePathSelector;