summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-03-04 23:20:29 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-04-12 18:19:07 +0300
commitc22fd9f4fd6699333629b8acb1e9c135a9783082 (patch)
tree7fad8249eb4fb3fa2797329716b1038d115a62d9 /tests
parentf2cdca7bccfcdfa04639600689b2b13b38b56898 (diff)
downloadsubsurface-c22fd9f4fd6699333629b8acb1e9c135a9783082.tar.gz
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 <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'tests')
-rw-r--r--tests/testgitstorage.cpp2
-rw-r--r--tests/testmerge.cpp2
-rw-r--r--tests/testparse.cpp2
-rw-r--r--tests/testparseperformance.cpp2
-rw-r--r--tests/testpicture.cpp2
-rw-r--r--tests/testprofile.cpp2
-rw-r--r--tests/testrenumber.cpp2
7 files changed, 7 insertions, 7 deletions
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 <QTextStream>
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 <QString>
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 <QTextStream>