diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2023-09-01 13:34:26 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2023-09-08 18:17:37 +0200 |
commit | 77fdd21cbf1a053efe6eec51356c665ed982d47c (patch) | |
tree | 235aad25951de0a3e9843b4e5c2ffdc93c7b508a /examples/corelib/serialization/convert/main.cpp | |
parent | eaebb5c4d2e2a87b23d63c5406bf54458b4c4a24 (diff) |
Serialization converter example: const-ify the Converter type
Its methods act on their parameters without changing the converter, so
can all be const. Its instances thus have no non-const members to
exercise, so can always be const.
Pick-to: 6.6 6.5
Task-number: QTBUG-111228
Change-Id: Ifcdb2f2159c2cfcd7998dd118aa327a32d299ccf
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'examples/corelib/serialization/convert/main.cpp')
-rw-r--r-- | examples/corelib/serialization/convert/main.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/examples/corelib/serialization/convert/main.cpp b/examples/corelib/serialization/convert/main.cpp index 20ae228fbf..697236dd7d 100644 --- a/examples/corelib/serialization/convert/main.cpp +++ b/examples/corelib/serialization/convert/main.cpp @@ -13,12 +13,12 @@ using namespace Qt::StringLiterals; -static QList<Converter *> *availableConverters; +static QList<const Converter *> *availableConverters; Converter::Converter() { if (!availableConverters) - availableConverters = new QList<Converter *>; + availableConverters = new QList<const Converter *>; availableConverters->append(this); } @@ -33,7 +33,7 @@ int main(int argc, char *argv[]) QStringList inputFormats; QStringList outputFormats; - for (Converter *conv : std::as_const(*availableConverters)) { + for (const Converter *conv : std::as_const(*availableConverters)) { auto direction = conv->directions(); QString name = conv->name(); if (direction & Converter::In) @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) if (parser.isSet(formatOptionsOption)) { QString format = parser.value(formatOptionsOption); - for (Converter *conv : std::as_const(*availableConverters)) { + for (const Converter *conv : std::as_const(*availableConverters)) { if (conv->name() == format) { const char *help = conv->optionsHelp(); if (help) { @@ -103,10 +103,10 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - Converter *inconv = nullptr; + const Converter *inconv = nullptr; QString format = parser.value(inputFormatOption); if (format != "auto"_L1) { - for (Converter *conv : std::as_const(*availableConverters)) { + for (const Converter *conv : std::as_const(*availableConverters)) { if (conv->name() == format) { inconv = conv; break; @@ -119,10 +119,10 @@ int main(int argc, char *argv[]) } } - Converter *outconv = nullptr; + const Converter *outconv = nullptr; format = parser.value(outputFormatOption); if (format != "auto"_L1) { - for (Converter *conv : std::as_const(*availableConverters)) { + for (const Converter *conv : std::as_const(*availableConverters)) { if (conv->name() == format) { outconv = conv; break; @@ -161,7 +161,7 @@ int main(int argc, char *argv[]) if (!inconv) { // probe the input to find a file format - for (Converter *conv : std::as_const(*availableConverters)) { + for (const Converter *conv : std::as_const(*availableConverters)) { if (conv->directions() & Converter::In && conv->probeFile(&input)) { inconv = conv; break; @@ -176,7 +176,7 @@ int main(int argc, char *argv[]) if (!outconv) { // probe the output to find a file format - for (Converter *conv : std::as_const(*availableConverters)) { + for (const Converter *conv : std::as_const(*availableConverters)) { if (conv->directions() & Converter::Out && conv->probeFile(&output)) { outconv = conv; break; |