From 84a5d90fc43ead2ce2aa3bdaac2ca88241700d5d Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Wed, 2 Aug 2023 17:43:39 +0200 Subject: Rename QPdfView::currentSearchResult() -> currentSearchResultIndex() I don't think it was very confusing, but just in case we could want a currentSearchResult() returning the actual result object at some point. It was a suggestion from header review. Amends 288e9be6ba2be40761333036f3397298df5e1018 Pick-to: 6.6 Change-Id: Ie3eb500e3a79b80b8abafbe19c48b57c7e9d71be Reviewed-by: Fabian Kosmale --- src/pdfwidgets/qpdfview.cpp | 20 ++++++++++---------- src/pdfwidgets/qpdfview.h | 8 ++++---- src/pdfwidgets/qpdfview_p.h | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/pdfwidgets') diff --git a/src/pdfwidgets/qpdfview.cpp b/src/pdfwidgets/qpdfview.cpp index bc231b369..8f4934eae 100644 --- a/src/pdfwidgets/qpdfview.cpp +++ b/src/pdfwidgets/qpdfview.cpp @@ -366,7 +366,7 @@ void QPdfView::setSearchModel(QPdfSearchModel *searchModel) connect(searchModel, &QPdfSearchModel::dataChanged, this, [this](const QModelIndex &, const QModelIndex &, const QList &) { update(); }); } - setCurrentSearchResult(-1); + setCurrentSearchResultIndex(-1); } QPdfSearchModel *QPdfView::searchModel() const @@ -377,7 +377,7 @@ QPdfSearchModel *QPdfView::searchModel() const /*! \since 6.6 - \property QPdfView::currentSearchResult + \property QPdfView::currentSearchResultIndex If this property is set to a positive number, and \l searchModel is set, QPdfView draws a frame around the search result provided by @@ -388,21 +388,21 @@ QPdfSearchModel *QPdfView::searchModel() const By default it is \c -1, so that no search results are framed. */ -void QPdfView::setCurrentSearchResult(int currentResult) +void QPdfView::setCurrentSearchResultIndex(int currentResult) { Q_D(QPdfView); - if (d->m_currentSearchResult == currentResult) + if (d->m_currentSearchResultIndex == currentResult) return; - d->m_currentSearchResult = currentResult; - emit currentSearchResultChanged(currentResult); + d->m_currentSearchResultIndex = currentResult; + emit currentSearchResultIndexChanged(currentResult); viewport()->update(); //update(); } -int QPdfView::currentSearchResult() const +int QPdfView::currentSearchResultIndex() const { Q_D(const QPdfView); - return d->m_currentSearchResult; + return d->m_currentSearchResultIndex; } /*! @@ -616,8 +616,8 @@ void QPdfView::paintEvent(QPaintEvent *event) painter.fillRect(scaleTransform.mapRect(rect).translated(pageGeometry.topLeft()), SearchResultHighlight); } - if (d->m_currentSearchResult >= 0 && d->m_currentSearchResult < d->m_searchModel->rowCount({})) { - const QPdfLink &cur = d->m_searchModel->resultAtIndex(d->m_currentSearchResult); + if (d->m_currentSearchResultIndex >= 0 && d->m_currentSearchResultIndex < d->m_searchModel->rowCount({})) { + const QPdfLink &cur = d->m_searchModel->resultAtIndex(d->m_currentSearchResultIndex); if (cur.page() == page) { painter.setPen({CurrentSearchResultHighlight, CurrentSearchResultWidth}); for (const auto &rect : cur.rectangles()) diff --git a/src/pdfwidgets/qpdfview.h b/src/pdfwidgets/qpdfview.h index 54e9ddfd5..548ee81cb 100644 --- a/src/pdfwidgets/qpdfview.h +++ b/src/pdfwidgets/qpdfview.h @@ -31,7 +31,7 @@ class Q_PDF_WIDGETS_EXPORT QPdfView : public QAbstractScrollArea Q_PROPERTY(QMargins documentMargins READ documentMargins WRITE setDocumentMargins NOTIFY documentMarginsChanged) Q_PROPERTY(QPdfSearchModel* searchModel READ searchModel WRITE setSearchModel NOTIFY searchModelChanged) - Q_PROPERTY(int currentSearchResult READ currentSearchResult WRITE setCurrentSearchResult NOTIFY currentSearchResultChanged) + Q_PROPERTY(int currentSearchResultIndex READ currentSearchResultIndex WRITE setCurrentSearchResultIndex NOTIFY currentSearchResultIndexChanged) public: enum class PageMode @@ -59,7 +59,7 @@ public: QPdfSearchModel *searchModel() const; void setSearchModel(QPdfSearchModel *searchModel); - int currentSearchResult() const; + int currentSearchResultIndex() const; QPdfPageNavigator *pageNavigator() const; @@ -77,7 +77,7 @@ public Q_SLOTS: void setPageMode(QPdfView::PageMode mode); void setZoomMode(QPdfView::ZoomMode mode); void setZoomFactor(qreal factor); - void setCurrentSearchResult(int currentResult); + void setCurrentSearchResultIndex(int currentResult); Q_SIGNALS: void documentChanged(QPdfDocument *document); @@ -87,7 +87,7 @@ Q_SIGNALS: void pageSpacingChanged(int pageSpacing); void documentMarginsChanged(QMargins documentMargins); void searchModelChanged(QPdfSearchModel *searchModel); - void currentSearchResultChanged(int currentResult); + void currentSearchResultIndexChanged(int currentResult); protected: void paintEvent(QPaintEvent *event) override; diff --git a/src/pdfwidgets/qpdfview_p.h b/src/pdfwidgets/qpdfview_p.h index 37222ce8c..91f6583a3 100644 --- a/src/pdfwidgets/qpdfview_p.h +++ b/src/pdfwidgets/qpdfview_p.h @@ -67,7 +67,7 @@ public: QPdfView::ZoomMode m_zoomMode; qreal m_zoomFactor; - int m_currentSearchResult = -1; + int m_currentSearchResultIndex = -1; int m_pageSpacing; QMargins m_documentMargins; -- cgit v1.2.3