mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: include divesite table directly in divelog

Browse source 
Having this as a pointer is an artifact from the C/C++ split.
The divesitetable header is small enough so that we can
include it directly.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-06-08 16:30:24 +02:00 • committed by bstoeger
parent 7792f54a73
commit 5af9d28291
29 changed files with 90 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/testdivesiteduplication.cpp
View file

@ -9,7 +9,7 @@ void TestDiveSiteDuplication::testReadV2()
{
prefs.cloud_base_url = strdup(default_prefs.cloud_base_url);
QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/TwoTimesTwo.ssrf", &divelog), 0);
QCOMPARE(divelog.sites->size(), 2);
QCOMPARE(divelog.sites.size(), 2);
}
QTEST_GUILESS_MAIN(TestDiveSiteDuplication)

2
tests/testparse.cpp
View file

@ -92,7 +92,7 @@ int TestParse::parseCSV(int units, std::string file)
int TestParse::parseDivingLog()
{
// Parsing of DivingLog import from SQLite database
struct dive_site *ds = divelog.sites->alloc_or_get(0xdeadbeef);
struct dive_site *ds = divelog.sites.alloc_or_get(0xdeadbeef);
ds->name = "Suomi - - Hälvälä";
int ret = sqlite3_open(SUBSURFACE_TEST_DATA "/dives/TestDivingLog4.1.1.sql", &_sqlite3_handle);