summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-10-06 18:46:39 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-10-06 18:46:39 (GMT)
commitffeb69003a9c676064cdf7ec099a02c2fbcf2ad3 (patch)
treee5c068aeab28daf3d87d38e948cb4d1613361dad
parent90ebbabf0b2a6b3fe008fb8d98da0df6a12a720c (diff)
downloadQt-ffeb69003a9c676064cdf7ec099a02c2fbcf2ad3.zip
Qt-ffeb69003a9c676064cdf7ec099a02c2fbcf2ad3.tar.gz
Qt-ffeb69003a9c676064cdf7ec099a02c2fbcf2ad3.tar.bz2
API review: change function name to setUseSystemConfiguration.
Requested-By: Volker Hilsheimer
-rw-r--r--src/network/kernel/qnetworkproxy.cpp4
-rw-r--r--src/network/kernel/qnetworkproxy.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index 7f40134..2d5c74f 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -1166,12 +1166,12 @@ QNetworkProxyFactory::~QNetworkProxyFactory()
sets an application-wide proxy factory. For this reason, this method
is mutually exclusive with setApplicationProxyFactory: calling
setApplicationProxyFactory overrides the use of the system-wide proxy,
- and calling setUseSystemConfigurationEnabled overrides any
+ and calling setUseSystemConfiguration overrides any
application proxy or proxy factory that was previously set.
\since 4.6
*/
-void QNetworkProxyFactory::setUseSystemConfigurationEnabled(bool enable)
+void QNetworkProxyFactory::setUseSystemConfiguration(bool enable)
{
if (enable) {
setApplicationProxyFactory(new QSystemConfigurationProxyFactory);
diff --git a/src/network/kernel/qnetworkproxy.h b/src/network/kernel/qnetworkproxy.h
index 6357c64..68bd6fd 100644
--- a/src/network/kernel/qnetworkproxy.h
+++ b/src/network/kernel/qnetworkproxy.h
@@ -171,7 +171,7 @@ public:
virtual QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query = QNetworkProxyQuery()) = 0;
- static void setUseSystemConfigurationEnabled(bool enable);
+ static void setUseSystemConfiguration(bool enable);
static void setApplicationProxyFactory(QNetworkProxyFactory *factory);
static QList<QNetworkProxy> proxyForQuery(const QNetworkProxyQuery &query);
static QList<QNetworkProxy> systemProxyForQuery(const QNetworkProxyQuery &query = QNetworkProxyQuery());