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

Rename dive class to avoid conflict

Browse source 
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>
This commit is contained in:
Grace Karanja 2015-06-18 10:45:26 +03:00 • committed by Dirk Hohndel
parent 4e9128f847
commit 2f25fe9f0b
2 changed files with 45 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qt-models/divelistmodel.h
View file

@ -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;
};