mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Helpers: move some date related function to qt-gui.cpp
divelist.c: get_dive_date_string() get_short_dive_date_string() get_trip_date_string() MinGW support for *printf and parameter positions (e.g. %1$d) is horribly broken. Instead of implementing *proper* support for this feature Microsoft decide to ignore the standard (again) and they implement new functions with the '_p' suffix, such as 'sprintf_p', which seem to be available from a 2003 runtime. To top that 'sprintf_p' is not really a 'sprintf' but rather a 'snprintf'. It seems that the MinGW people ignore the issue and do not provide wrappers of any sort, or at least for the current recommended compiler for Qt 4.8.5 on Windows - which is a 4.4.0. A note of warning; inspecting how MinGW does certain things in headers such as stdio.h, can ensue bad dreams or other negative effects on to the viewer. This forces us to move the following functions from the 'back-end' (divelist.c) to the 'front-end' (qt-gui.cpp) and use QString. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
4c49670cdb
commit
861b524e7a
5 changed files with 45 additions and 72 deletions
|
@ -873,7 +873,7 @@ QVariant TripItem::data(int column, int role) const
|
|||
if (role == Qt::DisplayRole) {
|
||||
switch (column) {
|
||||
case DiveTripModel::NR:
|
||||
ret = QString(trip->location) + ", " + QString(get_trip_date_string(trip->when, trip->nrdives));
|
||||
ret = QString(trip->location) + ", " + get_trip_date_string(trip->when, trip->nrdives);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -953,10 +953,7 @@ QVariant DiveItem::data(int column, int role) const
|
|||
|
||||
QString DiveItem::displayDate() const
|
||||
{
|
||||
char *buf = get_dive_date_string(dive->when);
|
||||
QString date(buf);
|
||||
free(buf);
|
||||
return date;
|
||||
return get_dive_date_string(dive->when);
|
||||
}
|
||||
|
||||
QString DiveItem::displayDepth() const
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue