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

Revert the singleton PR

Browse source 
It turns out that this isn't working the way it was intended to.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2019-09-27 16:26:54 -07:00
parent 400b218f76
commit 9ae7040a91
15 changed files with 118 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

8
qt-models/divelistmodel.cpp
View file

@ -134,8 +134,11 @@ QString DiveListSortModel::tripShortDate(const QString &section)
return QStringLiteral("%1\n'%2").arg(firstMonth,firstTime.toString("yy"));
}
DiveListModel *DiveListModel::m_instance = NULL;
DiveListModel::DiveListModel(QObject *parent) : QAbstractListModel(parent)
{
m_instance = this;
}
void DiveListModel::insertDive(int i)
@ -271,6 +274,11 @@ QString DiveListModel::startAddDive()
return QString::number(d->id);
}
DiveListModel *DiveListModel::instance()
{
return m_instance;
}
struct dive *DiveListModel::getDive(int i)
{
if (i < 0 || i >= dive_table.nr) {

6
qt-models/divelistmodel.h
View file

@ -6,7 +6,6 @@
#include <QSortFilterProxyModel>
#include "core/subsurface-qt/DiveObjectHelper.h"
#include "core/singleton.h"
class DiveListSortModel : public QSortFilterProxyModel
{
@ -29,7 +28,7 @@ private:
void updateFilterState();
};
class DiveListModel : public QAbstractListModel, public SillySingleton<DiveListModel>
class DiveListModel : public QAbstractListModel
{
Q_OBJECT
public:
@ -46,6 +45,7 @@ public:
DepthDurationRole,
};
static DiveListModel *instance();
DiveListModel(QObject *parent = 0);
void addDive(const QList<dive *> &listOfDives);
void addAllDives();
@ -63,6 +63,8 @@ public:
QString startAddDive();
void resetInternalData();
Q_INVOKABLE DiveObjectHelper at(int i);
private:
static DiveListModel *m_instance;
};
#endif // DIVELISTMODEL_H

12
qt-models/gpslistmodel.cpp
View file

@ -3,12 +3,16 @@
#include "core/qthelper.h"
#include <QVector>
GpsListModel *GpsListModel::m_instance = NULL;
GpsListModel::GpsListModel(QObject *parent) : QAbstractListModel(parent)
{
m_instance = this;
}
void GpsListModel::update(QVector<gpsTracker> trackers)
void GpsListModel::update()
{
QVector<gpsTracker> trackers = QVector<gpsTracker>::fromList(GpsLocation::instance()->currentGPSInfo().values());
beginResetModel();
m_gpsFixes = trackers;
endResetModel();
@ -58,3 +62,9 @@ QHash<int, QByteArray> GpsListModel::roleNames() const
roles[GpsLongitudeRole] = "longitude";
return roles;
}
GpsListModel *GpsListModel::instance()
{
return m_instance;
}

8
qt-models/gpslistmodel.h
View file

@ -3,10 +3,10 @@
#define GPSLISTMODEL_H
#include "core/gpslocation.h"
#include "core/singleton.h"
#include <QObject>
#include <QAbstractListModel>
class GpsListModel : public QAbstractListModel, public SillySingleton<GpsListModel>
class GpsListModel : public QAbstractListModel
{
Q_OBJECT
public:
@ -19,14 +19,16 @@ public:
GpsWhenRole
};
static GpsListModel *instance();
GpsListModel(QObject *parent = 0);
void clear();
int rowCount(const QModelIndex &parent = QModelIndex()) const;
QHash<int, QByteArray> roleNames() const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
void update(QVector<gpsTracker> trackers);
void update();
private:
QVector<gpsTracker> m_gpsFixes;
static GpsListModel *m_instance;
};
#endif // GPSLISTMODEL_H