diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-02-28 15:43:54 +0100 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-02-28 15:45:26 +0100 |
| commit | 10af45d6dce8b02b17ea9a63342acb0b310b2c8f (patch) | |
| tree | 3d45b1a8d153745d440f8259c12ed6161cfd4561 /qt-mobile/qmlmanager.cpp | |
| parent | 26779a9af5beb10a4e0dd50a418450cab5960137 (diff) | |
| download | subsurface-10af45d6dce8b02b17ea9a63342acb0b310b2c8f.tar.gz | |
QML UI: we no longer use the return value of commitChanges()
So make it a void function.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-mobile/qmlmanager.cpp')
| -rw-r--r-- | qt-mobile/qmlmanager.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/qt-mobile/qmlmanager.cpp b/qt-mobile/qmlmanager.cpp index 663463b80..b50b3c501 100644 --- a/qt-mobile/qmlmanager.cpp +++ b/qt-mobile/qmlmanager.cpp @@ -351,9 +351,9 @@ void QMLManager::refreshDiveList() } // update the dive and return the notes field, stripped of the HTML junk -QString QMLManager::commitChanges(QString diveId, QString date, QString location, QString gps, QString duration, QString depth, - QString airtemp, QString watertemp, QString suit, QString buddy, QString diveMaster, QString weight, QString notes, - QString startpressure, QString endpressure, QString gasmix) +void QMLManager::commitChanges(QString diveId, QString date, QString location, QString gps, QString duration, QString depth, + QString airtemp, QString watertemp, QString suit, QString buddy, QString diveMaster, QString weight, QString notes, + QString startpressure, QString endpressure, QString gasmix) { #define DROP_EMPTY_PLACEHOLDER(_s) if ((_s) == QLatin1Literal("--")) (_s).clear() @@ -381,7 +381,7 @@ QString QMLManager::commitChanges(QString diveId, QString date, QString location if (!d) { qDebug() << "don't touch this... no dive"; - return notes; + return; } bool diveChanged = false; bool needResort = false; @@ -507,7 +507,7 @@ QString QMLManager::commitChanges(QString diveId, QString date, QString location d->weightsystem[0].weight.grams = parseWeightToGrams(weight); } } -// start and end pressures for first cylinder only + // start and end pressures for first cylinder only if (get_pressure_string(d->cylinder[0].start, true) != startpressure || get_pressure_string(d->cylinder[0].end, true) != endpressure) { diveChanged = true; d->cylinder[0].start.mbar = parsePressureToMbar(startpressure); @@ -585,7 +585,6 @@ QString QMLManager::commitChanges(QString diveId, QString date, QString location prefs.cloud_background_sync = true; prefs.git_local_only = false; } - return notes; } void QMLManager::saveChanges() |