diff options
| -rw-r--r-- | src/pdf/qpdfbookmarkmodel.cpp | 6 | ||||
| -rw-r--r-- | src/pdf/qpdfbookmarkmodel.h | 6 | ||||
| -rw-r--r-- | tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/pdf/qpdfbookmarkmodel.cpp b/src/pdf/qpdfbookmarkmodel.cpp index e334d8bf0..f9017ce41 100644 --- a/src/pdf/qpdfbookmarkmodel.cpp +++ b/src/pdf/qpdfbookmarkmodel.cpp @@ -169,7 +169,7 @@ struct QPdfBookmarkModelPrivate QPdfBookmarkModelPrivate() : m_rootNode(new BookmarkNode(nullptr)) , m_document(nullptr) - , m_structureMode(QPdfBookmarkModel::TreeMode) + , m_structureMode(QPdfBookmarkModel::StructureMode::Tree) { } @@ -202,10 +202,10 @@ struct QPdfBookmarkModelPrivate while (bookmark) { BookmarkNode *childBookmarkNode = nullptr; - if (m_structureMode == QPdfBookmarkModel::TreeMode) { + if (m_structureMode == QPdfBookmarkModel::StructureMode::Tree) { childBookmarkNode = new BookmarkNode(parentBookmarkNode); parentBookmarkNode->appendChild(childBookmarkNode); - } else if (m_structureMode == QPdfBookmarkModel::ListMode) { + } else if (m_structureMode == QPdfBookmarkModel::StructureMode::List) { childBookmarkNode = new BookmarkNode(m_rootNode.data()); m_rootNode->appendChild(childBookmarkNode); } diff --git a/src/pdf/qpdfbookmarkmodel.h b/src/pdf/qpdfbookmarkmodel.h index 7b8cfc65a..325d630ff 100644 --- a/src/pdf/qpdfbookmarkmodel.h +++ b/src/pdf/qpdfbookmarkmodel.h @@ -56,10 +56,10 @@ class Q_PDF_EXPORT QPdfBookmarkModel : public QAbstractItemModel Q_PROPERTY(StructureMode structureMode READ structureMode WRITE setStructureMode NOTIFY structureModeChanged) public: - enum StructureMode + enum class StructureMode { - TreeMode = 1, - ListMode + Tree = 1, + List }; Q_ENUM(StructureMode) diff --git a/tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp b/tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp index f84a100dd..171f102ea 100644 --- a/tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp +++ b/tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp @@ -70,7 +70,7 @@ void tst_QPdfBookmarkModel::emptyModel() QPdfBookmarkModel model; QVERIFY(!model.document()); - QCOMPARE(model.structureMode(), QPdfBookmarkModel::TreeMode); + QCOMPARE(model.structureMode(), QPdfBookmarkModel::StructureMode::Tree); QCOMPARE(model.rowCount(), 0); QCOMPARE(model.columnCount(), 1); QCOMPARE(model.index(0, 0).isValid(), false); @@ -84,7 +84,7 @@ void tst_QPdfBookmarkModel::setEmptyDocument() model.setDocument(&document); QCOMPARE(model.document(), &document); - QCOMPARE(model.structureMode(), QPdfBookmarkModel::TreeMode); + QCOMPARE(model.structureMode(), QPdfBookmarkModel::StructureMode::Tree); QCOMPARE(model.rowCount(), 0); QCOMPARE(model.columnCount(), 1); QCOMPARE(model.index(0, 0).isValid(), false); @@ -212,7 +212,7 @@ void tst_QPdfBookmarkModel::testListStructure() QSignalSpy modelAboutToBeResetSpy(&model, SIGNAL(modelAboutToBeReset())); QSignalSpy modelResetSpy(&model, SIGNAL(modelReset())); - model.setStructureMode(QPdfBookmarkModel::ListMode); + model.setStructureMode(QPdfBookmarkModel::StructureMode::List); QCOMPARE(modelAboutToBeResetSpy.count(), 1); QCOMPARE(modelResetSpy.count(), 1); |