diff --git a/src/app/valentina/xml/vpattern.h b/src/app/valentina/xml/vpattern.h index 3f41c52c4..3ec9fa901 100644 --- a/src/app/valentina/xml/vpattern.h +++ b/src/app/valentina/xml/vpattern.h @@ -30,7 +30,6 @@ #define VPATTERN_H #include "../ifc/xml/vabstractpattern.h" -#include "../ifc/xml/vtoolrecord.h" #include "../vpatterndb/vcontainer.h" #include "../ifc/xml/vpatternconverter.h" diff --git a/src/libs/ifc/xml/utils.cpp b/src/libs/ifc/xml/utils.cpp index 47b3669a9..b4caa5e90 100644 --- a/src/libs/ifc/xml/utils.cpp +++ b/src/libs/ifc/xml/utils.cpp @@ -42,6 +42,8 @@ #include "../vmisc/compatibility.h" +using namespace Qt::Literals::StringLiterals; + //--------------------------------------------------------------------------------------------------------------------- auto IsMimeTypeImage(const QMimeType &mime) -> bool { @@ -108,10 +110,10 @@ auto PrepareImageFilters() -> QString if (not sufixes.isEmpty()) { - filters.append(QObject::tr("Images") + QStringLiteral(" (%1)").arg(sufixes.join(' '))); + filters.append(QObject::tr("Images") + " (%1)"_L1.arg(sufixes.join(' '_L1))); } - filters.append(QObject::tr("All files") + QStringLiteral(" (*.*)")); + filters.append(QObject::tr("All files") + " (*.*)"_L1); - return filters.join(QStringLiteral(";;")); + return filters.join(";;"_L1); } diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp index 64dd79d64..2263e5ac6 100644 --- a/src/libs/ifc/xml/vabstractpattern.cpp +++ b/src/libs/ifc/xml/vabstractpattern.cpp @@ -2476,7 +2476,7 @@ void VAbstractPattern::SetGroupTags(quint32 id, const QStringList &tags) QDomElement group = elementById(id, TagGroup); if (group.isElement()) { - SetAttributeOrRemoveIf(group, AttrTags, tags.join(','), + SetAttributeOrRemoveIf(group, AttrTags, tags.join(','_L1), [](const QString &rawTags) noexcept { return rawTags.isEmpty(); }); modified = true; emit patternChanged(false); diff --git a/src/libs/ifc/xml/vbackgroundpatternimage.cpp b/src/libs/ifc/xml/vbackgroundpatternimage.cpp index 40bded802..441290307 100644 --- a/src/libs/ifc/xml/vbackgroundpatternimage.cpp +++ b/src/libs/ifc/xml/vbackgroundpatternimage.cpp @@ -45,6 +45,8 @@ #include // and, not, or #endif +using namespace Qt::Literals::StringLiterals; + const QString VBackgroundPatternImage::brokenImage = QStringLiteral("://icon/svg/broken_path.svg"); namespace @@ -100,7 +102,7 @@ auto VBackgroundPatternImage::FromFile(const QString &fileName, bool builtIn) -> return {}; } - QString base64 = SplitString(QString::fromLatin1(file.readAll().toBase64().data())).join('\n'); + QString base64 = SplitString(QString::fromLatin1(file.readAll().toBase64().data())).join('\n'_L1); image.SetContentData(base64.toLatin1(), mime.name()); } else diff --git a/src/libs/ifc/xml/vpatternimage.cpp b/src/libs/ifc/xml/vpatternimage.cpp index 721cffe17..3b073f730 100644 --- a/src/libs/ifc/xml/vpatternimage.cpp +++ b/src/libs/ifc/xml/vpatternimage.cpp @@ -47,6 +47,8 @@ #include "../vmisc/compatibility.h" #include "utils.h" +using namespace Qt::Literals::StringLiterals; + //--------------------------------------------------------------------------------------------------------------------- auto VPatternImage::FromFile(const QString &fileName) -> VPatternImage { @@ -66,7 +68,7 @@ auto VPatternImage::FromFile(const QString &fileName) -> VPatternImage return {}; } - QString base64 = SplitString(QString::fromLatin1(file.readAll().toBase64().data())).join('\n'); + QString base64 = SplitString(QString::fromLatin1(file.readAll().toBase64().data())).join('\n'_L1); image.SetContentData(base64.toLatin1(), mime.name()); return image; diff --git a/src/libs/vpatterndb/variables/vmeasurement.cpp b/src/libs/vpatterndb/variables/vmeasurement.cpp index f71e105a0..d71d14454 100644 --- a/src/libs/vpatterndb/variables/vmeasurement.cpp +++ b/src/libs/vpatterndb/variables/vmeasurement.cpp @@ -36,6 +36,12 @@ #include "vmeasurement_p.h" #include "vvariable.h" +#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0) +#include "../vmisc/compatibility.h" +#endif + +using namespace Qt::Literals::StringLiterals; + //--------------------------------------------------------------------------------------------------------------------- VMeasurement::VMeasurement(quint32 index, const QString &name) : VVariable(name), @@ -123,7 +129,7 @@ auto VMeasurement::CorrectionHash(qreal baseA, qreal baseB, qreal baseC) -> QStr { hashBlocks.append(QString::number(baseC)); } - return hashBlocks.join(';'); + return hashBlocks.join(';'_L1); } //---------------------------------------------------------------------------------------------------------------------