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

Cleanup: remove eplicit constructors and unused member variable

Browse source 
Remove the explicit constructor in DiveComputerNode: Just use
classical C-style struct initialization. Moreover, remove the
empty constructor and destructor of DiveComputerList.

The variable DiveComputerList::dcWorkingMap was unused. Remove.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-06-16 13:22:33 +02:00 • committed by Dirk Hohndel
parent b0cc416954
commit 8e8cd7a8d9
2 changed files with 1 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/divecomputer.cpp
View file

@ -5,14 +5,6 @@
DiveComputerList dcList; DiveComputerList dcList;
DiveComputerList::DiveComputerList()
{
}
DiveComputerList::~DiveComputerList()
{
}
bool DiveComputerNode::operator==(const DiveComputerNode &a) const bool DiveComputerNode::operator==(const DiveComputerNode &a) const
{ {
return model == a.model && return model == a.model &&
@ -89,8 +81,7 @@ void DiveComputerList::addDC(QString m, uint32_t d, QString n, QString s, QStrin
dcMap.remove(m, *existNode); dcMap.remove(m, *existNode);
} }
DiveComputerNode newNode(m, d, s, f, n); dcMap.insert(m, { m, d, s, f, n });
dcMap.insert(m, newNode);
} }
extern "C" void create_device_node(const char *model, uint32_t deviceid, const char *serial, const char *firmware, const char *nickname) extern "C" void create_device_node(const char *model, uint32_t deviceid, const char *serial, const char *firmware, const char *nickname)

5
core/divecomputer.h
View file

@ -8,8 +8,6 @@
class DiveComputerNode { class DiveComputerNode {
public: 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 operator!=(const DiveComputerNode &a) const; bool operator!=(const DiveComputerNode &a) const;
bool changesValues(const DiveComputerNode &b) const; bool changesValues(const DiveComputerNode &b) const;
@ -23,15 +21,12 @@ public:
class DiveComputerList { class DiveComputerList {
public: public:
DiveComputerList();
~DiveComputerList();
const DiveComputerNode *getExact(const QString &m, uint32_t d); const DiveComputerNode *getExact(const QString &m, uint32_t d);
const DiveComputerNode *get(const QString &m); const DiveComputerNode *get(const QString &m);
void addDC(QString m, uint32_t d, QString n = QString(), QString s = QString(), QString f = QString()); 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 matchDC(const QString &m, uint32_t d);
DiveComputerNode matchModel(const QString &m); DiveComputerNode matchModel(const QString &m);
QMultiMap<QString, DiveComputerNode> dcMap; QMultiMap<QString, DiveComputerNode> dcMap;
QMultiMap<QString, DiveComputerNode> dcWorkingMap;
}; };
extern DiveComputerList dcList; extern DiveComputerList dcList;