From 7711e61381561b30789151c4775b1fa734878fdf Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 11 Jul 2024 18:26:28 +0300 Subject: [PATCH] Refactoring. Use "std::make_unique" to construct "std::unique_ptr". Use "std::make_shared" to construct "std::shared_ptr". --- src/app/valentina/core/vcmdexport.cpp | 2 +- src/app/valentina/mainwindow.cpp | 2 +- .../vdxf/libdxfrw/intern/drw_textcodec.cpp | 2 +- src/libs/vdxf/libdxfrw/libdxfrw.cpp | 2 +- src/libs/vdxf/vdxfengine.cpp | 8 +-- src/libs/vlayout/dialogs/watermarkwindow.cpp | 2 +- src/libs/vtools/tools/vtoolseamallowance.cpp | 2 +- src/libs/vtools/tools/vtooluniondetails.cpp | 52 +++++++++---------- src/libs/vwidgets/vhighlighter.cpp | 12 ++--- 9 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/app/valentina/core/vcmdexport.cpp b/src/app/valentina/core/vcmdexport.cpp index 11eef3702..630578e2c 100644 --- a/src/app/valentina/core/vcmdexport.cpp +++ b/src/app/valentina/core/vcmdexport.cpp @@ -90,7 +90,7 @@ auto VCommandLine::DefaultGenerator() const -> VLayoutGeneratorPtr { // this functions covers all options found into layout setup dialog, nothing to add here, unless dialog extended - VLayoutGeneratorPtr res(new VLayoutGenerator()); + auto res = std::make_shared(); DialogLayoutSettings diag(res.get(), nullptr, true); TestPageformat(); diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 47391a5a7..4e4b91068 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -6310,7 +6310,7 @@ auto MainWindow::LoadPattern(QString fileName, const QString &customMeasureFile) QFuture const futureConverter = QtConcurrent::run( [fileName]() { - std::unique_ptr converter(new VPatternConverter(fileName)); + auto converter = std::make_unique(fileName); return converter.release(); }); diff --git a/src/libs/vdxf/libdxfrw/intern/drw_textcodec.cpp b/src/libs/vdxf/libdxfrw/intern/drw_textcodec.cpp index ccac7e435..4b98bcaf3 100644 --- a/src/libs/vdxf/libdxfrw/intern/drw_textcodec.cpp +++ b/src/libs/vdxf/libdxfrw/intern/drw_textcodec.cpp @@ -17,7 +17,7 @@ DRW_TextCodec::DRW_TextCodec() : version(DRW::AC1021), - conv(new DRW_Converter()) + conv(std::make_unique()) { } diff --git a/src/libs/vdxf/libdxfrw/libdxfrw.cpp b/src/libs/vdxf/libdxfrw/libdxfrw.cpp index b09e04044..9cbd03f10 100644 --- a/src/libs/vdxf/libdxfrw/libdxfrw.cpp +++ b/src/libs/vdxf/libdxfrw/libdxfrw.cpp @@ -3419,7 +3419,7 @@ auto dxfRW::processVertex(DRW_Polyline *pl) -> bool { DRW_DBG("dxfRW::processVertex"); int code; - std::unique_ptr v(new DRW_Vertex()); + auto v = std::make_unique(); while (reader->readRec(&code)) { DRW_DBG(code); diff --git a/src/libs/vdxf/vdxfengine.cpp b/src/libs/vdxf/vdxfengine.cpp index 6c18a972f..e7fc100f9 100644 --- a/src/libs/vdxf/vdxfengine.cpp +++ b/src/libs/vdxf/vdxfengine.cpp @@ -798,7 +798,7 @@ auto VDxfEngine::ExportToAAMA(const QVector &details) -> bool m_input->AddBlock(detailBlock.data()); - std::unique_ptr insert(new DRW_Insert()); + auto insert = std::make_unique(); insert->name = blockName.toStdString(); insert->layer = *layer1; @@ -1028,7 +1028,7 @@ void VDxfEngine::ExportAAMANotch(const QSharedPointer &detailBloc { auto ExportNotch = [this, detailBlock](QPointF center, qreal length, qreal angle) { - std::unique_ptr notch(new DRW_ASTMNotch()); + auto notch = std::make_unique(); notch->basePoint = DRW_Coord(FromPixel(center.x(), m_varInsunits), FromPixel(GetSize().height() - center.y(), m_varInsunits), @@ -1363,7 +1363,7 @@ auto VDxfEngine::ExportToASTM(const QVector &details) -> bool m_input->AddBlock(detailBlock.data()); - std::unique_ptr insert(new DRW_Insert()); + auto insert = std::make_unique(); insert->name = blockName.toStdString(); insert->layer = *layer1; @@ -1639,7 +1639,7 @@ void VDxfEngine::ExportASTMDrill(const QSharedPointer &detailBloc auto ExportPoint = [this, detailBlock](QPointF center, qreal diameter) { - std::unique_ptr point(new DRW_Point()); + auto point = std::make_unique(); point->basePoint = DRW_Coord(FromPixel(center.x(), m_varInsunits), FromPixel(GetSize().height() - center.y(), m_varInsunits), FromPixel(diameter, m_varInsunits)); diff --git a/src/libs/vlayout/dialogs/watermarkwindow.cpp b/src/libs/vlayout/dialogs/watermarkwindow.cpp index dfe96cecb..f82e6b92b 100644 --- a/src/libs/vlayout/dialogs/watermarkwindow.cpp +++ b/src/libs/vlayout/dialogs/watermarkwindow.cpp @@ -181,7 +181,7 @@ auto WatermarkWindow::Open(QString path) -> bool QFuture const futureConverter = QtConcurrent::run( [path]() { - std::unique_ptr converter(new VWatermarkConverter(path)); + auto converter = std::make_unique(path); return converter.release(); }); diff --git a/src/libs/vtools/tools/vtoolseamallowance.cpp b/src/libs/vtools/tools/vtoolseamallowance.cpp index 0b7df7726..baf7a5110 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.cpp +++ b/src/libs/vtools/tools/vtoolseamallowance.cpp @@ -2520,12 +2520,12 @@ void VToolSeamAllowance::InitSpecialPoints(const QVector &points) const //--------------------------------------------------------------------------------------------------------------------- void VToolSeamAllowance::DeleteToolWithConfirm(bool ask) { - std::unique_ptr delDet(new DeletePiece(doc, m_id, VAbstractTool::data, m_sceneDetails)); if (ask && ConfirmDeletion() == QMessageBox::No) { return; } + auto delDet = std::make_unique(doc, m_id, VAbstractTool::data, m_sceneDetails); VAbstractApplication::VApp()->getUndoStack()->push(delDet.release()); // Throw exception, this will help prevent case when we forget to immediately quit function. diff --git a/src/libs/vtools/tools/vtooluniondetails.cpp b/src/libs/vtools/tools/vtooluniondetails.cpp index fa64f2b38..c05428b2e 100644 --- a/src/libs/vtools/tools/vtooluniondetails.cpp +++ b/src/libs/vtools/tools/vtooluniondetails.cpp @@ -385,7 +385,7 @@ void UnionInitParameters(const VToolUnionDetailsInitData &initData, const VPiece auto AddNodePoint(const VPieceNode &node, const VToolUnionDetailsInitData &initData, QVector &children, const QString &drawName, qreal dx, qreal dy, quint32 pRotate, qreal angle) -> quint32 { - std::unique_ptr point(new VPointF(*initData.data->GeometricObject(node.GetId()))); + auto point = std::make_unique(*initData.data->GeometricObject(node.GetId())); point->setMode(Draw::Modeling); if (not qFuzzyIsNull(dx) || not qFuzzyIsNull(dy) || pRotate != NULL_ID) @@ -394,7 +394,7 @@ auto AddNodePoint(const VPieceNode &node, const VToolUnionDetailsInitData &initD angle); } - std::unique_ptr point1(new VPointF(*point)); + auto point1 = std::make_unique(*point); const quint32 idObject = initData.data->AddGObject(point.release()); children.append(idObject); @@ -421,7 +421,7 @@ auto AddNodePoint(const VPieceNode &node, const VToolUnionDetailsInitData &initD auto AddPin(quint32 id, const VToolUnionDetailsInitData &initData, QVector &children, const QString &drawName, qreal dx, qreal dy, quint32 pRotate, qreal angle) -> quint32 { - std::unique_ptr point(new VPointF(*initData.data->GeometricObject(id))); + auto point = std::make_unique(*initData.data->GeometricObject(id)); point->setMode(Draw::Modeling); if (not qFuzzyIsNull(dx) || not qFuzzyIsNull(dy) || pRotate != NULL_ID) @@ -430,7 +430,7 @@ auto AddPin(quint32 id, const VToolUnionDetailsInitData &initData, QVector point1(new VPointF(*point)); + auto point1 = std::make_unique(*point); const quint32 idObject = initData.data->AddGObject(point.release()); children.append(idObject); @@ -456,7 +456,7 @@ auto AddPin(quint32 id, const VToolUnionDetailsInitData &initData, QVector &children, const QString &drawName, qreal dx, qreal dy, quint32 pRotate, qreal angle) -> quint32 { - std::unique_ptr label(new VPlaceLabelItem(*initData.data->GeometricObject(id))); + auto label = std::make_unique(*initData.data->GeometricObject(id)); if (not qFuzzyIsNull(dx) || not qFuzzyIsNull(dy) || pRotate != NULL_ID) { @@ -480,7 +480,7 @@ auto AddPlaceLabel(quint32 id, const VToolUnionDetailsInitData &initData, QVecto initNodeData.visibilityTrigger = label->GetVisibilityTrigger(); initNodeData.type = label->GetLabelType(); - std::unique_ptr label1(new VPlaceLabelItem(*label)); + auto label1 = std::make_unique(*label); initNodeData.centerPoint = initData.data->AddGObject(label.release()); children.append(initNodeData.centerPoint); @@ -499,7 +499,7 @@ auto AddNodeArc(const VPieceNode &node, const VToolUnionDetailsInitData &initDat const QSharedPointer arc = initData.data->GeometricObject(node.GetId()); auto p1 = VPointF(arc->GetP1(), QChar('A'), 0, 0); auto p2 = VPointF(arc->GetP2(), QChar('A'), 0, 0); - std::unique_ptr center(new VPointF(arc->GetCenter())); + auto center = std::make_unique(arc->GetCenter()); if (not qFuzzyIsNull(dx) || not qFuzzyIsNull(dy) || pRotate != NULL_ID) { @@ -516,11 +516,11 @@ auto AddNodeArc(const VPieceNode &node, const VToolUnionDetailsInitData &initDat VPointF *tmpCenter = center.release(); const quint32 idCenter = initData.data->AddGObject(tmpCenter); Q_UNUSED(idCenter) - std::unique_ptr arc1(new VArc(*tmpCenter, arc->GetRadius(), arc->GetFormulaRadius(), l1.angle(), - QString().setNum(l1.angle()), l2.angle(), QString().setNum(l2.angle()))); + auto arc1 = std::make_unique(*tmpCenter, arc->GetRadius(), arc->GetFormulaRadius(), l1.angle(), + QString().setNum(l1.angle()), l2.angle(), QString().setNum(l2.angle())); arc1->setMode(Draw::Modeling); - std::unique_ptr arc2(new VArc(*arc1)); + auto arc2 = std::make_unique(*arc1); const quint32 idObject = initData.data->AddGObject(arc1.release()); children.append(idObject); @@ -550,7 +550,7 @@ auto AddNodeElArc(const VPieceNode &node, const VToolUnionDetailsInitData &initD const QSharedPointer arc = initData.data->GeometricObject(node.GetId()); auto p1 = VPointF(arc->GetP1(), QChar('A'), 0, 0); auto p2 = VPointF(arc->GetP2(), QChar('A'), 0, 0); - std::unique_ptr center(new VPointF(arc->GetCenter())); + auto center = std::make_unique(arc->GetCenter()); if (not qFuzzyIsNull(dx) || not qFuzzyIsNull(dy) || pRotate != NULL_ID) { @@ -567,12 +567,12 @@ auto AddNodeElArc(const VPieceNode &node, const VToolUnionDetailsInitData &initD VPointF *tmpCenter = center.release(); quint32 const idCenter = initData.data->AddGObject(tmpCenter); Q_UNUSED(idCenter) - std::unique_ptr arc1(new VEllipticalArc( + auto arc1 = std::make_unique( *tmpCenter, arc->GetRadius1(), arc->GetRadius2(), arc->GetFormulaRadius1(), arc->GetFormulaRadius2(), - l1.angle(), QString().setNum(l1.angle()), l2.angle(), QString().setNum(l2.angle()), 0, QChar('0'))); + l1.angle(), QString().setNum(l1.angle()), l2.angle(), QString().setNum(l2.angle()), 0, QChar('0')); arc1->setMode(Draw::Modeling); - std::unique_ptr arc2(new VEllipticalArc(*arc1)); + auto arc2 = std::make_unique(*arc1); const quint32 idObject = initData.data->AddGObject(arc1.release()); children.append(idObject); @@ -644,7 +644,7 @@ auto AddNodeSpline(const VPieceNode &node, const VToolUnionDetailsInitData &init auto AddNodeSplinePath(const VPieceNode &node, const VToolUnionDetailsInitData &initData, QVector &children, const QString &drawName, qreal dx, qreal dy, quint32 pRotate, qreal angle) -> quint32 { - std::unique_ptr path(new VSplinePath()); + auto path = std::make_unique(); path->setMode(Draw::Modeling); const QSharedPointer splinePath = initData.data->GeometricObject(node.GetId()); @@ -690,7 +690,7 @@ auto AddNodeSplinePath(const VPieceNode &node, const VToolUnionDetailsInitData & path->append(VSplinePoint(*p4, spl.GetEndAngle(), spl.GetEndAngleFormula(), angle2, angle2F, spline.GetC2Length(), spline.GetC2LengthFormula(), pL2, pL2F)); } - std::unique_ptr path1(new VSplinePath(*path)); + auto path1 = std::make_unique(*path); const quint32 idObject = initData.data->AddGObject(path.release()); children.append(idObject); @@ -923,7 +923,7 @@ auto TakeNextId(QVector &children) -> quint32 void UpdateNodePoint(VContainer *data, const VPieceNode &node, QVector &children, qreal dx, qreal dy, quint32 pRotate, qreal angle) { - std::unique_ptr point(new VPointF(*data->GeometricObject(node.GetId()))); + auto point = std::make_unique(*data->GeometricObject(node.GetId())); point->setMode(Draw::Modeling); if (not qFuzzyIsNull(dx) || not qFuzzyIsNull(dy) || pRotate != NULL_ID) { @@ -953,8 +953,8 @@ void UpdateNodeArc(VContainer *data, const VPieceNode &node, QVector &c QLineF const l1(static_cast(*center), static_cast(p1)); QLineF const l2(static_cast(*center), static_cast(p2)); - std::unique_ptr arc1(new VArc(*center, arc->GetRadius(), arc->GetFormulaRadius(), l1.angle(), - QString().setNum(l1.angle()), l2.angle(), QString().setNum(l2.angle()))); + auto arc1 = std::make_unique(*center, arc->GetRadius(), arc->GetFormulaRadius(), l1.angle(), + QString().setNum(l1.angle()), l2.angle(), QString().setNum(l2.angle())); arc1->setMode(Draw::Modeling); data->UpdateGObject(TakeNextId(children), arc1.release()); } @@ -980,9 +980,9 @@ void UpdateNodeElArc(VContainer *data, const VPieceNode &node, QVector QLineF const l1(static_cast(*center), static_cast(p1)); QLineF const l2(static_cast(*center), static_cast(p2)); - std::unique_ptr arc1(new VEllipticalArc( + auto arc1 = std::make_unique( *center, arc->GetRadius1(), arc->GetRadius2(), arc->GetFormulaRadius1(), arc->GetFormulaRadius2(), l1.angle(), - QString().setNum(l1.angle()), l2.angle(), QString().setNum(l2.angle()), 0, QChar('0'))); + QString().setNum(l1.angle()), l2.angle(), QString().setNum(l2.angle()), 0, QChar('0')); arc1->setMode(Draw::Modeling); data->UpdateGObject(TakeNextId(children), arc1.release()); } @@ -1008,8 +1008,8 @@ void UpdateNodeSpline(VContainer *data, const VPieceNode &node, QVector BiasRotatePoint(p4.data(), dx, dy, p, angle); } - std::unique_ptr spl( - new VSpline(*p1, static_cast(p2), static_cast(p3), *p4, 0, Draw::Modeling)); + auto spl = + std::make_unique(*p1, static_cast(p2), static_cast(p3), *p4, 0, Draw::Modeling); data->UpdateGObject(TakeNextId(children), spl.release()); } @@ -1017,7 +1017,7 @@ void UpdateNodeSpline(VContainer *data, const VPieceNode &node, QVector void UpdateNodeSplinePath(VContainer *data, const VPieceNode &node, QVector &children, qreal dx, qreal dy, quint32 pRotate, qreal angle) { - std::unique_ptr path(new VSplinePath()); + auto path = std::make_unique(); path->setMode(Draw::Modeling); const QSharedPointer splinePath = data->GeometricObject(node.GetId()); @@ -1482,7 +1482,7 @@ void UpdateUnitedDetailPins(const VToolUnionDetailsInitData &initData, qreal dx, for (auto record : records) { - std::unique_ptr point(new VPointF(*initData.data->GeometricObject(record))); + auto point = std::make_unique(*initData.data->GeometricObject(record)); point->setMode(Draw::Modeling); if (not qFuzzyIsNull(dx) || not qFuzzyIsNull(dy) || pRotate != NULL_ID) { @@ -1507,7 +1507,7 @@ void UpdateUnitedDetailPlaceLabels(const VToolUnionDetailsInitData &initData, qr BiasRotatePoint(parentLabel.data(), dx, dy, static_cast(*initData.data->GeometricObject(pRotate)), angle); } - std::unique_ptr label(new VPlaceLabelItem()); + auto label = std::make_unique(); label->setName(parentLabel->name()); label->setX(parentLabel->x()); label->setY(parentLabel->y()); diff --git a/src/libs/vwidgets/vhighlighter.cpp b/src/libs/vwidgets/vhighlighter.cpp index 0a6d3720d..3f64b5cba 100644 --- a/src/libs/vwidgets/vhighlighter.cpp +++ b/src/libs/vwidgets/vhighlighter.cpp @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------------------------------------------- VTextBlockData::VTextBlockData() - : m_parentheses() + : m_parentheses() { // Nothing to do } @@ -55,19 +55,19 @@ void VTextBlockData::insert(ParenthesisInfo *info) //--------------------------------------------------------------------------------------------------------------------- VHighlighter::VHighlighter(QTextDocument *document) - : QSyntaxHighlighter(document) + : QSyntaxHighlighter(document) { } //--------------------------------------------------------------------------------------------------------------------- void VHighlighter::highlightBlock(const QString &text) { - std::unique_ptr data(new VTextBlockData); + auto data = std::make_unique(); vsizetype leftPos = text.indexOf('('); while (leftPos != -1) { - std::unique_ptr info(new ParenthesisInfo); + auto info = std::make_unique(); info->character = '('; info->position = leftPos; @@ -78,13 +78,13 @@ void VHighlighter::highlightBlock(const QString &text) vsizetype rightPos = text.indexOf(')'); while (rightPos != -1) { - std::unique_ptr info(new ParenthesisInfo); + auto info = std::make_unique(); info->character = ')'; info->position = rightPos; data->insert(info.release()); - rightPos = text.indexOf(')', rightPos +1); + rightPos = text.indexOf(')', rightPos + 1); } setCurrentBlockUserData(data.release());