diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-25 14:44:04 +0100 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-04-01 10:14:16 +0200 |
commit | 4a77e2593f281456d25c9b2dd5df400c3e588e4c (patch) | |
tree | a21a70166688d1a76f31bace9265e95c700cee05 /tests/auto/quick/qquickimageprovider | |
parent | da68a8431a2cc0fdea7482750ad4e1abf3f7a85d (diff) |
Mark overrides in tests, fix compiler warnings
Change-Id: If753558d911e50a73e351a93eed2e4df3e6592c7
Reviewed-by: David Skoland <david.skoland@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickimageprovider')
-rw-r--r-- | tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp b/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp index 9dc9ad53ea..49e94432e4 100644 --- a/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp +++ b/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp @@ -92,7 +92,7 @@ public: *deleteWatch = true; } - QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize) + QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize) override { lastImageId = id; @@ -129,7 +129,7 @@ public: *deleteWatch = true; } - QPixmap requestPixmap(const QString &id, QSize *size, const QSize& requestedSize) + QPixmap requestPixmap(const QString &id, QSize *size, const QSize& requestedSize) override { lastImageId = id; @@ -401,7 +401,7 @@ class TestThreadProvider : public QQuickImageProvider ~TestThreadProvider() {} - QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize) + QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize) override { mutex.lock(); if (!ok) @@ -470,7 +470,7 @@ public: Q_SIGNAL void finished(QQuickTextureFactory *texture); TestImageResponseRunner(QMutex *lock, QWaitCondition *condition, bool *ok, const QString &id, const QSize &requestedSize) : m_lock(lock), m_condition(condition), m_ok(ok), m_id(id), m_requestedSize(requestedSize) {} - void run() + void run() override { m_lock->lock(); if (!(*m_ok)) { @@ -503,7 +503,7 @@ class TestImageResponse : public QQuickImageResponse pool->start(runnable); } - QQuickTextureFactory *textureFactory() const + QQuickTextureFactory *textureFactory() const override { return m_texture; } @@ -531,7 +531,7 @@ class TestAsyncProvider : public QQuickAsyncImageProvider ~TestAsyncProvider() {} - QQuickImageResponse *requestImageResponse(const QString &id, const QSize &requestedSize) + QQuickImageResponse *requestImageResponse(const QString &id, const QSize &requestedSize) override { TestImageResponse *response = new TestImageResponse(&lock, &condition, &ok, id, requestedSize, &pool); return response; @@ -594,7 +594,7 @@ class InstantAsyncImageResponse : public QQuickImageResponse emit finished(); } - QQuickTextureFactory *textureFactory() const + QQuickTextureFactory *textureFactory() const override { return m_texture; } @@ -611,7 +611,7 @@ class InstancAsyncProvider : public QQuickAsyncImageProvider ~InstancAsyncProvider() {} - QQuickImageResponse *requestImageResponse(const QString &id, const QSize &requestedSize) + QQuickImageResponse *requestImageResponse(const QString &id, const QSize &requestedSize) override { return new InstantAsyncImageResponse(id, requestedSize); } @@ -696,7 +696,7 @@ public: ~WaitingAsyncProvider() {} - QQuickImageResponse *requestImageResponse(const QString & /* id */, const QSize & /* requestedSize */) + QQuickImageResponse *requestImageResponse(const QString & /* id */, const QSize & /* requestedSize */) override { auto response = new WaitingAsyncImageResponse(m_providerRemovedMutex, m_providerRemovedCond, m_providerRemoved, m_imageRequestedMutex, m_imageRequestedCondition, m_imageRequested); pool.start(response); |