From d68f3a81c9073c64e4492dfca33eeafccb460c6f Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 12 May 2020 22:04:16 +0200 Subject: [PATCH] Small fixes for the Q*Ref deprecation stuff - don't force the deprecation sentence into a separate memory location (gives the compiler more leeway in how to lay stuff out) - split the switch (will be useful when extending) - fix a spelling mistake in one of the messages Change-Id: Ied137dc8eee7047177983660e1a6776a0bf46bde Reviewed-by: Lars Knoll --- src/corelib/text/qbytearray.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp index f0c903737f9..3da643dc8bc 100644 --- a/src/corelib/text/qbytearray.cpp +++ b/src/corelib/text/qbytearray.cpp @@ -5097,20 +5097,28 @@ namespace QtPrivate { namespace DeprecatedRefClassBehavior { void warn(WarningType w, EmittingClass c) { - static const char deprecatedBehaviorString[] = + const char *deprecatedBehaviorString = "The corresponding behavior is deprecated, and will be changed" " in a future version of Qt."; const char *emittingClassName = nullptr; - const char *containerClassName = nullptr; switch (c) { case EmittingClass::QByteRef: emittingClassName = "QByteRef"; - containerClassName = "QByteArray"; break; case EmittingClass::QCharRef: emittingClassName = "QCharRef"; + break; + } + + const char *containerClassName = nullptr; + + switch (c) { + case EmittingClass::QByteRef: + containerClassName = "QByteArray"; + break; + case EmittingClass::QCharRef: containerClassName = "QString"; break; } @@ -5121,7 +5129,7 @@ void warn(WarningType w, EmittingClass c) emittingClassName, containerClassName, deprecatedBehaviorString); break; case WarningType::DelayedDetach: - qWarning("Using %s with on a %s that is not already detached. %s", + qWarning("Using %s on a %s that is not already detached. %s", emittingClassName, containerClassName, deprecatedBehaviorString); break; }