aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-11-08 15:08:59 +02:00
parent 6336a94bd5
commit 90bc077679
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/ifc/xml/vdomdocument.cpp
View File

@ -1151,7 +1151,7 @@ void VDomDocument::ValidateVersion(const QString &version)
const QRegularExpression rx(QStringLiteral("^([0-9]|[1-9][0-9]|[1-2][0-5][0-5]).([0-9]|[1-9][0-9]|[1-2][0-5][0-5])" const QRegularExpression rx(QStringLiteral("^([0-9]|[1-9][0-9]|[1-2][0-5][0-5]).([0-9]|[1-9][0-9]|[1-2][0-5][0-5])"
".([0-9]|[1-9][0-9]|[1-2][0-5][0-5])$")); ".([0-9]|[1-9][0-9]|[1-2][0-5][0-5])$"));
if (rx.match(version).hasMatch() == false) if (!rx.match(version).hasMatch())
{ {
const QString errorMsg(tr("Version \"%1\" invalid.").arg(version)); const QString errorMsg(tr("Version \"%1\" invalid.").arg(version));
throw VException(errorMsg); throw VException(errorMsg);

9
src/libs/vtools/tools/drawTools/vdrawtool.cpp
View File

@ -42,7 +42,6 @@
#include "../ifc/ifcdef.h" #include "../ifc/ifcdef.h"
#include "../ifc/xml/vabstractpattern.h" #include "../ifc/xml/vabstractpattern.h"
#include "../ifc/xml/vdomdocument.h" #include "../ifc/xml/vdomdocument.h"
#include "../qmuparser/qmuparsererror.h"
#include "../vabstracttool.h" #include "../vabstracttool.h"
#include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vcontainer.h"
@ -128,7 +127,7 @@ void VDrawTool::ApplyToolOptions(const QList<quint32> &oldDependencies, const QL
{ {
if (newDependencies != oldDependencies || not VDomDocument::Compare(newDomElement, oldDomElement)) if (newDependencies != oldDependencies || not VDomDocument::Compare(newDomElement, oldDomElement))
{ {
SaveToolOptions *saveOptions = auto *saveOptions =
new SaveToolOptions(oldDomElement, newDomElement, oldDependencies, newDependencies, doc, m_id); new SaveToolOptions(oldDomElement, newDomElement, oldDependencies, newDependencies, doc, m_id);
connect(saveOptions, &SaveToolOptions::NeedLiteParsing, doc, &VAbstractPattern::LiteParseTree); connect(saveOptions, &SaveToolOptions::NeedLiteParsing, doc, &VAbstractPattern::LiteParseTree);
VAbstractApplication::VApp()->getUndoStack()->push(saveOptions); VAbstractApplication::VApp()->getUndoStack()->push(saveOptions);
@ -158,7 +157,7 @@ void VDrawTool::SaveOption(QSharedPointer<VGObject> &obj)
SaveOptions(newDomElement, obj); SaveOptions(newDomElement, obj);
SaveToolOptions *saveOptions = auto *saveOptions =
new SaveToolOptions(oldDomElement, newDomElement, QList<quint32>(), QList<quint32>(), doc, m_id); new SaveToolOptions(oldDomElement, newDomElement, QList<quint32>(), QList<quint32>(), doc, m_id);
connect(saveOptions, &SaveToolOptions::NeedLiteParsing, doc, &VAbstractPattern::LiteParseTree); connect(saveOptions, &SaveToolOptions::NeedLiteParsing, doc, &VAbstractPattern::LiteParseTree);
VAbstractApplication::VApp()->getUndoStack()->push(saveOptions); VAbstractApplication::VApp()->getUndoStack()->push(saveOptions);
@ -220,7 +219,7 @@ void VDrawTool::ReadAttributes()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VDrawTool::ReadToolAttributes(const QDomElement &domElement) void VDrawTool::ReadToolAttributes(const QDomElement &domElement)
{ {
m_notes = doc->GetParametrEmptyString(domElement, AttrNotes); m_notes = VDomDocument::GetParametrEmptyString(domElement, AttrNotes);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -257,7 +256,7 @@ void VDrawTool::AddToCalculation(const QDomElement &domElement)
throw VExceptionWrongId(tr("This id (%1) is not unique.").arg(m_id), duplicate); throw VExceptionWrongId(tr("This id (%1) is not unique.").arg(m_id), duplicate);
} }
AddToCalc *addToCal = new AddToCalc(domElement, doc); auto *addToCal = new AddToCalc(domElement, doc);
connect(addToCal, &AddToCalc::NeedFullParsing, doc, &VAbstractPattern::NeedFullParsing); connect(addToCal, &AddToCalc::NeedFullParsing, doc, &VAbstractPattern::NeedFullParsing);
VAbstractApplication::VApp()->getUndoStack()->push(addToCal); VAbstractApplication::VApp()->getUndoStack()->push(addToCal);
} }