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

mobile cleanup: unduplicate code and do not loop over dives (2)

Browse source 
See e6e1473e6. Exact same commit but here for the
list of buddies.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2018-01-28 10:26:45 +01:00
parent fed2c5b6a1
commit 572fc47071
7 changed files with 9 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/subsurface-qt/DiveObjectHelper.cpp
View file

@ -429,28 +429,6 @@ QStringList DiveObjectHelper::locationList() const
return locations;
}
QStringList DiveObjectHelper::buddyList() const
{
QStringList buddies;
struct dive *d;
int i = 0;
for_each_dive (i, d) {
QString temp = d->buddy;
if (!temp.isEmpty() && !temp.contains(",")){
buddies << d->buddy;
}
else if (!temp.isEmpty()){
QRegExp sep("(,\\s)");
QStringList tempList = temp.split(sep);
buddies << tempList;
buddies << tr("Multiple Buddies");
}
}
buddies.removeDuplicates();
buddies.sort();
return buddies;
}
QStringList DiveObjectHelper::divemasterList() const
{
QStringList divemasters;

2
core/subsurface-qt/DiveObjectHelper.h
View file

@ -47,7 +47,6 @@ class DiveObjectHelper : public QObject {
Q_PROPERTY(QString startPressure READ startPressure CONSTANT)
Q_PROPERTY(QString endPressure READ endPressure CONSTANT)
Q_PROPERTY(QString firstGas READ firstGas CONSTANT)
Q_PROPERTY(QStringList buddyList READ buddyList CONSTANT)
Q_PROPERTY(QStringList divemasterList READ divemasterList CONSTANT)
Q_PROPERTY(QStringList locationList READ locationList CONSTANT)
public:
@ -93,7 +92,6 @@ public:
QString endPressure() const;
QString firstGas() const;
QStringList locationList() const;
QStringList buddyList() const;
QStringList divemasterList() const;
private: