Cleanup: consistently use qPrintable()

Replace constructs of the kind
  s.toUtf8().data(),
  s.toUtf8().constData(),
  s.toLocal8Bit().data(),
  s.toLocal8Bit.constData() or
  qUtf8Printable(s)
by
  qPrintable(s).

This is concise, consistent and - in principle - more performant than
the .data() versions.

Sadly, owing to a suboptimal implementation, qPrintable(s) currently
is a pessimization compared to s.toUtf8().data(). A fix is scheduled for
new Qt versions: https://codereview.qt-project.org/#/c/221331/

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 4 insertions, 4 deletions

diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp
index f968fd8fa..7818bc29e 100644
--- a/desktop-widgets/locationinformation.cpp
+++ b/desktop-widgets/locationinformation.cpp
@@ -158,7 +158,7 @@ void LocationInformationWidget::acceptChanges()
 {
 	char *uiString;
 	struct dive_site *currentDs;
-	uiString = copy_string(ui.diveSiteName->text().toUtf8().data());
+	uiString = copy_string(qPrintable(ui.diveSiteName->text()));
 	if (get_dive_site_by_uuid(displayed_dive_site.uuid) != NULL) {
 		currentDs = get_dive_site_by_uuid(displayed_dive_site.uuid);
 	} else {
@@ -175,14 +175,14 @@ void LocationInformationWidget::acceptChanges()
 	} else {
 		free(uiString);
 	}
-	uiString = copy_string(ui.diveSiteDescription->text().toUtf8().data());
+	uiString = copy_string(qPrintable(ui.diveSiteDescription->text()));
 	if (!same_string(uiString, currentDs->description)) {
 		free(currentDs->description);
 		currentDs->description = uiString;
 	} else {
 		free(uiString);
 	}
-	uiString = copy_string(ui.diveSiteCountry->text().toUtf8().data());
+	uiString = copy_string(qPrintable(ui.diveSiteCountry->text()));
 	// if the user entered a different contriy, first update the taxonomy
 	// for the displayed dive site; this below will get copied into the currentDs
 	if (!same_string(uiString, taxonomy_get_country(&displayed_dive_site.taxonomy)) &&
@@ -193,7 +193,7 @@ void LocationInformationWidget::acceptChanges()
 	// now update the currentDs (which we then later copy back ontop of displayed_dive_site
 	copy_dive_site_taxonomy(&displayed_dive_site, currentDs);
 
-	uiString = copy_string(ui.diveSiteNotes->document()->toPlainText().toUtf8().data());
+	uiString = copy_string(qPrintable(ui.diveSiteNotes->document()->toPlainText()));
 	if (!same_string(uiString, currentDs->notes)) {
 		free(currentDs->notes);
 		currentDs->notes = uiString;