From 0b1670134b43ba390f35b52d2458e4269a804de3 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 31 Oct 2023 16:10:55 +0100 Subject: Replace confusing member variable with a predicate The Converter class, in the eponymous example, had a null member variable that wasn't a nullptr - it pointed to an instance of NullConverter - so that other converters could test whether a Converter * they'd been passed was null (in the sense of pointing to a NullConverter). This, however, was susceptible to misreading - I misread one such comparison as a nullptr check and thus thought it redundant with an earlier actual nullptr check. To spare future readers similar confusion, replace the public static member variable with a protected (since only other derived classes need it) static predicate, to at least give the reader a clue that this is using the word null in a class-specific sense. Pick-to: 6.6 6.5 Task-number: QTBUG-111228 Change-Id: I1e4f494b303d1bf90107f8c6fa3a4a22f6d81b90 Reviewed-by: Thiago Macieira --- examples/corelib/serialization/convert/jsonconverter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/corelib/serialization/convert/jsonconverter.cpp') diff --git a/examples/corelib/serialization/convert/jsonconverter.cpp b/examples/corelib/serialization/convert/jsonconverter.cpp index 6c307cdb8c..611061705b 100644 --- a/examples/corelib/serialization/convert/jsonconverter.cpp +++ b/examples/corelib/serialization/convert/jsonconverter.cpp @@ -76,7 +76,7 @@ QVariant JsonConverter::loadFile(QIODevice *f, const Converter *&outputConverter qFatal("Could not parse JSON content: offset %d: %s", error.offset, qPrintable(error.errorString())); } - if (outputConverter == null) + if (isNull(outputConverter)) return QVariant(); return doc.toVariant(); } -- cgit v1.2.3