diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2015-05-28 16:23:49 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-05-29 14:09:13 -0700 |
| commit | f432b764e78ac3d66f5ab1bfc7c18fbdb75624e5 (patch) | |
| tree | c2ec5c81660d22bf986968808bd4ecb7256623ae /qthelper.h | |
| parent | 6e4aa7d044a344527e61f17c2254851ba799c4bd (diff) | |
| download | subsurface-f432b764e78ac3d66f5ab1bfc7c18fbdb75624e5.tar.gz | |
Move DivePlannerModel and CylinderModel to qt-models
Still trying to make it easier for the Mobile Port:
This patch is a bit bigger than I hopped, but it was the smallest that I
could get.
A lot of TODO items where added where I broke the code because the current
implementation would break the QML implementtion on the designer. I'll
most probably fix those myself when I finish the transition to the models
to the new folder.
I only moved both models at once because there's an interdependency
between them (seems inevitable, tough, but I'll take a better look at it
later).
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qthelper.h')
| -rw-r--r-- | qthelper.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qthelper.h b/qthelper.h index b0765aeda..0b1e3b111 100644 --- a/qthelper.h +++ b/qthelper.h @@ -16,7 +16,8 @@ QString weight_string(int weight_in_grams); bool gpsHasChanged(struct dive *dive, struct dive *master, const QString &gps_text, bool *parsed_out = 0); extern "C" const char *printGPSCoords(int lat, int lon); QList<int> getDivesInTrip(dive_trip_t *trip); -QString gasToStr(struct gasmix gas); +QString get_gas_string(struct gasmix gas); +QString get_divepoint_gas_string(const divedatapoint& dp); void read_hashes(); void write_hashes(); void updateHash(struct picture *picture); |