Rename QPdfLinkModel::Role::Rect to Rectangle

Roles are not abbreviated in general; this doesn't need to be either.

Change-Id: I55a6fcbc4818d7363f1184b660948da4943c110b
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>

6 files changed, 24 insertions, 21 deletions

diff --git a/src/pdf/qpdflinkmodel.cpp b/src/pdf/qpdflinkmodel.cpp
index 4997cd314..62d10eaf6 100644
--- a/src/pdf/qpdflinkmodel.cpp
+++ b/src/pdf/qpdflinkmodel.cpp
@@ -81,7 +81,7 @@ QVariant QPdfLinkModel::data(const QModelIndex &index, int role) const
     switch (Role(role)) {
     case Role::Link:
         return QVariant::fromValue(link);
-    case Role::Rect:
+    case Role::Rectangle:
         return link.rectangles().empty() ? QVariant() : link.rectangles().constFirst();
     case Role::Url:
         return link.url();
diff --git a/src/pdf/qpdflinkmodel_p.h b/src/pdf/qpdflinkmodel_p.h
index 35fa28dcd..afd98e892 100644
--- a/src/pdf/qpdflinkmodel_p.h
+++ b/src/pdf/qpdflinkmodel_p.h
@@ -70,7 +70,7 @@ class Q_PDF_EXPORT QPdfLinkModel : public QAbstractListModel
 public:
     enum class Role : int {
         Link = Qt::UserRole,
-        Rect,
+        Rectangle,
         Url,
         Page,
         Location,
diff --git a/src/pdfquick/PdfMultiPageView.qml b/src/pdfquick/PdfMultiPageView.qml
index 3ab0d1024..a718823fa 100644
--- a/src/pdfquick/PdfMultiPageView.qml
+++ b/src/pdfquick/PdfMultiPageView.qml
@@ -509,15 +509,15 @@ Item {
                         page: image.currentFrame
                     }
                     delegate: Shape {
-                        required property rect rect
+                        required property rect rectangle
                         required property url url
                         required property int page
                         required property point location
                         required property real zoom
-                        x: rect.x * paper.pageScale
-                        y: rect.y * paper.pageScale
-                        width: rect.width * paper.pageScale
-                        height: rect.height * paper.pageScale
+                        x: rectangle.x * paper.pageScale
+                        y: rectangle.y * paper.pageScale
+                        width: rectangle.width * paper.pageScale
+                        height: rectangle.height * paper.pageScale
                         visible: image.status === Image.Ready
                         ShapePath {
                             strokeWidth: style.linkUnderscoreStrokeWidth
diff --git a/src/pdfquick/PdfPageView.qml b/src/pdfquick/PdfPageView.qml
index d3643d7ed..387981ca6 100644
--- a/src/pdfquick/PdfPageView.qml
+++ b/src/pdfquick/PdfPageView.qml
@@ -434,10 +434,10 @@ Rectangle {
             page: pageNavigator.currentPage
         }
         delegate: Item {
-            x: rect.x * image.pageScale
-            y: rect.y * image.pageScale
-            width: rect.width * image.pageScale
-            height: rect.height * image.pageScale
+            x: rectangle.x * image.pageScale
+            y: rectangle.y * image.pageScale
+            width: rectangle.width * image.pageScale
+            height: rectangle.height * image.pageScale
             HoverHandler { cursorShape: Qt.PointingHandCursor }
             TapHandler {
                 onTapped: {
diff --git a/src/pdfquick/PdfScrollablePageView.qml b/src/pdfquick/PdfScrollablePageView.qml
index 600c3ab8e..65cd8bd0a 100644
--- a/src/pdfquick/PdfScrollablePageView.qml
+++ b/src/pdfquick/PdfScrollablePageView.qml
@@ -442,15 +442,15 @@ Flickable {
                     page: pageNavigator.currentPage
                 }
                 delegate: Shape {
-                    required property rect rect
+                    required property rect rectangle
                     required property url url
                     required property int page
                     required property point location
                     required property real zoom
-                    x: rect.x * image.pageScale
-                    y: rect.y * image.pageScale
-                    width: rect.width * image.pageScale
-                    height: rect.height * image.pageScale
+                    x: rectangle.x * image.pageScale
+                    y: rectangle.y * image.pageScale
+                    width: rectangle.width * image.pageScale
+                    height: rectangle.height * image.pageScale
                     visible: image.status === Image.Ready
                     ShapePath {
                         strokeWidth: style.linkUnderscoreStrokeWidth
diff --git a/src/pdfquick/qquickpdflinkmodel.cpp b/src/pdfquick/qquickpdflinkmodel.cpp
index 735ae88d2..b9137fd36 100644
--- a/src/pdfquick/qquickpdflinkmodel.cpp
+++ b/src/pdfquick/qquickpdflinkmodel.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
     The available model roles are:
 
-    \value rect
+    \value rectangle
         Bounding rectangle around the link.
     \value url
         If the link is a web link, the URL for that; otherwise an empty URL.
@@ -78,12 +78,15 @@ QT_BEGIN_NAMESPACE
             page: image.currentFrame
         }
         delegate: Rectangle {
+            required property rect rectangle
+            required property url url
+            required property int page
             color: "transparent"
             border.color: "lightgrey"
-            x: rect.x
-            y: rect.y
-            width: rect.width
-            height: rect.height
+            x: rectangle.x
+            y: rectangle.y
+            width: rectangle.width
+            height: rectangle.height
             HoverHandler { cursorShape: Qt.PointingHandCursor }
             TapHandler {
                 onTapped: {