Changeset 58310 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 19, 2015 3:35:17 PM (9 years ago)

Author:

vboxsync

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

103508

Message:

FE/Qt: Networking cleanup/rework (part 15): Get rid of Qt proxy stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• VBoxGlobal.cpp (modified) (4 diffs)
• VBoxGlobal.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -52 +52 @@
 /* GUI includes: */
 # include "VBoxGlobal.h"
-# include "VBoxUtils.h"
 # include "UISelectorWindow.h"
 # include "UIMessageCenter.h"
@@ -1555 +1554 @@
     return session;
 }
-
-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-void VBoxGlobal::reloadProxySettings()
-{
-    UIProxyManager proxyManager(settings().proxySettings());
-    if (proxyManager.authEnabled())
-    {
-        proxyManager.setAuthEnabled(false);
-        proxyManager.setAuthLogin(QString());
-        proxyManager.setAuthPassword(QString());
-        VBoxGlobalSettings globalSettings = settings();
-        globalSettings.setProxySettings(proxyManager.toString());
-        vboxGlobal().setSettings(globalSettings);
-    }
-    if (proxyManager.proxyEnabled())
-    {
-#if 0
-        QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::HttpProxy,
-                                                         proxyManager.proxyHost(),
-                                                         proxyManager.proxyPort().toInt(),
-                                                         proxyManager.authEnabled() ? proxyManager.authLogin() : QString(),
-                                                         proxyManager.authEnabled() ? proxyManager.authPassword() : QString()));
-#else
-        QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::HttpProxy,
-                                                         proxyManager.proxyHost(),
-                                                         proxyManager.proxyPort().toInt()));
-#endif
-    }
-    else
-    {
-        QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::NoProxy));
-    }
-}
-#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
 void VBoxGlobal::createMedium(const UIMedium &medium)
@@ -3870 +3835 @@
 }
 
-void VBoxGlobal::sltProcessGlobalSettingChange()
-{
-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-    /* Reload proxy settings: */
-    reloadProxySettings();
-#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-}
-
 // Protected members
 ////////////////////////////////////////////////////////////////////////////////
@@ -4373 +4330 @@
         startMediumEnumeration();
 
-    /* Prepare global settings change handler: */
-    connect(&settings(), SIGNAL(propertyChanged(const char*, const char*)),
-            this, SLOT(sltProcessGlobalSettingChange()));
-    /* Handle global settings change for the first time: */
-    sltProcessGlobalSettingChange();
-
     /* Create shortcut pool: */
     UIShortcutPool::create();

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -338 +338 @@
     CSession openExistingSession(const QString &aId) { return openSession(aId, KLockType_Shared); }
 
-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-    void reloadProxySettings();
-#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-
     /* API: Medium-processing stuff: */
     void createMedium(const UIMedium &medium);
@@ -494 +490 @@
 
     void sltGUILanguageChange(QString strLang);
-    void sltProcessGlobalSettingChange();
 
 protected slots: