diff options
author | Axel Waggershauser <awagger@gmail.com> | 2013-03-15 00:42:15 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-16 20:22:50 +0100 |
commit | b11317a64339f5a4bcffc8234ecaf15c7fb416f2 (patch) | |
tree | f81e40ee49f5109b4100048d131d5bb922b448aa /src/network/ssl | |
parent | 72367a94a750355eb748793ce8c365373a332c9c (diff) |
Whitespace cleanup: remove trailing whitespace
Remove all trailing whitespace from the following list of files:
*.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README
excluding 3rdparty, test-data and auto generated code.
Note A): the only non 3rdparty c++-files that still
have trailing whitespace after this change are:
* src/corelib/codecs/cp949codetbl_p.h
* src/corelib/codecs/qjpunicode.cpp
* src/corelib/codecs/qbig5codec.cpp
* src/corelib/xml/qxmlstream_p.h
* src/tools/qdoc/qmlparser/qqmljsgrammar.cpp
* src/tools/uic/ui4.cpp
* tests/auto/other/qtokenautomaton/tokenizers/*
* tests/benchmarks/corelib/tools/qstring/data.cpp
* util/lexgen/tokenizer.cpp
Note B): in about 30 files some overlapping 'leading tab' and
'TAB character in non-leading whitespace' issues have been fixed
to make the sanity bot happy. Plus some general ws-fixes here
and there as asked for during review.
Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/network/ssl')
-rw-r--r-- | src/network/ssl/qssl.cpp | 2 | ||||
-rw-r--r-- | src/network/ssl/qsslcipher.cpp | 2 | ||||
-rw-r--r-- | src/network/ssl/qsslerror.cpp | 4 | ||||
-rw-r--r-- | src/network/ssl/qsslerror.h | 2 | ||||
-rw-r--r-- | src/network/ssl/qsslsocket.cpp | 16 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp index 6fcd977759..4e33001d8d 100644 --- a/src/network/ssl/qssl.cpp +++ b/src/network/ssl/qssl.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE \enum QSsl::KeyType Describes the two types of keys QSslKey supports. - + \value PrivateKey A private key. \value PublicKey A public key. */ diff --git a/src/network/ssl/qsslcipher.cpp b/src/network/ssl/qsslcipher.cpp index 46131fc1aa..b045d2eba9 100644 --- a/src/network/ssl/qsslcipher.cpp +++ b/src/network/ssl/qsslcipher.cpp @@ -194,7 +194,7 @@ QString QSslCipher::keyExchangeMethod() const { return d->keyExchangeMethod; } - + /*! Returns the cipher's authentication method as a QString. */ diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp index d151b376d5..bf75d2e610 100644 --- a/src/network/ssl/qsslerror.cpp +++ b/src/network/ssl/qsslerror.cpp @@ -61,7 +61,7 @@ \enum QSslError::SslError Describes all recognized errors that can occur during an SSL handshake. - + \value NoError \value UnableToGetIssuerCertificate \value UnableToDecryptCertificateSignature @@ -108,7 +108,7 @@ public: }; /*! - Constructs a QSslError object with no error and default certificate. + Constructs a QSslError object with no error and default certificate. */ diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h index 135ba11ece..73549ce648 100644 --- a/src/network/ssl/qsslerror.h +++ b/src/network/ssl/qsslerror.h @@ -104,7 +104,7 @@ public: SslError error() const; QString errorString() const; QSslCertificate certificate() const; - + private: QScopedPointer<QSslErrorPrivate> d; }; diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index b1cdef7f29..a8bf8f83b8 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -267,7 +267,7 @@ /*! \fn void QSslSocket::sslErrors(const QList<QSslError> &errors); - + QSslSocket emits this signal after the SSL handshake to indicate that one or more errors have occurred while establishing the identity of the peer. The errors are usually an indication that QSslSocket is unable to @@ -281,7 +281,7 @@ \a errors contains one or more errors that prevent QSslSocket from verifying the identity of the peer. - + Note: You cannot use Qt::QueuedConnection when connecting to this signal, or calling QSslSocket::ignoreSslErrors() will have no effect. @@ -436,7 +436,7 @@ void QSslSocket::connectToHostEncrypted(const QString &hostName, quint16 port, O \overload In addition to the original behaviour of connectToHostEncrypted, - this overloaded method enables the usage of a different hostname + this overloaded method enables the usage of a different hostname (\a sslPeerName) for the certificate validation instead of the one used for the TCP connection (\a hostName). @@ -827,7 +827,7 @@ bool QSslSocket::flush() /*! \since 4.4 - Sets the size of QSslSocket's internal read buffer to be \a size bytes. + Sets the size of QSslSocket's internal read buffer to be \a size bytes. */ void QSslSocket::setReadBufferSize(qint64 size) { @@ -960,7 +960,7 @@ void QSslSocket::setLocalCertificate(const QSslCertificate &certificate) \overload Sets the socket's local \l {QSslCertificate} {certificate} to the - first one found in file \a path, which is parsed according to the + first one found in file \a path, which is parsed according to the specified \a format. */ void QSslSocket::setLocalCertificate(const QString &path, @@ -990,7 +990,7 @@ QSslCertificate QSslSocket::localCertificate() const Returns the peer's digital certificate (i.e., the immediate certificate of the host you are connected to), or a null certificate, if the peer has not assigned a certificate. - + The peer certificate is checked automatically during the handshake phase, so this function is normally used to fetch the certificate for display or for connection diagnostic @@ -1102,7 +1102,7 @@ void QSslSocket::setPrivateKey(const QSslKey &key) creating an SSL server socket. If you are creating an SSL client socket, the key and local certificate are required if your client must identify itself to an SSL server. - + \sa privateKey(), setLocalCertificate() */ void QSslSocket::setPrivateKey(const QString &fileName, QSsl::KeyAlgorithm algorithm, @@ -1710,7 +1710,7 @@ void QSslSocket::startClientEncryption() subclass of QTcpServer and reimplement QTcpServer::incomingConnection(). The returned socket descriptor is then passed to QSslSocket::setSocketDescriptor(). - + \sa connectToHostEncrypted(), startClientEncryption() */ void QSslSocket::startServerEncryption() |