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

Models: add the DiveItem::displayDate() helper

Browse source 
Add this helper so that we can easily wrap the required
memory release after calling get_dive_date_string()
(fixes a small memory leak).

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
Lubomir I. Ivanov 2013-07-11 12:41:50 +03:00
parent adb7dc6fac
commit 127cd21137
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
qt-ui/models.cpp
View file

@ -971,7 +971,7 @@ QVariant DiveItem::data(int column, int role) const
case Qt::DisplayRole: case Qt::DisplayRole:
switch (column) { switch (column) {
case NR: retVal = dive->number; break; case NR: retVal = dive->number; break;
case DATE: retVal = QString(get_dive_date_string(dive->when)); break; case DATE: retVal = displayDate(); break;
case DEPTH: retVal = displayDepth(); break; case DEPTH: retVal = displayDepth(); break;
case DURATION: retVal = displayDuration(); break; case DURATION: retVal = displayDuration(); break;
case TEMPERATURE: retVal = displayTemperature(); break; case TEMPERATURE: retVal = displayTemperature(); break;
@ -996,6 +996,14 @@ QVariant DiveItem::data(int column, int role) const
return retVal; return retVal;
} }
QString DiveItem::displayDate() const
{
char *buf = get_dive_date_string(dive->when);
QString date(buf);
free(buf);
return date;
}
QString DiveItem::displayDepth() const QString DiveItem::displayDepth() const
{ {
const int scale = 1000; const int scale = 1000;

1
qt-ui/models.h
View file

@ -142,6 +142,7 @@ struct DiveItem : public TreeItem {
virtual QVariant data(int column, int role) const; virtual QVariant data(int column, int role) const;
struct dive* dive; struct dive* dive;
QString displayDate() const;
QString displayDuration() const; QString displayDuration() const;
QString displayDepth() const; QString displayDepth() const;
QString displayTemperature() const; QString displayTemperature() const;