From cd27535ca048a671fc6d2e5fdc9c0727b065c097 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 6 Mar 2012 22:35:01 +0100 Subject: QtNetwork: make some constructors explicit This is a semi-automatic search, so I'm reasonably sure that all the exported ones have been caught. Change-Id: Ia00eb9194a5f64002bd7e7b894abf6333d1b825e Reviewed-by: Jonas Gastal Reviewed-by: Shane Kearns --- src/network/access/qhttpmultipart.h | 4 ++-- src/network/access/qnetworkcookie.h | 2 +- src/network/access/qnetworkcookiejar.h | 2 +- src/network/access/qnetworkreply.h | 2 +- src/network/kernel/qdnslookup.h | 2 +- src/network/kernel/qhostinfo.h | 2 +- src/network/kernel/qnetworkproxy.h | 4 ++-- src/network/socket/qlocalserver.h | 2 +- src/network/ssl/qsslcertificate.h | 4 ++-- src/network/ssl/qsslsocket.h | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/network/access/qhttpmultipart.h b/src/network/access/qhttpmultipart.h index c25beb7ae3..aea8421d30 100644 --- a/src/network/access/qhttpmultipart.h +++ b/src/network/access/qhttpmultipart.h @@ -92,8 +92,8 @@ public: AlternativeType }; - QHttpMultiPart(QObject *parent = 0); - QHttpMultiPart(ContentType contentType, QObject *parent = 0); + explicit QHttpMultiPart(QObject *parent = 0); + explicit QHttpMultiPart(ContentType contentType, QObject *parent = 0); ~QHttpMultiPart(); void append(const QHttpPart &httpPart); diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h index 32307e305e..5553e857de 100644 --- a/src/network/access/qnetworkcookie.h +++ b/src/network/access/qnetworkcookie.h @@ -66,7 +66,7 @@ public: Full }; - QNetworkCookie(const QByteArray &name = QByteArray(), const QByteArray &value = QByteArray()); + explicit QNetworkCookie(const QByteArray &name = QByteArray(), const QByteArray &value = QByteArray()); QNetworkCookie(const QNetworkCookie &other); ~QNetworkCookie(); QNetworkCookie &operator=(const QNetworkCookie &other); diff --git a/src/network/access/qnetworkcookiejar.h b/src/network/access/qnetworkcookiejar.h index 513fb3b66c..8e6fa45ac5 100644 --- a/src/network/access/qnetworkcookiejar.h +++ b/src/network/access/qnetworkcookiejar.h @@ -57,7 +57,7 @@ class Q_NETWORK_EXPORT QNetworkCookieJar: public QObject { Q_OBJECT public: - QNetworkCookieJar(QObject *parent = 0); + explicit QNetworkCookieJar(QObject *parent = 0); virtual ~QNetworkCookieJar(); virtual QList cookiesForUrl(const QUrl &url) const; diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h index b8d606c260..925ccab2b5 100644 --- a/src/network/access/qnetworkreply.h +++ b/src/network/access/qnetworkreply.h @@ -155,7 +155,7 @@ Q_SIGNALS: void downloadProgress(qint64 bytesReceived, qint64 bytesTotal); protected: - QNetworkReply(QObject *parent = 0); + explicit QNetworkReply(QObject *parent = 0); QNetworkReply(QNetworkReplyPrivate &dd, QObject *parent); virtual qint64 writeData(const char *data, qint64 len); diff --git a/src/network/kernel/qdnslookup.h b/src/network/kernel/qdnslookup.h index 198b19d8a8..89e8cbb852 100644 --- a/src/network/kernel/qdnslookup.h +++ b/src/network/kernel/qdnslookup.h @@ -191,7 +191,7 @@ public: TXT = 16 }; - QDnsLookup(QObject *parent = 0); + explicit QDnsLookup(QObject *parent = 0); QDnsLookup(Type type, const QString &name, QObject *parent = 0); ~QDnsLookup(); diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h index df377872c8..2fc87f3bdc 100644 --- a/src/network/kernel/qhostinfo.h +++ b/src/network/kernel/qhostinfo.h @@ -63,7 +63,7 @@ public: UnknownError }; - QHostInfo(int lookupId = -1); + explicit QHostInfo(int lookupId = -1); QHostInfo(const QHostInfo &d); QHostInfo &operator=(const QHostInfo &d); ~QHostInfo(); diff --git a/src/network/kernel/qnetworkproxy.h b/src/network/kernel/qnetworkproxy.h index 805f5cdb5c..2e5c3ed687 100644 --- a/src/network/kernel/qnetworkproxy.h +++ b/src/network/kernel/qnetworkproxy.h @@ -68,10 +68,10 @@ public: }; QNetworkProxyQuery(); - QNetworkProxyQuery(const QUrl &requestUrl, QueryType queryType = UrlRequest); + explicit QNetworkProxyQuery(const QUrl &requestUrl, QueryType queryType = UrlRequest); QNetworkProxyQuery(const QString &hostname, int port, const QString &protocolTag = QString(), QueryType queryType = TcpSocket); - QNetworkProxyQuery(quint16 bindPort, const QString &protocolTag = QString(), + explicit QNetworkProxyQuery(quint16 bindPort, const QString &protocolTag = QString(), QueryType queryType = TcpServer); QNetworkProxyQuery(const QNetworkProxyQuery &other); #ifndef QT_NO_BEARERMANAGEMENT diff --git a/src/network/socket/qlocalserver.h b/src/network/socket/qlocalserver.h index 291122e10d..f9499c69ba 100644 --- a/src/network/socket/qlocalserver.h +++ b/src/network/socket/qlocalserver.h @@ -74,7 +74,7 @@ public: }; Q_DECLARE_FLAGS(SocketOptions, SocketOption) - QLocalServer(QObject *parent = 0); + explicit QLocalServer(QObject *parent = 0); ~QLocalServer(); void close(); 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 aa16425e9a..f67ab5f25d 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. -- cgit v1.2.3