palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-07-07 19:46:09 +02:00
Code Issues Projects Releases Wiki Activity

Refactoring.

Browse source 
Code style.
This commit is contained in:
Roman Telezhynskyi 2023-08-13 10:51:54 +03:00
parent be2aaf5cdf
commit 7f332548c2
2 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libs/vlayout/vposter.cpp
View file

@ -371,10 +371,8 @@ auto VPoster::CountRows(int height, PageOrientation orientation) const -> int
{ {
return 1; return 1;
} }
else
{
return qCeil(imgLength / (pageLength - static_cast<int>(allowance))); return qCeil(imgLength / (pageLength - static_cast<int>(allowance)));
}
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -396,10 +394,8 @@ auto VPoster::CountColumns(int width, PageOrientation orientation) const -> int
{ {
return 1; return 1;
} }
else
{
return qCeil(imgLength / (pageLength - static_cast<int>(allowance))); return qCeil(imgLength / (pageLength - static_cast<int>(allowance)));
}
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

22
src/test/ValentinaTest/tst_qmutokenparser.cpp
View file

@ -27,8 +27,8 @@
*************************************************************************/ *************************************************************************/
#include "tst_qmutokenparser.h" #include "tst_qmutokenparser.h"
#include "../qmuparser/qmutokenparser.h"
#include "../qmuparser/qmudef.h" #include "../qmuparser/qmudef.h"
#include "../qmuparser/qmutokenparser.h"
#include <QtTest> #include <QtTest>
@ -84,7 +84,7 @@ void TST_QmuTokenParser::TokenFromUser_data()
const QList<QLocale> allLocales = const QList<QLocale> allLocales =
QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript, QLocale::AnyCountry); QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript, QLocale::AnyCountry);
for(const auto &locale : allLocales) for (const auto &locale : allLocales)
{ {
if (not SupportedLocale(locale)) if (not SupportedLocale(locale))
{ {
@ -121,15 +121,15 @@ void TST_QmuTokenParser::PrepareVal(qreal val, const QLocale &locale)
QString tag = QString("%1. String '%2'").arg(locale.name(), string); QString tag = QString("%1. String '%2'").arg(locale.name(), string);
QTest::newRow(qUtf8Printable(tag)) << string << true << locale; QTest::newRow(qUtf8Printable(tag)) << string << true << locale;
string = formula+QLatin1String("+"); string = formula + QLatin1String("+");
tag = QString("%1. String '%2'").arg(locale.name(), string); tag = QString("%1. String '%2'").arg(locale.name(), string);
QTest::newRow(qUtf8Printable(tag)) << string << false << locale; QTest::newRow(qUtf8Printable(tag)) << string << false << locale;
string = formula+QLatin1String("+")+formula; string = formula + QLatin1String("+") + formula;
tag = QString("%1. String '%2'").arg(locale.name(), string); tag = QString("%1. String '%2'").arg(locale.name(), string);
QTest::newRow(qUtf8Printable(tag)) << string << false << locale; QTest::newRow(qUtf8Printable(tag)) << string << false << locale;
string = formula+QString("+б"); string = formula + QString("+б");
tag = QString("%1. String '%2'").arg(locale.name(), string); tag = QString("%1. String '%2'").arg(locale.name(), string);
QTest::newRow(qUtf8Printable(tag)) << string << false << locale; QTest::newRow(qUtf8Printable(tag)) << string << false << locale;
} }
@ -139,22 +139,22 @@ auto TST_QmuTokenParser::IsSingleFromUser(const QString &formula) -> bool
{ {
if (formula.isEmpty()) if (formula.isEmpty())
{ {
return false;// if don't know say no return false; // if don't know say no
} }
QMap<vsizetype, QString> tokens; QMap<qmusizetype, QString> tokens;
QMap<vsizetype, QString> numbers; QMap<qmusizetype, QString> numbers;
try try
{ {
QScopedPointer<qmu::QmuTokenParser> cal(new qmu::QmuTokenParser(formula, true, true)); QScopedPointer<qmu::QmuTokenParser> cal(new qmu::QmuTokenParser(formula, true, true));
tokens = cal->GetTokens();// Tokens (variables, measurements) tokens = cal->GetTokens(); // Tokens (variables, measurements)
numbers = cal->GetNumbers();// All numbers in expression numbers = cal->GetNumbers(); // All numbers in expression
} }
catch (const qmu::QmuParserError &e) catch (const qmu::QmuParserError &e)
{ {
Q_UNUSED(e) Q_UNUSED(e)
return false;// something wrong with formula, say no return false; // something wrong with formula, say no
} }
// Remove "-" from tokens list if exist. If don't do that unary minus operation will broken. // Remove "-" from tokens list if exist. If don't do that unary minus operation will broken.