From c132d5676d174b83e37ce323c8146406756abff4 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 28 Jun 2023 10:19:17 +0300 Subject: [PATCH] Fix build issues. --- src/libs/vformat/vsinglelineoutlinechar.cpp | 2 +- src/libs/vmisc/compatibility.h | 10 ++++++++++ src/libs/vmisc/svgfont/vsvgfontengine.cpp | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/libs/vformat/vsinglelineoutlinechar.cpp b/src/libs/vformat/vsinglelineoutlinechar.cpp index 5d121d722..1358cced7 100644 --- a/src/libs/vformat/vsinglelineoutlinechar.cpp +++ b/src/libs/vformat/vsinglelineoutlinechar.cpp @@ -79,7 +79,7 @@ Q_REQUIRED_RESULT auto ParseCorrectiosn(const QJsonObject &correctionsObject) -> if (!segments.isEmpty()) { - corrections->insert(glyph.front(), segments); + corrections->insert(Front(glyph), segments); } } diff --git a/src/libs/vmisc/compatibility.h b/src/libs/vmisc/compatibility.h index 900bb1108..e959cd5d8 100644 --- a/src/libs/vmisc/compatibility.h +++ b/src/libs/vmisc/compatibility.h @@ -419,4 +419,14 @@ inline auto Back(const QString &str) -> QChar #endif } +//--------------------------------------------------------------------------------------------------------------------- +inline auto Front(const QString &str) -> QChar +{ +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + return str.front(); +#else + return str.at(0); +#endif +} + #endif // COMPATIBILITY_H diff --git a/src/libs/vmisc/svgfont/vsvgfontengine.cpp b/src/libs/vmisc/svgfont/vsvgfontengine.cpp index e2a28ee5b..20bb9f233 100644 --- a/src/libs/vmisc/svgfont/vsvgfontengine.cpp +++ b/src/libs/vmisc/svgfont/vsvgfontengine.cpp @@ -338,7 +338,7 @@ auto VSvgFontEngine::InFont(QChar ch) const -> bool //--------------------------------------------------------------------------------------------------------------------- auto VSvgFontEngine::CanRender(const QString &str) const -> bool { - return std::all_of(str.cbegin(), str.cend(), [this](auto c) { return InFont(c); }); + return std::all_of(str.cbegin(), str.cend(), [this](auto c) { return this->InFont(c); }); } //---------------------------------------------------------------------------------------------------------------------