diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-08-09 11:19:09 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-10 14:54:50 +0000 |
| commit | d1cb5bab9c64ff5321aa2f7a7b33aefc8959c569 (patch) | |
| tree | c19a4552ea3117bc6cd068afce0aeab857bcd5da | |
| parent | 63337e535e0b990f623f6ac266121493a47debd4 (diff) | |
Move QPdfBookmarkModel::d_rolesNames to private class
To protect implementation internals
From API Review
Change-Id: Idaf221546a1d7d00b433759b2f3160b915155cc3
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 978677f6457693a716d40101dc4a94f43e6946a8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/pdf/qpdfbookmarkmodel.cpp | 7 | ||||
| -rw-r--r-- | src/pdf/qpdfbookmarkmodel.h | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/pdf/qpdfbookmarkmodel.cpp b/src/pdf/qpdfbookmarkmodel.cpp index b2b4851ea..7b984a300 100644 --- a/src/pdf/qpdfbookmarkmodel.cpp +++ b/src/pdf/qpdfbookmarkmodel.cpp @@ -219,6 +219,7 @@ struct QPdfBookmarkModelPrivate QScopedPointer<BookmarkNode> m_rootNode; QPointer<QPdfDocument> m_document; + QHash<int, QByteArray> m_roleNames; }; @@ -253,10 +254,10 @@ QPdfBookmarkModel::QPdfBookmarkModel(QObject *parent) : QAbstractItemModel(parent), d(new QPdfBookmarkModelPrivate) { d->q = this; - m_roleNames = QAbstractItemModel::roleNames(); + d->m_roleNames = QAbstractItemModel::roleNames(); QMetaEnum rolesMetaEnum = metaObject()->enumerator(metaObject()->indexOfEnumerator("Role")); for (int r = Qt::UserRole; r < int(Role::NRoles); ++r) - m_roleNames.insert(r, QByteArray(rolesMetaEnum.valueToKey(r)).toLower()); + d->m_roleNames.insert(r, QByteArray(rolesMetaEnum.valueToKey(r)).toLower()); } /*! @@ -300,7 +301,7 @@ int QPdfBookmarkModel::columnCount(const QModelIndex &parent) const */ QHash<int, QByteArray> QPdfBookmarkModel::roleNames() const { - return m_roleNames; + return d->m_roleNames; } /*! diff --git a/src/pdf/qpdfbookmarkmodel.h b/src/pdf/qpdfbookmarkmodel.h index 50f765edc..5a3c24f84 100644 --- a/src/pdf/qpdfbookmarkmodel.h +++ b/src/pdf/qpdfbookmarkmodel.h @@ -48,7 +48,6 @@ Q_SIGNALS: void documentChanged(QPdfDocument *document); private: - QHash<int, QByteArray> m_roleNames; std::unique_ptr<QPdfBookmarkModelPrivate> d; Q_PRIVATE_SLOT(d, void _q_documentStatusChanged()) |