From 7f4d9db962e73aa5d5089c43c99b78b3690ffb87 Mon Sep 17 00:00:00 2001
From: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Date: Fri, 31 May 2019 16:09:14 +0200
Subject: Cleanup: move trip-related functions into own translation unit

These functions were spread out over dive.c and divelist.c.
Move them into their own file to make all this a bit less monolithic.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
---
 tests/testAirPressure.cpp         | 2 +-
 tests/testdivesiteduplication.cpp | 1 +
 tests/testgitstorage.cpp          | 2 +-
 tests/testmerge.cpp               | 2 +-
 tests/testparse.cpp               | 2 +-
 tests/testparseperformance.cpp    | 2 +-
 tests/testpicture.cpp             | 2 +-
 tests/testprofile.cpp             | 1 +
 tests/testrenumber.cpp            | 2 +-
 9 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/testAirPressure.cpp b/tests/testAirPressure.cpp
index aa6b13014..cbd9079fc 100644
--- a/tests/testAirPressure.cpp
+++ b/tests/testAirPressure.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "testAirPressure.h"
 #include "core/divesite.h"
-#include "core/divelist.h"
+#include "core/trip.h"
 #include "core/file.h"
 #include "core/dive.h"
 #include <QString>
diff --git a/tests/testdivesiteduplication.cpp b/tests/testdivesiteduplication.cpp
index ae8488eb2..cdaa5eed7 100644
--- a/tests/testdivesiteduplication.cpp
+++ b/tests/testdivesiteduplication.cpp
@@ -2,6 +2,7 @@
 #include "testdivesiteduplication.h"
 #include "core/dive.h"
 #include "core/divesite.h"
+#include "core/trip.h"
 #include "core/file.h"
 
 void TestDiveSiteDuplication::testReadV2()
diff --git a/tests/testgitstorage.cpp b/tests/testgitstorage.cpp
index 16b954cf1..083887850 100644
--- a/tests/testgitstorage.cpp
+++ b/tests/testgitstorage.cpp
@@ -3,12 +3,12 @@
 #include "git2.h"
 
 #include "core/divesite.h"
-#include "core/divelist.h"
 #include "core/file.h"
 #include "core/qthelper.h"
 #include "core/subsurfacestartup.h"
 #include "core/settings/qPrefProxy.h"
 #include "core/settings/qPrefCloudStorage.h"
+#include "core/trip.h"
 
 #include <QDir>
 #include <QTextStream>
diff --git a/tests/testmerge.cpp b/tests/testmerge.cpp
index bef03cb14..37ab253cc 100644
--- a/tests/testmerge.cpp
+++ b/tests/testmerge.cpp
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "testmerge.h"
 #include "core/divesite.h"
-#include "core/divelist.h"
 #include "core/file.h"
+#include "core/trip.h"
 #include <QTextStream>
 
 void TestMerge::initTestCase()
diff --git a/tests/testparse.cpp b/tests/testparse.cpp
index 8318eb137..b0344bac2 100644
--- a/tests/testparse.cpp
+++ b/tests/testparse.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "testparse.h"
 #include "core/divesite.h"
-#include "core/divelist.h"
+#include "core/trip.h"
 #include "core/file.h"
 #include "core/import-csv.h"
 #include "core/parse.h"
diff --git a/tests/testparseperformance.cpp b/tests/testparseperformance.cpp
index 099b41c42..e7cce9303 100644
--- a/tests/testparseperformance.cpp
+++ b/tests/testparseperformance.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "testparseperformance.h"
 #include "core/divesite.h"
-#include "core/divelist.h"
+#include "core/trip.h"
 #include "core/file.h"
 #include "core/git-access.h"
 #include "core/settings/qPrefProxy.h"
diff --git a/tests/testpicture.cpp b/tests/testpicture.cpp
index a9aafa365..017e1a486 100644
--- a/tests/testpicture.cpp
+++ b/tests/testpicture.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "testpicture.h"
 #include "core/divesite.h"
-#include "core/divelist.h"
+#include "core/trip.h"
 #include "core/file.h"
 #include <QString>
 #include <core/qthelper.h>
diff --git a/tests/testprofile.cpp b/tests/testprofile.cpp
index f64848e46..4e1c470b4 100644
--- a/tests/testprofile.cpp
+++ b/tests/testprofile.cpp
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "testprofile.h"
 #include "core/divesite.h"
+#include "core/trip.h"
 #include "core/file.h"
 
 void TestProfile::testRedCeiling()
diff --git a/tests/testrenumber.cpp b/tests/testrenumber.cpp
index 2eb17f9be..9d1289906 100644
--- a/tests/testrenumber.cpp
+++ b/tests/testrenumber.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "testrenumber.h"
 #include "core/divesite.h"
-#include "core/divelist.h"
+#include "core/trip.h"
 #include "core/file.h"
 #include <QTextStream>
 
-- 
cgit v1.2.3-70-g09d2