mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Move the fill_computer_list() out of widgets
fill_computer_list() creates a Qt friendly structure that contains all of the necessary information about dive computers and it's devices, and it's needed both in Qml and Widgets to allow the user to download their dives. This patch makes it possible to use the code in QML without duplication. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
dec47e11cd
commit
a55efcf7d8
6 changed files with 87 additions and 73 deletions
|
|
@ -2,6 +2,9 @@
|
|||
#define DOWNLOADFROMDCTHREAD_H
|
||||
|
||||
#include <QThread>
|
||||
#include <QMap>
|
||||
#include <QHash>
|
||||
|
||||
#include "dive.h"
|
||||
#include "libdivecomputer.h"
|
||||
|
||||
|
|
@ -18,4 +21,32 @@ private:
|
|||
device_data_t *data;
|
||||
};
|
||||
|
||||
struct product {
|
||||
const char *product;
|
||||
dc_descriptor_t *descriptor;
|
||||
struct product *next;
|
||||
};
|
||||
|
||||
struct vendor {
|
||||
const char *vendor;
|
||||
struct product *productlist;
|
||||
struct vendor *next;
|
||||
};
|
||||
|
||||
struct mydescriptor {
|
||||
const char *vendor;
|
||||
const char *product;
|
||||
dc_family_t type;
|
||||
unsigned int model;
|
||||
};
|
||||
|
||||
/* This fills the vendor list QStringList and related members.
|
||||
* this code needs to be reworked to be less ugly, but it will
|
||||
* stay like this for now.
|
||||
*/
|
||||
void fill_computer_list();
|
||||
extern QStringList vendorList;
|
||||
extern QHash<QString, QStringList> productList;
|
||||
extern QMap<QString, dc_descriptor_t *> descriptorLookup;
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue