summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-06-03 15:38:44 +0200
committerQt by Nokia <qt-info@nokia.com>2011-07-01 13:06:20 +0200
commitdf515ded6096a3c24df7bc9307a12790a6f474e1 (patch)
treefc2de03b9f6f24067cacd5eacf25723a08085b73 /src/network
parent9057cad32f22e878701a55e41f1730dac0ec1797 (diff)
Doc: Fixed qdoc warnings.
Change-Id: I7b4e9ef513b82a82d2365c9256d09520a44ad10d Reviewed-on: http://codereview.qt.nokia.com/324 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/access/qnetworkrequest.cpp25
-rw-r--r--src/network/kernel/qnetworkproxy.cpp7
2 files changed, 21 insertions, 11 deletions
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index 5608f1f9a3..7f61ef9239 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -77,28 +77,33 @@ QT_BEGIN_NAMESPACE
List of known header types that QNetworkRequest parses. Each known
header is also represented in raw form with its full HTTP name.
- \value ContentTypeHeader corresponds to the HTTP Content-Type
+ \value ContentDispositionHeader Corresponds to the HTTP
+ Content-Disposition header and contains a string containing the
+ disposition type (for instance, attachment) and a parameter (for
+ instance, filename).
+
+ \value ContentTypeHeader Corresponds to the HTTP Content-Type
header and contains a string containing the media (MIME) type and
- any auxiliary data (for instance, charset)
+ any auxiliary data (for instance, charset).
- \value ContentLengthHeader corresponds to the HTTP Content-Length
+ \value ContentLengthHeader Corresponds to the HTTP Content-Length
header and contains the length in bytes of the data transmitted.
- \value LocationHeader corresponds to the HTTP Location
+ \value LocationHeader Corresponds to the HTTP Location
header and contains a URL representing the actual location of the
data, including the destination URL in case of redirections.
- \value LastModifiedHeader corresponds to the HTTP Last-Modified
+ \value LastModifiedHeader Corresponds to the HTTP Last-Modified
header and contains a QDateTime representing the last modification
- date of the contents
+ date of the contents.
- \value CookieHeader corresponds to the HTTP Cookie header
+ \value CookieHeader Corresponds to the HTTP Cookie header
and contains a QList<QNetworkCookie> representing the cookies to
- be sent back to the server
+ be sent back to the server.
- \value SetCookieHeader corresponds to the HTTP Set-Cookie
+ \value SetCookieHeader Corresponds to the HTTP Set-Cookie
header and contains a QList<QNetworkCookie> representing the
- cookies sent by the server to be stored locally
+ cookies sent by the server to be stored locally.
\sa header(), setHeader(), rawHeader(), setRawHeader()
*/
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index 4f9836e863..1062663b23 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -1191,6 +1191,11 @@ void QNetworkProxyQuery::setUrl(const QUrl &url)
}
#ifndef QT_NO_BEARERMANAGEMENT
+/*!
+ Returns the network configuration component of the query.
+
+ \sa setNetworkConfiguration()
+*/
QNetworkConfiguration QNetworkProxyQuery::networkConfiguration() const
{
return d ? d->config : QNetworkConfiguration();
@@ -1206,7 +1211,7 @@ QNetworkConfiguration QNetworkProxyQuery::networkConfiguration() const
you should first start the QNetworkSession and obtain the active
configuration from its properties.
- \sa networkConfiguration
+ \sa networkConfiguration()
*/
void QNetworkProxyQuery::setNetworkConfiguration(const QNetworkConfiguration &networkConfiguration)
{