Changeset 846 for trunk/src/network/access/qnetworkaccessmanager_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/network/access/qnetworkaccessmanager_p.h (modified) (7 diffs)

trunk/src/network/access/qnetworkaccessmanager_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -59 +59 @@
 #include "private/qobject_p.h"
 #include "QtNetwork/qnetworkproxy.h"
+
 
 QT_BEGIN_NAMESPACE
@@ -75 +76 @@
           proxyFactory(0),
 #endif
+
+
+
+
+
+
           cookieJarCreated(false)
     { }
@@ -85 +92 @@
 
     void authenticationRequired(QNetworkAccessBackend *backend, QAuthenticator *authenticator);
-    void addCredentials(const QUrl &url, const QAuthenticator *auth);
+    void Credentials(const QUrl &url, const QAuthenticator *auth);
     QNetworkAuthenticationCredential *fetchCachedCredentials(const QUrl &url,
                                                              const QAuthenticator *auth = 0);
@@ -92 +99 @@
     void proxyAuthenticationRequired(QNetworkAccessBackend *backend, const QNetworkProxy &proxy,
                                      QAuthenticator *authenticator);
-    void addCredentials(const QNetworkProxy &proxy, const QAuthenticator *auth);
-    QNetworkAuthenticationCredential *fetchCachedCredentials(const QNetworkProxy &proxy,
+    void Credentials(const QNetworkProxy &proxy, const QAuthenticator *auth);
+    QNetworkAuthenticationCredential *fetchCachedCredentials(const QNetworkProxy &proxy,
                                                              const QAuthenticator *auth = 0);
     QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query);
@@ -99 +106 @@
 
     QNetworkAccessBackend *findBackend(QNetworkAccessManager::Operation op, const QNetworkRequest &request);
+
+
+
+
+
+
+
+
+
+
 
     // this is the cache for storing downloaded files
@@ -111 +128 @@
 #endif
 
+
+
+
+
+
+
+
+
     bool cookieJarCreated;
-
 
     // this cache can be used by individual backends to cache e.g. their TCP connections to a server