diff options
author | Grace Karanja <gracie.karanja89@gmail.com> | 2015-06-18 10:45:26 +0300 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-06-20 14:29:24 -0700 |
commit | 2f25fe9f0ba6832020b9a38762a709eaaa09dea1 (patch) | |
tree | 616f9384e8e480dab283ee22fe8f81ee9b58ec3c /qt-models/divelistmodel.h | |
parent | 4e9128f8472d1ac221d573cf0c0459707c6c7e01 (diff) | |
download | subsurface-2f25fe9f0ba6832020b9a38762a709eaaa09dea1.tar.gz |
Rename dive class to avoid conflict
Rename the Dive class in divelistmodel.h to a void a conflict with
the Dive class in templatelayout.h
Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-models/divelistmodel.h')
-rw-r--r-- | qt-models/divelistmodel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qt-models/divelistmodel.h b/qt-models/divelistmodel.h index cb1918879..68f0c6fa7 100644 --- a/qt-models/divelistmodel.h +++ b/qt-models/divelistmodel.h @@ -4,9 +4,9 @@ #include <QAbstractListModel> #include "dive.h" -class Dive { +class MobileDive { public: - Dive(dive* d); + MobileDive(dive* d); QString date() const; void setDate(const QString &date); @@ -120,7 +120,7 @@ public: QHash<int, QByteArray> roleNames() const; private: - QList<Dive> m_dives; + QList<MobileDive> m_dives; static DiveListModel *m_instance; }; |