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

Core: remove preexisting field from struct dive_table

Browse source 
Dives are now in all cases imported via distinct dive_tables.
Therefore the "preexisting" marker is useless. Remove.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-03 21:14:11 +02:00 • committed by Dirk Hohndel
parent 810903bdb9
commit ab14889563
6 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/dive.h
View file

@ -431,7 +431,7 @@ extern const struct units *get_units(void);
extern int run_survey, verbose, quit, force_root; extern int run_survey, verbose, quit, force_root;
struct dive_table { struct dive_table {
int nr, allocated, preexisting; int nr, allocated;
struct dive **dives; struct dive **dives;
}; };

1
core/downloadfromdcthread.cpp
View file

@ -77,7 +77,6 @@ void DownloadThread::run()
#endif #endif
qDebug() << "Starting download from " << (internalData->bluetooth_mode ? "BT" : internalData->devname); qDebug() << "Starting download from " << (internalData->bluetooth_mode ? "BT" : internalData->devname);
downloadTable.nr = 0; downloadTable.nr = 0;
dive_table.preexisting = dive_table.nr;
Q_ASSERT(internalData->download_table != nullptr); Q_ASSERT(internalData->download_table != nullptr);
const char *errorText; const char *errorText;

2
core/libdivecomputer.c
View file

@ -503,7 +503,7 @@ static int find_dive(struct divecomputer *match)
{ {
int i; int i;
for (i = dive_table.preexisting - 1; i >= 0; i--) { for (i = dive_table.nr - 1; i >= 0; i--) {
struct dive *old = dive_table.dives[i]; struct dive *old = dive_table.dives[i];
if (match_one_dive(match, old)) if (match_one_dive(match, old))

1
mobile-widgets/qmlmanager.cpp
View file

@ -671,7 +671,6 @@ successful_exit:
// for the remote data - which then later gets merged with the remote data if necessary // for the remote data - which then later gets merged with the remote data if necessary
if (noCloudToCloud) { if (noCloudToCloud) {
git_storage_update_progress(qPrintable(tr("Loading dives from local storage ('no cloud' mode)"))); git_storage_update_progress(qPrintable(tr("Loading dives from local storage ('no cloud' mode)")));
dive_table.preexisting = dive_table.nr;
mergeLocalRepo(); mergeLocalRepo();
DiveListModel::instance()->clear(); DiveListModel::instance()->clear();
DiveListModel::instance()->addAllDives(); DiveListModel::instance()->addAllDives();

1
qt-models/divetripmodel.cpp
View file

@ -611,7 +611,6 @@ void DiveTripModel::setupModelData()
clear(); clear();
if (autogroup) if (autogroup)
autogroup_dives(); autogroup_dives();
dive_table.preexisting = dive_table.nr;
QMap<dive_trip_t *, TripItem *> trips; QMap<dive_trip_t *, TripItem *> trips;
while (--i >= 0) { while (--i >= 0) {
struct dive *dive = get_dive(i); struct dive *dive = get_dive(i);

2
tests/testrenumber.cpp
View file

@ -9,7 +9,6 @@ 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), 0);
process_loaded_dives(); process_loaded_dives();
dive_table.preexisting = dive_table.nr;
} }
void TestRenumber::testMerge() void TestRenumber::testMerge()
@ -20,7 +19,6 @@ void TestRenumber::testMerge()
QCOMPARE(dive_table.nr, 1); QCOMPARE(dive_table.nr, 1);
QCOMPARE(unsaved_changes(), 1); QCOMPARE(unsaved_changes(), 1);
mark_divelist_changed(false); mark_divelist_changed(false);
dive_table.preexisting = dive_table.nr;
} }
void TestRenumber::testMergeAndAppend() void TestRenumber::testMergeAndAppend()