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: move data file version functions into version.cpp/h

Browse source 
It is unclear why these were located in divelist.cpp/h.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-06-25 14:33:36 +02:00 • committed by bstoeger
parent 72bb38601d
commit 60c7b503cf
9 changed files with 44 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/save-xml.cpp
View file

@ -12,19 +12,19 @@
#include <unistd.h>
#include <fcntl.h>
#include "device.h"
#include "dive.h"
#include "divelog.h"
#include "divesite.h"
#include "errorhelper.h"
#include "extradata.h"
#include "event.h"
#include "filterconstraint.h"
#include "filterpreset.h"
#include "sample.h"
#include "subsurface-string.h"
#include "subsurface-time.h"
#include "trip.h"
#include "device.h"
#include "event.h"
#include "file.h"
#include "membuffer.h"
#include "picture.h"
@ -32,6 +32,7 @@
#include "qthelper.h"
#include "gettext.h"
#include "tag.h"
#include "version.h"
#include "xmlparams.h"
/*
@ -632,7 +633,7 @@ static void save_filter_presets(struct membuffer *b)
static void save_dives_buffer(struct membuffer *b, bool select_only, bool anonymize)
{
put_format(b, "<divelog program='subsurface' version='%d'>\n<settings>\n", DATAFORMAT_VERSION);
put_format(b, "<divelog program='subsurface' version='%d'>\n<settings>\n", dataformat_version);
/* save the dive computer nicknames, if any */
for (auto &d: divelog.devices) {
@ -743,7 +744,7 @@ static void try_to_backup(const char *filename)
while (extension[i][0] != '\0') {
int elen = strlen(extension[i]);
if (strcasecmp(filename + flen - elen, extension[i]) == 0) {
if (last_xml_version < DATAFORMAT_VERSION) {
if (last_xml_version < dataformat_version) {
std::string special_ext = std::string(extension[i]) + ".v" + std::to_string(last_xml_version);
save_backup(filename, extension[i], special_ext.c_str());
} else {
@ -851,7 +852,7 @@ static int export_dives_xslt_doit(const char *filename, struct xml_params *param
static void save_dive_sites_buffer(struct membuffer *b, const struct dive_site *sites[], int nr_sites, bool anonymize)
{
int i;
put_format(b, "<divesites program='subsurface' version='%d'>\n", DATAFORMAT_VERSION);
put_format(b, "<divesites program='subsurface' version='%d'>\n", dataformat_version);
/* save the dive sites */
for (i = 0; i < nr_sites; i++) {