Changeset 58475 in vbox

Timestamp:

Oct 29, 2015 11:51:53 AM (9 years ago)

Author:

vboxsync

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

103786

Message:

FE/Qt: Properties: Network page: Simplifying validation rules for the NAT Networks, no input validation for name/cidr fields, only final validation.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp (modified) (2 diffs)

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

@@ -40 +40 @@
     /* Setup dialog: */
     setWindowIcon(QIcon(":/guesttools_16px.png"));
-
-    /* Setup validators: */
-    const QString strTemplateName("\\S+");
-    const QString strTemplateCIDRPrefix1("([1-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])");
-    const QString strTemplateCIDRPrefix2("([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])");
-    const QString strTemplateCIDRPostfix("([1-9]|1[0-9]|2[0-9]|3[0-2])");
-    const QString strTemplateCIDR("%1(\\.%2(\\.%2(\\.%2)?)?)?/%3");
-    const QString strTemplateCIDRFull = strTemplateCIDR.arg(strTemplateCIDRPrefix1, strTemplateCIDRPrefix2, strTemplateCIDRPostfix);
-    m_pEditorNetworkName->setValidator(new QRegExpValidator(QRegExp(strTemplateName), this));
-    m_pEditorNetworkCIDR->setValidator(new QRegExpValidator(QRegExp(strTemplateCIDRFull), this));
 
     /* Apply language settings: */
@@ -112 +102 @@
     /* NAT Network: */
     m_data.m_fEnabled = m_pCheckboxNetwork->isChecked();
-    m_data.m_strNewName = m_pEditorNetworkName->text();
-    m_data.m_strCIDR = m_pEditorNetworkCIDR->text();
+    m_data.m_strNewName = m_pEditorNetworkName->text().trimmed();
+    m_data.m_strCIDR = m_pEditorNetworkCIDR->text().trimmed();
     m_data.m_fSupportsDHCP = m_pCheckboxSupportsDHCP->isChecked();
     m_data.m_fSupportsIPv6 = m_pCheckboxSupportsIPv6->isChecked();