diff options
Diffstat (limited to 'tests/auto/network')
11 files changed, 56 insertions, 56 deletions
diff --git a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp index b6be01d900..4b392d867c 100644 --- a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp +++ b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp @@ -86,7 +86,7 @@ public: clear(); } - QIODevice *data(const QUrl &url) + QIODevice *data(const QUrl &url) override { gotData = true; return QNetworkDiskCache::data(url); diff --git a/tests/auto/network/access/qhttpnetworkreply/tst_qhttpnetworkreply.cpp b/tests/auto/network/access/qhttpnetworkreply/tst_qhttpnetworkreply.cpp index edfef09a96..d230fcad4b 100644 --- a/tests/auto/network/access/qhttpnetworkreply/tst_qhttpnetworkreply.cpp +++ b/tests/auto/network/access/qhttpnetworkreply/tst_qhttpnetworkreply.cpp @@ -111,7 +111,7 @@ public: open(QIODevice::ReadOnly | QIODevice::Unbuffered); } - qint64 readData(char *data, qint64 maxlen) { return inputBuffer.read(data, maxlen); } + qint64 readData(char *data, qint64 maxlen) override { return inputBuffer.read(data, maxlen); } QBuffer inputBuffer; }; diff --git a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp index b724e3a40b..50f118a89f 100644 --- a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp +++ b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp @@ -668,7 +668,7 @@ public: , cachePath(cachePath) {} - void run() + void run() override { QByteArray longString = "Hello World, this is some long string, well not really that long"; for (int j = 0; j < 10; ++j) diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index e470dd02b4..98f468e49e 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -616,7 +616,7 @@ public: } protected: - void incomingConnection(qintptr socketDescriptor) + void incomingConnection(qintptr socketDescriptor) override { //qDebug() << "incomingConnection" << socketDescriptor << "doSsl:" << doSsl << "ipv6:" << ipv6; #ifndef QT_NO_SSL @@ -767,7 +767,7 @@ public: lastQuery = QNetworkProxyQuery(); } - virtual QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query) + virtual QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query) override { lastQuery = query; ++callCount; @@ -785,17 +785,17 @@ public: MyMemoryCache(QObject *parent) : QAbstractNetworkCache(parent) {} - QNetworkCacheMetaData metaData(const QUrl &url) + QNetworkCacheMetaData metaData(const QUrl &url) override { return cache.value(url.toEncoded()).first; } - void updateMetaData(const QNetworkCacheMetaData &metaData) + void updateMetaData(const QNetworkCacheMetaData &metaData) override { cache[metaData.url().toEncoded()].first = metaData; } - QIODevice *data(const QUrl &url) + QIODevice *data(const QUrl &url) override { CacheData::ConstIterator it = cache.find(url.toEncoded()); if (it == cache.constEnd()) @@ -807,13 +807,13 @@ public: return io; } - bool remove(const QUrl &url) + bool remove(const QUrl &url) override { cache.remove(url.toEncoded()); return true; } - qint64 cacheSize() const + qint64 cacheSize() const override { qint64 total = 0; foreach (const CachedContent &entry, cache) @@ -821,17 +821,17 @@ public: return total; } - QIODevice *prepare(const QNetworkCacheMetaData &) + QIODevice *prepare(const QNetworkCacheMetaData &) override { qFatal("%s: Should not have tried to add to the cache", Q_FUNC_INFO); return 0; } - void insert(QIODevice *) + void insert(QIODevice *) override { qFatal("%s: Should not have tried to add to the cache", Q_FUNC_INFO); } - void clear() { cache.clear(); } + void clear() override { cache.clear(); } }; Q_DECLARE_METATYPE(MyMemoryCache::CachedContent) Q_DECLARE_METATYPE(MyMemoryCache::CacheData) @@ -849,32 +849,32 @@ public: QHash<QUrl, QIODevice*> m_buffers; QList<QUrl> m_insertedUrls; - QNetworkCacheMetaData metaData(const QUrl &) + QNetworkCacheMetaData metaData(const QUrl &) override { return QNetworkCacheMetaData(); } - void updateMetaData(const QNetworkCacheMetaData &) + void updateMetaData(const QNetworkCacheMetaData &) override { } - QIODevice *data(const QUrl &) + QIODevice *data(const QUrl &) override { return 0; } - bool remove(const QUrl &url) + bool remove(const QUrl &url) override { delete m_buffers.take(url); return m_insertedUrls.removeAll(url) > 0; } - qint64 cacheSize() const + qint64 cacheSize() const override { return 0; } - QIODevice *prepare(const QNetworkCacheMetaData &metaData) + QIODevice *prepare(const QNetworkCacheMetaData &metaData) override { QBuffer* buffer = new QBuffer; buffer->open(QIODevice::ReadWrite); @@ -883,14 +883,14 @@ public: return buffer; } - void insert(QIODevice *buffer) + void insert(QIODevice *buffer) override { QUrl url = buffer->property("url").toUrl(); m_insertedUrls << url; delete m_buffers.take(url); } - void clear() { m_insertedUrls.clear(); } + void clear() override { m_insertedUrls.clear(); } }; class DataReader: public QObject @@ -985,7 +985,7 @@ public: return nextPendingConnection(); } } - virtual void incomingConnection(qintptr socketDescriptor) + virtual void incomingConnection(qintptr socketDescriptor) override { #ifndef QT_NO_SSL if (doSsl) { @@ -1090,7 +1090,7 @@ public: } protected: - void run() + void run() override { BlockingTcpServer server(doSsl); server.listen(); @@ -1234,7 +1234,7 @@ private slots: } protected: - void timerEvent(QTimerEvent *) + void timerEvent(QTimerEvent *) override { //qDebug() << "RateControlledReader: timerEvent bytesAvailable=" << device->bytesAvailable(); if (readBufferSize > 0 && device->bytesAvailable() > readBufferSize) { @@ -5011,7 +5011,7 @@ class SslServer : public QTcpServer Q_OBJECT public: SslServer() : socket(0), m_ssl(true) {} - void incomingConnection(qintptr socketDescriptor) + void incomingConnection(qintptr socketDescriptor) override { QSslSocket *serverSocket = new QSslSocket; serverSocket->setParent(this); @@ -7921,7 +7921,7 @@ void tst_QNetworkReply::synchronousAuthenticationCache() { public: MiniAuthServer(QThread *thread) : MiniHttpServer(QByteArray(), false, thread) {} - virtual void reply() + virtual void reply() override { dataToTransmit = @@ -8139,13 +8139,13 @@ public: timer.start(); } - virtual qint64 writeData(const char* , qint64 ) + virtual qint64 writeData(const char* , qint64 ) override { Q_ASSERT(false); return 0; } - virtual qint64 readData(char* data, qint64 maxlen) + virtual qint64 readData(char* data, qint64 maxlen) override { //qDebug() << Q_FUNC_INFO << maxlen << bandwidthQuota; maxlen = qMin(maxlen, buffer.bytesAvailable()); @@ -8163,14 +8163,14 @@ public: //qDebug() << Q_FUNC_INFO << maxlen << bandwidthQuota << read << ret << buffer.bytesAvailable(); return ret; } - virtual bool atEnd() const { return buffer.atEnd(); } - virtual qint64 size() const { return data.length(); } - qint64 bytesAvailable() const + virtual bool atEnd() const override { return buffer.atEnd(); } + virtual qint64 size() const override { return data.length(); } + qint64 bytesAvailable() const override { return buffer.bytesAvailable() + QIODevice::bytesAvailable(); } - virtual bool isSequential() const { return false; } // random access, we can seek - virtual bool seek (qint64 pos) { return buffer.seek(pos); } + virtual bool isSequential() const override { return false; } // random access, we can seek + virtual bool seek (qint64 pos) override { return buffer.seek(pos); } protected slots: void timeoutSlot() { diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp index 835e279ac3..539043377f 100644 --- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp @@ -525,7 +525,7 @@ void tst_QHostInfo::raceCondition() class LookupThread : public QThread { protected: - inline void run() + inline void run() override { QHostInfo info = QHostInfo::fromName("a-single" TEST_DOMAIN); QCOMPARE(info.error(), QHostInfo::NoError); diff --git a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp index 6414aa6c82..f0cff5da3e 100644 --- a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp +++ b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp @@ -73,14 +73,14 @@ private slots: void incomplete(); protected slots: - void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth); + void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth) override; private: - void readNotification() { } - void writeNotification() { } - void closeNotification() { } - void exceptionNotification() { } - void connectionNotification() { } + void readNotification() override { } + void writeNotification() override { } + void closeNotification() override { } + void exceptionNotification() override { } + void connectionNotification() override { } }; class MiniSocks5ResponseHandler : public QObject diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp index 927dc5cf9a..1bf6777040 100644 --- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp @@ -474,7 +474,7 @@ public: } protected: - void run() + void run() override { sleep(2); @@ -575,7 +575,7 @@ public: bool ok; protected: - void incomingConnection(qintptr socketDescriptor) + void incomingConnection(qintptr socketDescriptor) override { // how a user woulddo it (qabstractsocketengine is not public) unsigned long arg = 0; @@ -713,7 +713,7 @@ public: lastQuery = QNetworkProxyQuery(); } - virtual QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query) + virtual QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query) override { lastQuery = query; ++callCount; diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/Test.h b/tests/auto/network/socket/qtcpsocket/stressTest/Test.h index 7839cb2c89..3e61456f75 100644 --- a/tests/auto/network/socket/qtcpsocket/stressTest/Test.h +++ b/tests/auto/network/socket/qtcpsocket/stressTest/Test.h @@ -56,7 +56,7 @@ public: My4Server(QObject *parent = 0); protected: - void incomingConnection(qintptr socket); + void incomingConnection(qintptr socket) override; private slots: void stopServer(); diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index 3c4728afec..b9108932f7 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -1375,7 +1375,7 @@ public: } protected: - void run() + void run() override { bool timedOut = false; while (!quit) { @@ -1865,7 +1865,7 @@ public: } protected: - inline void run() + inline void run() override { #ifndef QT_NO_SSL QFETCH_GLOBAL(bool, ssl); @@ -2265,7 +2265,7 @@ class TestThread2 : public QThread { Q_OBJECT public: - void run() + void run() override { QFile fileWriter("fifo"); QVERIFY(fileWriter.open(QFile::WriteOnly)); @@ -2880,7 +2880,7 @@ public: lastQuery = QNetworkProxyQuery(); } - virtual QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query) + virtual QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query) override { lastQuery = query; ++callCount; diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp index e84d4eb667..2c7bafba23 100644 --- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp +++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp @@ -1221,7 +1221,7 @@ void tst_QSslCertificate::extensionsCritical() class TestThread : public QThread { public: - void run() + void run() override { effectiveDate = cert.effectiveDate(); expiryDate = cert.expiryDate(); diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index c30d996b3e..470ef1cd25 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -1228,7 +1228,7 @@ signals: void alertSent(QSsl::AlertLevel level, QSsl::AlertType type, const QString &message); protected: - void incomingConnection(qintptr socketDescriptor) + void incomingConnection(qintptr socketDescriptor) override { QSslConfiguration configuration = config; socket = new QSslSocket(this); @@ -1881,7 +1881,7 @@ void tst_QSslSocket::wildcard() class SslServer2 : public QTcpServer { protected: - void incomingConnection(qintptr socketDescriptor) + void incomingConnection(qintptr socketDescriptor) override { QSslSocket *socket = new QSslSocket(this); socket->ignoreSslErrors(); @@ -2111,7 +2111,7 @@ public: QSslSocket *socket; protected: - void incomingConnection(qintptr socketDescriptor) + void incomingConnection(qintptr socketDescriptor) override { socket = new QSslSocket(this); connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot())); @@ -2163,7 +2163,7 @@ signals: void listening(); protected: - void run() + void run() override { // if all goes well (no timeouts), this thread will sleep for a total of 500 ms // (i.e., 5 times 100 ms, one sleep for each operation) @@ -2292,7 +2292,7 @@ public: QSslSocket *socket; protected: - void incomingConnection(qintptr socketDescriptor) + void incomingConnection(qintptr socketDescriptor) override { socket = new QSslSocket(this); @@ -3010,7 +3010,7 @@ public: QSslSocket *socket; protected: - void incomingConnection(qintptr socketDescriptor) + void incomingConnection(qintptr socketDescriptor) override { socket = new QSslSocket; socket->setSocketDescriptor(socketDescriptor); @@ -3612,7 +3612,7 @@ public: PskProvider m_pskProvider; protected: - void incomingConnection(qintptr socketDescriptor) + void incomingConnection(qintptr socketDescriptor) override { socket = new QSslSocket(this); socket->setSslConfiguration(config); |