1 files changed, 14 insertions, 42 deletions

diff --git a/src/pdf/qpdfsearchmodel.h b/src/pdf/qpdfsearchmodel.h
index 1a413c763..04f8b9140 100644
--- a/src/pdf/qpdfsearchmodel.h
+++ b/src/pdf/qpdfsearchmodel.h
@@ -1,38 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtPDF module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QPDFSEARCHMODEL_H
 #define QPDFSEARCHMODEL_H
@@ -41,7 +8,7 @@
 
 #include <QtCore/qabstractitemmodel.h>
 #include <QtPdf/qpdfdocument.h>
-#include <QtPdf/qpdfsearchresult.h>
+#include <QtPdf/qpdflink.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -52,6 +19,7 @@ class Q_PDF_EXPORT QPdfSearchModel : public QAbstractListModel
     Q_OBJECT
     Q_PROPERTY(QPdfDocument *document READ document WRITE setDocument NOTIFY documentChanged)
     Q_PROPERTY(QString searchString READ searchString WRITE setSearchString NOTIFY searchStringChanged)
+    Q_PROPERTY(int count READ count NOTIFY countChanged REVISION(6, 8) FINAL)
 
 public:
     enum class Role : int {
@@ -60,14 +28,15 @@ public:
         Location,
         ContextBefore,
         ContextAfter,
-        _Count
+        NRoles
     };
     Q_ENUM(Role)
-    explicit QPdfSearchModel(QObject *parent = nullptr);
-    ~QPdfSearchModel();
+    QPdfSearchModel() : QPdfSearchModel(nullptr) {}
+    explicit QPdfSearchModel(QObject *parent);
+    ~QPdfSearchModel() override;
 
-    QList<QPdfSearchResult> resultsOnPage(int page) const;
-    QPdfSearchResult resultAtIndex(int index) const;
+    QList<QPdfLink> resultsOnPage(int page) const;
+    QPdfLink resultAtIndex(int index) const;
 
     QPdfDocument *document() const;
     QString searchString() const;
@@ -76,13 +45,16 @@ public:
     int rowCount(const QModelIndex &parent) const override;
     QVariant data(const QModelIndex &index, int role) const override;
 
+    int count() const;
+
 public Q_SLOTS:
-    void setSearchString(QString searchString);
+    void setSearchString(const QString &searchString);
     void setDocument(QPdfDocument *document);
 
 Q_SIGNALS:
     void documentChanged();
     void searchStringChanged();
+    Q_REVISION(6, 8) void countChanged();
 
 protected:
     void updatePage(int page);