diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-04-11 17:41:56 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-05-06 13:58:09 -0700 |
| commit | 989d6a3f96b818e5eacc5a2ccb1cc82e6dd8354c (patch) | |
| tree | 006daeb578ac4d3e68044ecfc36e7e12b1604ee8 /tests/testpicture.cpp | |
| parent | 282041e228d4a60ff7108fbfd1fc23caffd59ba4 (diff) | |
| download | subsurface-989d6a3f96b818e5eacc5a2ccb1cc82e6dd8354c.tar.gz | |
media: use table instead of linked list for media
For consistency with equipment, use our table macros for pictures.
Generally tables (arrays) are preferred over linked lists, because
they allow random access.
This is mostly copy & paste of the equipment code.
Sadly, our table macros are quite messy and need some revamping.
Therefore, the resulting code is likewise somewhat messy.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'tests/testpicture.cpp')
| -rw-r--r-- | tests/testpicture.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tests/testpicture.cpp b/tests/testpicture.cpp index da8fedeec..7bd683523 100644 --- a/tests/testpicture.cpp +++ b/tests/testpicture.cpp @@ -31,17 +31,15 @@ void TestPicture::addPicture() // Pictures will be added to selected dives dive->selected = true; QVERIFY(dive != NULL); - pic1 = dive->picture_list; // So far no picture in dive - QVERIFY(pic1 == NULL); + QVERIFY(dive->pictures.nr == 0); create_picture(SUBSURFACE_TEST_DATA "/dives/images/wreck.jpg", 0, false); create_picture(SUBSURFACE_TEST_DATA "/dives/images/data_after_EOI.jpg", 0, false); - pic1 = dive->picture_list; - pic2 = pic1->next; // Now there are two picture2 - QVERIFY(pic1 != NULL); - QVERIFY(pic2 != NULL); + QVERIFY(dive->pictures.nr == 2); + pic1 = &dive->pictures.pictures[0]; + pic2 = &dive->pictures.pictures[1]; // 1st appearing at time 21:01 // 2nd appearing at time 22:01 QVERIFY(pic1->offset.seconds == 1261); @@ -55,5 +53,4 @@ void TestPicture::addPicture() QCOMPARE(localFilePath(pic2->filename), QString(PIC2_NAME)); } - QTEST_GUILESS_MAIN(TestPicture) |