1 files changed, 19 insertions, 33 deletions

diff --git a/examples/corelib/serialization/convert/textconverter.cpp b/examples/corelib/serialization/convert/textconverter.cpp
index b02ce12f66..1f8b4f9c19 100644
--- a/examples/corelib/serialization/convert/textconverter.cpp
+++ b/examples/corelib/serialization/convert/textconverter.cpp
@@ -6,6 +6,8 @@
 #include <QFile>
 #include <QTextStream>
 
+using namespace Qt::StringLiterals;
+
 static void dumpVariant(QTextStream &out, const QVariant &v)
 {
     switch (v.userType()) {
@@ -42,68 +44,52 @@ static void dumpVariant(QTextStream &out, const QVariant &v)
     }
 }
 
-QString TextConverter::name()
-{
-    return QStringLiteral("text");
-}
-
-Converter::Direction TextConverter::directions()
-{
-    return InOut;
-}
-
-Converter::Options TextConverter::outputOptions()
+QString TextConverter::name() const
 {
-    return {};
+    return "text"_L1;
 }
 
-const char *TextConverter::optionsHelp()
+Converter::Directions TextConverter::directions() const
 {
-    return nullptr;
+    return Direction::InOut;
 }
 
-bool TextConverter::probeFile(QIODevice *f)
+bool TextConverter::probeFile(QIODevice *f) const
 {
     if (QFile *file = qobject_cast<QFile *>(f))
-        return file->fileName().endsWith(QLatin1String(".txt"));
+        return file->fileName().endsWith(".txt"_L1);
     return false;
 }
 
-QVariant TextConverter::loadFile(QIODevice *f, Converter *&outputConverter)
+QVariant TextConverter::loadFile(QIODevice *f, const Converter *&outputConverter) const
 {
     if (!outputConverter)
         outputConverter = this;
 
     QVariantList list;
     QTextStream in(f);
-    QString line ;
+    QString line;
     while (!in.atEnd()) {
         in.readLineInto(&line);
-
         bool ok;
-        qint64 v = line.toLongLong(&ok);
-        if (ok) {
-            list.append(v);
-            continue;
-        }
 
-        double d = line.toDouble(&ok);
-        if (ok) {
+        if (qint64 v = line.toLongLong(&ok); ok)
+            list.append(v);
+        else if (double d = line.toDouble(&ok); ok)
             list.append(d);
-            continue;
-        }
-
-        list.append(line);
+        else
+            list.append(line);
     }
 
     return list;
 }
 
-void TextConverter::saveFile(QIODevice *f, const QVariant &contents, const QStringList &options)
+void TextConverter::saveFile(QIODevice *f, const QVariant &contents,
+                             const QStringList &options) const
 {
     if (!options.isEmpty()) {
-        fprintf(stderr, "Unknown option '%s' to text output. This format has no options.\n", qPrintable(options.first()));
-        exit(EXIT_FAILURE);
+        qFatal("Unknown option '%s' to text output. This format has no options.",
+               qPrintable(options.first()));
     }
 
     QTextStream out(f);