Rename _Count to NRoles

Identifiers shouldn't really begin with underscore even if it works. It
is reserved for compiler/library internals.

Pick-to: 6.4
Change-Id: I17e1b3ce2dc19af036fcb13a6c90fc1f6f149e17
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

8 files changed, 16 insertions, 16 deletions

diff --git a/src/pdf/qpdfbookmarkmodel.cpp b/src/pdf/qpdfbookmarkmodel.cpp
index 50e1f88ba..b2b4851ea 100644
--- a/src/pdf/qpdfbookmarkmodel.cpp
+++ b/src/pdf/qpdfbookmarkmodel.cpp
@@ -243,7 +243,7 @@ struct QPdfBookmarkModelPrivate
     \value Page The page number of the destination (int).
     \value Location The position of the destination (QPointF).
     \value Zoom The suggested zoom level (qreal).
-    \omitvalue _Count
+    \omitvalue NRoles
 */
 
 /*!
@@ -255,7 +255,7 @@ QPdfBookmarkModel::QPdfBookmarkModel(QObject *parent)
     d->q = this;
     m_roleNames = QAbstractItemModel::roleNames();
     QMetaEnum rolesMetaEnum = metaObject()->enumerator(metaObject()->indexOfEnumerator("Role"));
-    for (int r = Qt::UserRole; r < int(Role::_Count); ++r)
+    for (int r = Qt::UserRole; r < int(Role::NRoles); ++r)
         m_roleNames.insert(r, QByteArray(rolesMetaEnum.valueToKey(r)).toLower());
 }
 
@@ -323,7 +323,7 @@ QVariant QPdfBookmarkModel::data(const QModelIndex &index, int role) const
         return node->location();
     case Role::Zoom:
         return node->zoom();
-    case Role::_Count:
+    case Role::NRoles:
         break;
     }
     if (role == Qt::DisplayRole)
diff --git a/src/pdf/qpdfbookmarkmodel.h b/src/pdf/qpdfbookmarkmodel.h
index 616cb5379..50f765edc 100644
--- a/src/pdf/qpdfbookmarkmodel.h
+++ b/src/pdf/qpdfbookmarkmodel.h
@@ -26,7 +26,7 @@ public:
         Page,
         Location,
         Zoom,
-        _Count
+        NRoles
     };
     Q_ENUM(Role)
 
diff --git a/src/pdf/qpdfdocument.cpp b/src/pdf/qpdfdocument.cpp
index 26ca90e30..56d5398bf 100644
--- a/src/pdf/qpdfdocument.cpp
+++ b/src/pdf/qpdfdocument.cpp
@@ -37,7 +37,7 @@ public:
     {
         m_roleNames = QAbstractItemModel::roleNames();
         QMetaEnum rolesMetaEnum = doc->metaObject()->enumerator(doc->metaObject()->indexOfEnumerator("PageModelRole"));
-        for (int r = Qt::UserRole; r < int(QPdfDocument::PageModelRole::_Count); ++r) {
+        for (int r = Qt::UserRole; r < int(QPdfDocument::PageModelRole::NRoles); ++r) {
             auto name = QByteArray(rolesMetaEnum.valueToKey(r));
             name[0] = tolower(name[0]);
             m_roleNames.insert(r, name);
@@ -59,7 +59,7 @@ public:
             return document()->pageLabel(index.row());
         case QPdfDocument::PageModelRole::PointSize:
             return document()->pagePointSize(index.row());
-        case QPdfDocument::PageModelRole::_Count:
+        case QPdfDocument::PageModelRole::NRoles:
             break;
         }
         return QVariant();
@@ -750,7 +750,7 @@ QSizeF QPdfDocument::pagePointSize(int page) const
 
     \value Label The page number to be used for display purposes (QString).
     \value PointSize The page size in points (1/72 of an inch) (QSizeF).
-    \omitvalue _Count
+    \omitvalue NRoles
 */
 
 /*!
diff --git a/src/pdf/qpdfdocument.h b/src/pdf/qpdfdocument.h
index 1a96d6e11..5f55ed29c 100644
--- a/src/pdf/qpdfdocument.h
+++ b/src/pdf/qpdfdocument.h
@@ -62,7 +62,7 @@ public:
     enum class PageModelRole {
         Label = Qt::UserRole,
         PointSize,
-        _Count
+        NRoles
     };
     Q_ENUM(PageModelRole)
 
diff --git a/src/pdf/qpdflinkmodel.cpp b/src/pdf/qpdflinkmodel.cpp
index 4fc9d8aea..a5d9930f6 100644
--- a/src/pdf/qpdflinkmodel.cpp
+++ b/src/pdf/qpdflinkmodel.cpp
@@ -37,7 +37,7 @@ Q_LOGGING_CATEGORY(qLcLink, "qt.pdf.links")
     \value Page If the link is an internal link, the page number to which the link should jump; otherwise \c {-1}.
     \value Location If the link is an internal link, the location on the page to which the link should jump.
     \value Zoom If the link is an internal link, the suggested zoom level on the destination page.
-    \omitvalue _Count
+    \omitvalue NRoles
 */
 
 /*!
@@ -47,7 +47,7 @@ QPdfLinkModel::QPdfLinkModel(QObject *parent)
     : QAbstractListModel(*(new QPdfLinkModelPrivate()), parent)
 {
     QMetaEnum rolesMetaEnum = metaObject()->enumerator(metaObject()->indexOfEnumerator("Role"));
-    for (int r = Qt::UserRole; r < int(Role::_Count); ++r)
+    for (int r = Qt::UserRole; r < int(Role::NRoles); ++r)
         m_roleNames.insert(r, QByteArray(rolesMetaEnum.valueToKey(r)).toLower());
 }
 
@@ -91,7 +91,7 @@ QVariant QPdfLinkModel::data(const QModelIndex &index, int role) const
         return link.location();
     case Role::Zoom:
         return link.zoom();
-    case Role::_Count:
+    case Role::NRoles:
         break;
     }
     if (role == Qt::DisplayRole)
diff --git a/src/pdf/qpdflinkmodel_p.h b/src/pdf/qpdflinkmodel_p.h
index 48c973d11..3251d4e9a 100644
--- a/src/pdf/qpdflinkmodel_p.h
+++ b/src/pdf/qpdflinkmodel_p.h
@@ -39,7 +39,7 @@ public:
         Page,
         Location,
         Zoom,
-        _Count
+        NRoles
     };
     Q_ENUM(Role)
     explicit QPdfLinkModel(QObject *parent = nullptr);
diff --git a/src/pdf/qpdfsearchmodel.cpp b/src/pdf/qpdfsearchmodel.cpp
index bead3165f..e8946ea86 100644
--- a/src/pdf/qpdfsearchmodel.cpp
+++ b/src/pdf/qpdfsearchmodel.cpp
@@ -47,7 +47,7 @@ static const double CharacterHitTolerance = 6.0;
     \value Location The position of the search result on the page (QPointF).
     \value ContextBefore The adjacent text on the page, before the search string (QString).
     \value ContextAfter The adjacent text on the page, after the search string (QString).
-    \omitvalue _Count
+    \omitvalue NRoles
 
     \sa QPdfLink
 */
@@ -59,7 +59,7 @@ QPdfSearchModel::QPdfSearchModel(QObject *parent)
     : QAbstractListModel(*(new QPdfSearchModelPrivate()), parent)
 {
     QMetaEnum rolesMetaEnum = metaObject()->enumerator(metaObject()->indexOfEnumerator("Role"));
-    for (int r = Qt::UserRole; r < int(Role::_Count); ++r) {
+    for (int r = Qt::UserRole; r < int(Role::NRoles); ++r) {
         QByteArray roleName = QByteArray(rolesMetaEnum.valueToKey(r));
         if (roleName.isEmpty())
             continue;
@@ -113,7 +113,7 @@ QVariant QPdfSearchModel::data(const QModelIndex &index, int role) const
         return d->searchResults[pi.page][pi.index].contextBefore();
     case Role::ContextAfter:
         return d->searchResults[pi.page][pi.index].contextAfter();
-    case Role::_Count:
+    case Role::NRoles:
         break;
     }
     if (role == Qt::DisplayRole) {
diff --git a/src/pdf/qpdfsearchmodel.h b/src/pdf/qpdfsearchmodel.h
index 70342d691..c1e4e64ec 100644
--- a/src/pdf/qpdfsearchmodel.h
+++ b/src/pdf/qpdfsearchmodel.h
@@ -27,7 +27,7 @@ public:
         Location,
         ContextBefore,
         ContextAfter,
-        _Count
+        NRoles
     };
     Q_ENUM(Role)
     QPdfSearchModel() : QPdfSearchModel(nullptr) {}