mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Move all core-functionality to subsurface-core
And adapt a new CMakeLists.txt file for it. On the way I've also found out that we where double-compilling a few files. I've also set the subsurface-core as a include_path but that was just to reduce the noise on this commit, since I plan to remove it from the include path to make it obligatory to specify something like include "subsurface-core/dive.h" for the header files. Since the app is growing quite a bit we ended up having a few different files with almost same name that did similar things, I want to kill that (for instance Dive.h, dive.h, PrintDive.h and such). Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
a079821423
commit
4c0156e3d5
105 changed files with 102 additions and 78 deletions
38
subsurface-core/divecomputer.h
Normal file
38
subsurface-core/divecomputer.h
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
#ifndef DIVECOMPUTER_H
|
||||
#define DIVECOMPUTER_H
|
||||
|
||||
#include <QString>
|
||||
#include <QMap>
|
||||
#include <stdint.h>
|
||||
|
||||
class DiveComputerNode {
|
||||
public:
|
||||
DiveComputerNode(QString m, uint32_t d, QString s, QString f, QString n)
|
||||
: model(m), deviceId(d), serialNumber(s), firmware(f), nickName(n) {};
|
||||
bool operator==(const DiveComputerNode &a) const;
|
||||
bool operator!=(const DiveComputerNode &a) const;
|
||||
bool changesValues(const DiveComputerNode &b) const;
|
||||
void showchanges(const QString &n, const QString &s, const QString &f) const;
|
||||
QString model;
|
||||
uint32_t deviceId;
|
||||
QString serialNumber;
|
||||
QString firmware;
|
||||
QString nickName;
|
||||
};
|
||||
|
||||
class DiveComputerList {
|
||||
public:
|
||||
DiveComputerList();
|
||||
~DiveComputerList();
|
||||
const DiveComputerNode *getExact(const QString &m, uint32_t d);
|
||||
const DiveComputerNode *get(const QString &m);
|
||||
void addDC(QString m, uint32_t d, QString n = QString(), QString s = QString(), QString f = QString());
|
||||
DiveComputerNode matchDC(const QString &m, uint32_t d);
|
||||
DiveComputerNode matchModel(const QString &m);
|
||||
QMultiMap<QString, DiveComputerNode> dcMap;
|
||||
QMultiMap<QString, DiveComputerNode> dcWorkingMap;
|
||||
};
|
||||
|
||||
extern DiveComputerList dcList;
|
||||
|
||||
#endif
|
||||
Loading…
Add table
Add a link
Reference in a new issue