mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-08 06:16:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: we no longer use the return value of commitChanges()

Browse source 
So make it a void function.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-02-28 15:43:54 +01:00
parent 26779a9af5
commit 10af45d6dc
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
qt-mobile/qmlmanager.cpp
View file

@ -351,9 +351,9 @@ void QMLManager::refreshDiveList()
} }
// update the dive and return the notes field, stripped of the HTML junk // 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, 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 airtemp, QString watertemp, QString suit, QString buddy, QString diveMaster, QString weight, QString notes,
QString startpressure, QString endpressure, QString gasmix) QString startpressure, QString endpressure, QString gasmix)
{ {
#define DROP_EMPTY_PLACEHOLDER(_s) if ((_s) == QLatin1Literal("--")) (_s).clear() #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) { if (!d) {
qDebug() << "don't touch this... no dive"; qDebug() << "don't touch this... no dive";
return notes; return;
} }
bool diveChanged = false; bool diveChanged = false;
bool needResort = false; bool needResort = false;
@ -507,7 +507,7 @@ QString QMLManager::commitChanges(QString diveId, QString date, QString location
d->weightsystem[0].weight.grams = parseWeightToGrams(weight); 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) { if (get_pressure_string(d->cylinder[0].start, true) != startpressure || get_pressure_string(d->cylinder[0].end, true) != endpressure) {
diveChanged = true; diveChanged = true;
d->cylinder[0].start.mbar = parsePressureToMbar(startpressure); 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.cloud_background_sync = true;
prefs.git_local_only = false; prefs.git_local_only = false;
} }
return notes;
} }
void QMLManager::saveChanges() void QMLManager::saveChanges()

10
qt-mobile/qmlmanager.h
View file

@ -84,11 +84,11 @@ public slots:
void loadDivesWithValidCredentials(); void loadDivesWithValidCredentials();
void loadDiveProgress(int percent); void loadDiveProgress(int percent);
void provideAuth(QNetworkReply *reply, QAuthenticator *auth); void provideAuth(QNetworkReply *reply, QAuthenticator *auth);
QString commitChanges(QString diveId, QString date, QString location, void commitChanges(QString diveId, QString date, QString location,
QString gps, QString duration, QString depth, QString gps, QString duration, QString depth,
QString airtemp, QString watertemp, QString suit, QString airtemp, QString watertemp, QString suit,
QString buddy, QString diveMaster, QString weight, QString notes, QString buddy, QString diveMaster, QString weight, QString notes,
QString startpressure, QString endpressure, QString gasmix); QString startpressure, QString endpressure, QString gasmix);
void saveChanges(); void saveChanges();
void deleteDive(int id); void deleteDive(int id);