Fix some warnings about virtual/override
This patch marks some functions "override" to silence the corresponding warning. Change-Id: I88ccc5fa7521ecccc84a6cba9f06ea185cc5679e Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
parent
5540c9c107
commit
a944de7742
@ -53,7 +53,7 @@ public:
|
|||||||
class QDebugProxyFactory : public QNetworkProxyFactory
|
class QDebugProxyFactory : public QNetworkProxyFactory
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query = QNetworkProxyQuery())
|
QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query = QNetworkProxyQuery()) override
|
||||||
{
|
{
|
||||||
returnedList = QNetworkProxyFactory::systemProxyForQuery(query);
|
returnedList = QNetworkProxyFactory::systemProxyForQuery(query);
|
||||||
requestCounter++;
|
requestCounter++;
|
||||||
@ -294,7 +294,7 @@ void tst_QNetworkProxyFactory::genericSystemProxy_data()
|
|||||||
class QSPFQThread : public QThread
|
class QSPFQThread : public QThread
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
virtual void run()
|
void run() override
|
||||||
{
|
{
|
||||||
proxies = QNetworkProxyFactory::systemProxyForQuery(query);
|
proxies = QNetworkProxyFactory::systemProxyForQuery(query);
|
||||||
}
|
}
|
||||||
|
@ -157,7 +157,7 @@ public:
|
|||||||
QList<int> hits;
|
QList<int> hits;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void incomingConnection(quintptr socketDescriptor)
|
void incomingConnection(quintptr socketDescriptor) override
|
||||||
{
|
{
|
||||||
hits.append(socketDescriptor);
|
hits.append(socketDescriptor);
|
||||||
QLocalServer::incomingConnection(socketDescriptor);
|
QLocalServer::incomingConnection(socketDescriptor);
|
||||||
|
@ -47,7 +47,7 @@ public:
|
|||||||
|
|
||||||
QByteArray cachedData;
|
QByteArray cachedData;
|
||||||
|
|
||||||
virtual QNetworkCacheMetaData metaData(const QUrl &url)
|
QNetworkCacheMetaData metaData(const QUrl &url) override
|
||||||
{
|
{
|
||||||
QNetworkCacheMetaData metaData;
|
QNetworkCacheMetaData metaData;
|
||||||
if (!cachedData.isEmpty()) {
|
if (!cachedData.isEmpty()) {
|
||||||
@ -60,7 +60,7 @@ public:
|
|||||||
return metaData;
|
return metaData;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual QIODevice *data(const QUrl &/*url*/)
|
QIODevice *data(const QUrl &/*url*/) override
|
||||||
{
|
{
|
||||||
if (cachedData.isEmpty())
|
if (cachedData.isEmpty())
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user