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

qthelper.cpp: define EMPTY_DIVE_STRING

Browse source 
The macro is used as a common replacer for the "--"
string when the Dive class members return no particular
information for a "struct dive" property.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2015-11-17 00:29:17 +02:00 • committed by Dirk Hohndel
parent 7de22e69b2
commit a34dfe8284
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
subsurface-core/qthelper.cpp
View file

@ -38,6 +38,8 @@ static QLocale loc;
#define translate(_context, arg) trGettext(arg) #define translate(_context, arg) trGettext(arg)
static const QString DEGREE_SIGNS("dD" UTF8_DEGREE); static const QString DEGREE_SIGNS("dD" UTF8_DEGREE);
#define EMPTY_DIVE_STRING "--"
Dive::Dive() : Dive::Dive() :
m_number(-1), m_number(-1),
dive(NULL) dive(NULL)
@ -156,7 +158,7 @@ int Dive::rating() const
void Dive::put_divemaster() void Dive::put_divemaster()
{ {
if (!dive->divemaster) if (!dive->divemaster)
m_divemaster = "--"; m_divemaster = EMPTY_DIVE_STRING;
else else
m_divemaster = dive->divemaster; m_divemaster = dive->divemaster;
} }
@ -178,7 +180,7 @@ void Dive::put_location()
{ {
m_location = QString::fromUtf8(get_dive_location(dive)); m_location = QString::fromUtf8(get_dive_location(dive));
if (m_location.isEmpty()) { if (m_location.isEmpty()) {
m_location = "--"; m_location = EMPTY_DIVE_STRING;
} }
} }
@ -195,7 +197,7 @@ void Dive::put_duration()
void Dive::put_buddy() void Dive::put_buddy()
{ {
if (!dive->buddy) if (!dive->buddy)
m_buddy = "--"; m_buddy = EMPTY_DIVE_STRING;
else else
m_buddy = dive->buddy; m_buddy = dive->buddy;
} }
@ -205,10 +207,10 @@ void Dive::put_temp()
m_airTemp = get_temperature_string(dive->airtemp, true); m_airTemp = get_temperature_string(dive->airtemp, true);
m_waterTemp = get_temperature_string(dive->watertemp, true); m_waterTemp = get_temperature_string(dive->watertemp, true);
if (m_airTemp.isEmpty()) { if (m_airTemp.isEmpty()) {
m_airTemp = "--"; m_airTemp = EMPTY_DIVE_STRING;
} }
if (m_waterTemp.isEmpty()) { if (m_waterTemp.isEmpty()) {
m_waterTemp = "--"; m_waterTemp = EMPTY_DIVE_STRING;
} }
} }
@ -216,7 +218,7 @@ void Dive::put_notes()
{ {
m_notes = QString::fromUtf8(dive->notes); m_notes = QString::fromUtf8(dive->notes);
if (m_notes.isEmpty()) { if (m_notes.isEmpty()) {
m_notes = "--"; m_notes = EMPTY_DIVE_STRING;
return; return;
} }
if (same_string(dive->dc.model, "planned dive")) { if (same_string(dive->dc.model, "planned dive")) {