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

cleanup: move get_dc_nickname from qthelper.cpp to divecomputer.cpp

Browse source 
1) qthelper is already huge.
2) set_dc_nickname et al. is already there.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-04-23 23:17:19 +02:00 • committed by Dirk Hohndel
parent 3d4698c0a1
commit 9386eb2a0b
5 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/divecomputer.cpp
View file

@ -158,3 +158,13 @@ extern "C" void set_dc_nickname(struct dive *dive)
} }
} }
} }
QString get_dc_nickname(const struct divecomputer *dc)
{
const DiveComputerNode *existNode = dcList.getExact(dc->model, dc->deviceid);
if (existNode && !existNode->nickName.isEmpty())
return existNode->nickName;
else
return dc->model;
}

1
core/divecomputer.h
View file

@ -32,6 +32,7 @@ public:
QVector<DiveComputerNode> dcs; QVector<DiveComputerNode> dcs;
}; };
QString get_dc_nickname(const struct divecomputer *dc);
extern DiveComputerList dcList; extern DiveComputerList dcList;
#endif #endif

11
core/qthelper.cpp
View file

@ -9,7 +9,6 @@
#include "membuffer.h" #include "membuffer.h"
#include "subsurfacesysinfo.h" #include "subsurfacesysinfo.h"
#include "version.h" #include "version.h"
#include "divecomputer.h"
#include "errorhelper.h" #include "errorhelper.h"
#include "planner.h" #include "planner.h"
#include "time.h" #include "time.h"
@ -527,16 +526,6 @@ void set_filename(const char *filename)
existing_filename = copy_string(filename); existing_filename = copy_string(filename);
} }
QString get_dc_nickname(const char *model, uint32_t deviceid)
{
const DiveComputerNode *existNode = dcList.getExact(model, deviceid);
if (existNode && !existNode->nickName.isEmpty())
return existNode->nickName;
else
return model;
}
QString get_depth_string(int mm, bool showunit, bool showdecimal) QString get_depth_string(int mm, bool showunit, bool showdecimal)
{ {
if (prefs.units.length == units::METERS) { if (prefs.units.length == units::METERS) {

2
core/qthelper.h
View file

@ -2,7 +2,6 @@
#ifndef QTHELPER_H #ifndef QTHELPER_H
#define QTHELPER_H #define QTHELPER_H
#include <stdint.h>
#include <libxslt/transform.h> #include <libxslt/transform.h>
#include <libxslt/xsltutils.h> #include <libxslt/xsltutils.h>
#include "core/pref.h" #include "core/pref.h"
@ -60,7 +59,6 @@ QString get_pressure_unit();
QString getSubsurfaceDataPath(QString folderToFind); QString getSubsurfaceDataPath(QString folderToFind);
QString getPrintingTemplatePathUser(); QString getPrintingTemplatePathUser();
QString getPrintingTemplatePathBundle(); QString getPrintingTemplatePathBundle();
QString get_dc_nickname(const char *model, uint32_t deviceid);
int gettimezoneoffset(timestamp_t when = 0); int gettimezoneoffset(timestamp_t when = 0);
int parseDurationToSeconds(const QString &text); int parseDurationToSeconds(const QString &text);
int parseLengthToMm(const QString &text); int parseLengthToMm(const QString &text);

3
profile-widget/profilewidget2.cpp
View file

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "profile-widget/profilewidget2.h" #include "profile-widget/profilewidget2.h"
#include "qt-models/diveplotdatamodel.h" #include "qt-models/diveplotdatamodel.h"
#include "core/divecomputer.h"
#include "core/subsurface-string.h" #include "core/subsurface-string.h"
#include "core/qthelper.h" #include "core/qthelper.h"
#include "core/picture.h" #include "core/picture.h"
@ -806,7 +807,7 @@ void ProfileWidget2::plotDive(const struct dive *d, bool force, bool doClearPict
Q_FOREACH (DiveEventItem *event, eventItems) { Q_FOREACH (DiveEventItem *event, eventItems) {
event->setVisible(!event->shouldBeHidden()); event->setVisible(!event->shouldBeHidden());
} }
QString dcText = get_dc_nickname(currentdc->model, currentdc->deviceid); QString dcText = get_dc_nickname(currentdc);
if (dcText == "planned dive") if (dcText == "planned dive")
dcText = tr("Planned dive"); dcText = tr("Planned dive");
else if (dcText == "manually added dive") else if (dcText == "manually added dive")