diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-10-03 21:45:50 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-06 19:47:06 -0700 |
| commit | 6dc1dcaea52e383803a620369567684f553ede80 (patch) | |
| tree | acde1a3bd6e60445f1e8dcbe2aa5283d3573ca50 /tests/testmerge.cpp | |
| parent | e5dca8228e6b60cac5957726700c66d0565c064e (diff) | |
| download | subsurface-6dc1dcaea52e383803a620369567684f553ede80.tar.gz | |
Import: pass "downloaded" parameter to process_imported_dives()
process_imported_dives() is more efficient for downloaded than for
imported (from a file) dives, because it checks only the divecomputer
of the first dive.
This condition is checked via the "downloaded" flag of the first
dive. Instead, pass an argument to process_imported_dives().
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'tests/testmerge.cpp')
| -rw-r--r-- | tests/testmerge.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/testmerge.cpp b/tests/testmerge.cpp index a99fd65e7..4559ad9b9 100644 --- a/tests/testmerge.cpp +++ b/tests/testmerge.cpp @@ -23,9 +23,9 @@ void TestMerge::testMergeEmpty() */ struct dive_table table = { 0 }; QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table), 0); - process_imported_dives(&table, false); + process_imported_dives(&table, false, false); QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table), 0); - process_imported_dives(&table, false); + process_imported_dives(&table, false, false); QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0); QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml"); org.open(QFile::ReadOnly); @@ -47,9 +47,9 @@ void TestMerge::testMergeBackwards() */ struct dive_table table = { 0 }; QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table), 0); - process_imported_dives(&table, false); + process_imported_dives(&table, false, false); QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table), 0); - process_imported_dives(&table, false); + process_imported_dives(&table, false, false); QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0); QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml"); org.open(QFile::ReadOnly); |