diff options
-rw-r--r-- | src/pdf/api/qpdfpagerenderer.h | 8 | ||||
-rw-r--r-- | src/pdf/qpdfpagerenderer.cpp | 18 | ||||
-rw-r--r-- | src/pdfwidgets/qpdfview.cpp | 2 | ||||
-rw-r--r-- | tests/auto/pdf/qpdfpagerenderer/tst_qpdfpagerenderer.cpp | 8 |
4 files changed, 19 insertions, 17 deletions
diff --git a/src/pdf/api/qpdfpagerenderer.h b/src/pdf/api/qpdfpagerenderer.h index 21f270bd4..c7b8de0df 100644 --- a/src/pdf/api/qpdfpagerenderer.h +++ b/src/pdf/api/qpdfpagerenderer.h @@ -57,15 +57,15 @@ class Q_PDF_EXPORT QPdfPageRenderer : public QObject Q_PROPERTY(RenderMode renderMode READ renderMode WRITE setRenderMode NOTIFY renderModeChanged) public: - enum RenderMode + enum class RenderMode { - MultiThreadedRenderMode, - SingleThreadedRenderMode + MultiThreaded, + SingleThreaded }; Q_ENUM(RenderMode) explicit QPdfPageRenderer(QObject *parent = nullptr); - ~QPdfPageRenderer(); + ~QPdfPageRenderer() override; RenderMode renderMode() const; void setRenderMode(RenderMode mode); diff --git a/src/pdf/qpdfpagerenderer.cpp b/src/pdf/qpdfpagerenderer.cpp index e90f66700..31d9f4e1e 100644 --- a/src/pdf/qpdfpagerenderer.cpp +++ b/src/pdf/qpdfpagerenderer.cpp @@ -79,7 +79,7 @@ public: void requestFinished(int page, QSize imageSize, const QImage &image, QPdfDocumentRenderOptions options, quint64 requestId); - QPdfPageRenderer::RenderMode m_renderMode = QPdfPageRenderer::SingleThreadedRenderMode; + QPdfPageRenderer::RenderMode m_renderMode = QPdfPageRenderer::RenderMode::SingleThreaded; QPointer<QPdfDocument> m_document; struct PageRequest @@ -164,6 +164,8 @@ void QPdfPageRendererPrivate::handleNextRequest() void QPdfPageRendererPrivate::requestFinished(int page, QSize imageSize, const QImage &image, QPdfDocumentRenderOptions options, quint64 requestId) { + Q_UNUSED(image); + Q_UNUSED(requestId); const auto it = std::find_if(m_pendingRequests.begin(), m_pendingRequests.end(), [page, imageSize, options](const PageRequest &request){ return request.pageNumber == page && request.imageSize == imageSize && request.options == options; }); @@ -180,8 +182,8 @@ void QPdfPageRendererPrivate::requestFinished(int page, QSize imageSize, const Q The QPdfPageRenderer contains a queue that collects all render requests that are invoked through requestPage(). Depending on the configured RenderMode the QPdfPageRenderer processes this queue - in the main UI thread on next event loop invocation (SingleThreadedRenderMode) or in a separate worker thread - (MultiThreadedRenderMode) and emits the result through the pageRendered() signal for each request once + in the main UI thread on next event loop invocation (\c RenderMode::SingleThreaded) or in a separate worker thread + (\c RenderMode::MultiThreaded) and emits the result through the pageRendered() signal for each request once the rendering is done. \sa QPdfDocument @@ -218,8 +220,8 @@ QPdfPageRenderer::~QPdfPageRenderer() This enum describes how the pages are rendered. - \value MultiThreadedRenderMode All pages are rendered in a separate worker thread. - \value SingleThreadedRenderMode All pages are rendered in the main UI thread (default). + \value MultiThreaded All pages are rendered in a separate worker thread. + \value SingleThreaded All pages are rendered in the main UI thread (default). \sa renderMode(), setRenderMode() */ @@ -228,7 +230,7 @@ QPdfPageRenderer::~QPdfPageRenderer() \property QPdfPageRenderer::renderMode \brief The mode the renderer uses to render the pages. - By default, this property is \c QPdfPageRenderer::SingleThreaded. + By default, this property is \c RenderMode::SingleThreaded. \sa setRenderMode(), RenderMode */ @@ -260,7 +262,7 @@ void QPdfPageRenderer::setRenderMode(RenderMode mode) d->m_renderMode = mode; emit renderModeChanged(d->m_renderMode); - if (d->m_renderMode == MultiThreadedRenderMode) { + if (d->m_renderMode == RenderMode::MultiThreaded) { d->m_renderThread = new QThread; d->m_renderWorker->moveToThread(d->m_renderThread); d->m_renderThread->start(); @@ -332,7 +334,7 @@ quint64 QPdfPageRenderer::requestPage(int pageNumber, QSize imageSize, if (!d->m_document || d->m_document->status() != QPdfDocument::Ready) return 0; - for (const auto request : qAsConst(d->m_pendingRequests)) { + for (const auto &request : qAsConst(d->m_pendingRequests)) { if (request.pageNumber == pageNumber && request.imageSize == imageSize && request.options == options) diff --git a/src/pdfwidgets/qpdfview.cpp b/src/pdfwidgets/qpdfview.cpp index 19e5b719a..35e368633 100644 --- a/src/pdfwidgets/qpdfview.cpp +++ b/src/pdfwidgets/qpdfview.cpp @@ -70,7 +70,7 @@ void QPdfViewPrivate::init() m_pageNavigation = new QPdfPageNavigation(q); m_pageRenderer = new QPdfPageRenderer(q); - m_pageRenderer->setRenderMode(QPdfPageRenderer::MultiThreadedRenderMode); + m_pageRenderer->setRenderMode(QPdfPageRenderer::RenderMode::MultiThreaded); } void QPdfViewPrivate::documentStatusChanged() diff --git a/tests/auto/pdf/qpdfpagerenderer/tst_qpdfpagerenderer.cpp b/tests/auto/pdf/qpdfpagerenderer/tst_qpdfpagerenderer.cpp index 8eaef7c6e..534fbd9ce 100644 --- a/tests/auto/pdf/qpdfpagerenderer/tst_qpdfpagerenderer.cpp +++ b/tests/auto/pdf/qpdfpagerenderer/tst_qpdfpagerenderer.cpp @@ -57,7 +57,7 @@ void tst_QPdfPageRenderer::defaultValues() QPdfPageRenderer pageRenderer; QCOMPARE(pageRenderer.document(), nullptr); - QCOMPARE(pageRenderer.renderMode(), QPdfPageRenderer::SingleThreadedRenderMode); + QCOMPARE(pageRenderer.renderMode(), QPdfPageRenderer::RenderMode::SingleThreaded); } void tst_QPdfPageRenderer::withNoDocument() @@ -110,7 +110,7 @@ void tst_QPdfPageRenderer::withLoadedDocumentMultiThreaded() QPdfPageRenderer pageRenderer; pageRenderer.setDocument(&document); - pageRenderer.setRenderMode(QPdfPageRenderer::MultiThreadedRenderMode); + pageRenderer.setRenderMode(QPdfPageRenderer::RenderMode::MultiThreaded); QCOMPARE(document.load(QFINDTESTDATA("pdf-sample.pagerenderer.pdf")), QPdfDocument::NoError); @@ -152,7 +152,7 @@ void tst_QPdfPageRenderer::switchingRenderMode() pageRenderedSpy.clear(); // switch to multi threaded - pageRenderer.setRenderMode(QPdfPageRenderer::MultiThreadedRenderMode); + pageRenderer.setRenderMode(QPdfPageRenderer::RenderMode::MultiThreaded); const quint64 secondRequestId = pageRenderer.requestPage(0, imageSize); @@ -167,7 +167,7 @@ void tst_QPdfPageRenderer::switchingRenderMode() pageRenderedSpy.clear(); // switch back to single threaded - pageRenderer.setRenderMode(QPdfPageRenderer::SingleThreadedRenderMode); + pageRenderer.setRenderMode(QPdfPageRenderer::RenderMode::SingleThreaded); const quint64 thirdRequestId = pageRenderer.requestPage(0, imageSize); |