From 7e33369dc8b27b20385ab055b662e06bbf369784 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Tue, 27 Nov 2018 00:25:15 +0100 Subject: Parser: add trip_table parameter to parsing functions To allow parsing into arbitrary trip_tables, add the corresponding parameter to the parsing functions and the parser state. Currently, all callers pass the global trip_table so there should be no change in functionality. These arguments will be replaced in subsequent commits. Signed-off-by: Berthold Stoeger --- tests/testrenumber.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/testrenumber.cpp') diff --git a/tests/testrenumber.cpp b/tests/testrenumber.cpp index 89ce1f8d0..b2075a849 100644 --- a/tests/testrenumber.cpp +++ b/tests/testrenumber.cpp @@ -7,14 +7,14 @@ void TestRenumber::setup() { - QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &dive_table), 0); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &dive_table, &trip_table), 0); process_loaded_dives(); } void TestRenumber::testMerge() { struct dive_table table = { 0 }; - QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47b.xml", &table), 0); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47b.xml", &table, &trip_table), 0); process_imported_dives(&table, false, false); QCOMPARE(dive_table.nr, 1); QCOMPARE(unsaved_changes(), 1); @@ -24,7 +24,7 @@ void TestRenumber::testMerge() void TestRenumber::testMergeAndAppend() { struct dive_table table = { 0 }; - QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47c.xml", &table), 0); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47c.xml", &table, &trip_table), 0); process_imported_dives(&table, false, false); QCOMPARE(dive_table.nr, 2); QCOMPARE(unsaved_changes(), 1); -- cgit v1.2.3-70-g09d2