diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:41 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:52 +0200 |
commit | 64255ef6502b1144f7b0aa4b2bf62803e0d4788b (patch) | |
tree | 29bf116bfda2ccf61057115690d14f85cc9b085b /src/network/ssl | |
parent | 4a9fb41a7947d0bb7a47a9625603a436df288b24 (diff) | |
parent | 7e0beba891cb963a1d535bd45b0be78b43b8d07f (diff) |
Merge remote-tracking branch 'origin/api_changes'
Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1
Diffstat (limited to 'src/network/ssl')
-rw-r--r-- | src/network/ssl/qsslcertificate.h | 4 | ||||
-rw-r--r-- | src/network/ssl/qsslsocket.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h index b15d6e97bb..fbb38a9b46 100644 --- a/src/network/ssl/qsslcertificate.h +++ b/src/network/ssl/qsslcertificate.h @@ -82,8 +82,8 @@ public: EmailAddress }; - QSslCertificate(QIODevice *device, QSsl::EncodingFormat format = QSsl::Pem); - QSslCertificate(const QByteArray &data = QByteArray(), QSsl::EncodingFormat format = QSsl::Pem); + explicit QSslCertificate(QIODevice *device, QSsl::EncodingFormat format = QSsl::Pem); + explicit QSslCertificate(const QByteArray &data = QByteArray(), QSsl::EncodingFormat format = QSsl::Pem); QSslCertificate(const QSslCertificate &other); ~QSslCertificate(); QSslCertificate &operator=(const QSslCertificate &other); diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index e420972041..195cbdf7c7 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -80,7 +80,7 @@ public: AutoVerifyPeer }; - QSslSocket(QObject *parent = 0); + explicit QSslSocket(QObject *parent = 0); ~QSslSocket(); void resume(); // to continue after proxy authentication required, SSL errors etc. |