From 433389b798088e7d07ef71e3ff857ac72b710de0 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 3 Apr 2023 13:44:20 +0300 Subject: [PATCH] QScopedPointer::take() was deprecated since 6.1. --- src/app/valentina/mainwindow.cpp | 4 +- src/libs/ifc/xml/vpatternconverter.cpp | 2 +- src/libs/vdxf/libdxfrw/libdxfrw.cpp | 4 +- src/libs/vdxf/vdxfengine.cpp | 8 +- src/libs/vlayout/dialogs/watermarkwindow.cpp | 4 +- src/libs/vpatterndb/vtranslatevars.cpp | 2 +- src/libs/vtools/tools/vtoolseamallowance.cpp | 4 +- src/libs/vtools/tools/vtooluniondetails.cpp | 116 +++++++++---------- src/libs/vwidgets/vhighlighter.cpp | 12 +- 9 files changed, 78 insertions(+), 78 deletions(-) diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index c70a6d4c8..0e37867ea 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -5849,8 +5849,8 @@ auto MainWindow::LoadPattern(QString fileName, const QString& customMeasureFile) QFuture futureConverter = QtConcurrent::run([fileName]() { - QScopedPointer converter(new VPatternConverter(fileName)); - return converter.take(); + std::unique_ptr converter(new VPatternConverter(fileName)); + return converter.release(); }); //We have unsaved changes or load more then one file per time diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index 77845567e..d952cc4e0 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -1002,7 +1002,7 @@ QString VPatternConverter::FixMeasurementInFormulaToV0_2_0(const QString &formul QScopedPointer cal(new qmu::QmuTokenParser(formula, false, false));// Eval formula QMap tokens = cal->GetTokens();// Tokens (variables, measurements) - delete cal.take(); + cal.reset(); QList tKeys = tokens.keys();// Take all tokens positions QList tValues = tokens.values(); diff --git a/src/libs/vdxf/libdxfrw/libdxfrw.cpp b/src/libs/vdxf/libdxfrw/libdxfrw.cpp index 580d77b51..96289dc1f 100644 --- a/src/libs/vdxf/libdxfrw/libdxfrw.cpp +++ b/src/libs/vdxf/libdxfrw/libdxfrw.cpp @@ -2764,11 +2764,11 @@ bool dxfRW::processPolyline() { bool dxfRW::processVertex(DRW_Polyline *pl) { DRW_DBG("dxfRW::processVertex"); int code; - QScopedPointer v(new DRW_Vertex()); + std::unique_ptr v(new DRW_Vertex()); while (reader->readRec(&code)) { DRW_DBG(code); DRW_DBG("\n"); if (0 == code) { - pl->appendVertex(v.take()); + pl->appendVertex(v.release()); nextentity = reader->getString(); DRW_DBG(nextentity); DRW_DBG("\n"); if (nextentity == "SEQEND") { diff --git a/src/libs/vdxf/vdxfengine.cpp b/src/libs/vdxf/vdxfengine.cpp index 178cc9ec7..c5eb71828 100644 --- a/src/libs/vdxf/vdxfengine.cpp +++ b/src/libs/vdxf/vdxfengine.cpp @@ -747,11 +747,11 @@ auto VDxfEngine::ExportToAAMA(const QVector &details) -> bool m_input->AddBlock(detailBlock.data()); - QScopedPointer insert(new DRW_Insert()); + std::unique_ptr insert(new DRW_Insert()); insert->name = blockName.toStdString(); insert->layer = *layer1; - m_input->AddEntity(insert.take()); + m_input->AddEntity(insert.release()); deleteBlock = false; // lose ownership } @@ -977,11 +977,11 @@ auto VDxfEngine::ExportToASTM(const QVector &details) -> bool m_input->AddBlock(detailBlock.data()); - QScopedPointer insert(new DRW_Insert()); + std::unique_ptr insert(new DRW_Insert()); insert->name = blockName.toStdString(); insert->layer = *layer1; - m_input->AddEntity(insert.take()); + m_input->AddEntity(insert.release()); deleteBlock = false; // lose ownership } diff --git a/src/libs/vlayout/dialogs/watermarkwindow.cpp b/src/libs/vlayout/dialogs/watermarkwindow.cpp index 78cd079c4..3349cd44c 100644 --- a/src/libs/vlayout/dialogs/watermarkwindow.cpp +++ b/src/libs/vlayout/dialogs/watermarkwindow.cpp @@ -170,8 +170,8 @@ bool WatermarkWindow::Open(QString path) QFuture futureConverter = QtConcurrent::run([path]() { - QScopedPointer converter(new VWatermarkConverter(path)); - return converter.take(); + std::unique_ptr converter(new VWatermarkConverter(path)); + return converter.release(); }); //We have unsaved changes or load more then one file per time diff --git a/src/libs/vpatterndb/vtranslatevars.cpp b/src/libs/vpatterndb/vtranslatevars.cpp index b1ad3b3f6..e1e058c04 100644 --- a/src/libs/vpatterndb/vtranslatevars.cpp +++ b/src/libs/vpatterndb/vtranslatevars.cpp @@ -1051,7 +1051,7 @@ auto VTranslateVars::FormulaFromUser(const QString &formula, bool osSeparator) c new qmu::QmuTokenParser(formula, osSeparator, true, GetTranslatedFunctions())); QMap tokens = cal->GetTokens();// Tokens (variables, measurements) QMap numbers = cal->GetNumbers();// All numbers in expression for changing decimal separator - delete cal.take(); + cal.reset(); QString newFormula = formula;// Local copy for making changes diff --git a/src/libs/vtools/tools/vtoolseamallowance.cpp b/src/libs/vtools/tools/vtoolseamallowance.cpp index 39058a446..7f319df29 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.cpp +++ b/src/libs/vtools/tools/vtoolseamallowance.cpp @@ -2050,7 +2050,7 @@ void VToolSeamAllowance::InitSpecialPoints(const QVector &points) const //--------------------------------------------------------------------------------------------------------------------- void VToolSeamAllowance::DeleteToolWithConfirm(bool ask) { - QScopedPointer delDet(new DeletePiece(doc, m_id, VAbstractTool::data, m_sceneDetails)); + std::unique_ptr delDet(new DeletePiece(doc, m_id, VAbstractTool::data, m_sceneDetails)); if (ask) { if (ConfirmDeletion() == QMessageBox::No) @@ -2059,7 +2059,7 @@ void VToolSeamAllowance::DeleteToolWithConfirm(bool ask) } } - VAbstractApplication::VApp()->getUndoStack()->push(delDet.take()); + VAbstractApplication::VApp()->getUndoStack()->push(delDet.release()); // Throw exception, this will help prevent case when we forget to immediately quit function. VExceptionToolWasDeleted e(tr("Tool was used after deleting.")); diff --git a/src/libs/vtools/tools/vtooluniondetails.cpp b/src/libs/vtools/tools/vtooluniondetails.cpp index 5234cc84d..4fb850762 100644 --- a/src/libs/vtools/tools/vtooluniondetails.cpp +++ b/src/libs/vtools/tools/vtooluniondetails.cpp @@ -393,22 +393,22 @@ quint32 AddNodePoint(const VPieceNode &node, const VToolUnionDetailsInitData &in QVector &children, const QString &drawName, qreal dx, qreal dy, quint32 pRotate, qreal angle) { - QScopedPointer point(new VPointF(*initData.data->GeometricObject(node.GetId()))); + std::unique_ptr point(new VPointF(*initData.data->GeometricObject(node.GetId()))); point->setMode(Draw::Modeling); if (not qFuzzyIsNull(dx) || not qFuzzyIsNull(dy) || pRotate != NULL_ID) { - BiasRotatePoint(point.data(), dx, dy, static_cast(*initData.data->GeometricObject(pRotate)), + BiasRotatePoint(point.get(), dx, dy, static_cast(*initData.data->GeometricObject(pRotate)), angle); } - QScopedPointer point1(new VPointF(*point)); + std::unique_ptr point1(new VPointF(*point)); - const quint32 idObject = initData.data->AddGObject(point.take()); + const quint32 idObject = initData.data->AddGObject(point.release()); children.append(idObject); point1->setIdObject(idObject); point1->setMode(Draw::Modeling); - const quint32 id = initData.data->AddGObject(point1.take()); + const quint32 id = initData.data->AddGObject(point1.release()); VAbstractNodeInitData initNodeData; initNodeData.id = id; @@ -429,21 +429,21 @@ quint32 AddNodePoint(const VPieceNode &node, const VToolUnionDetailsInitData &in quint32 AddPin(quint32 id, const VToolUnionDetailsInitData &initData, QVector &children, const QString &drawName, qreal dx, qreal dy, quint32 pRotate, qreal angle) { - QScopedPointer point(new VPointF(*initData.data->GeometricObject(id))); + std::unique_ptr point(new VPointF(*initData.data->GeometricObject(id))); point->setMode(Draw::Modeling); if (not qFuzzyIsNull(dx) || not qFuzzyIsNull(dy) || pRotate != NULL_ID) { - BiasRotatePoint(point.data(), dx, dy, static_cast(*initData.data->GeometricObject(pRotate)), + BiasRotatePoint(point.get(), dx, dy, static_cast(*initData.data->GeometricObject(pRotate)), angle); } - QScopedPointer point1(new VPointF(*point)); + std::unique_ptr point1(new VPointF(*point)); - const quint32 idObject = initData.data->AddGObject(point.take()); + const quint32 idObject = initData.data->AddGObject(point.release()); children.append(idObject); point1->setMode(Draw::Modeling); - const quint32 idPin = initData.data->AddGObject(point1.take()); + const quint32 idPin = initData.data->AddGObject(point1.release()); VToolPinInitData initNodeData; initNodeData.id = idPin; @@ -464,11 +464,11 @@ quint32 AddPin(quint32 id, const VToolUnionDetailsInitData &initData, QVector &children, const QString &drawName, qreal dx, qreal dy, quint32 pRotate, qreal angle) { - QScopedPointer label(new VPlaceLabelItem(*initData.data->GeometricObject(id))); + std::unique_ptr label(new VPlaceLabelItem(*initData.data->GeometricObject(id))); if (not qFuzzyIsNull(dx) || not qFuzzyIsNull(dy) || pRotate != NULL_ID) { - BiasRotatePoint(label.data(), dx, dy, static_cast(*initData.data->GeometricObject(pRotate)), + BiasRotatePoint(label.get(), dx, dy, static_cast(*initData.data->GeometricObject(pRotate)), angle); } @@ -488,12 +488,12 @@ quint32 AddPlaceLabel(quint32 id, const VToolUnionDetailsInitData &initData, QVe initNodeData.visibilityTrigger = label->GetVisibilityTrigger(); initNodeData.type = label->GetLabelType(); - QScopedPointer label1(new VPlaceLabelItem(*label)); + std::unique_ptr label1(new VPlaceLabelItem(*label)); - initNodeData.centerPoint = initData.data->AddGObject(label.take()); + initNodeData.centerPoint = initData.data->AddGObject(label.release()); children.append(initNodeData.centerPoint); - const quint32 idLabel = initData.data->AddGObject(label1.take()); + const quint32 idLabel = initData.data->AddGObject(label1.release()); initNodeData.id = idLabel; VToolPlaceLabel::Create(initNodeData); @@ -508,7 +508,7 @@ quint32 AddNodeArc(const VPieceNode &node, const VToolUnionDetailsInitData &init const QSharedPointer arc = initData.data->GeometricObject(node.GetId()); VPointF p1 = VPointF(arc->GetP1(), "A", 0, 0); VPointF p2 = VPointF(arc->GetP2(), "A", 0, 0); - QScopedPointer center(new VPointF(arc->GetCenter())); + std::unique_ptr center(new VPointF(arc->GetCenter())); if (not qFuzzyIsNull(dx) || not qFuzzyIsNull(dy) || pRotate != NULL_ID) { @@ -516,27 +516,27 @@ quint32 AddNodeArc(const VPieceNode &node, const VToolUnionDetailsInitData &init BiasRotatePoint(&p1, dx, dy, p, angle); BiasRotatePoint(&p2, dx, dy, p, angle); - BiasRotatePoint(center.data(), dx, dy, p, angle); + BiasRotatePoint(center.get(), dx, dy, p, angle); } QLineF l1(static_cast(*center), static_cast(p1)); QLineF l2(static_cast(*center), static_cast(p2)); center->setMode(Draw::Modeling); - VPointF *tmpCenter = center.take(); + VPointF *tmpCenter = center.release(); const quint32 idCenter = initData.data->AddGObject(tmpCenter); Q_UNUSED(idCenter) - QScopedPointer arc1(new VArc(*tmpCenter, arc->GetRadius(), arc->GetFormulaRadius(), l1.angle(), - QString().setNum(l1.angle()), l2.angle(), QString().setNum(l2.angle()))); + std::unique_ptr arc1(new VArc(*tmpCenter, arc->GetRadius(), arc->GetFormulaRadius(), l1.angle(), + QString().setNum(l1.angle()), l2.angle(), QString().setNum(l2.angle()))); arc1->setMode(Draw::Modeling); - QScopedPointerarc2(new VArc(*arc1)); + std::unique_ptrarc2(new VArc(*arc1)); - const quint32 idObject = initData.data->AddGObject(arc1.take()); + const quint32 idObject = initData.data->AddGObject(arc1.release()); children.append(idObject); arc2->setIdObject(idObject); arc2->setMode(Draw::Modeling); - const quint32 id = initData.data->AddGObject(arc2.take()); + const quint32 id = initData.data->AddGObject(arc2.release()); VAbstractNodeInitData initNodeData; initNodeData.id = id; @@ -560,7 +560,7 @@ quint32 AddNodeElArc(const VPieceNode &node, const VToolUnionDetailsInitData &in const QSharedPointer arc = initData.data->GeometricObject(node.GetId()); VPointF p1 = VPointF(arc->GetP1(), "A", 0, 0); VPointF p2 = VPointF(arc->GetP2(), "A", 0, 0); - QScopedPointer center(new VPointF(arc->GetCenter())); + std::unique_ptr center(new VPointF(arc->GetCenter())); if (not qFuzzyIsNull(dx) || not qFuzzyIsNull(dy) || pRotate != NULL_ID) { @@ -568,29 +568,29 @@ quint32 AddNodeElArc(const VPieceNode &node, const VToolUnionDetailsInitData &in BiasRotatePoint(&p1, dx, dy, p, angle); BiasRotatePoint(&p2, dx, dy, p, angle); - BiasRotatePoint(center.data(), dx, dy, p, angle); + BiasRotatePoint(center.get(), dx, dy, p, angle); } QLineF l1(static_cast(*center), static_cast(p1)); QLineF l2(static_cast(*center), static_cast(p2)); center->setMode(Draw::Modeling); - VPointF *tmpCenter = center.take(); + VPointF *tmpCenter = center.release(); quint32 idCenter = initData.data->AddGObject(tmpCenter); Q_UNUSED(idCenter) - QScopedPointer arc1(new VEllipticalArc (*tmpCenter, arc->GetRadius1(), arc->GetRadius2(), - arc->GetFormulaRadius1(), arc->GetFormulaRadius2(), - l1.angle(), QString().setNum(l1.angle()), l2.angle(), - QString().setNum(l2.angle()), 0, QChar('0'))); + std::unique_ptr arc1(new VEllipticalArc (*tmpCenter, arc->GetRadius1(), arc->GetRadius2(), + arc->GetFormulaRadius1(), arc->GetFormulaRadius2(), + l1.angle(), QString().setNum(l1.angle()), l2.angle(), + QString().setNum(l2.angle()), 0, QChar('0'))); arc1->setMode(Draw::Modeling); - QScopedPointer arc2(new VEllipticalArc(*arc1)); + std::unique_ptr arc2(new VEllipticalArc(*arc1)); - const quint32 idObject = initData.data->AddGObject(arc1.take()); + const quint32 idObject = initData.data->AddGObject(arc1.release()); children.append(idObject); arc2->setIdObject(idObject); arc2->setMode(Draw::Modeling); - const quint32 id = initData.data->AddGObject(arc2.take()); + const quint32 id = initData.data->AddGObject(arc2.release()); VAbstractNodeInitData initNodeData; initNodeData.id = id; @@ -657,7 +657,7 @@ quint32 AddNodeSplinePath(const VPieceNode &node, const VToolUnionDetailsInitDat QVector &children, const QString &drawName, qreal dx, qreal dy, quint32 pRotate, qreal angle) { - QScopedPointer path(new VSplinePath()); + std::unique_ptr path(new VSplinePath()); path->setMode(Draw::Modeling); const QSharedPointer splinePath = initData.data->GeometricObject(node.GetId()); @@ -703,14 +703,14 @@ quint32 AddNodeSplinePath(const VPieceNode &node, const VToolUnionDetailsInitDat path->append(VSplinePoint(*p4, spl.GetEndAngle(), spl.GetEndAngleFormula(), angle2, angle2F, spline.GetC2Length(), spline.GetC2LengthFormula(), pL2, pL2F)); } - QScopedPointer path1(new VSplinePath(*path)); + std::unique_ptr path1(new VSplinePath(*path)); - const quint32 idObject = initData.data->AddGObject(path.take()); + const quint32 idObject = initData.data->AddGObject(path.release()); children.append(idObject); path1->setIdObject(idObject); path1->setMode(Draw::Modeling); - const quint32 id = initData.data->AddGObject(path1.take()); + const quint32 id = initData.data->AddGObject(path1.release()); VAbstractNodeInitData initNodeData; initNodeData.id = id; @@ -935,13 +935,13 @@ quint32 TakeNextId(QVector &children) void UpdateNodePoint(VContainer *data, const VPieceNode &node, QVector &children, qreal dx, qreal dy, quint32 pRotate, qreal angle) { - QScopedPointer point(new VPointF(*data->GeometricObject(node.GetId()))); + std::unique_ptr point(new VPointF(*data->GeometricObject(node.GetId()))); point->setMode(Draw::Modeling); if (not qFuzzyIsNull(dx) || not qFuzzyIsNull(dy) || pRotate != NULL_ID) { - BiasRotatePoint(point.data(), dx, dy, static_cast(*data->GeometricObject(pRotate)), angle); + BiasRotatePoint(point.get(), dx, dy, static_cast(*data->GeometricObject(pRotate)), angle); } - data->UpdateGObject(TakeNextId(children), point.take()); + data->UpdateGObject(TakeNextId(children), point.release()); } //--------------------------------------------------------------------------------------------------------------------- @@ -965,10 +965,10 @@ void UpdateNodeArc(VContainer *data, const VPieceNode &node, QVector &c QLineF l1(static_cast(*center), static_cast(p1)); QLineF l2(static_cast(*center), static_cast(p2)); - QScopedPointer arc1(new VArc(*center, arc->GetRadius(), arc->GetFormulaRadius(), l1.angle(), - QString().setNum(l1.angle()), l2.angle(), QString().setNum(l2.angle()))); + std::unique_ptr arc1(new VArc(*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.take()); + data->UpdateGObject(TakeNextId(children), arc1.release()); } //--------------------------------------------------------------------------------------------------------------------- @@ -992,12 +992,12 @@ void UpdateNodeElArc(VContainer *data, const VPieceNode &node, QVector QLineF l1(static_cast(*center), static_cast(p1)); QLineF l2(static_cast(*center), static_cast(p2)); - QScopedPointer arc1(new VEllipticalArc (*center, arc->GetRadius1(), arc->GetRadius2(), - arc->GetFormulaRadius1(), arc->GetFormulaRadius2(), - l1.angle(), QString().setNum(l1.angle()), l2.angle(), - QString().setNum(l2.angle()), 0, QChar('0'))); + std::unique_ptr arc1(new VEllipticalArc (*center, arc->GetRadius1(), arc->GetRadius2(), + arc->GetFormulaRadius1(), arc->GetFormulaRadius2(), + l1.angle(), QString().setNum(l1.angle()), l2.angle(), + QString().setNum(l2.angle()), 0, QChar('0'))); arc1->setMode(Draw::Modeling); - data->UpdateGObject(TakeNextId(children), arc1.take()); + data->UpdateGObject(TakeNextId(children), arc1.release()); } //--------------------------------------------------------------------------------------------------------------------- @@ -1022,16 +1022,16 @@ void UpdateNodeSpline(VContainer *data, const VPieceNode &node, QVector BiasRotatePoint(p4.data(), dx, dy, p, angle); } - QScopedPointer spl(new VSpline(*p1, static_cast(p2), static_cast(p3), *p4, 0, - Draw::Modeling)); - data->UpdateGObject(TakeNextId(children), spl.take()); + std::unique_ptr spl(new VSpline(*p1, static_cast(p2), static_cast(p3), *p4, 0, + Draw::Modeling)); + data->UpdateGObject(TakeNextId(children), spl.release()); } //--------------------------------------------------------------------------------------------------------------------- void UpdateNodeSplinePath(VContainer *data, const VPieceNode &node, QVector &children, qreal dx, qreal dy, quint32 pRotate, qreal angle) { - QScopedPointer path(new VSplinePath()); + std::unique_ptr path(new VSplinePath()); path->setMode(Draw::Modeling); const QSharedPointer splinePath = data->GeometricObject(node.GetId()); @@ -1080,7 +1080,7 @@ void UpdateNodeSplinePath(VContainer *data, const VPieceNode &node, QVectorappend(VSplinePoint(*p4, spl.GetEndAngle(), spl.GetEndAngleFormula(), angle2, angle2F, spline.GetC2Length(), spline.GetC2LengthFormula(), pL2, pL2F)); } - data->UpdateGObject(TakeNextId(children), path.take()); + data->UpdateGObject(TakeNextId(children), path.release()); } //--------------------------------------------------------------------------------------------------------------------- @@ -1498,14 +1498,14 @@ void UpdateUnitedDetailPins(const VToolUnionDetailsInitData &initData, qreal dx, for (auto record : records) { - QScopedPointer point(new VPointF(*initData.data->GeometricObject(record))); + std::unique_ptr point(new VPointF(*initData.data->GeometricObject(record))); point->setMode(Draw::Modeling); if (not qFuzzyIsNull(dx) || not qFuzzyIsNull(dy) || pRotate != NULL_ID) { - BiasRotatePoint(point.data(), dx, dy, + BiasRotatePoint(point.get(), dx, dy, static_cast(*initData.data->GeometricObject(pRotate)), angle); } - initData.data->UpdateGObject(TakeNextId(children), point.take()); + initData.data->UpdateGObject(TakeNextId(children), point.release()); } } @@ -1523,7 +1523,7 @@ void UpdateUnitedDetailPlaceLabels(const VToolUnionDetailsInitData &initData, qr BiasRotatePoint(parentLabel.data(), dx, dy, static_cast(*initData.data->GeometricObject(pRotate)), angle); } - QScopedPointer label(new VPlaceLabelItem()); + std::unique_ptr label(new VPlaceLabelItem()); label->setName(parentLabel->name()); label->setX(parentLabel->x()); label->setY(parentLabel->y()); @@ -1531,7 +1531,7 @@ void UpdateUnitedDetailPlaceLabels(const VToolUnionDetailsInitData &initData, qr label->setMy(parentLabel->my()); label->SetCorrectionAngle(parentLabel->GetCorrectionAngle()+angle); - initData.data->UpdateGObject(TakeNextId(children), label.take()); + initData.data->UpdateGObject(TakeNextId(children), label.release()); } } diff --git a/src/libs/vwidgets/vhighlighter.cpp b/src/libs/vwidgets/vhighlighter.cpp index 02184cc16..264305810 100644 --- a/src/libs/vwidgets/vhighlighter.cpp +++ b/src/libs/vwidgets/vhighlighter.cpp @@ -61,30 +61,30 @@ VHighlighter::VHighlighter(QTextDocument *document) //--------------------------------------------------------------------------------------------------------------------- void VHighlighter::highlightBlock(const QString &text) { - QScopedPointer data(new VTextBlockData); + std::unique_ptr data(new VTextBlockData); vsizetype leftPos = text.indexOf('('); while (leftPos != -1) { - QScopedPointer info(new ParenthesisInfo); + std::unique_ptr info(new ParenthesisInfo); info->character = '('; info->position = leftPos; - data->insert(info.take()); + data->insert(info.release()); leftPos = text.indexOf('(', leftPos + 1); } vsizetype rightPos = text.indexOf(')'); while (rightPos != -1) { - QScopedPointer info(new ParenthesisInfo); + std::unique_ptr info(new ParenthesisInfo); info->character = ')'; info->position = rightPos; - data->insert(info.take()); + data->insert(info.release()); rightPos = text.indexOf(')', rightPos +1); } - setCurrentBlockUserData(data.take()); + setCurrentBlockUserData(data.release()); }