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

QML UI: Remove unneeded MobileDive class

Browse source 
The MobileDive class in divelistmodel.h is a duplication of the
Dive class in templatelayout.h. This patch moves the Dive to
the qthelper file.

[Dirk Hohndel: merged with upstream master - let's hope I didn't
               mess anything up]

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-08-18 12:03:30 +03:00 • committed by Dirk Hohndel
parent 46cfe003f3
commit 390c10bb08
6 changed files with 345 additions and 603 deletions
Download patch file Download diff file Expand all files Collapse all files

94
qt-models/divelistmodel.h
View file

@ -3,97 +3,7 @@
#include <QAbstractListModel>
#include "dive.h"
class MobileDive {
public:
MobileDive(dive* d);
QString dateString() const;
void setDateString(const QString &date);
timestamp_t date() const;
void setDate(const timestamp_t when);
QString location() const;
void setLocation(const QString &location);
QString sac() const;
void setSac(const QString &sac);
QString gas() const;
void setGas(const QString &gas);
QString cylinder() const;
void setCylinder(const QString &cylinder);
QString suit() const;
void setSuit(const QString &suit);
QString weight() const;
void setWeight(const QString &weight);
QString airtemp() const;
void setAirTemp(const QString &airtemp);
QString duration() const;
void setDuration(const QString &duration);
QString depth() const;
void setDepth(const QString &depth);
QString rating() const;
void setRating(const QString &rating);
dive *thisDive() const;
void setThisDive(dive *thisDive);
QString diveNumber() const;
void setDiveNumber(const QString &diveNumber);
QString notes() const;
void setNotes(const QString &notes);
QString trip() const;
void setTrip(const QString &trip);
QString buddy() const;
void setBuddy(const QString &buddy);
QString divemaster() const;
void setDivemaster(const QString &divemaster);
QString watertemp() const;
void setWatertemp(const QString &watertemp);
QString diveId() const;
void setDiveId(const QString &diveId);
private:
void setupDiveTempDetails();
QString m_diveNumber;
QString m_trip;
timestamp_t m_date;
QString m_dateString;
QString m_rating;
QString m_depth;
QString m_duration;
QString m_airtemp;
QString m_watertemp;
QString m_weight;
QString m_suit;
QString m_cylinder;
QString m_gas;
QString m_sac;
QString m_location;
QString m_notes;
QString m_buddy;
QString m_divemaster;
QString m_diveId;
dive *m_thisDive;
};
#include "helpers.h"
class DiveListModel : public QAbstractListModel
{
@ -130,7 +40,7 @@ public:
QHash<int, QByteArray> roleNames() const;
void startAddDive();
private:
QList<MobileDive> m_dives;
QList<Dive> m_dives;
static DiveListModel *m_instance;
};