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>

2 files changed, 10 insertions, 11 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()
diff --git a/qt-mobile/qmlmanager.h b/qt-mobile/qmlmanager.h
index fec29c13c..33e356940 100644
--- a/qt-mobile/qmlmanager.h
+++ b/qt-mobile/qmlmanager.h
@@ -84,11 +84,11 @@ public slots:
 	void loadDivesWithValidCredentials();
 	void loadDiveProgress(int percent);
 	void provideAuth(QNetworkReply *reply, QAuthenticator *auth);
-	QString 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 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 saveChanges();
 	void deleteDive(int id);