From 499ec96691aa6f53cd996a908e39818bbee4edf9 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 18 Feb 2022 10:36:38 +0200 Subject: [PATCH] Move literals to separate header. --- src/app/puzzle/vptilefactory.cpp | 1 + .../preferencesconfigurationpage.cpp | 1 + src/libs/ifc/xml/vdomdocument.h | 1 + src/libs/vlayout/vlayoutpiece.cpp | 1 + src/libs/vmisc/commandoptions.cpp | 1 + src/libs/vmisc/def.cpp | 144 +---------------- src/libs/vmisc/def.h | 123 --------------- src/libs/vmisc/literals.cpp | 146 ++++++++++++++++++ src/libs/vmisc/literals.h | 125 ++++++++++++++- src/libs/vmisc/vcommonsettings.cpp | 1 + src/libs/vpatterndb/vcontainer.cpp | 1 + src/libs/vpatterndb/vtranslatevars.cpp | 1 + .../tools/piece/dialogpatternmaterials.cpp | 1 + src/libs/vwidgets/vcontrolpointspline.cpp | 1 + src/libs/vwidgets/vgrainlineitem.cpp | 1 + src/libs/vwidgets/vgraphicssimpletextitem.cpp | 1 + src/libs/vwidgets/vmaingraphicsview.cpp | 1 + src/libs/vwidgets/vtextgraphicsitem.cpp | 1 + .../TranslationsTest/tst_buitinregexp.cpp | 1 + 19 files changed, 286 insertions(+), 267 deletions(-) diff --git a/src/app/puzzle/vptilefactory.cpp b/src/app/puzzle/vptilefactory.cpp index 531e39c6f..117068957 100644 --- a/src/app/puzzle/vptilefactory.cpp +++ b/src/app/puzzle/vptilefactory.cpp @@ -7,6 +7,7 @@ #include "qobject.h" #include "scene/vpmaingraphicsview.h" #include "../vmisc/def.h" +#include "../vmisc/literals.h" #include "../vmisc/vcommonsettings.h" #include "../vlayout/vprintlayout.h" diff --git a/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp b/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp index 3998bddc5..95f0cf175 100644 --- a/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp +++ b/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp @@ -31,6 +31,7 @@ #include "../../core/vapplication.h" #include "../vpatterndb/pmsystems.h" #include "../vmisc/vvalentinasettings.h" +#include "../vmisc/literals.h" #include #include diff --git a/src/libs/ifc/xml/vdomdocument.h b/src/libs/ifc/xml/vdomdocument.h index 20c2d09ee..f5b2e28d0 100644 --- a/src/libs/ifc/xml/vdomdocument.h +++ b/src/libs/ifc/xml/vdomdocument.h @@ -47,6 +47,7 @@ #include "../ifc/ifcdef.h" #include "../vmisc/def.h" #include "../vmisc/diagnostic.h" +#include "../vmisc/literals.h" class QDomElement; class QDomNode; diff --git a/src/libs/vlayout/vlayoutpiece.cpp b/src/libs/vlayout/vlayoutpiece.cpp index e08863c55..0eefb8a53 100644 --- a/src/libs/vlayout/vlayoutpiece.cpp +++ b/src/libs/vlayout/vlayoutpiece.cpp @@ -51,6 +51,7 @@ #include "../vmisc/vmath.h" #include "../vmisc/vabstractvalapplication.h" #include "../vmisc/compatibility.h" +#include "../vmisc/literals.h" #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/calculator.h" #include "../vpatterndb/vpassmark.h" diff --git a/src/libs/vmisc/commandoptions.cpp b/src/libs/vmisc/commandoptions.cpp index 208fa0cf3..272d9fa6e 100644 --- a/src/libs/vmisc/commandoptions.cpp +++ b/src/libs/vmisc/commandoptions.cpp @@ -28,6 +28,7 @@ #include "commandoptions.h" #include "def.h" +#include "literals.h" #include #include diff --git a/src/libs/vmisc/def.cpp b/src/libs/vmisc/def.cpp index 93e169ed8..13c3abe95 100644 --- a/src/libs/vmisc/def.cpp +++ b/src/libs/vmisc/def.cpp @@ -62,6 +62,7 @@ # include "vdatastreamenum.h" #endif #include "../ifc/exception/vexception.h" +#include "literals.h" const qreal defCurveApproximationScale = 0.5; const qreal minCurveApproximationScale = 0.2; @@ -70,133 +71,6 @@ const qreal maxCurveApproximationScale = 10.0; const int minLabelFontSize = 5; const int maxLabelFontSize = 100; -//functions -const QString degTorad_F = QStringLiteral("degTorad"); -const QString radTodeg_F = QStringLiteral("radTodeg"); -const QString sin_F = QStringLiteral("sin"); -const QString cos_F = QStringLiteral("cos"); -const QString tan_F = QStringLiteral("tan"); -const QString asin_F = QStringLiteral("asin"); -const QString acos_F = QStringLiteral("acos"); -const QString atan_F = QStringLiteral("atan"); -const QString sinh_F = QStringLiteral("sinh"); -const QString cosh_F = QStringLiteral("cosh"); -const QString tanh_F = QStringLiteral("tanh"); -const QString asinh_F = QStringLiteral("asinh"); -const QString acosh_F = QStringLiteral("acosh"); -const QString atanh_F = QStringLiteral("atanh"); -const QString sinD_F = QStringLiteral("sinD"); -const QString cosD_F = QStringLiteral("cosD"); -const QString tanD_F = QStringLiteral("tanD"); -const QString asinD_F = QStringLiteral("asinD"); -const QString acosD_F = QStringLiteral("acosD"); -const QString atanD_F = QStringLiteral("atanD"); -const QString log2_F = QStringLiteral("log2"); -const QString log10_F = QStringLiteral("log10"); -const QString log_F = QStringLiteral("log"); -const QString ln_F = QStringLiteral("ln"); -const QString exp_F = QStringLiteral("exp"); -const QString sqrt_F = QStringLiteral("sqrt"); -const QString sign_F = QStringLiteral("sign"); -const QString rint_F = QStringLiteral("rint"); -const QString r2cm_F = QStringLiteral("r2cm"); -const QString csrCm_F = QStringLiteral("csrCm"); -const QString csrInch_F = QStringLiteral("csrInch"); -const QString abs_F = QStringLiteral("abs"); -const QString min_F = QStringLiteral("min"); -const QString max_F = QStringLiteral("max"); -const QString sum_F = QStringLiteral("sum"); -const QString avg_F = QStringLiteral("avg"); -const QString fmod_F = QStringLiteral("fmod"); -const QString warning_F = QStringLiteral("warning"); - -const QStringList builInFunctions -{ - degTorad_F, radTodeg_F, - sin_F, cos_F, tan_F, - asin_F, acos_F, atan_F, - sinh_F, cosh_F, tanh_F, - asinh_F, acosh_F, atanh_F, - sinD_F, cosD_F, tanD_F, - asinD_F, acosD_F, atanD_F, - log2_F, log10_F, log_F, - ln_F, - exp_F, - sqrt_F, - sign_F, - rint_F, r2cm_F, - csrCm_F, csrInch_F, - abs_F, - min_F, max_F, - sum_F, - avg_F, - fmod_F, - warning_F -}; - -const QString pl_size = QStringLiteral("size"); -const QString pl_height = QStringLiteral("height"); -const QString pl_hip = QStringLiteral("hip"); -const QString pl_waist = QStringLiteral("waist"); - -const QString pl_sizeLabel = QStringLiteral("sizeLabel"); -const QString pl_heightLabel = QStringLiteral("heightLabel"); -const QString pl_hipLabel = QStringLiteral("hipLabel"); -const QString pl_waistLabel = QStringLiteral("waistLabel"); - -const QString pl_dimensionX = QStringLiteral("dimensionX"); -const QString pl_dimensionY = QStringLiteral("dimensionY"); -const QString pl_dimensionW = QStringLiteral("dimensionW"); -const QString pl_dimensionZ = QStringLiteral("dimensionZ"); - -const QString pl_dimensionXLabel = QStringLiteral("dimensionXLabel"); -const QString pl_dimensionYLabel = QStringLiteral("dimensionYLabel"); -const QString pl_dimensionWLabel = QStringLiteral("dimensionWLabel"); -const QString pl_dimensionZLabel = QStringLiteral("dimensionZLabel"); - -const QString pl_date = QStringLiteral("date"); -const QString pl_time = QStringLiteral("time"); -const QString pl_birthDate = QStringLiteral("birthDate"); -const QString pl_patternName = QStringLiteral("patternName"); -const QString pl_patternNumber = QStringLiteral("patternNumber"); -const QString pl_author = QStringLiteral("author"); -const QString pl_customer = QStringLiteral("customer"); -const QString pl_email = QStringLiteral("email"); -const QString pl_userMaterial = QStringLiteral("userMaterial"); -const QString pl_pExt = QStringLiteral("pExt"); -const QString pl_pUnits = QStringLiteral("pUnits"); -const QString pl_pFileName = QStringLiteral("pFileName"); -const QString pl_mFileName = QStringLiteral("mFileName"); -const QString pl_mExt = QStringLiteral("mExt"); -const QString pl_mUnits = QStringLiteral("mUnits"); -const QString pl_mSizeUnits = QStringLiteral("mSizeUnits"); -const QString pl_pLetter = QStringLiteral("pLetter"); -const QString pl_pAnnotation = QStringLiteral("pAnnotation"); -const QString pl_pOrientation = QStringLiteral("pOrientation"); -const QString pl_pRotation = QStringLiteral("pRotation"); -const QString pl_pTilt = QStringLiteral("pTilt"); -const QString pl_pFoldPosition = QStringLiteral("pFoldPosition"); -const QString pl_pName = QStringLiteral("pName"); -const QString pl_pQuantity = QStringLiteral("pQuantity"); -const QString pl_mFabric = QStringLiteral("mFabric"); -const QString pl_mLining = QStringLiteral("mLining"); -const QString pl_mInterfacing = QStringLiteral("mInterfacing"); -const QString pl_mInterlining = QStringLiteral("mInterlining"); -const QString pl_wCut = QStringLiteral("wCut"); -const QString pl_wOnFold = QStringLiteral("wOnFold"); -const QString pl_measurement = QStringLiteral("measurement_"); -const QString pl_finalMeasurement = QStringLiteral("finalMeasurement_"); - -const QString cursorArrowOpenHand = QStringLiteral("://cursor/cursor-arrow-openhand.png"); -const QString cursorArrowCloseHand = QStringLiteral("://cursor/cursor-arrow-closehand.png"); - -const QString unitMM = QStringLiteral("mm"); -const QString unitCM = QStringLiteral("cm"); -const QString unitINCH = QStringLiteral("inch"); -const QString unitPX = QStringLiteral("px"); - -const QString valentinaNamespace = QStringLiteral("valentina"); - //--------------------------------------------------------------------------------------------------------------------- QPixmap QPixmapFromCache(const QString &pixmapPath) { @@ -408,10 +282,6 @@ void InitHighDpiScaling(int argc, char *argv[]) } } -const QString strOne = QStringLiteral("one"); -const QString strTwo = QStringLiteral("two"); -const QString strThree = QStringLiteral("three"); - Q_GLOBAL_STATIC_WITH_ARGS(const QString, strTMark, (QLatin1String("tMark"))) Q_GLOBAL_STATIC_WITH_ARGS(const QString, strVMark, (QLatin1String("vMark"))) Q_GLOBAL_STATIC_WITH_ARGS(const QString, strVMark2, (QLatin1String("vMark2"))) @@ -475,18 +345,6 @@ PassmarkLineType StringToPassmarkLineType(const QString &value) return PassmarkLineType::OneLine; } -const QString strStraightforward = QStringLiteral("straightforward"); -const QString strBisector = QStringLiteral("bisector"); -const QString strIntersection = QStringLiteral("intersection"); -const QString strIntersectionOnlyLeft = QStringLiteral("intersectionLeft"); -const QString strIntersectionOnlyRight = QStringLiteral("intersectionRight"); -const QString strIntersection2 = QStringLiteral("intersection2"); -const QString strIntersection2OnlyLeft = QStringLiteral("intersection2Left"); -const QString strIntersection2OnlyRight = QStringLiteral("intersection2Right"); -const QString strTypeIncrement = QStringLiteral("increment"); -const QString strTypeSeparator = QStringLiteral("separator"); -const QString strTypeMeasurement = QStringLiteral("measurement"); - //--------------------------------------------------------------------------------------------------------------------- QString PassmarkAngleTypeToString(PassmarkAngleType type) { diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h index bf85b0948..2b80a7ef3 100644 --- a/src/libs/vmisc/def.h +++ b/src/libs/vmisc/def.h @@ -43,7 +43,6 @@ #include #include -#include "literals.h" #include "debugbreak.h" #include "defglobal.h" @@ -366,131 +365,9 @@ if (!(cond)) \ bool IsOptionSet(int argc, char *argv[], const char *option); void InitHighDpiScaling(int argc, char *argv[]); -// functions -extern const QString degTorad_F; -extern const QString radTodeg_F; -extern const QString sin_F; -extern const QString cos_F; -extern const QString tan_F; -extern const QString asin_F; -extern const QString acos_F; -extern const QString atan_F; -extern const QString sinh_F; -extern const QString cosh_F; -extern const QString tanh_F; -extern const QString asinh_F; -extern const QString acosh_F; -extern const QString atanh_F; -extern const QString sinD_F; -extern const QString cosD_F; -extern const QString tanD_F; -extern const QString asinD_F; -extern const QString acosD_F; -extern const QString atanD_F; -extern const QString log2_F; -extern const QString log10_F; -extern const QString log_F; -extern const QString ln_F; -extern const QString exp_F; -extern const QString sqrt_F; -extern const QString sign_F; -extern const QString rint_F; -extern const QString r2cm_F; -extern const QString csrCm_F; -extern const QString csrInch_F; -extern const QString abs_F; -extern const QString min_F; -extern const QString max_F; -extern const QString sum_F; -extern const QString avg_F; -extern const QString fmod_F; -extern const QString warning_F; - -extern const QStringList builInFunctions; - -// Placeholders -extern const QString pl_height; -extern const QString pl_size; -extern const QString pl_waist; -extern const QString pl_hip; - -extern const QString pl_heightLabel; -extern const QString pl_sizeLabel; -extern const QString pl_hipLabel; -extern const QString pl_waistLabel; - -extern const QString pl_dimensionX; -extern const QString pl_dimensionY; -extern const QString pl_dimensionW; -extern const QString pl_dimensionZ; - -extern const QString pl_dimensionXLabel; -extern const QString pl_dimensionYLabel; -extern const QString pl_dimensionWLabel; -extern const QString pl_dimensionZLabel; - -extern const QString pl_date; -extern const QString pl_time; -extern const QString pl_birthDate; -extern const QString pl_patternName; -extern const QString pl_patternNumber; -extern const QString pl_author; -extern const QString pl_customer; -extern const QString pl_email; -extern const QString pl_userMaterial; -extern const QString pl_pExt; -extern const QString pl_pUnits; -extern const QString pl_pFileName; -extern const QString pl_mFileName; -extern const QString pl_mExt; -extern const QString pl_mUnits; -extern const QString pl_mSizeUnits; -extern const QString pl_pLetter; -extern const QString pl_pAnnotation; -extern const QString pl_pOrientation; -extern const QString pl_pRotation; -extern const QString pl_pTilt; -extern const QString pl_pFoldPosition; -extern const QString pl_pName; -extern const QString pl_pQuantity; -extern const QString pl_mFabric; -extern const QString pl_mLining; -extern const QString pl_mInterfacing; -extern const QString pl_mInterlining; -extern const QString pl_wCut; -extern const QString pl_wOnFold; -extern const QString pl_measurement; -extern const QString pl_finalMeasurement; - // Don't forget to syncronize with XSD schema. const int userMaterialPlaceholdersQuantity = 20; -extern const QString cursorArrowOpenHand; -extern const QString cursorArrowCloseHand; - -extern const QString strOne; -extern const QString strTwo; -extern const QString strThree; - -extern const QString strStraightforward; -extern const QString strBisector; -extern const QString strIntersection; -extern const QString strIntersectionOnlyLeft; -extern const QString strIntersectionOnlyRight; -extern const QString strIntersection2; -extern const QString strIntersection2OnlyLeft; -extern const QString strIntersection2OnlyRight; -extern const QString strTypeIncrement; -extern const QString strTypeSeparator; -extern const QString strTypeMeasurement; - -extern const QString unitMM; -extern const QString unitCM; -extern const QString unitINCH; -extern const QString unitPX; - -extern const QString valentinaNamespace; - QPixmap QPixmapFromCache(const QString &pixmapPath); void SetItemOverrideCursor(QGraphicsItem *item, const QString & pixmapPath, int hotX = -1, int hotY = -1); diff --git a/src/libs/vmisc/literals.cpp b/src/libs/vmisc/literals.cpp index a0faaaa90..ab9f672c6 100644 --- a/src/libs/vmisc/literals.cpp +++ b/src/libs/vmisc/literals.cpp @@ -27,6 +27,9 @@ *************************************************************************/ #include "literals.h" +#include +#include + const QString LONG_OPTION_NO_HDPI_SCALING = QStringLiteral("no-scaling"); const QString editDeleteIcon = QStringLiteral("edit-delete"); @@ -34,3 +37,146 @@ const QString preferencesOtherIcon = QStringLiteral("preferences-other"); const QString degreeSymbol = QStringLiteral("°"); const QString trueStr = QStringLiteral("true"); const QString falseStr = QStringLiteral("false"); + +//functions +const QString degTorad_F = QStringLiteral("degTorad"); +const QString radTodeg_F = QStringLiteral("radTodeg"); +const QString sin_F = QStringLiteral("sin"); +const QString cos_F = QStringLiteral("cos"); +const QString tan_F = QStringLiteral("tan"); +const QString asin_F = QStringLiteral("asin"); +const QString acos_F = QStringLiteral("acos"); +const QString atan_F = QStringLiteral("atan"); +const QString sinh_F = QStringLiteral("sinh"); +const QString cosh_F = QStringLiteral("cosh"); +const QString tanh_F = QStringLiteral("tanh"); +const QString asinh_F = QStringLiteral("asinh"); +const QString acosh_F = QStringLiteral("acosh"); +const QString atanh_F = QStringLiteral("atanh"); +const QString sinD_F = QStringLiteral("sinD"); +const QString cosD_F = QStringLiteral("cosD"); +const QString tanD_F = QStringLiteral("tanD"); +const QString asinD_F = QStringLiteral("asinD"); +const QString acosD_F = QStringLiteral("acosD"); +const QString atanD_F = QStringLiteral("atanD"); +const QString log2_F = QStringLiteral("log2"); +const QString log10_F = QStringLiteral("log10"); +const QString log_F = QStringLiteral("log"); +const QString ln_F = QStringLiteral("ln"); +const QString exp_F = QStringLiteral("exp"); +const QString sqrt_F = QStringLiteral("sqrt"); +const QString sign_F = QStringLiteral("sign"); +const QString rint_F = QStringLiteral("rint"); +const QString r2cm_F = QStringLiteral("r2cm"); +const QString csrCm_F = QStringLiteral("csrCm"); +const QString csrInch_F = QStringLiteral("csrInch"); +const QString abs_F = QStringLiteral("abs"); +const QString min_F = QStringLiteral("min"); +const QString max_F = QStringLiteral("max"); +const QString sum_F = QStringLiteral("sum"); +const QString avg_F = QStringLiteral("avg"); +const QString fmod_F = QStringLiteral("fmod"); +const QString warning_F = QStringLiteral("warning"); + +const QStringList builInFunctions +{ + degTorad_F, radTodeg_F, + sin_F, cos_F, tan_F, + asin_F, acos_F, atan_F, + sinh_F, cosh_F, tanh_F, + asinh_F, acosh_F, atanh_F, + sinD_F, cosD_F, tanD_F, + asinD_F, acosD_F, atanD_F, + log2_F, log10_F, log_F, + ln_F, + exp_F, + sqrt_F, + sign_F, + rint_F, r2cm_F, + csrCm_F, csrInch_F, + abs_F, + min_F, max_F, + sum_F, + avg_F, + fmod_F, + warning_F +}; + +const QString pl_size = QStringLiteral("size"); +const QString pl_height = QStringLiteral("height"); +const QString pl_hip = QStringLiteral("hip"); +const QString pl_waist = QStringLiteral("waist"); + +const QString pl_sizeLabel = QStringLiteral("sizeLabel"); +const QString pl_heightLabel = QStringLiteral("heightLabel"); +const QString pl_hipLabel = QStringLiteral("hipLabel"); +const QString pl_waistLabel = QStringLiteral("waistLabel"); + +const QString pl_dimensionX = QStringLiteral("dimensionX"); +const QString pl_dimensionY = QStringLiteral("dimensionY"); +const QString pl_dimensionW = QStringLiteral("dimensionW"); +const QString pl_dimensionZ = QStringLiteral("dimensionZ"); + +const QString pl_dimensionXLabel = QStringLiteral("dimensionXLabel"); +const QString pl_dimensionYLabel = QStringLiteral("dimensionYLabel"); +const QString pl_dimensionWLabel = QStringLiteral("dimensionWLabel"); +const QString pl_dimensionZLabel = QStringLiteral("dimensionZLabel"); + +const QString pl_date = QStringLiteral("date"); +const QString pl_time = QStringLiteral("time"); +const QString pl_birthDate = QStringLiteral("birthDate"); +const QString pl_patternName = QStringLiteral("patternName"); +const QString pl_patternNumber = QStringLiteral("patternNumber"); +const QString pl_author = QStringLiteral("author"); +const QString pl_customer = QStringLiteral("customer"); +const QString pl_email = QStringLiteral("email"); +const QString pl_userMaterial = QStringLiteral("userMaterial"); +const QString pl_pExt = QStringLiteral("pExt"); +const QString pl_pUnits = QStringLiteral("pUnits"); +const QString pl_pFileName = QStringLiteral("pFileName"); +const QString pl_mFileName = QStringLiteral("mFileName"); +const QString pl_mExt = QStringLiteral("mExt"); +const QString pl_mUnits = QStringLiteral("mUnits"); +const QString pl_mSizeUnits = QStringLiteral("mSizeUnits"); +const QString pl_pLetter = QStringLiteral("pLetter"); +const QString pl_pAnnotation = QStringLiteral("pAnnotation"); +const QString pl_pOrientation = QStringLiteral("pOrientation"); +const QString pl_pRotation = QStringLiteral("pRotation"); +const QString pl_pTilt = QStringLiteral("pTilt"); +const QString pl_pFoldPosition = QStringLiteral("pFoldPosition"); +const QString pl_pName = QStringLiteral("pName"); +const QString pl_pQuantity = QStringLiteral("pQuantity"); +const QString pl_mFabric = QStringLiteral("mFabric"); +const QString pl_mLining = QStringLiteral("mLining"); +const QString pl_mInterfacing = QStringLiteral("mInterfacing"); +const QString pl_mInterlining = QStringLiteral("mInterlining"); +const QString pl_wCut = QStringLiteral("wCut"); +const QString pl_wOnFold = QStringLiteral("wOnFold"); +const QString pl_measurement = QStringLiteral("measurement_"); +const QString pl_finalMeasurement = QStringLiteral("finalMeasurement_"); + +const QString cursorArrowOpenHand = QStringLiteral("://cursor/cursor-arrow-openhand.png"); +const QString cursorArrowCloseHand = QStringLiteral("://cursor/cursor-arrow-closehand.png"); + +const QString strOne = QStringLiteral("one"); +const QString strTwo = QStringLiteral("two"); +const QString strThree = QStringLiteral("three"); + +const QString strStraightforward = QStringLiteral("straightforward"); +const QString strBisector = QStringLiteral("bisector"); +const QString strIntersection = QStringLiteral("intersection"); +const QString strIntersectionOnlyLeft = QStringLiteral("intersectionLeft"); +const QString strIntersectionOnlyRight = QStringLiteral("intersectionRight"); +const QString strIntersection2 = QStringLiteral("intersection2"); +const QString strIntersection2OnlyLeft = QStringLiteral("intersection2Left"); +const QString strIntersection2OnlyRight = QStringLiteral("intersection2Right"); +const QString strTypeIncrement = QStringLiteral("increment"); +const QString strTypeSeparator = QStringLiteral("separator"); +const QString strTypeMeasurement = QStringLiteral("measurement"); + +const QString unitMM = QStringLiteral("mm"); +const QString unitCM = QStringLiteral("cm"); +const QString unitINCH = QStringLiteral("inch"); +const QString unitPX = QStringLiteral("px"); + +const QString valentinaNamespace = QStringLiteral("valentina"); diff --git a/src/libs/vmisc/literals.h b/src/libs/vmisc/literals.h index d20a07865..008e28d01 100644 --- a/src/libs/vmisc/literals.h +++ b/src/libs/vmisc/literals.h @@ -28,7 +28,8 @@ #ifndef LITERALS_H #define LITERALS_H -#include +class QString; +class QStringList; // From documantation: If you use QStringLiteral you should avoid declaring the same literal in multiple places: This // furthermore blows up the binary sizes. @@ -41,4 +42,126 @@ extern const QString degreeSymbol; extern const QString trueStr; extern const QString falseStr; +// functions +extern const QString degTorad_F; +extern const QString radTodeg_F; +extern const QString sin_F; +extern const QString cos_F; +extern const QString tan_F; +extern const QString asin_F; +extern const QString acos_F; +extern const QString atan_F; +extern const QString sinh_F; +extern const QString cosh_F; +extern const QString tanh_F; +extern const QString asinh_F; +extern const QString acosh_F; +extern const QString atanh_F; +extern const QString sinD_F; +extern const QString cosD_F; +extern const QString tanD_F; +extern const QString asinD_F; +extern const QString acosD_F; +extern const QString atanD_F; +extern const QString log2_F; +extern const QString log10_F; +extern const QString log_F; +extern const QString ln_F; +extern const QString exp_F; +extern const QString sqrt_F; +extern const QString sign_F; +extern const QString rint_F; +extern const QString r2cm_F; +extern const QString csrCm_F; +extern const QString csrInch_F; +extern const QString abs_F; +extern const QString min_F; +extern const QString max_F; +extern const QString sum_F; +extern const QString avg_F; +extern const QString fmod_F; +extern const QString warning_F; + +extern const QStringList builInFunctions; + +// Placeholders +extern const QString pl_height; +extern const QString pl_size; +extern const QString pl_waist; +extern const QString pl_hip; + +extern const QString pl_heightLabel; +extern const QString pl_sizeLabel; +extern const QString pl_hipLabel; +extern const QString pl_waistLabel; + +extern const QString pl_dimensionX; +extern const QString pl_dimensionY; +extern const QString pl_dimensionW; +extern const QString pl_dimensionZ; + +extern const QString pl_dimensionXLabel; +extern const QString pl_dimensionYLabel; +extern const QString pl_dimensionWLabel; +extern const QString pl_dimensionZLabel; + +extern const QString pl_date; +extern const QString pl_time; +extern const QString pl_birthDate; +extern const QString pl_patternName; +extern const QString pl_patternNumber; +extern const QString pl_author; +extern const QString pl_customer; +extern const QString pl_email; +extern const QString pl_userMaterial; +extern const QString pl_pExt; +extern const QString pl_pUnits; +extern const QString pl_pFileName; +extern const QString pl_mFileName; +extern const QString pl_mExt; +extern const QString pl_mUnits; +extern const QString pl_mSizeUnits; +extern const QString pl_pLetter; +extern const QString pl_pAnnotation; +extern const QString pl_pOrientation; +extern const QString pl_pRotation; +extern const QString pl_pTilt; +extern const QString pl_pFoldPosition; +extern const QString pl_pName; +extern const QString pl_pQuantity; +extern const QString pl_mFabric; +extern const QString pl_mLining; +extern const QString pl_mInterfacing; +extern const QString pl_mInterlining; +extern const QString pl_wCut; +extern const QString pl_wOnFold; +extern const QString pl_measurement; +extern const QString pl_finalMeasurement; + +extern const QString cursorArrowOpenHand; +extern const QString cursorArrowCloseHand; + +extern const QString strOne; +extern const QString strTwo; +extern const QString strThree; + +extern const QString strStraightforward; +extern const QString strBisector; +extern const QString strIntersection; +extern const QString strIntersectionOnlyLeft; +extern const QString strIntersectionOnlyRight; +extern const QString strIntersection2; +extern const QString strIntersection2OnlyLeft; +extern const QString strIntersection2OnlyRight; +extern const QString strTypeIncrement; +extern const QString strTypeSeparator; +extern const QString strTypeMeasurement; + +extern const QString unitMM; +extern const QString unitCM; +extern const QString unitINCH; +extern const QString unitPX; + +extern const QString valentinaNamespace; + #endif // LITERALS_H diff --git a/src/libs/vmisc/vcommonsettings.cpp b/src/libs/vmisc/vcommonsettings.cpp index 5c1b53ad9..9ba358ee9 100644 --- a/src/libs/vmisc/vcommonsettings.cpp +++ b/src/libs/vmisc/vcommonsettings.cpp @@ -47,6 +47,7 @@ #include "../vmisc/def.h" #include "../vmisc/vmath.h" #include "../vmisc/compatibility.h" +#include "../vmisc/literals.h" #include "../vpatterndb/pmsystems.h" const int VCommonSettings::defaultScrollingDuration = 300; diff --git a/src/libs/vpatterndb/vcontainer.cpp b/src/libs/vpatterndb/vcontainer.cpp index 039b5d3e2..07a1bde22 100644 --- a/src/libs/vpatterndb/vcontainer.cpp +++ b/src/libs/vpatterndb/vcontainer.cpp @@ -45,6 +45,7 @@ #include "../vgeometry/vellipticalarc.h" #include "../vmisc/diagnostic.h" #include "../vmisc/vabstractapplication.h" +#include "../vmisc/literals.h" #include "variables/varcradius.h" #include "variables/vcurveangle.h" #include "variables/vcurvelength.h" diff --git a/src/libs/vpatterndb/vtranslatevars.cpp b/src/libs/vpatterndb/vtranslatevars.cpp index 0c42f39fd..6528bda01 100644 --- a/src/libs/vpatterndb/vtranslatevars.cpp +++ b/src/libs/vpatterndb/vtranslatevars.cpp @@ -42,6 +42,7 @@ #include "../vpatterndb/vtranslatevars.h" #include "../vmisc/def.h" #include "../vmisc/vabstractapplication.h" +#include "../vmisc/literals.h" #include "vtranslatemeasurements.h" #include "pmsystems.h" diff --git a/src/libs/vtools/dialogs/tools/piece/dialogpatternmaterials.cpp b/src/libs/vtools/dialogs/tools/piece/dialogpatternmaterials.cpp index 11257e68c..7c2923e12 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogpatternmaterials.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogpatternmaterials.cpp @@ -33,6 +33,7 @@ #include "../vmisc/vabstractvalapplication.h" #include "../vwidgets/vcomboboxdelegate.h" #include "../vmisc/vvalentinasettings.h" +#include "../vmisc/literals.h" namespace { diff --git a/src/libs/vwidgets/vcontrolpointspline.cpp b/src/libs/vwidgets/vcontrolpointspline.cpp index 4fdb3a1ed..523d0c9e2 100644 --- a/src/libs/vwidgets/vcontrolpointspline.cpp +++ b/src/libs/vwidgets/vcontrolpointspline.cpp @@ -46,6 +46,7 @@ #include "../vwidgets/global.h" #include "../vgeometry/vgobject.h" #include "../vmisc/vabstractapplication.h" +#include "../vmisc/literals.h" #include "vmaingraphicsscene.h" #include "vmaingraphicsview.h" #include "vgraphicssimpletextitem.h" diff --git a/src/libs/vwidgets/vgrainlineitem.cpp b/src/libs/vwidgets/vgrainlineitem.cpp index d6437afa9..b4e57545e 100644 --- a/src/libs/vwidgets/vgrainlineitem.cpp +++ b/src/libs/vwidgets/vgrainlineitem.cpp @@ -38,6 +38,7 @@ #include "../vmisc/def.h" #include "../vmisc/vmath.h" #include "../vmisc/vabstractvalapplication.h" +#include "../vmisc/literals.h" #include "global.h" #include "vgrainlineitem.h" diff --git a/src/libs/vwidgets/vgraphicssimpletextitem.cpp b/src/libs/vwidgets/vgraphicssimpletextitem.cpp index c218f2afa..0a94db7c6 100644 --- a/src/libs/vwidgets/vgraphicssimpletextitem.cpp +++ b/src/libs/vwidgets/vgraphicssimpletextitem.cpp @@ -49,6 +49,7 @@ #include "vscenepoint.h" #include "../vmisc/vmath.h" #include "../vmisc/vabstractvalapplication.h" +#include "../vmisc/literals.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/libs/vwidgets/vmaingraphicsview.cpp b/src/libs/vwidgets/vmaingraphicsview.cpp index daacb96ab..5ae5a1415 100644 --- a/src/libs/vwidgets/vmaingraphicsview.cpp +++ b/src/libs/vwidgets/vmaingraphicsview.cpp @@ -59,6 +59,7 @@ #include "vcontrolpointspline.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" +#include "../vmisc/literals.h" #include "vabstractmainwindow.h" #include "global.h" #include "../ifc/xml/utils.h" diff --git a/src/libs/vwidgets/vtextgraphicsitem.cpp b/src/libs/vwidgets/vtextgraphicsitem.cpp index bf1e79a67..66f969ebd 100644 --- a/src/libs/vwidgets/vtextgraphicsitem.cpp +++ b/src/libs/vwidgets/vtextgraphicsitem.cpp @@ -41,6 +41,7 @@ #include "../vmisc/def.h" #include "../vmisc/vmath.h" +#include "../vmisc/literals.h" #include "vtextgraphicsitem.h" const qreal resizeSquare = (3./*mm*/ / 25.4) * PrintDPI; diff --git a/src/test/TranslationsTest/tst_buitinregexp.cpp b/src/test/TranslationsTest/tst_buitinregexp.cpp index 099f3440e..e65af2a60 100644 --- a/src/test/TranslationsTest/tst_buitinregexp.cpp +++ b/src/test/TranslationsTest/tst_buitinregexp.cpp @@ -30,6 +30,7 @@ #include "../qmuparser/qmudef.h" #include "../vpatterndb/vtranslatevars.h" #include "../ifc/ifcdef.h" +#include "../vmisc/literals.h" #include #include