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/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp
index 04dcbe64d..dcb1f8382 100644
--- a/core/subsurface-qt/SettingsObjectWrapper.cpp
+++ b/core/subsurface-qt/SettingsObjectWrapper.cpp
@@ -1914,9 +1914,9 @@ void DisplaySettingsObjectWrapper::setDivelistFont(const QString& value)
 	s.beginGroup(group);
 	s.setValue("divelist_font", value);
 
-	if (!subsurface_ignore_font(newValue.toUtf8().constData())) {
+	if (!subsurface_ignore_font(qPrintable(newValue))) {
 		free((void *)prefs.divelist_font);
-		prefs.divelist_font = strdup(newValue.toUtf8().constData());
+		prefs.divelist_font = strdup(qPrintable(newValue));
 		qApp->setFont(QFont(newValue));
 	}
 	emit divelistFontChanged(newValue);
@@ -2265,11 +2265,11 @@ void SettingsObjectWrapper::load()
 	QString fontName = defaultFont.toString();
 	if (fontName.contains(","))
 		fontName = fontName.left(fontName.indexOf(","));
-	if (subsurface_ignore_font(fontName.toUtf8().constData())) {
+	if (subsurface_ignore_font(qPrintable(fontName))) {
 		defaultFont = QFont(prefs.divelist_font);
 	} else {
 		free((void *)prefs.divelist_font);
-		prefs.divelist_font = strdup(fontName.toUtf8().constData());
+		prefs.divelist_font = strdup(qPrintable(fontName));
 	}
 	defaultFont.setPointSizeF(prefs.font_size);
 	qApp->setFont(defaultFont);