From 28aee9009378571faea642c0ce48141b5f139f85 Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Mon, 28 Aug 2023 17:59:59 +0300 Subject: [PATCH] qimagereaderwriterhelpers: deduplicate literal Extract literal to constexpr function and reuse it Change-Id: I0a1ec24cb67e413222c826f2f26d78e16459ff8c Reviewed-by: Edward Welbourne --- src/gui/image/qimagereaderwriterhelpers.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gui/image/qimagereaderwriterhelpers.cpp b/src/gui/image/qimagereaderwriterhelpers.cpp index 2916e5260d..8a7564572f 100644 --- a/src/gui/image/qimagereaderwriterhelpers.cpp +++ b/src/gui/image/qimagereaderwriterhelpers.cpp @@ -97,12 +97,14 @@ QList supportedImageFormats(Capability cap) return formats; } +static constexpr QByteArrayView imagePrefix() noexcept { return "image/"; } + QList supportedMimeTypes(Capability cap) { QList mimeTypes; mimeTypes.reserve(_qt_NumFormats); for (const auto &fmt : _qt_BuiltInFormats) - mimeTypes.append(QByteArrayLiteral("image/") + fmt.mimeType); + mimeTypes.append(imagePrefix() + fmt.mimeType); #ifndef QT_NO_IMAGEFORMATPLUGIN appendImagePluginMimeTypes(irhLoader(), pluginCapability(cap), &mimeTypes); @@ -116,8 +118,8 @@ QList supportedMimeTypes(Capability cap) QList imageFormatsForMimeType(QByteArrayView mimeType, Capability cap) { QList formats; - if (mimeType.startsWith("image/")) { - const QByteArrayView type = mimeType.mid(sizeof("image/") - 1); + if (mimeType.startsWith(imagePrefix())) { + const QByteArrayView type = mimeType.mid(imagePrefix().size()); for (const auto &fmt : _qt_BuiltInFormats) { if (fmt.mimeType == type && !formats.contains(fmt.extension)) formats << fmt.extension;