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

SonarQube warnings.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-09-13 11:52:41 +03:00
parent 851044d37e
commit 39aa43fe8f
64 changed files with 69 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/valentina/dialogs/configpages/preferencespathpage.cpp
View File

@ -93,7 +93,7 @@ void PreferencesPathPage::DefaultPath()
path = VCommonSettings::GetDefPathTemplate();
break;
case 5: // label templates
path = VSettings::GetDefPathLabelTemplate();
path = VCommonSettings::GetDefPathLabelTemplate();
break;
default:
break;

8
src/app/valentina/dialogs/configpages/preferencespatternpage.cpp
View File

@ -138,12 +138,12 @@ void PreferencesPatternPage::EditDateTimeFormats()
QPushButton *button = qobject_cast<QPushButton *>(sender());
if (button == ui->pushButtonEditDateFormats)
{
CallDateTimeFormatEditor(QDate::currentDate(), settings->PredefinedDateFormats(),
CallDateTimeFormatEditor(QDate::currentDate(), VCommonSettings::PredefinedDateFormats(),
settings->GetUserDefinedDateFormats(), ui->comboBoxDateFormats);
}
else if (button == ui->pushButtonEditTimeFormats)
{
CallDateTimeFormatEditor(QTime::currentTime(), settings->PredefinedTimeFormats(),
CallDateTimeFormatEditor(QTime::currentTime(), VCommonSettings::PredefinedTimeFormats(),
settings->GetUserDefinedTimeFormats(), ui->comboBoxTimeFormats);
}
}
@ -166,10 +166,10 @@ void PreferencesPatternPage::InitLabelDateTimeFormats()
VSettings *settings = qApp->ValentinaSettings();
InitComboBoxFormats(ui->comboBoxDateFormats,
VSettings::PredefinedDateFormats() + settings->GetUserDefinedDateFormats(),
VCommonSettings::PredefinedDateFormats() + settings->GetUserDefinedDateFormats(),
settings->GetLabelDateFormat());
InitComboBoxFormats(ui->comboBoxTimeFormats,
VSettings::PredefinedTimeFormats() + settings->GetUserDefinedTimeFormats(),
VCommonSettings::PredefinedTimeFormats() + settings->GetUserDefinedTimeFormats(),
settings->GetLabelTimeFormat());
connect(ui->pushButtonEditDateFormats, &QPushButton::clicked, this, &PreferencesPatternPage::EditDateTimeFormats);

12
src/app/valentina/dialogs/dialogpatternproperties.cpp
View File

@ -191,10 +191,10 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc, VContainer *pat
&DialogPatternProperties::ManagePatternMaterials);
InitComboBoxFormats(ui->comboBoxDateFormat,
VSettings::PredefinedDateFormats() + settings->GetUserDefinedDateFormats(),
VCommonSettings::PredefinedDateFormats() + settings->GetUserDefinedDateFormats(),
doc->GetLabelDateFormat());
InitComboBoxFormats(ui->comboBoxTimeFormat,
VSettings::PredefinedTimeFormats() + settings->GetUserDefinedTimeFormats(),
VCommonSettings::PredefinedTimeFormats() + settings->GetUserDefinedTimeFormats(),
doc->GetLabelTimeFormat());
connect(ui->comboBoxDateFormat, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
@ -824,13 +824,9 @@ void DialogPatternProperties::ChangeImage()
const QString filter = tr("Images") + QLatin1String(" (*.png *.jpg *.jpeg *.bmp)");
const QString fileName = QFileDialog::getOpenFileName(this, tr("Image for pattern"), QString(), filter, nullptr,
QFileDialog::DontUseNativeDialog);
if (not fileName.isEmpty())
{
QImage image;
if (fileName.isEmpty())
{
return;
}
else
{
if (not image.load(fileName))
{
return;

8
src/app/valentina/xml/vpattern.cpp
View File

@ -3067,13 +3067,13 @@ void VPattern::GarbageCollector()
{
// First get next sibling because later will not have chance to get it
QDomElement nextSibling = modNode.nextSibling().toElement();
if (modNode.hasAttribute(VAbstractNode::AttrInUse))
if (modNode.hasAttribute(VAbstractTool::AttrInUse))
{
const NodeUsage inUse = GetParametrUsage(modNode, VAbstractNode::AttrInUse);
const NodeUsage inUse = GetParametrUsage(modNode, VAbstractTool::AttrInUse);
if (inUse == NodeUsage::InUse)
{ // It is dangerous to leave object with attribute 'inUse'
// Each parse should confirm this status.
SetParametrUsage(modNode, VAbstractNode::AttrInUse, NodeUsage::NotInUse);
SetParametrUsage(modNode, VAbstractTool::AttrInUse, NodeUsage::NotInUse);
}
else
{ // Parent was deleted. We do not need this object anymore
@ -3082,7 +3082,7 @@ void VPattern::GarbageCollector()
}
else
{ // Each parse should confirm his status.
SetParametrUsage(modNode, VAbstractNode::AttrInUse, NodeUsage::NotInUse);
SetParametrUsage(modNode, VAbstractTool::AttrInUse, NodeUsage::NotInUse);
}
modNode = nextSibling;

11
src/libs/vpropertyexplorer/vpropertyformview.cpp
View File

@ -135,10 +135,13 @@ void VPE::VPropertyFormView::dataChanged(const QModelIndex &top_left, const QMod
{
Q_UNUSED(top_left)
Q_UNUSED(bottom_right)
if (static_cast<VPropertyFormViewPrivate*>(d_ptr)->IgnoreDataChangedSignal)
{
return;
}
// Ucomment when handle data changes
// if (static_cast<VPropertyFormViewPrivate*>(d_ptr)->IgnoreDataChangedSignal)
// {
// return;
// }
// todo: handle data changes
}

4
src/libs/vpropertyexplorer/vpropertyformwidget.cpp
View File

@ -78,8 +78,8 @@ void VPE::VPropertyFormWidget::build()
d_ptr->EditorWidgets.clear();
if (layout())
{
QLayoutItem *child;
while (layout()->count() > 0 && (child = layout()->takeAt(0)) != nullptr)
QLayoutItem *child = layout()->takeAt(0);
while (layout()->count() > 0 && child != nullptr)
{
if (child->widget())
{

6
src/libs/vpropertyexplorer/vpropertyset.cpp
View File

@ -221,11 +221,7 @@ bool VPE::VPropertySet::hasProperty(VProperty *property, VProperty *parent) cons
const QList<VProperty*>& tmpChildrenList = (parent != nullptr ? parent->getChildren() : d_ptr->RootProperties);
foreach(VProperty* tmpProp, tmpChildrenList)
{
if (!tmpProp)
{
continue;
}
else if (tmpProp == property || hasProperty(property, tmpProp))
if (tmpProp && (tmpProp == property || hasProperty(property, tmpProp)))
{
return true;
}

1
src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp
View File

@ -222,7 +222,6 @@ void DialogEditWrongFormula::ValChanged(int row)
if (ui->radioButtonFunctions->isChecked())
{
ui->labelDescription->setText(item->toolTip());
return;
}
}

3
src/libs/vtools/dialogs/tools/dialoguniondetails.cpp
View File

@ -177,7 +177,6 @@ void DialogUnionDetails::ChoosedDetail(const quint32 &id, const SceneObject &typ
emit ToolTip("");
this->setModal(true);
this->show();
return;
}
else
{
@ -185,13 +184,11 @@ void DialogUnionDetails::ChoosedDetail(const quint32 &id, const SceneObject &typ
p1 = 0;
p2 = 0;
emit ToolTip(tr("Select a detail"));
return;
}
}
else
{
emit ToolTip(tr("Select a point on edge"));
return;
}
}
}

2
src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp
View File

@ -124,7 +124,7 @@ VToolFlippingByAxis *VToolFlippingByAxis::Create(const quint32 _id, quint32 orig
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::FlippingByAxis, doc);
VAbstractTool::AddRecord(id, Tool::FlippingByAxis, doc);
VToolFlippingByAxis *tool = new VToolFlippingByAxis(doc, data, id, originPointId, axisType, suffix, source,
dest, typeCreation);
scene->addItem(tool);

2
src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp
View File

@ -118,7 +118,7 @@ VToolFlippingByLine *VToolFlippingByLine::Create(const quint32 _id, quint32 firs
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::FlippingByLine, doc);
VAbstractTool::AddRecord(id, Tool::FlippingByLine, doc);
VToolFlippingByLine *tool = new VToolFlippingByLine(doc, data, id, firstLinePointId, secondLinePointId, suffix,
source, dest, typeCreation);
scene->addItem(tool);

2
src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp
View File

@ -219,7 +219,7 @@ QT_WARNING_POP
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::Move, doc);
VAbstractTool::AddRecord(id, Tool::Move, doc);
VToolMove *tool = new VToolMove(doc, data, id, formulaAngle, formulaLength, suffix, source, dest,
typeCreation);
scene->addItem(tool);

2
src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp
View File

@ -236,7 +236,7 @@ QT_WARNING_POP
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::Rotation, doc);
VAbstractTool::AddRecord(id, Tool::Rotation, doc);
VToolRotation *tool = new VToolRotation(doc, data, id, origin, angle, suffix, source, dest, typeCreation);
scene->addItem(tool);
InitOperationToolConnections(scene, tool);

2
src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp
View File

@ -172,7 +172,7 @@ VToolArc* VToolArc::Create(const quint32 _id, const quint32 &center, QString &ra
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::Arc, doc);
VAbstractTool::AddRecord(id, Tool::Arc, doc);
VToolArc *toolArc = new VToolArc(doc, data, id, typeCreation);
scene->addItem(toolArc);
InitArcToolConnections(scene, toolArc);

2
src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp
View File

@ -141,7 +141,7 @@ VToolArcWithLength *VToolArcWithLength::Create(const quint32 _id, const quint32
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::ArcWithLength, doc);
VAbstractTool::AddRecord(id, Tool::ArcWithLength, doc);
VToolArcWithLength *toolArc = new VToolArcWithLength(doc, data, id, typeCreation);
scene->addItem(toolArc);
InitArcToolConnections(scene, toolArc);

2
src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp
View File

@ -124,7 +124,7 @@ VToolCubicBezier *VToolCubicBezier::Create(const quint32 _id, VCubicBezier *spli
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::CubicBezier, doc);
VAbstractTool::AddRecord(id, Tool::CubicBezier, doc);
auto _spl = new VToolCubicBezier(doc, data, id, typeCreation);
scene->addItem(_spl);
InitSplineToolConnections(scene, _spl);

2
src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp
View File

@ -130,7 +130,7 @@ VToolCubicBezierPath *VToolCubicBezierPath::Create(const quint32 _id, VCubicBezi
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::CubicBezierPath, doc);
VAbstractTool::AddRecord(id, Tool::CubicBezierPath, doc);
VToolCubicBezierPath *spl = new VToolCubicBezierPath(doc, data, id, typeCreation);
scene->addItem(spl);
InitSplinePathToolConnections(scene, spl);

2
src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp
View File

@ -185,7 +185,7 @@ VToolEllipticalArc* VToolEllipticalArc::Create(const quint32 _id, const quint32
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::EllipticalArc, doc);
VAbstractTool::AddRecord(id, Tool::EllipticalArc, doc);
VToolEllipticalArc *toolEllipticalArc = new VToolEllipticalArc(doc, data, id, typeCreation);
scene->addItem(toolEllipticalArc);
InitElArcToolConnections(scene, toolEllipticalArc);

2
src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp
View File

@ -200,7 +200,7 @@ VToolSpline* VToolSpline::Create(const quint32 _id, VSpline *spline, VMainGraphi
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::Spline, doc);
VAbstractTool::AddRecord(id, Tool::Spline, doc);
auto _spl = new VToolSpline(doc, data, id, typeCreation);
scene->addItem(_spl);
InitSplineToolConnections(scene, _spl);

2
src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp
View File

@ -211,7 +211,7 @@ VToolSplinePath* VToolSplinePath::Create(const quint32 _id, VSplinePath *path, V
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::SplinePath, doc);
VAbstractTool::AddRecord(id, Tool::SplinePath, doc);
VToolSplinePath *spl = new VToolSplinePath(doc, data, id, typeCreation);
scene->addItem(spl);
InitSplinePathToolConnections(scene, spl);

2
src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp
View File

@ -191,7 +191,7 @@ VToolTrueDarts *VToolTrueDarts::Create(quint32 _id,
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::TrueDarts, doc);
VAbstractTool::AddRecord(id, Tool::TrueDarts, doc);
VToolTrueDarts *points = new VToolTrueDarts(doc, data, id, p1id, p2id, baseLineP1Id, baseLineP2Id,
dartP1Id, dartP2Id, dartP3Id, typeCreation);
scene->addItem(points);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp
View File

@ -170,7 +170,7 @@ VToolCutArc* VToolCutArc::Create(const quint32 _id, const QString &pointName, QS
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::CutArc, doc);
VAbstractTool::AddRecord(id, Tool::CutArc, doc);
VToolCutArc *point = new VToolCutArc(doc, data, id, formula, arcId, typeCreation);
scene->addItem(point);
InitToolConnections(scene, point);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp
View File

@ -170,7 +170,7 @@ VToolCutSpline* VToolCutSpline::Create(const quint32 _id, const QString &pointNa
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::CutSpline, doc);
VAbstractTool::AddRecord(id, Tool::CutSpline, doc);
VToolCutSpline *point = new VToolCutSpline(doc, data, id, formula, splineId, typeCreation);
scene->addItem(point);
InitToolConnections(scene, point);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp
View File

@ -181,7 +181,7 @@ VToolCutSplinePath* VToolCutSplinePath::Create(const quint32 _id, const QString
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::CutSplinePath, doc);
VAbstractTool::AddRecord(id, Tool::CutSplinePath, doc);
VToolCutSplinePath *point = new VToolCutSplinePath(doc, data, id, formula, splinePathId, typeCreation);
scene->addItem(point);
InitToolConnections(scene, point);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp
View File

@ -317,7 +317,7 @@ VToolAlongLine* VToolAlongLine::Create(const quint32 _id, const QString &pointNa
VToolAlongLine *point = nullptr;
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::AlongLine, doc);
VAbstractTool::AddRecord(id, Tool::AlongLine, doc);
point = new VToolAlongLine(doc, data, id, formula, firstPointId, secondPointId, typeLine, lineColor,
typeCreation);
scene->addItem(point);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp
View File

@ -215,7 +215,7 @@ VToolBisector* VToolBisector::Create(const quint32 _id, QString &formula, const
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::Bisector, doc);
VAbstractTool::AddRecord(id, Tool::Bisector, doc);
VToolBisector *point = new VToolBisector(doc, data, id, typeLine, lineColor, formula, firstPointId,
secondPointId, thirdPointId, typeCreation);
scene->addItem(point);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp
View File

@ -162,7 +162,7 @@ VToolCurveIntersectAxis *VToolCurveIntersectAxis::Create(const quint32 _id, cons
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::CurveIntersectAxis, doc);
VAbstractTool::AddRecord(id, Tool::CurveIntersectAxis, doc);
VToolCurveIntersectAxis *point = new VToolCurveIntersectAxis(doc, data, id, typeLine, lineColor, formulaAngle,
basePointId, curveId, typeCreation);
scene->addItem(point);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp
View File

@ -177,7 +177,7 @@ VToolEndLine* VToolEndLine::Create(const quint32 _id, const QString &pointName,
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::EndLine, doc);
VAbstractTool::AddRecord(id, Tool::EndLine, doc);
VToolEndLine *point = new VToolEndLine(doc, data, id, typeLine, lineColor, formulaLength, formulaAngle,
basePointId, typeCreation);
scene->addItem(point);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp
View File

@ -175,7 +175,7 @@ VToolHeight* VToolHeight::Create(const quint32 _id, const QString &pointName, co
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::Height, doc);
VAbstractTool::AddRecord(id, Tool::Height, doc);
VToolHeight *point = new VToolHeight(doc, data, id, typeLine, lineColor, basePointId, p1LineId, p2LineId,
typeCreation);
scene->addItem(point);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
View File

@ -149,7 +149,7 @@ VToolLineIntersectAxis *VToolLineIntersectAxis::Create(const quint32 _id, const
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::LineIntersectAxis, doc);
VAbstractTool::AddRecord(id, Tool::LineIntersectAxis, doc);
VToolLineIntersectAxis *point = new VToolLineIntersectAxis(doc, data, id, typeLine, lineColor, formulaAngle,
basePointId, firstPointId, secondPointId,
typeCreation);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp
View File

@ -179,7 +179,7 @@ VToolNormal* VToolNormal::Create(const quint32 _id, QString &formula, const quin
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::Normal, doc);
VAbstractTool::AddRecord(id, Tool::Normal, doc);
VToolNormal *point = new VToolNormal(doc, data, id, typeLine, lineColor, formula, angle, firstPointId,
secondPointId, typeCreation);
scene->addItem(point);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp
View File

@ -232,7 +232,7 @@ VToolShoulderPoint* VToolShoulderPoint::Create(const quint32 _id, QString &formu
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::ShoulderPoint, doc);
VAbstractTool::AddRecord(id, Tool::ShoulderPoint, doc);
VToolShoulderPoint *point = new VToolShoulderPoint(doc, data, id, typeLine, lineColor, formula,
p1Line, p2Line, pShoulder,
typeCreation);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp
View File

@ -126,7 +126,7 @@ VToolBasePoint *VToolBasePoint::Create(quint32 _id, const QString &nameActivPP,
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::BasePoint, doc);
VAbstractTool::AddRecord(id, Tool::BasePoint, doc);
VToolBasePoint *spoint = new VToolBasePoint(doc, data, id, typeCreation, nameActivPP);
scene->addItem(spoint);
InitToolConnections(scene, spoint);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp
View File

@ -183,7 +183,7 @@ VToolLineIntersect* VToolLineIntersect::Create(const quint32 _id, const quint32
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::LineIntersect, doc);
VAbstractTool::AddRecord(id, Tool::LineIntersect, doc);
VToolLineIntersect *point = new VToolLineIntersect(doc, data, id, p1Line1Id, p2Line1Id, p1Line2Id,
p2Line2Id, typeCreation);
scene->addItem(point);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp
View File

@ -126,7 +126,7 @@ VToolPointFromArcAndTangent *VToolPointFromArcAndTangent::Create(const quint32 _
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::PointFromArcAndTangent, doc);
VAbstractTool::AddRecord(id, Tool::PointFromArcAndTangent, doc);
VToolPointFromArcAndTangent *point = new VToolPointFromArcAndTangent(doc, data, id, arcId, tangentPointId,
crossPoint, typeCreation);
scene->addItem(point);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp
View File

@ -135,7 +135,7 @@ VToolPointFromCircleAndTangent *VToolPointFromCircleAndTangent::Create(const qui
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::PointFromCircleAndTangent, doc);
VAbstractTool::AddRecord(id, Tool::PointFromCircleAndTangent, doc);
VToolPointFromCircleAndTangent *point = new VToolPointFromCircleAndTangent(doc, data, id, circleCenterId,
circleRadius, tangentPointId,
crossPoint, typeCreation);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp
View File

@ -237,7 +237,7 @@ VToolPointOfContact* VToolPointOfContact::Create(const quint32 _id, QString &rad
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::PointOfContact, doc);
VAbstractTool::AddRecord(id, Tool::PointOfContact, doc);
VToolPointOfContact *point = new VToolPointOfContact(doc, data, id, radius, center,
firstPointId, secondPointId, typeCreation);
scene->addItem(point);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp
View File

@ -157,7 +157,7 @@ VToolPointOfIntersection *VToolPointOfIntersection::Create(const quint32 _id, co
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::PointOfIntersection, doc);
VAbstractTool::AddRecord(id, Tool::PointOfIntersection, doc);
VToolPointOfIntersection *point = new VToolPointOfIntersection(doc, data, id, firstPointId,
secondPointId, typeCreation);
scene->addItem(point);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp
View File

@ -127,7 +127,7 @@ VToolPointOfIntersectionArcs *VToolPointOfIntersectionArcs::Create(const quint32
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::PointOfIntersectionArcs, doc);
VAbstractTool::AddRecord(id, Tool::PointOfIntersectionArcs, doc);
VToolPointOfIntersectionArcs *point = new VToolPointOfIntersectionArcs(doc, data, id, firstArcId,
secondArcId, pType, typeCreation);
scene->addItem(point);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp
View File

@ -148,7 +148,7 @@ VToolPointOfIntersectionCircles *VToolPointOfIntersectionCircles::Create(const q
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::PointOfIntersectionCircles, doc);
VAbstractTool::AddRecord(id, Tool::PointOfIntersectionCircles, doc);
VToolPointOfIntersectionCircles *point = new VToolPointOfIntersectionCircles(doc, data, id, firstCircleCenterId,
secondCircleCenterId,
firstCircleRadius,

16
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp
View File

@ -136,7 +136,7 @@ VToolPointOfIntersectionCurves *VToolPointOfIntersectionCurves::Create(const qui
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::PointOfIntersectionCurves, doc);
VAbstractTool::AddRecord(id, Tool::PointOfIntersectionCurves, doc);
auto point = new VToolPointOfIntersectionCurves(doc, data, id, firstCurveId, secondCurveId, vCrossPoint,
hCrossPoint, typeCreation);
scene->addItem(point);
@ -185,17 +185,13 @@ QPointF VToolPointOfIntersectionCurves::FindPoint(const QVector<QPointF> &curve1
for ( auto i = 1; i < intersections.count(); ++i )
{
const QPointF p = intersections.at(i);
if (p.y() > minY)
{
continue;
}
else if (p.y() < minY)
if (p.y() < minY)
{
minY = p.y();
vIntersections.clear();
vIntersections.append(p);
}
else
else if (VFuzzyComparePossibleNulls(p.y(), minY))
{
vIntersections.append(p);
}
@ -215,11 +211,7 @@ QPointF VToolPointOfIntersectionCurves::FindPoint(const QVector<QPointF> &curve1
vIntersections.clear();
vIntersections.append(p);
}
else if (p.y() < maxY)
{
continue;
}
else
else if (VFuzzyComparePossibleNulls(p.y(), maxY))
{
vIntersections.append(p);
}

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp
View File

@ -169,7 +169,7 @@ VToolTriangle* VToolTriangle::Create(const quint32 _id, const QString &pointName
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::Triangle, doc);
VAbstractTool::AddRecord(id, Tool::Triangle, doc);
VToolTriangle *point = new VToolTriangle(doc, data, id, axisP1Id, axisP2Id, firstPointId,
secondPointId, typeCreation);
scene->addItem(point);

4
src/libs/vtools/tools/drawTools/vtoolline.cpp
View File

@ -168,7 +168,7 @@ VToolLine * VToolLine::Create(const quint32 &_id, const quint32 &firstPoint, con
if (parse == Document::FullParse)
{
VDrawTool::AddRecord(id, Tool::Line, doc);
VAbstractTool::AddRecord(id, Tool::Line, doc);
VToolLine *line = new VToolLine(doc, data, id, firstPoint, secondPoint, typeLine, lineColor, typeCreation);
scene->addItem(line);
InitDrawToolConnections(scene, line);
@ -189,7 +189,7 @@ VToolLine * VToolLine::Create(const quint32 &_id, const quint32 &firstPoint, con
//---------------------------------------------------------------------------------------------------------------------
QString VToolLine::getTagName() const
{
return VAbstractPattern::TagLine;
return VDomDocument::TagLine;
}
//---------------------------------------------------------------------------------------------------------------------

2
src/libs/vtools/tools/vtoolseamallowance.cpp
View File

@ -1065,7 +1065,7 @@ void VToolSeamAllowance::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
Q_UNUSED(e);
return;//Leave this method immediately!!!
}
return; //Leave this method immediately after call!!!
//Leave this method immediately after call!!!
}
}

1
src/libs/vtools/tools/vtooluniondetails.cpp
View File

@ -1529,7 +1529,6 @@ void VToolUnionDetails::AddToModeling(const QDomElement &domElement)
else
{
qCCritical(vToolUnion, "Can't find tag %s.", qUtf8Printable(VAbstractPattern::TagModeling));
return;
}
}

4
src/libs/vtools/undocommands/adddetnode.cpp
View File

@ -61,19 +61,16 @@ void AddDetNode::undo()
if (modeling.removeChild(domElement).isNull())
{
qCDebug(vUndo, "Can't delete node.");
return;
}
}
else
{
qCDebug(vUndo, "Can't get node by id = %u.", nodeId);
return;
}
}
else
{
qCDebug(vUndo, "Can't find tag %s.", qUtf8Printable(VAbstractPattern::TagModeling));
return;
}
}
@ -90,7 +87,6 @@ void AddDetNode::redo()
else
{
qCDebug(vUndo, "Can't find tag %s.", qUtf8Printable(VAbstractPattern::TagModeling));
return;
}
}

4
src/libs/vtools/undocommands/deletepiece.cpp
View File

@ -63,13 +63,12 @@ DeletePiece::DeletePiece(VAbstractPattern *doc, quint32 id, const VPiece &detail
else
{
// Better save id of previous detail instead of reference to node.
m_siblingId = doc->GetParametrUInt(previousDetail.toElement(), VAbstractPattern::AttrId, NULL_ID_STR);
m_siblingId = doc->GetParametrUInt(previousDetail.toElement(), VDomDocument::AttrId, NULL_ID_STR);
}
}
else
{
qCDebug(vUndo, "Can't get detail by id = %u.", nodeId);
return;
}
}
@ -111,6 +110,5 @@ void DeletePiece::redo()
else
{
qCDebug(vUndo, "Can't get detail by id = %u.", nodeId);
return;
}
}

2
src/libs/vtools/undocommands/label/movedoublelabel.cpp
View File

@ -77,7 +77,6 @@ MoveDoubleLabel::MoveDoubleLabel(VAbstractPattern *doc, const double &x, const d
else
{
qCDebug(vUndo, "Can't find point with id = %u.", nodeId);
return;
}
}
@ -151,6 +150,5 @@ void MoveDoubleLabel::Do(double mx, double my)
else
{
qCDebug(vUndo, "Can't find point with id = %u.", nodeId);
return;
}
}

2
src/libs/vtools/undocommands/label/movelabel.cpp
View File

@ -56,7 +56,6 @@ MoveLabel::MoveLabel(VAbstractPattern *doc, const double &x, const double &y, co
else
{
qCDebug(vUndo, "Can't find point with id = %u.", nodeId);
return;
}
}
@ -104,6 +103,5 @@ void MoveLabel::Do(double mx, double my)
else
{
qCDebug(vUndo, "Can't find point with id = %u.", nodeId);
return;
}
}

4
src/libs/vtools/undocommands/label/operationmovelabel.cpp
View File

@ -62,7 +62,6 @@ OperationMoveLabel::OperationMoveLabel(quint32 idTool, VAbstractPattern *doc, do
else
{
qCDebug(vUndo, "Can't find point with id = %u.", nodeId);
return;
}
}
@ -111,7 +110,6 @@ void OperationMoveLabel::Do(double mx, double my)
else
{
qCDebug(vUndo, "Can't find point with id = %u.", nodeId);
return;
}
}
@ -126,7 +124,7 @@ QDomElement OperationMoveLabel::GetDestinationObject(quint32 idTool, quint32 idP
for (qint32 i = 0; i < nodeList.size(); ++i)
{
const QDomElement dest = nodeList.at(i).toElement();
if (not dest.isNull() && dest.isElement() && dest.tagName() == VToolRotation::TagDestination)
if (not dest.isNull() && dest.isElement() && dest.tagName() == VAbstractOperation::TagDestination)
{
correctDest = dest;
break;

3
src/libs/vtools/undocommands/movepiece.cpp
View File

@ -61,7 +61,6 @@ MovePiece::MovePiece(VAbstractPattern *doc, const double &x, const double &y, co
else
{
qCDebug(vUndo, "Can't find detail with id = %u.", nodeId);
return;
}
}
@ -84,7 +83,6 @@ void MovePiece::undo()
else
{
qCDebug(vUndo, "Can't find detail with id = %u.", nodeId);
return;
}
}
@ -111,7 +109,6 @@ void MovePiece::redo()
else
{
qCDebug(vUndo, "Can't find detail with id = %u.", nodeId);
return;
}
}

1
src/libs/vtools/undocommands/movespline.cpp
View File

@ -116,6 +116,5 @@ void MoveSpline::Do(const VSpline &spl)
else
{
qCDebug(vUndo, "Can't find spline with id = %u.", nodeId);
return;
}
}

1
src/libs/vtools/undocommands/movesplinepath.cpp
View File

@ -110,6 +110,5 @@ void MoveSplinePath::Do(const VSplinePath &splPath)
else
{
qCDebug(vUndo, "Can't find spline path with id = %u.", nodeId);
return;
}
}

2
src/libs/vtools/undocommands/movespoint.cpp
View File

@ -62,7 +62,6 @@ MoveSPoint::MoveSPoint(VAbstractPattern *doc, const double &x, const double &y,
else
{
qCDebug(vUndo, "Can't find spoint with id = %u.", nodeId);
return;
}
}
@ -131,6 +130,5 @@ void MoveSPoint::Do(double x, double y)
else
{
qCDebug(vUndo, "Can't find spoint with id = %u.", nodeId);
return;
}
}

2
src/libs/vtools/undocommands/savepieceoptions.cpp
View File

@ -86,7 +86,6 @@ void SavePieceOptions::undo()
else
{
qCDebug(vUndo, "Can't find detail with id = %u.", nodeId);
return;
}
}
@ -118,7 +117,6 @@ void SavePieceOptions::redo()
else
{
qCDebug(vUndo, "Can't find detail with id = %u.", nodeId);
return;
}
}

2
src/libs/vtools/undocommands/savepiecepathoptions.cpp
View File

@ -73,7 +73,6 @@ void SavePiecePathOptions::undo()
else
{
qCDebug(vUndo, "Can't find path with id = %u.", nodeId);
return;
}
}
@ -97,7 +96,6 @@ void SavePiecePathOptions::redo()
else
{
qCDebug(vUndo, "Can't find path with id = %u.", nodeId);
return;
}
}

2
src/libs/vtools/undocommands/savetooloptions.cpp
View File

@ -63,7 +63,6 @@ void SaveToolOptions::undo()
else
{
qCDebug(vUndo, "Can't find tool with id = %u.", nodeId);
return;
}
}
@ -82,7 +81,6 @@ void SaveToolOptions::redo()
else
{
qCDebug(vUndo, "Can't find tool with id = %u.", nodeId);
return;
}
}

1
src/libs/vtools/undocommands/togglepieceinlayout.cpp
View File

@ -121,6 +121,5 @@ void TogglePieceInLayout::Do(bool state)
else
{
qDebug("Can't get detail by id = %u.", m_id);
return;
}
}

6
src/libs/vtools/visualization/line/vistoollineintersect.cpp
View File

@ -75,11 +75,7 @@ void VisToolLineIntersect::RefreshGeometry()
DrawLine(line1, QLineF(static_cast<QPointF>(*first), static_cast<QPointF>(*second)), supportColor);
if (line2P1Id <= NULL_ID)
{
return;
}
else
if (line2P1Id > NULL_ID)
{
const QSharedPointer<VPointF> third = Visualization::data->GeometricObject<VPointF>(line2P1Id);
DrawPoint(line2P1, static_cast<QPointF>(*third), supportColor);

6
src/libs/vtools/visualization/line/vistoolpointofcontact.cpp
View File

@ -73,11 +73,7 @@ void VisToolPointOfContact::RefreshGeometry()
DrawPoint(lineP2, static_cast<QPointF>(*second), supportColor);
DrawLine(this, QLineF(static_cast<QPointF>(*first), static_cast<QPointF>(*second)), supportColor);
if (radiusId <= NULL_ID)
{
return;
}
else
if (radiusId > NULL_ID)
{
const QSharedPointer<VPointF> third = Visualization::data->GeometricObject<VPointF>(radiusId);
DrawPoint(arc_point, static_cast<QPointF>(*third), supportColor);

6
src/libs/vtools/visualization/line/vistooltriangle.cpp
View File

@ -81,11 +81,7 @@ void VisToolTriangle::RefreshGeometry()
DrawAimedAxis(axis, QLineF(static_cast<QPointF>(*first), static_cast<QPointF>(*second)), supportColor);
if (hypotenuseP1Id <= NULL_ID)
{
return;
}
else
if (hypotenuseP1Id > NULL_ID)
{
const QSharedPointer<VPointF> third = Visualization::data->GeometricObject<VPointF>(hypotenuseP1Id);
DrawPoint(hypotenuseP1, static_cast<QPointF>(*third), supportColor);

1
src/libs/vwidgets/vgrainlineitem.cpp
View File

@ -345,7 +345,6 @@ void VGrainlineItem::mousePressEvent(QGraphicsSceneMouseEvent* pME)
else
{
pME->ignore();
return;
}
}
}

4
src/libs/vwidgets/vmaingraphicsview.cpp
View File

@ -213,7 +213,7 @@ bool GraphicsViewZoom::eventFilter(QObject *object, QEvent *event)
{
QWheelEvent* wheel_event = static_cast<QWheelEvent*>(event);
SCASSERT(wheel_event != nullptr)
if (QApplication::keyboardModifiers() == _modifiers)
if (QGuiApplication::keyboardModifiers() == _modifiers)
{
if (wheel_event->orientation() == Qt::Vertical)
{
@ -225,7 +225,7 @@ bool GraphicsViewZoom::eventFilter(QObject *object, QEvent *event)
}
else
{
if (QApplication::keyboardModifiers() == Qt::ShiftModifier)
if (QGuiApplication::keyboardModifiers() == Qt::ShiftModifier)
{
return StartHorizontalScrollings(wheel_event);
}

1
src/libs/vwidgets/vtextgraphicsitem.cpp
View File

@ -453,7 +453,6 @@ void VTextGraphicsItem::mousePressEvent(QGraphicsSceneMouseEvent *pME)
else
{
pME->ignore();
return;
}
}
}