diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-19 21:15:56 -0400 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-10-23 22:45:30 +0100 |
| commit | 40536286d2b6a4533bd4ef863a1146cc321689dc (patch) | |
| tree | 3bbc5b478df7bcb1d61b8603c0524f7b79763fc2 | |
| parent | c0540d7682ebc7410791cefa489e3b16257f679c (diff) | |
| download | subsurface-40536286d2b6a4533bd4ef863a1146cc321689dc.tar.gz | |
Mobile/filtering: add fullTextNoNotes to the dive object helper
This way we can filter with and without the notes.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.cpp | 7 | ||||
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp index d24f85a6d..dfc1739e8 100644 --- a/core/subsurface-qt/DiveObjectHelper.cpp +++ b/core/subsurface-qt/DiveObjectHelper.cpp @@ -438,5 +438,10 @@ QStringList DiveObjectHelper::firstGas() const // for a full text search / filter function QString DiveObjectHelper::fullText() const { - return trip() + ":-:" + location() + ":-:" + buddy() + ":-:" + divemaster() + ":-:" + suit() + ":-:" + tags() + ":-:" + notes(); + return fullTextNoNotes() + ":-:" + notes(); +} + +QString DiveObjectHelper::fullTextNoNotes() const +{ + return trip() + ":-:" + location() + ":-:" + buddy() + ":-:" + divemaster() + ":-:" + suit() + ":-:" + tags(); } diff --git a/core/subsurface-qt/DiveObjectHelper.h b/core/subsurface-qt/DiveObjectHelper.h index 86c2a6748..0abdf8e5a 100644 --- a/core/subsurface-qt/DiveObjectHelper.h +++ b/core/subsurface-qt/DiveObjectHelper.h @@ -50,6 +50,7 @@ class DiveObjectHelper : public QObject { Q_PROPERTY(QStringList endPressure READ endPressure CONSTANT) Q_PROPERTY(QStringList firstGas READ firstGas CONSTANT) Q_PROPERTY(QString fullText READ fullText CONSTANT) + Q_PROPERTY(QString fullTextNoNotes READ fullTextNoNotes CONSTANT) public: DiveObjectHelper(struct dive *dive = NULL); ~DiveObjectHelper(); @@ -95,6 +96,7 @@ public: QStringList endPressure() const; QStringList firstGas() const; QString fullText() const; + QString fullTextNoNotes() const; private: struct dive *m_dive; |