Changeset 74440 in vbox for trunk

Timestamp:

Sep 24, 2018 12:43:12 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9252: A bit of fixes for r125272: Some coding-style stuff; Use cached m_properties instead of acquiring new every time; Adjust validation for port field which can be a part of url.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• net/UINetworkReply.cpp (modified) (1 diff)
• settings/global/UIGlobalSettingsProxy.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp

@@ -387 +387 @@
     /* If the specific proxy settings are enabled, we'll use them
      * unless user disabled that functionality manually. */
-    CSystemProperties properties = vboxGlobal().virtualBox().GetSystemProperties();
-    KProxyMode enmProxyMode = properties.GetProxyMode();
-    AssertReturn(properties.isOk(), VERR_INTERNAL_ERROR_3);
+    const CSystemProperties comProperties = vboxGlobal().virtualBox().GetSystemProperties();
+    const KProxyMode enmProxyMode = comProperties.GetProxyMode();
+    AssertReturn(comProperties.isOk(), VERR_INTERNAL_ERROR_3);
     switch (enmProxyMode)
     {
         case KProxyMode_Manual:
-        {
-            QString strProxyURL = properties.GetProxyURL();
-            return RTHttpSetProxyByUrl(m_hHttp, strProxyURL.toUtf8().constData());
-        }
+            return RTHttpSetProxyByUrl(m_hHttp, comProperties.GetProxyURL().toUtf8().constData());
         case KProxyMode_NoProxy:
             return VINF_SUCCESS;

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

@@ -29 +29 @@
 # include "UIExtraDataManager.h"
 # include "UIMessageCenter.h"
+# include "VBoxGlobal.h"
 # include "VBoxUtils.h"
-# include "VBoxGlobal.h"
+
+/* COM includes: */
 # include "CSystemProperties.h"
 
@@ -62 +64 @@
 
     /** Holds the proxy mode. */
-    KProxyMode m_enmProxyMode;
+    KProxyMode  m_enmProxyMode;
     /** Holds the proxy host. */
-    QString m_strProxyHost;
+    QString     m_strProxyHost;
     /** Holds the proxy port. */
-    QString m_strProxyPort;
+    QString     m_strProxyPort;
 };
 
@@ -95 +97 @@
 
     /* Gather old proxy data: */
-    CSystemProperties properties = vboxGlobal().virtualBox().GetSystemProperties();
-    if (properties.isNotNull())
-    {
-        oldProxyData.m_enmProxyMode = properties.GetProxyMode();
-        oldProxyData.m_strProxyHost = properties.GetProxyURL();
-        oldProxyData.m_strProxyPort = "";
-        if (!oldProxyData.m_strProxyHost.isEmpty())
-        {
-            QUrl url(oldProxyData.m_strProxyHost);
-            if (url.port() != -1)
-            {
-                oldProxyData.m_strProxyPort = QString::number(url.port());
-                url.setPort(-1);
-                oldProxyData.m_strProxyHost = url.url();
-            }
+    oldProxyData.m_enmProxyMode = m_properties.GetProxyMode();
+    oldProxyData.m_strProxyHost = m_properties.GetProxyURL();
+    oldProxyData.m_strProxyPort = "";
+    if (!oldProxyData.m_strProxyHost.isEmpty())
+    {
+        QUrl url(oldProxyData.m_strProxyHost);
+        if (url.port() != -1)
+        {
+            oldProxyData.m_strProxyPort = QString::number(url.port());
+            url.setPort(-1);
+            oldProxyData.m_strProxyHost = url.url();
         }
     }
@@ -131 +129 @@
         case KProxyMode_NoProxy: m_pRadioProxyDisabled->setChecked(true); break;
         case KProxyMode_Manual:  m_pRadioProxyEnabled->setChecked(true); break;
-        case KProxyMode_Max: break; /* (compiler warnings) */
+        case KProxyMode_Max:     break; /* (compiler warnings) */
     }
     m_pHostEditor->setText(oldProxyData.m_strProxyHost);
@@ -188 +186 @@
 
     /* Check for port value: */
-    if (m_pPortEditor->text().trimmed().isEmpty())
+    if (   m_pPortEditor->text().trimmed().isEmpty()
+        && QUrl(m_pHostEditor->text()).port() == -1)
     {
         message.second << tr("No proxy port is currently specified.");
@@ -281 +280 @@
 
         /* Save new proxy data from the cache: */
-        CSystemProperties properties = vboxGlobal().virtualBox().GetSystemProperties();
-        if (properties.isNull())
-            fSuccess = false;
+        m_properties.SetProxyMode(newProxyData.m_enmProxyMode);
+        fSuccess &= m_properties.isOk();
+        if (newProxyData.m_strProxyPort.isEmpty())
+            m_properties.SetProxyURL(newProxyData.m_strProxyHost);
         else
         {
-            properties.SetProxyMode(newProxyData.m_enmProxyMode);
-            fSuccess &= properties.isOk();
-
-            if (newProxyData.m_strProxyPort.isEmpty())
-                properties.SetProxyURL(newProxyData.m_strProxyHost);
-            else
-            {
-                QUrl url(newProxyData.m_strProxyHost);
-                if (url.port() == -1)
-                    url.setPort(newProxyData.m_strProxyPort.toUInt());
-                properties.SetProxyURL(url.url());
-            }
-            fSuccess &= properties.isOk();
-
-            /* Drop the old extra data setting if still around: */
-            if (fSuccess && !gEDataManager->proxySettings().isEmpty())
-                gEDataManager->setProxySettings(QString());
-        }
+            QUrl url(newProxyData.m_strProxyHost);
+            if (url.port() == -1)
+                url.setPort(newProxyData.m_strProxyPort.toUInt());
+            m_properties.SetProxyURL(url.url());
+        }
+        fSuccess &= m_properties.isOk();
+
+        /* Drop the old extra data setting if still around: */
+        if (fSuccess && !gEDataManager->proxySettings().isEmpty())
+            gEDataManager->setProxySettings(QString());
     }
     /* Return result: */