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

helper functions: remove timestamp argument from gettiemzoneoffset()

Browse source 
The last user of that argument has been removed.

(a random whitespace fix snuck in with this)

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-07-11 12:00:05 -07:00
parent 7acb229b4a
commit f059adb639
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/qthelper.cpp
View file

@ -624,7 +624,7 @@ QString get_pressure_string(pressure_t pressure, bool showunit)
QString get_salinity_string(int salinity) QString get_salinity_string(int salinity)
{ {
return QStringLiteral("%L1%2").arg(salinity / 10.0).arg(gettextFromC::tr("g/ℓ")); return QStringLiteral("%L1%2").arg(salinity / 10.0).arg(gettextFromC::tr("g/ℓ"));
} }
QString get_water_type_string(int salinity) QString get_water_type_string(int salinity)
@ -690,13 +690,10 @@ QString getPrintingTemplatePathBundle()
return path; return path;
} }
int gettimezoneoffset(timestamp_t when) int gettimezoneoffset()
{ {
QDateTime dt1, dt2; QDateTime dt1, dt2;
if (when == 0) dt1 = QDateTime::currentDateTime();
dt1 = QDateTime::currentDateTime();
else
dt1 = timestampToDateTime(when);
dt2 = dt1.toUTC(); dt2 = dt1.toUTC();
dt1.setTimeSpec(Qt::UTC); dt1.setTimeSpec(Qt::UTC);
return dt2.secsTo(dt1); return dt2.secsTo(dt1);

2
core/qthelper.h
View file

@ -61,7 +61,7 @@ QString get_water_type_string(int salinity);
QString getSubsurfaceDataPath(QString folderToFind); QString getSubsurfaceDataPath(QString folderToFind);
QString getPrintingTemplatePathUser(); QString getPrintingTemplatePathUser();
QString getPrintingTemplatePathBundle(); QString getPrintingTemplatePathBundle();
int gettimezoneoffset(timestamp_t when = 0); int gettimezoneoffset();
QDateTime timestampToDateTime(timestamp_t when); QDateTime timestampToDateTime(timestamp_t when);
timestamp_t dateTimeToTimestamp(const QDateTime &t); timestamp_t dateTimeToTimestamp(const QDateTime &t);
int parseDurationToSeconds(const QString &text); int parseDurationToSeconds(const QString &text);