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, 5 insertions, 5 deletions

diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index ac6289f34..990629154 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -623,12 +623,12 @@ void MainWindow::on_actionCloudstoragesave_triggered()
 		information()->acceptChanges();
 
 	showProgressBar();
-	int error = save_dives(filename.toUtf8().data());
+	int error = save_dives(qPrintable(filename));
 	hideProgressBar();
 	if (error)
 		return;
 
-	setCurrentFile(filename.toUtf8().data());
+	setCurrentFile(qPrintable(filename));
 	mark_divelist_changed(false);
 }
 
@@ -935,7 +935,7 @@ void MainWindow::updateVariations(QString variations)
 {
 	QString notes = QString(displayed_dive.notes);
 	free(displayed_dive.notes);
-	displayed_dive.notes = strdup(notes.replace("VARIATIONS", variations).toUtf8().data());
+	displayed_dive.notes = strdup(qPrintable(notes.replace("VARIATIONS", variations)));
 	plannerDetails()->divePlanOutput()->setHtml(displayed_dive.notes);
 }
 
@@ -1683,10 +1683,10 @@ int MainWindow::file_save_as(void)
 	if (information()->isEditing())
 		information()->acceptChanges();
 
-	if (save_dives(filename.toUtf8().data()))
+	if (save_dives(qPrintable(filename)))
 		return -1;
 
-	setCurrentFile(filename.toUtf8().data());
+	setCurrentFile(qPrintable(filename));
 	mark_divelist_changed(false);
 	addRecentFile(filename, true);
 	return 0;