diff --git a/src/app/container/calculator.cpp b/src/app/container/calculator.cpp index 5fac47f0a..0178def70 100644 --- a/src/app/container/calculator.cpp +++ b/src/app/container/calculator.cpp @@ -182,18 +182,19 @@ void Calculator::InitCharacterSets() { //String with all unique symbols for supported alpabets. // See script alphabets.py for generation and more information. - const QString symbols = QStringLiteral("ցЀĆЈVӧĎАғΕĖӅИқΝĞơРңњΥĦШҫ̆جگĮаҳѕεشԶиһνԾрυلՆӝшËՎҔPÓՖXӛӟŞӣզhëծpóӞնxßվāŁЃֆĉЋCŬđ\ - ҐГΒęҘЛΚŘġҠУGاհЫدԱҰгβطԹõлκKՁÀуςهՉÈыvیՑÐSOřӘћաőcӐթèkàѓżűðsķչøӥӔĀփїІĈЎґĐΗЖҙĘȚ\ - ΟОҡĠآΧЦتЮұİزηжԸغοоÁՀقχцÉՈيюÑՐђӋіәťӆўáŠĺѐfөըnñŰӤӨӹոľЁրăЉŭċБӸēłΔҖЙŤěΜӜDСձģΤӰ\ - ЩīņحҮбưԳصδHйԻŇμӲӴсՃمτƠщՋєLQŹՓŕÖYśÞaգĽæiŽիӓîqճöyջþĂօЄӦĊЌΑĒДҗјΙȘĚМΡéĵĢФūӚΩبĪ\ - ЬүќαذԲдҷιظԺмρՂфÇωوՊьÏՒTŚĻJբdçժlïӪղtպӫAւąЇčŃЏĕӯЗΖEțŮĝПΞأĥĹЧΦثÆӳЯIسŲԵзζԽпξكՅ\ - ÄчφNMՍӌяӢՕÔWÎŝÜџёźեägխoӒյôwĶBžսüЂĄև̈ЊČƏљΓВҕĔӮΛКĜΣТҥĤکЪƯخγвŅԴŪضλкԼĴσтÅՄنъÍՌR\ - ӕՔZÝŜbåդﻩjíլļrӵմzýռپêЅքćچЍďӱҒЕůėژșΘØҚНğńءΠFҢХħΨҪЭųįҶرҲеԷňعθҺнԿفπÂхՇψÊэšՏÒU\ - əÚѝŻşҤӑâeէŐımկòuշÕúտŔ"); + //Note. MSVC doen't support normal string concatenation for long string. Thats why we use QStringList in this place. + QStringList symbols = QStringList() << "ցЀĆЈVӧĎАғΕĖӅИқΝĞơРңњΥĦШҫ̆جگĮаҳѕεشԶиһνԾрυلՆӝшËՎҔPÓՖXӛӟŞӣզhëծpóӞնxßվāŁЃֆĉЋ" + << "CŬđҐГΒęҘЛΚŘġҠУGاհЫدԱҰгβطԹõлκKՁÀуςهՉÈыvیՑÐSOřӘћաőcӐթèkàѓżűðsķչøӥӔĀփїІĈЎ" + << "ґĐΗЖҙĘȚΟОҡĠآΧЦتЮұİزηжԸغοоÁՀقχцÉՈيюÑՐђӋіәťӆўáŠĺѐfөըnñŰӤӨӹոľЁրăЉŭċБӸēłΔҖ" + << "ЙŤěΜӜDСձģΤӰЩīņحҮбưԳصδHйԻŇμӲӴсՃمτƠщՋєLQŹՓŕÖYśÞaգĽæiŽիӓîqճöyջþĂօЄӦĊЌΑĒДҗј" + << "ΙȘĚМΡéĵĢФūӚΩبĪЬүќαذԲдҷιظԺмρՂфÇωوՊьÏՒTŚĻJբdçժlïӪղtպӫAւąЇčŃЏĕӯЗΖEțŮĝПΞأĥ" + << "ثĹЧΦÆӳЯIسŲԵзζԽпξكՅÄчφNMՍӌяӢՕÔWÎŝÜџёźեägխoӒյôwĶBžսüЂĄև̈ЊČƏљΓВҕĔӮΛКĜΣТҥĤک" + << "ЪƯخγвŅԴŪضλкԼĴσтÅՄنъÍՌRӕՔZÝŜbåդﻩjíլļrӵմzýռپêЅքćچЍďӱҒЕůėژșΘØҚНğńءΠFҢХħΨҪ" + << "ЭųįҶرҲеԷňعθҺнԿفπÂхՇψÊэšՏÒUəÚѝŻşҤӑâeէŐımկòuշÕúտŔ"; // Defining identifier character sets - DefineNameChars(QStringLiteral("0123456789_") + symbols); - DefineOprtChars(symbols + QStringLiteral("+-*^/?<>=#!$%&|~'_")); + DefineNameChars(QStringLiteral("0123456789_") + symbols.join("")); + DefineOprtChars(symbols.join("") + QStringLiteral("+-*^/?<>=#!$%&|~'_")); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/exception/vexception.h b/src/app/exception/vexception.h index 5c6a86a48..e057d8db2 100644 --- a/src/app/exception/vexception.h +++ b/src/app/exception/vexception.h @@ -45,9 +45,9 @@ class VException : public QException public: VException(const QString &what); VException(const VException &e); - Q_NORETURN virtual ~VException() V_NOEXCEPT_EXPR (true){} + virtual ~VException() V_NOEXCEPT_EXPR (true){} - Q_NORETURN virtual void raise() const; + Q_NORETURN virtual void raise() const; // cppcheck-suppress unusedFunction virtual VException *clone() const; virtual QString ErrorMessage() const; diff --git a/src/libs/qmuparser/qmuparserdef.h b/src/libs/qmuparser/qmuparserdef.h index 3296fe35d..cf6ce2652 100644 --- a/src/libs/qmuparser/qmuparserdef.h +++ b/src/libs/qmuparser/qmuparserdef.h @@ -37,15 +37,6 @@ #define QMUP_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" -//// Is noexcept supported? -//#if defined(__clang__) && defined(__has_feature) && __has_feature(cxx_noexcept) || \ -// defined(__GXX_EXPERIMENTAL_CXX0X__) && __GNUC__ * 10 + __GNUC_MINOR__ >= 46 || \ -// defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 180021114 -//# define QMUP_NOEXCEPT_EXPR(x) noexcept(x) -//#else -//# define QMUP_NOEXCEPT_EXPR(x) -//#endif - // Detect whether the compiler supports C++11 noexcept exception specifications. # if defined(__clang__) # if __has_feature(cxx_noexcept)