summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/pdf/qpdfbookmarkmodel.cpp27
-rw-r--r--src/pdf/qpdfbookmarkmodel.h12
-rw-r--r--tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp65
3 files changed, 2 insertions, 102 deletions
diff --git a/src/pdf/qpdfbookmarkmodel.cpp b/src/pdf/qpdfbookmarkmodel.cpp
index f9017ce41..695333659 100644
--- a/src/pdf/qpdfbookmarkmodel.cpp
+++ b/src/pdf/qpdfbookmarkmodel.cpp
@@ -169,7 +169,6 @@ struct QPdfBookmarkModelPrivate
QPdfBookmarkModelPrivate()
: m_rootNode(new BookmarkNode(nullptr))
, m_document(nullptr)
- , m_structureMode(QPdfBookmarkModel::StructureMode::Tree)
{
}
@@ -202,13 +201,8 @@ struct QPdfBookmarkModelPrivate
while (bookmark) {
BookmarkNode *childBookmarkNode = nullptr;
- if (m_structureMode == QPdfBookmarkModel::StructureMode::Tree) {
- childBookmarkNode = new BookmarkNode(parentBookmarkNode);
- parentBookmarkNode->appendChild(childBookmarkNode);
- } else if (m_structureMode == QPdfBookmarkModel::StructureMode::List) {
- childBookmarkNode = new BookmarkNode(m_rootNode.data());
- m_rootNode->appendChild(childBookmarkNode);
- }
+ childBookmarkNode = new BookmarkNode(parentBookmarkNode);
+ parentBookmarkNode->appendChild(childBookmarkNode);
Q_ASSERT(childBookmarkNode);
const int titleLength = int(FPDFBookmark_GetTitle(bookmark, nullptr, 0));
@@ -261,7 +255,6 @@ struct QPdfBookmarkModelPrivate
QScopedPointer<BookmarkNode> m_rootNode;
QPointer<QPdfDocument> m_document;
- QPdfBookmarkModel::StructureMode m_structureMode;
};
@@ -299,22 +292,6 @@ void QPdfBookmarkModel::setDocument(QPdfDocument *document)
d->rebuild();
}
-QPdfBookmarkModel::StructureMode QPdfBookmarkModel::structureMode() const
-{
- return d->m_structureMode;
-}
-
-void QPdfBookmarkModel::setStructureMode(StructureMode mode)
-{
- if (d->m_structureMode == mode)
- return;
-
- d->m_structureMode = mode;
- emit structureModeChanged(d->m_structureMode);
-
- d->rebuild();
-}
-
int QPdfBookmarkModel::columnCount(const QModelIndex &parent) const
{
Q_UNUSED(parent);
diff --git a/src/pdf/qpdfbookmarkmodel.h b/src/pdf/qpdfbookmarkmodel.h
index 325d630ff..4f547ad47 100644
--- a/src/pdf/qpdfbookmarkmodel.h
+++ b/src/pdf/qpdfbookmarkmodel.h
@@ -53,16 +53,8 @@ class Q_PDF_EXPORT QPdfBookmarkModel : public QAbstractItemModel
Q_OBJECT
Q_PROPERTY(QPdfDocument* document READ document WRITE setDocument NOTIFY documentChanged)
- Q_PROPERTY(StructureMode structureMode READ structureMode WRITE setStructureMode NOTIFY structureModeChanged)
public:
- enum class StructureMode
- {
- Tree = 1,
- List
- };
- Q_ENUM(StructureMode)
-
enum class Role : int
{
Title = Qt::DisplayRole,
@@ -81,9 +73,6 @@ public:
QPdfDocument* document() const;
void setDocument(QPdfDocument *document);
- StructureMode structureMode() const;
- void setStructureMode(StructureMode mode);
-
QVariant data(const QModelIndex &index, int role) const override;
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex &index) const override;
@@ -93,7 +82,6 @@ public:
Q_SIGNALS:
void documentChanged(QPdfDocument *document);
- void structureModeChanged(QPdfBookmarkModel::StructureMode structureMode);
private:
QHash<int, QByteArray> m_roleNames;
diff --git a/tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp b/tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp
index 171f102ea..dddc7b936 100644
--- a/tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp
+++ b/tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp
@@ -60,7 +60,6 @@ private slots:
void setLoadedDocument();
void unloadDocument();
void testTreeStructure();
- void testListStructure();
void testPageNumberRole();
void testLocationAndZoomRoles();
};
@@ -70,7 +69,6 @@ void tst_QPdfBookmarkModel::emptyModel()
QPdfBookmarkModel model;
QVERIFY(!model.document());
- QCOMPARE(model.structureMode(), QPdfBookmarkModel::StructureMode::Tree);
QCOMPARE(model.rowCount(), 0);
QCOMPARE(model.columnCount(), 1);
QCOMPARE(model.index(0, 0).isValid(), false);
@@ -84,7 +82,6 @@ void tst_QPdfBookmarkModel::setEmptyDocument()
model.setDocument(&document);
QCOMPARE(model.document(), &document);
- QCOMPARE(model.structureMode(), QPdfBookmarkModel::StructureMode::Tree);
QCOMPARE(model.rowCount(), 0);
QCOMPARE(model.columnCount(), 1);
QCOMPARE(model.index(0, 0).isValid(), false);
@@ -201,68 +198,6 @@ void tst_QPdfBookmarkModel::testTreeStructure()
QCOMPARE(index4, QModelIndex());
}
-void tst_QPdfBookmarkModel::testListStructure()
-{
- QPdfDocument document;
- QCOMPARE(document.load(QFINDTESTDATA("pdf-sample.bookmarks.pdf")), QPdfDocument::Error::None);
-
- QPdfBookmarkModel model;
- model.setDocument(&document);
-
- QSignalSpy modelAboutToBeResetSpy(&model, SIGNAL(modelAboutToBeReset()));
- QSignalSpy modelResetSpy(&model, SIGNAL(modelReset()));
-
- model.setStructureMode(QPdfBookmarkModel::StructureMode::List);
-
- QCOMPARE(modelAboutToBeResetSpy.count(), 1);
- QCOMPARE(modelResetSpy.count(), 1);
-
- QCOMPARE(model.rowCount(), 8);
-
- const QModelIndex index1 = model.index(0, 0);
- QCOMPARE(index1.data(int(QPdfBookmarkModel::Role::Title)).toString(), QLatin1String("Section 1"));
- QCOMPARE(index1.data(int(QPdfBookmarkModel::Role::Level)).toInt(), 0);
- QCOMPARE(model.rowCount(index1), 0);
-
- const QModelIndex index1_1 = model.index(1, 0);
- QCOMPARE(index1_1.data(int(QPdfBookmarkModel::Role::Title)).toString(), QLatin1String("Section 1.1"));
- QCOMPARE(index1_1.data(int(QPdfBookmarkModel::Role::Level)).toInt(), 1);
- QCOMPARE(model.rowCount(index1_1), 0);
-
- const QModelIndex index1_2 = model.index(2, 0);
- QCOMPARE(index1_2.data(int(QPdfBookmarkModel::Role::Title)).toString(), QLatin1String("Section 1.2"));
- QCOMPARE(index1_2.data(int(QPdfBookmarkModel::Role::Level)).toInt(), 1);
- QCOMPARE(model.rowCount(index1_2), 0);
-
- const QModelIndex index2 = model.index(3, 0);
- QCOMPARE(index2.data(int(QPdfBookmarkModel::Role::Title)).toString(), QLatin1String("Section 2"));
- QCOMPARE(index2.data(int(QPdfBookmarkModel::Role::Level)).toInt(), 0);
- QCOMPARE(model.rowCount(index2), 0);
-
- const QModelIndex index2_1 = model.index(4, 0);
- QCOMPARE(index2_1.data(int(QPdfBookmarkModel::Role::Title)).toString(), QLatin1String("Section 2.1"));
- QCOMPARE(index2_1.data(int(QPdfBookmarkModel::Role::Level)).toInt(), 1);
- QCOMPARE(model.rowCount(index2_1), 0);
-
- const QModelIndex index2_1_1 = model.index(5, 0);
- QCOMPARE(index2_1_1.data(int(QPdfBookmarkModel::Role::Title)).toString(), QLatin1String("Section 2.1.1"));
- QCOMPARE(index2_1_1.data(int(QPdfBookmarkModel::Role::Level)).toInt(), 2);
- QCOMPARE(model.rowCount(index2_1_1), 0);
-
- const QModelIndex index2_2 = model.index(6, 0);
- QCOMPARE(index2_2.data(int(QPdfBookmarkModel::Role::Title)).toString(), QLatin1String("Section 2.2"));
- QCOMPARE(index2_2.data(int(QPdfBookmarkModel::Role::Level)).toInt(), 1);
- QCOMPARE(model.rowCount(index2_2), 0);
-
- const QModelIndex index3 = model.index(7, 0);
- QCOMPARE(index3.data(int(QPdfBookmarkModel::Role::Title)).toString(), QLatin1String("Section 3"));
- QCOMPARE(index3.data(int(QPdfBookmarkModel::Role::Level)).toInt(), 0);
- QCOMPARE(model.rowCount(index3), 0);
-
- const QModelIndex index4 = model.index(8, 0);
- QCOMPARE(index4, QModelIndex());
-}
-
void tst_QPdfBookmarkModel::testPageNumberRole()
{
QPdfDocument document;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 05:25:56 +0000