diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-08-13 20:35:40 +0200 |
|---|---|---|
| committer |  bstoeger <32835590+bstoeger@users.noreply.github.com> | 2019-09-14 13:20:59 +0200 |
| commit | b7cddcc737886ee3e99cee30a78423570de15f00 (patch) | |
| tree | 8b190c6b2f58aa1befe108242774df1e19378ef0 | |
| parent | 37a3daf2dd51330a9dc0a26f1b923698546373ed (diff) | |
| download | subsurface-b7cddcc737886ee3e99cee30a78423570de15f00.tar.gz | |
Mobile: remove full-text properties from DiveObjectHelper
These properties are not needed anymore, because the full text search
was decoupled from the DiveObjectHelper.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.cpp | 12 | ||||
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.h | 4 | ||||
| -rw-r--r-- | qt-models/divelistmodel.cpp | 4 | ||||
| -rw-r--r-- | qt-models/divelistmodel.h | 2 |
4 files changed, 0 insertions, 22 deletions
diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp index 2825f1fe0..d7d92ee90 100644 --- a/core/subsurface-qt/DiveObjectHelper.cpp +++ b/core/subsurface-qt/DiveObjectHelper.cpp @@ -391,15 +391,3 @@ QStringList DiveObjectHelper::firstGas() const } return gas; } - -// for a full text search / filter function -QString DiveObjectHelper::fullText() const -{ - return fullTextNoNotes() + ":-:" + notes(); -} - -QString DiveObjectHelper::fullTextNoNotes() const -{ - QString tripLocation = m_dive->divetrip ? m_dive->divetrip->location : QString(); - return tripLocation + ":-:" + location() + ":-:" + buddy() + ":-:" + divemaster() + ":-:" + suit() + ":-:" + tags(); -} diff --git a/core/subsurface-qt/DiveObjectHelper.h b/core/subsurface-qt/DiveObjectHelper.h index 49eb1d8a6..11416b6c6 100644 --- a/core/subsurface-qt/DiveObjectHelper.h +++ b/core/subsurface-qt/DiveObjectHelper.h @@ -49,8 +49,6 @@ class DiveObjectHelper : public QObject { Q_PROPERTY(QStringList startPressure READ startPressure CONSTANT) 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); int number() const; @@ -94,8 +92,6 @@ public: QStringList startPressure() const; QStringList endPressure() const; QStringList firstGas() const; - QString fullText() const; - QString fullTextNoNotes() const; private: struct dive *m_dive; diff --git a/qt-models/divelistmodel.cpp b/qt-models/divelistmodel.cpp index c1b8bea83..cad745dd3 100644 --- a/qt-models/divelistmodel.cpp +++ b/qt-models/divelistmodel.cpp @@ -243,8 +243,6 @@ QVariant DiveListModel::data(const QModelIndex &index, int role) const switch(role) { case DiveRole: return QVariant::fromValue<QObject*>(curr_dive); case DiveDateRole: return (qlonglong)curr_dive->timestamp(); - case FullTextRole: return curr_dive->fullText(); - case FullTextNoNotesRole: return curr_dive->fullTextNoNotes(); } return QVariant(); @@ -255,8 +253,6 @@ QHash<int, QByteArray> DiveListModel::roleNames() const QHash<int, QByteArray> roles; roles[DiveRole] = "dive"; roles[DiveDateRole] = "date"; - roles[FullTextRole] = "fulltext"; - roles[FullTextNoNotesRole] = "fulltextnonotes"; return roles; } diff --git a/qt-models/divelistmodel.h b/qt-models/divelistmodel.h index 37d3513bf..5ac252d60 100644 --- a/qt-models/divelistmodel.h +++ b/qt-models/divelistmodel.h @@ -38,8 +38,6 @@ public: enum DiveListRoles { DiveRole = Qt::UserRole + 1, DiveDateRole, - FullTextRole, - FullTextNoNotesRole }; static DiveListModel *instance(); |