subsurface/device.h

#ifndef DEVICE_INFO_H
#define DEVICE_INFO_H

#ifdef __cplusplus
#include "dive.h"
extern "C" {
#endif

extern struct divecomputer *fake_dc(struct divecomputer* dc);
extern void create_device_node(const char *model, uint32_t deviceid, const char *serial, const char *firmware, const char *nickname);
extern void call_for_each_dc(FILE *f, void (*callback)(FILE *, const char *, uint32_t,
						const char *, const char *, const char *));

#ifdef __cplusplus
}
#endif

#endif
Move device_info handling into a new 'device.c' file The legacy nickname wrappers (that use the device_info structure) are left in gtk-gui.c. We can slowly start moving away from them, we don't want to start exporting that thing as some kind of generic interface. This isn't a pure code movement - because we leave the legacy interfaces alone, there are a few new interfaces in device.c (like "create a new device_info entry") that were embedded into the legacy "create nickname" code, and needed to be abstracted out. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org> 2013-01-09 20:07:09 +00:00			`#ifndef DEVICE_INFO_H`
			`#define DEVICE_INFO_H`

Have some C++ file in the project Rename gtk-gui.c to qt-gui.cpp, and make the necessary changes so that the project still builds. Signed-off-by: Alberto Mardegan <mardy@users.sourceforge.net> 2013-04-01 10:51:49 +00:00			`#ifdef __cplusplus`
Moved the 'create fake dc' to it's own function in device.c Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org> 2013-06-10 16:35:27 +00:00			`#include "dive.h"`
Have some C++ file in the project Rename gtk-gui.c to qt-gui.cpp, and make the necessary changes so that the project still builds. Signed-off-by: Alberto Mardegan <mardy@users.sourceforge.net> 2013-04-01 10:51:49 +00:00			`extern "C" {`
			`#endif`

Moved the 'create fake dc' to it's own function in device.c Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org> 2013-06-10 16:35:27 +00:00			`extern struct divecomputer fake_dc(struct divecomputer dc);`
Converting the device_info list into a Qt data structure This data structure was quite fragile and made 'undo' when editing rather hard to implement. So instead I decided to turn this into a QMultiMap which seemed like the ideal data structure for it. This map holds all the dive computer related data indexed by the model. As QMultiMap it allows multiple entries per key (model string) and disambiguates between them with the deviceId. This commit turned out much larger than I wanted. But I didn't manage to find a clean way to break it up and make the pieces make sense. So this brings back the Ok / Cancel button for the dive computer edit dialog. And it makes those two buttons actually do the right thing (which is what started this whole process). For this to work we simply copy the map to a working copy and do all edits on that one - and then copy that over the 'real' map when we accept the changes. Signed-off-by: Dirk Hohndel <dirk@hohndel.org> 2013-06-17 22:58:26 +00:00			`extern void create_device_node(const char model, uint32_t deviceid, const char serial, const char firmware, const char nickname);`
			`extern void call_for_each_dc(FILE f, void (callback)(FILE , const char , uint32_t,`
			`const char , const char , const char *));`
Move device_info handling into a new 'device.c' file The legacy nickname wrappers (that use the device_info structure) are left in gtk-gui.c. We can slowly start moving away from them, we don't want to start exporting that thing as some kind of generic interface. This isn't a pure code movement - because we leave the legacy interfaces alone, there are a few new interfaces in device.c (like "create a new device_info entry") that were embedded into the legacy "create nickname" code, and needed to be abstracted out. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org> 2013-01-09 20:07:09 +00:00
Have some C++ file in the project Rename gtk-gui.c to qt-gui.cpp, and make the necessary changes so that the project still builds. Signed-off-by: Alberto Mardegan <mardy@users.sourceforge.net> 2013-04-01 10:51:49 +00:00			`#ifdef __cplusplus`
			`}`
			`#endif`

Move device_info handling into a new 'device.c' file The legacy nickname wrappers (that use the device_info structure) are left in gtk-gui.c. We can slowly start moving away from them, we don't want to start exporting that thing as some kind of generic interface. This isn't a pure code movement - because we leave the legacy interfaces alone, there are a few new interfaces in device.c (like "create a new device_info entry") that were embedded into the legacy "create nickname" code, and needed to be abstracted out. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org> 2013-01-09 20:07:09 +00:00			`#endif`