From e85c548b816027724173d89fd6c7f9fdc9018177 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 24 Jun 2023 12:07:41 +0300 Subject: [PATCH] Fix build. --- src/libs/vlayout/vtextmanager.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/libs/vlayout/vtextmanager.cpp b/src/libs/vlayout/vtextmanager.cpp index 8b555eaab..c18e986e1 100644 --- a/src/libs/vlayout/vtextmanager.cpp +++ b/src/libs/vlayout/vtextmanager.cpp @@ -39,13 +39,12 @@ #include "../ifc/xml/vabstractpattern.h" #include "../vmisc/compatibility.h" +#include "../vmisc/svgfont/vsvgfont.h" #include "../vmisc/svgfont/vsvgfontdatabase.h" #include "../vmisc/svgfont/vsvgfontengine.h" #include "../vmisc/vabstractvalapplication.h" #include "../vmisc/vcommonsettings.h" #include "../vpatterndb/floatItemData/vpiecelabeldata.h" -#include -#include "svgfont/vsvgfont.h" #if QT_VERSION < QT_VERSION_CHECK(5, 9, 0) #include "../vmisc/vdatastreamenum.h" @@ -915,9 +914,9 @@ auto VTextManager::BreakTextIntoLines(const QString &text, const QFont &font, in } else { - const int width = TextWidth(fontMetrics, ConstFirst(subWords)); + const int width = TextWidth(fontMetrics, ConstFirst(subWords)); const int tWidth = !currentLine.isEmpty() ? currentLineWidth + spaceWidth + width : width; - AppendWord(ConstFirst(subWords), tWidth); + AppendWord(ConstFirst(subWords), tWidth); lines.append(currentLine); if (subWords.size() == 2) @@ -1015,9 +1014,9 @@ auto VTextManager::BreakTextIntoLines(const QString &text, const VSvgFont &font, } else { - const int width = qRound(engine.TextWidth(ConstFirst(subWords), penWidth)); + const int width = qRound(engine.TextWidth(ConstFirst(subWords), penWidth)); const int tWidth = !currentLine.isEmpty() ? currentLineWidth + spaceWidth + width : width; - AppendWord(ConstFirst(subWords), tWidth); + AppendWord(ConstFirst(subWords), tWidth); lines.append(currentLine); if (subWords.size() == 2)