diff options
| -rw-r--r-- | helpers.h | 2 | ||||
| -rw-r--r-- | qt-gui.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -27,7 +27,7 @@ void set_default_dive_computer(const char *vendor, const char *product); void set_default_dive_computer_device(const char *name); QString getSubsurfaceDataPath(QString folderToFind); extern const QString get_dc_nickname(const char *model, uint32_t deviceid); -int gettimezoneoffset(time_t when = 0); +int gettimezoneoffset(timestamp_t when = 0); int parseTemperatureToMkelvin(const QString &text); QString get_dive_date_string(timestamp_t when); QString get_short_dive_date_string(timestamp_t when); diff --git a/qt-gui.cpp b/qt-gui.cpp index 0f5342921..e337a5ddd 100644 --- a/qt-gui.cpp +++ b/qt-gui.cpp @@ -372,7 +372,7 @@ QString getSubsurfaceDataPath(QString folderToFind) return QString(""); } -int gettimezoneoffset(time_t when) +int gettimezoneoffset(timestamp_t when) { QDateTime dt1, dt2; if (when == 0) @@ -408,14 +408,14 @@ int parseTemperatureToMkelvin(const QString &text) QString get_dive_date_string(timestamp_t when) { QDateTime ts; - ts.setMSecsSinceEpoch(when * 1000); + ts.setMSecsSinceEpoch(when * 1000L); return loc.toString(ts.toUTC(), dateFormat + " " + timeFormat); } QString get_short_dive_date_string(timestamp_t when) { QDateTime ts; - ts.setMSecsSinceEpoch(when * 1000); + ts.setMSecsSinceEpoch(when * 1000L); return loc.toString(ts.toUTC(), shortDateFormat + " " + timeFormat); } |