From c22fd9f4fd6699333629b8acb1e9c135a9783082 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Mon, 4 Mar 2019 23:20:29 +0100 Subject: Dive sites: prepare for dive site ref-counting Add a dive site table to each dive site to keep track of dives that have been added to a dive site. Add two functions to add dives to / remove dives from dive sites. Since dive sites now contain a dive table, the order of includes had to be changed: "divesite.h" now includes "dive.h" and not vice-versa. This caused some include churn. Signed-off-by: Berthold Stoeger --- tests/testgitstorage.cpp | 2 +- tests/testmerge.cpp | 2 +- tests/testparse.cpp | 2 +- tests/testparseperformance.cpp | 2 +- tests/testpicture.cpp | 2 +- tests/testprofile.cpp | 2 +- tests/testrenumber.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/testgitstorage.cpp b/tests/testgitstorage.cpp index e4b22a713..16b954cf1 100644 --- a/tests/testgitstorage.cpp +++ b/tests/testgitstorage.cpp @@ -2,7 +2,7 @@ #include "testgitstorage.h" #include "git2.h" -#include "core/dive.h" +#include "core/divesite.h" #include "core/divelist.h" #include "core/file.h" #include "core/qthelper.h" diff --git a/tests/testmerge.cpp b/tests/testmerge.cpp index c8a103c82..739e7014d 100644 --- a/tests/testmerge.cpp +++ b/tests/testmerge.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "testmerge.h" -#include "core/dive.h" +#include "core/divesite.h" #include "core/divelist.h" #include "core/file.h" #include diff --git a/tests/testparse.cpp b/tests/testparse.cpp index 0a751cf11..8318eb137 100644 --- a/tests/testparse.cpp +++ b/tests/testparse.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "testparse.h" -#include "core/dive.h" +#include "core/divesite.h" #include "core/divelist.h" #include "core/file.h" #include "core/import-csv.h" diff --git a/tests/testparseperformance.cpp b/tests/testparseperformance.cpp index 37393f515..099b41c42 100644 --- a/tests/testparseperformance.cpp +++ b/tests/testparseperformance.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "testparseperformance.h" -#include "core/dive.h" +#include "core/divesite.h" #include "core/divelist.h" #include "core/file.h" #include "core/git-access.h" diff --git a/tests/testpicture.cpp b/tests/testpicture.cpp index 0e369b937..a9aafa365 100644 --- a/tests/testpicture.cpp +++ b/tests/testpicture.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "testpicture.h" -#include "core/dive.h" +#include "core/divesite.h" #include "core/divelist.h" #include "core/file.h" #include diff --git a/tests/testprofile.cpp b/tests/testprofile.cpp index c35312123..f64848e46 100644 --- a/tests/testprofile.cpp +++ b/tests/testprofile.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "testprofile.h" -#include "core/dive.h" +#include "core/divesite.h" #include "core/file.h" void TestProfile::testRedCeiling() diff --git a/tests/testrenumber.cpp b/tests/testrenumber.cpp index 71f4e2952..2eb17f9be 100644 --- a/tests/testrenumber.cpp +++ b/tests/testrenumber.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "testrenumber.h" -#include "core/dive.h" +#include "core/divesite.h" #include "core/divelist.h" #include "core/file.h" #include -- cgit v1.2.3-70-g09d2