From 643deeb52153b5e26ba8197985cec7f874e4aaf7 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 19 Feb 2024 18:15:42 +0200 Subject: [PATCH] Use auto to avoid duplicating the type name. --- src/app/valentina/xml/vpattern.cpp | 15 ++++++------- src/libs/ifc/xml/vpatternconverter.cpp | 2 +- src/libs/vdxf/dxiface.cpp | 4 ++-- src/libs/vdxf/dxiface.h | 4 ++-- src/libs/vdxf/libdxfrw/drw_objects.h | 4 ++-- src/libs/vlayout/vposter.cpp | 2 +- src/libs/vmisc/dialogs/dialogexporttocsv.cpp | 4 ++-- src/libs/vobj/vobjpaintdevice.cpp | 2 +- src/libs/vpatterndb/calculator.cpp | 2 +- .../vpropertyexplorer/checkablemessagebox.cpp | 16 +++++++------- .../plugins/vcolorproperty.cpp | 6 +++--- .../plugins/vcolorpropertyeditor.cpp | 4 ++-- .../plugins/venumproperty.cpp | 6 +++--- .../plugins/vfilepropertyeditor.cpp | 2 +- .../plugins/vlabelproperty.cpp | 6 +++--- .../plugins/vobjectproperty.cpp | 10 ++++----- .../plugins/vpointfproperty.cpp | 4 ++-- .../plugins/vshortcutproperty.cpp | 6 +++--- .../plugins/vshortcutpropertyeditor.cpp | 4 ++-- .../plugins/vstringproperty.cpp | 10 ++++----- .../plugins/vtextproperty.cpp | 6 +++--- .../plugins/vwidgetproperty.cpp | 2 +- src/libs/vpropertyexplorer/vproperty.cpp | 2 +- .../vpropertyexplorer/vpropertydelegate.cpp | 6 +++--- .../vpropertyexplorer/vpropertyformwidget.cpp | 4 ++-- src/libs/vpropertyexplorer/vpropertymodel.cpp | 4 ++-- src/libs/vpropertyexplorer/vpropertyset.cpp | 2 +- src/libs/vtest/abstracttest.cpp | 6 +++--- src/libs/vtools/dialogs/dialogtoolbox.cpp | 4 ++-- .../dialogs/tools/dialogcubicbezierpath.cpp | 5 ++--- .../dialogs/tools/dialogflippingbyaxis.cpp | 17 +++++++-------- .../dialogs/tools/dialogflippingbyline.cpp | 21 +++++++++---------- src/libs/vtools/dialogs/tools/dialogline.cpp | 6 +++--- .../dialogs/tools/dialoglineintersect.cpp | 12 +++++------ .../dialogs/tools/dialoglineintersectaxis.cpp | 10 ++++----- .../tools/dialogpointfromarcandtangent.cpp | 6 +++--- .../tools/dialogpointofintersection.cpp | 8 +++---- .../tools/dialogpointofintersectionarcs.cpp | 10 ++++----- src/libs/vtools/dialogs/tools/dialogtool.cpp | 2 +- src/libs/vtools/dialogs/tools/dialogtool.h | 3 +-- .../vtools/dialogs/tools/dialogtriangle.cpp | 12 +++++------ .../vtools/dialogs/tools/dialogtruedarts.cpp | 16 +++++++------- .../tools/piece/dialogduplicatedetail.cpp | 4 ++-- .../dialogs/tools/piece/dialoginsertnode.cpp | 6 +++--- .../tools/piece/dialogpatternmaterials.cpp | 2 +- .../vtools/dialogs/tools/piece/dialogpin.cpp | 2 +- .../dialogs/tools/piece/dialogplacelabel.cpp | 2 +- .../flipping/vtoolflippingbyaxis.cpp | 2 +- .../flipping/vtoolflippingbyline.cpp | 2 +- .../toolcurve/vtoolarcwithlength.cpp | 2 +- .../toolcurve/vtoolellipticalarc.cpp | 5 ++--- .../drawTools/toolcurve/vtoolsplinepath.cpp | 4 ++-- .../toolcut/vtoolcutsplinepath.cpp | 4 ++-- .../toollinepoint/vtoolbisector.cpp | 4 ++-- .../toollinepoint/vtoolendline.cpp | 4 ++-- .../toollinepoint/vtoolheight.cpp | 4 ++-- .../toollinepoint/vtoollineintersectaxis.cpp | 4 ++-- .../toollinepoint/vtoolnormal.cpp | 4 ++-- .../toollinepoint/vtoolshoulderpoint.cpp | 4 ++-- .../toolsinglepoint/vtoolbasepoint.cpp | 12 +++++------ .../toolsinglepoint/vtoollineintersect.cpp | 4 ++-- .../vtoolpointfromarcandtangent.cpp | 4 ++-- .../toolsinglepoint/vtoolpointofcontact.cpp | 4 ++-- .../vtoolpointofintersection.cpp | 4 ++-- .../vtoolpointofintersectionarcs.cpp | 4 ++-- .../vtoolpointofintersectioncircles.cpp | 4 ++-- .../toolsinglepoint/vtoolsinglepoint.cpp | 4 ++-- src/libs/vtools/tools/drawTools/vdrawtool.h | 2 +- src/libs/vtools/tools/drawTools/vtoolline.cpp | 2 +- .../vtools/tools/nodeDetails/vnodearc.cpp | 2 +- .../tools/nodeDetails/vnodeellipticalarc.cpp | 2 +- .../tools/nodeDetails/vnodesplinepath.cpp | 2 +- .../vtools/tools/nodeDetails/vtoolpin.cpp | 2 +- src/libs/vtools/tools/vabstracttool.cpp | 2 +- .../undocommands/label/movedoublelabel.cpp | 4 ++-- .../undocommands/label/operationmovelabel.cpp | 4 ++-- .../undocommands/label/operationshowlabel.cpp | 2 +- .../undocommands/label/showdoublelabel.cpp | 2 +- .../vtools/undocommands/label/showlabel.cpp | 2 +- src/libs/vtools/undocommands/movepiece.cpp | 4 ++-- .../vtools/undocommands/movesplinepath.cpp | 2 +- src/libs/vtools/undocommands/renamepp.cpp | 2 +- .../undocommands/savepiecepathoptions.cpp | 6 +++--- .../vtools/undocommands/savetooloptions.cpp | 2 +- src/libs/vwidgets/fancytabbar/fancytabbar.cpp | 2 +- src/libs/vwidgets/global.cpp | 2 +- src/libs/vwidgets/qtcolorpicker.cpp | 4 ++-- src/libs/vwidgets/vcomboboxdelegate.cpp | 6 +++--- src/libs/vwidgets/vplaintextedit.cpp | 4 ++-- src/libs/vwidgets/vwidgetpopup.cpp | 4 ++-- 90 files changed, 217 insertions(+), 225 deletions(-) diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp index 0a184f617..1e399ec36 100644 --- a/src/app/valentina/xml/vpattern.cpp +++ b/src/app/valentina/xml/vpattern.cpp @@ -2787,8 +2787,7 @@ void VPattern::ParseToolSpline(VMainGraphicsScene *scene, QDomElement &domElemen if (spl != nullptr) { - VAbstractMainWindow *window = - qobject_cast(VAbstractValApplication::VApp()->getMainWindow()); + auto *window = qobject_cast(VAbstractValApplication::VApp()->getMainWindow()); SCASSERT(window != nullptr) connect(spl, &VToolSpline::ToolTip, window, &VAbstractMainWindow::ShowToolTip); } @@ -2997,8 +2996,7 @@ void VPattern::ParseToolSplinePath(VMainGraphicsScene *scene, const QDomElement if (spl != nullptr) { - VAbstractMainWindow *window = - qobject_cast(VAbstractValApplication::VApp()->getMainWindow()); + auto *window = qobject_cast(VAbstractValApplication::VApp()->getMainWindow()); SCASSERT(window != nullptr) connect(spl, &VToolSplinePath::ToolTip, window, &VAbstractMainWindow::ShowToolTip); } @@ -3121,14 +3119,14 @@ void VPattern::ParseNodeSpline(const QDomElement &domElement, const Document &pa const auto obj = initData.data->GetGObject(initData.idObject); if (obj->getType() == GOType::Spline) { - VSpline *spl = new VSpline(*data->GeometricObject(initData.idObject)); + auto *spl = new VSpline(*data->GeometricObject(initData.idObject)); spl->setIdObject(initData.idObject); spl->setMode(Draw::Modeling); initData.data->UpdateGObject(initData.id, spl); } else { - VCubicBezier *spl = new VCubicBezier(*initData.data->GeometricObject(initData.idObject)); + auto *spl = new VCubicBezier(*initData.data->GeometricObject(initData.idObject)); spl->setIdObject(initData.idObject); spl->setMode(Draw::Modeling); initData.data->UpdateGObject(initData.id, spl); @@ -3169,15 +3167,14 @@ void VPattern::ParseNodeSplinePath(const QDomElement &domElement, const Document const auto obj = initData.data->GetGObject(initData.idObject); if (obj->getType() == GOType::SplinePath) { - VSplinePath *path = new VSplinePath(*initData.data->GeometricObject(initData.idObject)); + auto *path = new VSplinePath(*initData.data->GeometricObject(initData.idObject)); path->setIdObject(initData.idObject); path->setMode(Draw::Modeling); initData.data->UpdateGObject(initData.id, path); } else { - VCubicBezierPath *spl = - new VCubicBezierPath(*initData.data->GeometricObject(initData.idObject)); + auto *spl = new VCubicBezierPath(*initData.data->GeometricObject(initData.idObject)); spl->setIdObject(initData.idObject); spl->setMode(Draw::Modeling); initData.data->UpdateGObject(initData.id, spl); diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index 43b5096c4..8d63b4e6c 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -1035,7 +1035,7 @@ auto VPatternConverter::FixIncrementInFormulaToV0_2_0(const QString &formula, co // TODO. Delete if minimal supported version is 0.2.0 Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); - qmu::QmuTokenParser *cal = new qmu::QmuTokenParser(formula, false, false); // Eval formula + auto *cal = new qmu::QmuTokenParser(formula, false, false); // Eval formula QMap tokens = cal->GetTokens(); // Tokens (variables, measurements) delete cal; diff --git a/src/libs/vdxf/dxiface.cpp b/src/libs/vdxf/dxiface.cpp index af093ac83..61c68df86 100644 --- a/src/libs/vdxf/dxiface.cpp +++ b/src/libs/vdxf/dxiface.cpp @@ -137,7 +137,7 @@ void dx_iface::writeBlocks() { dxfW->writeBlock(bk); // and write each entity in block - for (std::list::const_iterator it = bk->ent.begin(); it != bk->ent.end(); ++it) + for (auto it = bk->ent.begin(); it != bk->ent.end(); ++it) writeEntity(*it); } } @@ -150,7 +150,7 @@ void dx_iface::writeBlockRecords() void dx_iface::writeEntities() { - for (std::list::const_iterator it = cData.mBlock->ent.begin(); it != cData.mBlock->ent.end(); ++it) + for (auto it = cData.mBlock->ent.begin(); it != cData.mBlock->ent.end(); ++it) writeEntity(*it); } diff --git a/src/libs/vdxf/dxiface.h b/src/libs/vdxf/dxiface.h index 050bfac4a..7c8f79cb4 100644 --- a/src/libs/vdxf/dxiface.h +++ b/src/libs/vdxf/dxiface.h @@ -56,7 +56,7 @@ public: virtual ~dx_ifaceBlock() { - for (std::list::const_iterator it = ent.begin(); it != ent.end(); ++it) + for (auto it = ent.begin(); it != ent.end(); ++it) delete *it; } std::list ent; // stores the entities list @@ -83,7 +83,7 @@ public: ~dx_data() { // cleanup, - for (std::list::const_iterator it = blocks.begin(); it != blocks.end(); ++it) + for (auto it = blocks.begin(); it != blocks.end(); ++it) delete *it; delete mBlock; } diff --git a/src/libs/vdxf/libdxfrw/drw_objects.h b/src/libs/vdxf/libdxfrw/drw_objects.h index 2cd792f0c..586bdfa8c 100644 --- a/src/libs/vdxf/libdxfrw/drw_objects.h +++ b/src/libs/vdxf/libdxfrw/drw_objects.h @@ -80,10 +80,10 @@ public: extData(), curr(nullptr) { - for (std::vector::const_iterator it = e.extData.begin(); it != e.extData.end(); ++it) + for (auto it = e.extData.begin(); it != e.extData.end(); ++it) { DRW_Variant *src = *it; - DRW_Variant *dst = new DRW_Variant(*src); + auto *dst = new DRW_Variant(*src); extData.push_back(dst); if (src == e.curr) { diff --git a/src/libs/vlayout/vposter.cpp b/src/libs/vlayout/vposter.cpp index fd8a7664b..9fd7158de 100644 --- a/src/libs/vlayout/vposter.cpp +++ b/src/libs/vlayout/vposter.cpp @@ -275,7 +275,7 @@ auto VPoster::TextWatermark(QGraphicsItem *parent, const PosterData &img, const QVector data; - QGraphicsSimpleTextItem *text = new QGraphicsSimpleTextItem(watermarkData.text, parent); + auto *text = new QGraphicsSimpleTextItem(watermarkData.text, parent); text->setFont(watermarkData.font); QPen pen = text->pen(); diff --git a/src/libs/vmisc/dialogs/dialogexporttocsv.cpp b/src/libs/vmisc/dialogs/dialogexporttocsv.cpp index 48684996c..31ff04747 100644 --- a/src/libs/vmisc/dialogs/dialogexporttocsv.cpp +++ b/src/libs/vmisc/dialogs/dialogexporttocsv.cpp @@ -231,7 +231,7 @@ void DialogExportToCSV::ShowPreview() { for (int column = 0; column < columns; ++column) { - QTableWidgetItem *header = new QTableWidgetItem(csv.headerText(column)); + auto *header = new QTableWidgetItem(csv.headerText(column)); ui->tableWidget->setHorizontalHeaderItem(column, header); } ui->tableWidget->horizontalHeader()->setStretchLastSection(true); @@ -241,7 +241,7 @@ void DialogExportToCSV::ShowPreview() { for (int column = 0; column < columns; ++column) { - QTableWidgetItem *item = new QTableWidgetItem(csv.text(row, column)); + auto *item = new QTableWidgetItem(csv.text(row, column)); item->setToolTip(csv.text(row, column)); // set the item non-editable (view only), and non-selectable diff --git a/src/libs/vobj/vobjpaintdevice.cpp b/src/libs/vobj/vobjpaintdevice.cpp index 22ee91d91..f69692f1c 100644 --- a/src/libs/vobj/vobjpaintdevice.cpp +++ b/src/libs/vobj/vobjpaintdevice.cpp @@ -85,7 +85,7 @@ void VObjPaintDevice::setFileName(const QString &value) owns_iodevice = static_cast(true); fileName = value; - QFile *file = new QFile(fileName); + auto *file = new QFile(fileName); engine->setOutputDevice(file); } diff --git a/src/libs/vpatterndb/calculator.cpp b/src/libs/vpatterndb/calculator.cpp index 4e2b7b5f1..3602f8f6e 100644 --- a/src/libs/vpatterndb/calculator.cpp +++ b/src/libs/vpatterndb/calculator.cpp @@ -97,7 +97,7 @@ auto Calculator::EvalFormula(const QHash qreal * { Q_UNUSED(a_szName) - Calculator *calc = static_cast(a_pUserData); + auto *calc = static_cast(a_pUserData); if (calc->m_vars != nullptr && calc->m_vars->contains(a_szName)) { diff --git a/src/libs/vpropertyexplorer/checkablemessagebox.cpp b/src/libs/vpropertyexplorer/checkablemessagebox.cpp index a4faac88e..e992a6897 100644 --- a/src/libs/vpropertyexplorer/checkablemessagebox.cpp +++ b/src/libs/vpropertyexplorer/checkablemessagebox.cpp @@ -66,7 +66,7 @@ public: pixmapLabel->setSizePolicy(sizePolicy); pixmapLabel->setVisible(false); - QSpacerItem *pixmapSpacer = new QSpacerItem(0, 5, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding); + auto *pixmapSpacer = new QSpacerItem(0, 5, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding); messageLabel = new QLabel(q); messageLabel->setMinimumSize(QSize(300, 0)); @@ -74,8 +74,8 @@ public: messageLabel->setOpenExternalLinks(true); messageLabel->setTextInteractionFlags(Qt::LinksAccessibleByKeyboard | Qt::LinksAccessibleByMouse); - QSpacerItem *checkBoxRightSpacer = new QSpacerItem(1, 1, QSizePolicy::Expanding, QSizePolicy::Minimum); - QSpacerItem *buttonSpacer = new QSpacerItem(0, 1, QSizePolicy::Minimum, QSizePolicy::Minimum); + auto *checkBoxRightSpacer = new QSpacerItem(1, 1, QSizePolicy::Expanding, QSizePolicy::Minimum); + auto *buttonSpacer = new QSpacerItem(0, 1, QSizePolicy::Minimum, QSizePolicy::Minimum); checkBox = new QCheckBox(q); checkBox->setText(CheckableMessageBox::tr("Do not ask again")); @@ -84,19 +84,19 @@ public: buttonBox->setOrientation(Qt::Horizontal); buttonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok); - QVBoxLayout *verticalLayout = new QVBoxLayout(); + auto *verticalLayout = new QVBoxLayout(); verticalLayout->addWidget(pixmapLabel); verticalLayout->addItem(pixmapSpacer); - QHBoxLayout *horizontalLayout_2 = new QHBoxLayout(); + auto *horizontalLayout_2 = new QHBoxLayout(); horizontalLayout_2->addLayout(verticalLayout); horizontalLayout_2->addWidget(messageLabel); - QHBoxLayout *horizontalLayout = new QHBoxLayout(); + auto *horizontalLayout = new QHBoxLayout(); horizontalLayout->addWidget(checkBox); horizontalLayout->addItem(checkBoxRightSpacer); - QVBoxLayout *verticalLayout_2 = new QVBoxLayout(q); + auto *verticalLayout_2 = new QVBoxLayout(q); verticalLayout_2->addLayout(horizontalLayout_2); verticalLayout_2->addLayout(horizontalLayout); verticalLayout_2->addItem(buttonSpacer); @@ -230,7 +230,7 @@ auto CheckableMessageBox::defaultButton() const -> QDialogButtonBox::StandardBut const QList buttons = d->buttonBox->buttons(); for (auto *b : buttons) { - if (QPushButton *pb = qobject_cast(b)) + if (auto *pb = qobject_cast(b)) { if (pb->isDefault()) { diff --git a/src/libs/vpropertyexplorer/plugins/vcolorproperty.cpp b/src/libs/vpropertyexplorer/plugins/vcolorproperty.cpp index ed13c6303..f199f1d29 100644 --- a/src/libs/vpropertyexplorer/plugins/vcolorproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vcolorproperty.cpp @@ -67,7 +67,7 @@ auto VPE::VColorProperty::createEditor(QWidget *parent, const QStyleOptionViewIt Q_UNUSED(options) Q_UNUSED(delegate) - VColorPropertyEditor* tmpWidget = new VColorPropertyEditor(parent); + auto *tmpWidget = new VColorPropertyEditor(parent); tmpWidget->setLocale(parent->locale()); tmpWidget->SetColor(d_ptr->VariantValue.value()); return tmpWidget; @@ -76,7 +76,7 @@ auto VPE::VColorProperty::createEditor(QWidget *parent, const QStyleOptionViewIt //! Sets the property's data to the editor (returns false, if the standard delegate should do that) auto VPE::VColorProperty::setEditorData(QWidget *editor) -> bool { - VColorPropertyEditor* tmpWidget = qobject_cast(editor); + auto *tmpWidget = qobject_cast(editor); if (tmpWidget) { tmpWidget->SetColor(d_ptr->VariantValue.value()); @@ -90,7 +90,7 @@ auto VPE::VColorProperty::setEditorData(QWidget *editor) -> bool //! Gets the data from the widget auto VPE::VColorProperty::getEditorData(const QWidget *editor) const -> QVariant { - const VColorPropertyEditor* tmpWidget = qobject_cast(editor); + const auto *tmpWidget = qobject_cast(editor); if (tmpWidget) { return tmpWidget->GetColor(); diff --git a/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.cpp b/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.cpp index 79b13302a..d729adf85 100644 --- a/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.cpp +++ b/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.cpp @@ -60,7 +60,7 @@ VPE::VColorPropertyEditor::VColorPropertyEditor(QWidget *parent) Spacer = new QSpacerItem(1, 0, QSizePolicy::Expanding, QSizePolicy::Ignored); // The layout (a horizontal layout) - QHBoxLayout* layout = new QHBoxLayout(this); + auto *layout = new QHBoxLayout(this); layout->setSpacing(3); layout->setContentsMargins(0, 0, 0, 0); layout->addWidget(ColorLabel); @@ -101,7 +101,7 @@ void VPE::VColorPropertyEditor::onToolButtonClicked() { SetColor(newColor); emit dataChangedByUser(Color, this); - UserChangeEvent *event = new UserChangeEvent(); + auto *event = new UserChangeEvent(); QCoreApplication::postEvent ( this, event ); } } diff --git a/src/libs/vpropertyexplorer/plugins/venumproperty.cpp b/src/libs/vpropertyexplorer/plugins/venumproperty.cpp index b6a090854..94b24800e 100644 --- a/src/libs/vpropertyexplorer/plugins/venumproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/venumproperty.cpp @@ -79,7 +79,7 @@ auto VPE::VEnumProperty::createEditor(QWidget *parent, const QStyleOptionViewIte { Q_UNUSED(options) Q_UNUSED(delegate) - QComboBox* tmpEditor = new QComboBox(parent); + auto *tmpEditor = new QComboBox(parent); tmpEditor->clear(); tmpEditor->setLocale(parent->locale()); tmpEditor->addItems(EnumerationLiterals); @@ -93,7 +93,7 @@ auto VPE::VEnumProperty::createEditor(QWidget *parent, const QStyleOptionViewIte //! Gets the data from the widget auto VPE::VEnumProperty::getEditorData(const QWidget *editor) const -> QVariant { - const QComboBox* tmpEditor = qobject_cast(editor); + const auto *tmpEditor = qobject_cast(editor); if (tmpEditor) { return tmpEditor->currentIndex(); @@ -173,6 +173,6 @@ auto VPE::VEnumProperty::getSettingKeys() const -> QStringList void VPE::VEnumProperty::currentIndexChanged(int index) { Q_UNUSED(index) - UserChangeEvent *event = new UserChangeEvent(); + auto *event = new UserChangeEvent(); QCoreApplication::postEvent ( VProperty::d_ptr->editor, event ); } diff --git a/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.cpp b/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.cpp index da17efcdd..80f1529dd 100644 --- a/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.cpp +++ b/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.cpp @@ -63,7 +63,7 @@ VPE::VFileEditWidget::VFileEditWidget(QWidget *parent, bool is_directory) FileLineEdit->installEventFilter(this); // The layout (a horizontal layout) - QHBoxLayout *layout = new QHBoxLayout(this); + auto *layout = new QHBoxLayout(this); layout->setSpacing(0); layout->setContentsMargins(0, 0, 0, 0); layout->addWidget(FileLineEdit); diff --git a/src/libs/vpropertyexplorer/plugins/vlabelproperty.cpp b/src/libs/vpropertyexplorer/plugins/vlabelproperty.cpp index e1bfaee84..84998b63c 100644 --- a/src/libs/vpropertyexplorer/plugins/vlabelproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vlabelproperty.cpp @@ -77,7 +77,7 @@ auto VPE::VLabelProperty::createEditor(QWidget *parent, const QStyleOptionViewIt Q_UNUSED(options) Q_UNUSED(delegate) - QLabel *tmpEditor = new QLabel(parent); + auto *tmpEditor = new QLabel(parent); tmpEditor->setLocale(parent->locale()); tmpEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); tmpEditor->setText(d_ptr->VariantValue.toString()); @@ -88,7 +88,7 @@ auto VPE::VLabelProperty::createEditor(QWidget *parent, const QStyleOptionViewIt auto VPE::VLabelProperty::setEditorData(QWidget *editor) -> bool { - if (QLabel *tmpWidget = qobject_cast(editor)) + if (auto *tmpWidget = qobject_cast(editor)) { tmpWidget->setText(d_ptr->VariantValue.toString()); return true; @@ -99,7 +99,7 @@ auto VPE::VLabelProperty::setEditorData(QWidget *editor) -> bool auto VPE::VLabelProperty::getEditorData(const QWidget *editor) const -> QVariant { - const QLabel *tmpEditor = qobject_cast(editor); + const auto *tmpEditor = qobject_cast(editor); if (tmpEditor) { return tmpEditor->text(); diff --git a/src/libs/vpropertyexplorer/plugins/vobjectproperty.cpp b/src/libs/vpropertyexplorer/plugins/vobjectproperty.cpp index c3d999fce..b15702c91 100644 --- a/src/libs/vpropertyexplorer/plugins/vobjectproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vobjectproperty.cpp @@ -52,7 +52,7 @@ auto VPE::VObjectProperty::data(int column, int role) const -> QVariant return QVariant(); } - QComboBox* tmpEditor = qobject_cast(VProperty::d_ptr->editor); + auto *tmpEditor = qobject_cast(VProperty::d_ptr->editor); if (column == DPC_Data && Qt::DisplayRole == role) { @@ -72,7 +72,7 @@ auto VPE::VObjectProperty::createEditor(QWidget *parent, const QStyleOptionViewI { Q_UNUSED(options) Q_UNUSED(delegate) - QComboBox* tmpEditor = new QComboBox(parent); + auto *tmpEditor = new QComboBox(parent); tmpEditor->clear(); tmpEditor->setLocale(parent->locale()); FillList(tmpEditor, objects); @@ -91,7 +91,7 @@ auto VPE::VObjectProperty::setEditorData(QWidget *editor) -> bool return false; } - QComboBox* tmpEditor = qobject_cast(editor); + auto *tmpEditor = qobject_cast(editor); if (tmpEditor) { quint32 const objId = VProperty::d_ptr->VariantValue.toUInt(); @@ -113,7 +113,7 @@ auto VPE::VObjectProperty::setEditorData(QWidget *editor) -> bool //! Gets the data from the widget auto VPE::VObjectProperty::getEditorData(const QWidget *editor) const -> QVariant { - const QComboBox* tmpEditor = qobject_cast(editor); + const auto *tmpEditor = qobject_cast(editor); if (tmpEditor) { return tmpEditor->itemData(tmpEditor->currentIndex()); @@ -165,7 +165,7 @@ auto VPE::VObjectProperty::clone(bool include_children, VProperty *container) co void VPE::VObjectProperty::currentIndexChanged(int index) { Q_UNUSED(index) - UserChangeEvent *event = new UserChangeEvent(); + auto *event = new UserChangeEvent(); QCoreApplication::postEvent ( VProperty::d_ptr->editor, event ); } diff --git a/src/libs/vpropertyexplorer/plugins/vpointfproperty.cpp b/src/libs/vpropertyexplorer/plugins/vpointfproperty.cpp index 22d036c57..f9da717e3 100644 --- a/src/libs/vpropertyexplorer/plugins/vpointfproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vpointfproperty.cpp @@ -42,11 +42,11 @@ VPE::VPointFProperty::VPointFProperty(const QString &name) d_ptr->VariantValue.convert(QVariant::PointF); #endif - VDoubleProperty* tmpX = new VDoubleProperty("X"); + auto *tmpX = new VDoubleProperty("X"); addChild(tmpX); tmpX->setUpdateBehaviour(true, false); - VDoubleProperty* tmpY = new VDoubleProperty("Y"); + auto *tmpY = new VDoubleProperty("Y"); addChild(tmpY); tmpY->setUpdateBehaviour(true, false); diff --git a/src/libs/vpropertyexplorer/plugins/vshortcutproperty.cpp b/src/libs/vpropertyexplorer/plugins/vshortcutproperty.cpp index 2b573b66f..b47565499 100644 --- a/src/libs/vpropertyexplorer/plugins/vshortcutproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vshortcutproperty.cpp @@ -58,7 +58,7 @@ auto VPE::VShortcutProperty::createEditor(QWidget *parent, const QStyleOptionVie { Q_UNUSED(options) - VShortcutEditWidget* tmpWidget = new VShortcutEditWidget(parent); + auto *tmpWidget = new VShortcutEditWidget(parent); if (delegate) { VShortcutEditWidget::connect(tmpWidget, SIGNAL(commitData(QWidget*)), delegate, SIGNAL(commitData(QWidget*))); @@ -69,7 +69,7 @@ auto VPE::VShortcutProperty::createEditor(QWidget *parent, const QStyleOptionVie auto VPE::VShortcutProperty::setEditorData(QWidget *editor) -> bool { - VShortcutEditWidget* tmpWidget = qobject_cast(editor); + auto *tmpWidget = qobject_cast(editor); if (tmpWidget) { tmpWidget->setShortcut(d_ptr->VariantValue.toString(), false); @@ -82,7 +82,7 @@ auto VPE::VShortcutProperty::setEditorData(QWidget *editor) -> bool auto VPE::VShortcutProperty::getEditorData(const QWidget *editor) const -> QVariant { - const VShortcutEditWidget* tmpWidget = qobject_cast(editor); + const auto *tmpWidget = qobject_cast(editor); if (tmpWidget) { return tmpWidget->getShortcutAsString(); diff --git a/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.cpp b/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.cpp index d59ba21eb..a636a6c72 100644 --- a/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.cpp +++ b/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.cpp @@ -40,7 +40,7 @@ VPE::VShortcutEditWidget::VShortcutEditWidget(QWidget *parent) connect(LineEdit, &QLineEdit::textEdited, this, &VShortcutEditWidget::onTextEdited); // The layout (a horizontal layout) - QHBoxLayout *layout = new QHBoxLayout(this); + auto *layout = new QHBoxLayout(this); layout->setSpacing(0); layout->setContentsMargins(0, 0, 0, 0); layout->addWidget(LineEdit); @@ -57,7 +57,7 @@ auto VPE::VShortcutEditWidget::eventFilter(QObject *obj, QEvent *event) -> bool { if (event->type() == QEvent::KeyPress) { - QKeyEvent *keyEvent = static_cast(event); + auto *keyEvent = static_cast(event); int keys = keyEvent->key(); diff --git a/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp b/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp index f9deefaf4..15a7b8301 100644 --- a/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp @@ -64,7 +64,7 @@ auto VPE::VStringProperty::createEditor(QWidget *parent, const QStyleOptionViewI Q_UNUSED(options) Q_UNUSED(delegate) - QLineEdit* tmpEditor = new QLineEdit(parent); + auto *tmpEditor = new QLineEdit(parent); tmpEditor->setLocale(parent->locale()); tmpEditor->setReadOnly(readOnly); tmpEditor->installEventFilter(this); @@ -78,7 +78,7 @@ auto VPE::VStringProperty::createEditor(QWidget *parent, const QStyleOptionViewI auto VPE::VStringProperty::setEditorData(QWidget *editor) -> bool { - if (QLineEdit* tmpWidget = qobject_cast(editor)) + if (auto *tmpWidget = qobject_cast(editor)) { if (not readOnly) { @@ -92,7 +92,7 @@ auto VPE::VStringProperty::setEditorData(QWidget *editor) -> bool auto VPE::VStringProperty::getEditorData(const QWidget *editor) const -> QVariant { - const QLineEdit* tmpEditor = qobject_cast(editor); + const auto *tmpEditor = qobject_cast(editor); if (tmpEditor) { return tmpEditor->text(); @@ -177,11 +177,11 @@ void VPE::VStringProperty::setTypeForParent(int value) auto VPE::VStringProperty::eventFilter(QObject *object, QEvent *event) -> bool { - if (QLineEdit *textEdit = qobject_cast(object)) + if (auto *textEdit = qobject_cast(object)) { if (event->type() == QEvent::KeyPress) { - QKeyEvent *keyEvent = static_cast(event); + auto *keyEvent = static_cast(event); if ((keyEvent->key() == Qt::Key_Period) && (keyEvent->modifiers() & Qt::KeypadModifier)) { if (m_osSeparator) diff --git a/src/libs/vpropertyexplorer/plugins/vtextproperty.cpp b/src/libs/vpropertyexplorer/plugins/vtextproperty.cpp index 895ba3762..d9d3143f2 100644 --- a/src/libs/vpropertyexplorer/plugins/vtextproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vtextproperty.cpp @@ -79,7 +79,7 @@ auto VPE::VTextProperty::createEditor(QWidget *parent, const QStyleOptionViewIte Q_UNUSED(options) Q_UNUSED(delegate) - QPlainTextEdit *tmpEditor = new QPlainTextEdit(parent); + auto *tmpEditor = new QPlainTextEdit(parent); tmpEditor->setLocale(parent->locale()); tmpEditor->setReadOnly(readOnly); tmpEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); @@ -92,7 +92,7 @@ auto VPE::VTextProperty::createEditor(QWidget *parent, const QStyleOptionViewIte auto VPE::VTextProperty::setEditorData(QWidget *editor) -> bool { - if (QPlainTextEdit *tmpWidget = qobject_cast(editor)) + if (auto *tmpWidget = qobject_cast(editor)) { tmpWidget->setPlainText(d_ptr->VariantValue.toString()); return true; @@ -103,7 +103,7 @@ auto VPE::VTextProperty::setEditorData(QWidget *editor) -> bool auto VPE::VTextProperty::getEditorData(const QWidget *editor) const -> QVariant { - const QPlainTextEdit *tmpEditor = qobject_cast(editor); + const auto *tmpEditor = qobject_cast(editor); if (tmpEditor) { return tmpEditor->toPlainText(); diff --git a/src/libs/vpropertyexplorer/plugins/vwidgetproperty.cpp b/src/libs/vpropertyexplorer/plugins/vwidgetproperty.cpp index 2da6593b3..fbcde99ad 100644 --- a/src/libs/vpropertyexplorer/plugins/vwidgetproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vwidgetproperty.cpp @@ -52,7 +52,7 @@ auto VPE::VWidgetProperty::getWidget() const -> QWidget * void VPE::VWidgetProperty::setWidget(QWidget* widget) { - VWidgetPropertyPrivate* tmpDPtr = static_cast(d_ptr); + auto *tmpDPtr = static_cast(d_ptr); QWidget* tmpOldWidget = tmpDPtr->Widget.data(); if (tmpOldWidget) { diff --git a/src/libs/vpropertyexplorer/vproperty.cpp b/src/libs/vpropertyexplorer/vproperty.cpp index fec2fabd5..1eb9ed0be 100644 --- a/src/libs/vpropertyexplorer/vproperty.cpp +++ b/src/libs/vpropertyexplorer/vproperty.cpp @@ -117,7 +117,7 @@ auto VPE::VProperty::createEditor(QWidget *parent, const QStyleOptionViewItem &o Q_UNUSED(options) Q_UNUSED(delegate) - QItemEditorFactory *factory = new QItemEditorFactory; + auto *factory = new QItemEditorFactory; QItemEditorCreatorBase *lineCreator = new QStandardItemEditorCreator(); #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) factory->registerEditor(QMetaType::QString, lineCreator); diff --git a/src/libs/vpropertyexplorer/vpropertydelegate.cpp b/src/libs/vpropertyexplorer/vpropertydelegate.cpp index 8212ac549..3f41e27f4 100644 --- a/src/libs/vpropertyexplorer/vpropertydelegate.cpp +++ b/src/libs/vpropertyexplorer/vpropertydelegate.cpp @@ -49,7 +49,7 @@ auto VPE::VPropertyDelegate::createEditor(QWidget *parent, const QStyleOptionVie QWidget* tmpWidget = nullptr; if (index.isValid()) { - VProperty* tmpProperty = reinterpret_cast(index.internalPointer()); + auto *tmpProperty = reinterpret_cast(index.internalPointer()); tmpWidget = tmpProperty->createEditor(parent, option, this); } @@ -63,7 +63,7 @@ void VPE::VPropertyDelegate::setEditorData (QWidget * editor, const QModelIndex bool done = false; if (index.isValid() && editor) { - VProperty* tmpProperty = reinterpret_cast(index.internalPointer()); + auto *tmpProperty = reinterpret_cast(index.internalPointer()); done = tmpProperty->setEditorData(editor); } @@ -80,7 +80,7 @@ void VPE::VPropertyDelegate::setModelData (QWidget * editor, QAbstractItemModel QVariant tmpData; if (index.isValid() && editor) { - VProperty* tmpProperty = reinterpret_cast(index.internalPointer()); + auto *tmpProperty = reinterpret_cast(index.internalPointer()); tmpData = tmpProperty->getEditorData(editor); } diff --git a/src/libs/vpropertyexplorer/vpropertyformwidget.cpp b/src/libs/vpropertyexplorer/vpropertyformwidget.cpp index ad895b482..652969ace 100644 --- a/src/libs/vpropertyexplorer/vpropertyformwidget.cpp +++ b/src/libs/vpropertyexplorer/vpropertyformwidget.cpp @@ -141,7 +141,7 @@ void VPE::VPropertyFormWidget::build() else { // Child properties, the property itself is not being added - VPropertyFormWidget *tmpNewFormWidget = new VPropertyFormWidget(tmpProperty, this); + auto *tmpNewFormWidget = new VPropertyFormWidget(tmpProperty, this); tmpFormLayout->addRow(tmpNewFormWidget); d_ptr->EditorWidgets.append(VPropertyFormWidgetPrivate::SEditorWidget(tmpNewFormWidget)); tmpNewFormWidget->setCommitBehaviour(d_ptr->UpdateEditors); @@ -149,7 +149,7 @@ void VPE::VPropertyFormWidget::build() } else if (tmpProperty->type() == "widget") { - VWidgetProperty *tmpWidgetProperty = static_cast(tmpProperty); + auto *tmpWidgetProperty = static_cast(tmpProperty); tmpFormLayout->addRow(tmpWidgetProperty->getWidget()); d_ptr->EditorWidgets.append(VPropertyFormWidgetPrivate::SEditorWidget(tmpWidgetProperty->getWidget())); } diff --git a/src/libs/vpropertyexplorer/vpropertymodel.cpp b/src/libs/vpropertyexplorer/vpropertymodel.cpp index c8d61c058..b20ab396d 100644 --- a/src/libs/vpropertyexplorer/vpropertymodel.cpp +++ b/src/libs/vpropertyexplorer/vpropertymodel.cpp @@ -83,7 +83,7 @@ auto VPE::VPropertyModel::addProperty(VProperty *property, const QString &id, co auto VPE::VPropertyModel::createProperty(const QString &id, const QString &name, const QString &parentid, const QVariant &data) -> VPE::VProperty * { - VProperty* tmpProp = new VProperty(name); + auto *tmpProp = new VProperty(name); tmpProp->setValue(data); if (addProperty(tmpProp, id, parentid)) { @@ -263,7 +263,7 @@ auto VPE::VPropertyModel::getProperty(const QModelIndex &index) const -> VPE::VP { if (index.isValid()) { - VProperty* prop = static_cast(index.internalPointer()); + auto *prop = static_cast(index.internalPointer()); if (prop) { diff --git a/src/libs/vpropertyexplorer/vpropertyset.cpp b/src/libs/vpropertyexplorer/vpropertyset.cpp index b6fc8b904..cdf746128 100644 --- a/src/libs/vpropertyexplorer/vpropertyset.cpp +++ b/src/libs/vpropertyexplorer/vpropertyset.cpp @@ -204,7 +204,7 @@ auto VPE::VPropertySet::getRootPropertyCount() const -> vpesizetype auto VPE::VPropertySet::clone() const -> VPE::VPropertySet * { - VPropertySet* tmpResult = new VPropertySet(); + auto *tmpResult = new VPropertySet(); const QList rootProperties = d_ptr->RootProperties; for (auto *tmpProperty : rootProperties) diff --git a/src/libs/vtest/abstracttest.cpp b/src/libs/vtest/abstracttest.cpp index a669eec48..234008352 100644 --- a/src/libs/vtest/abstracttest.cpp +++ b/src/libs/vtest/abstracttest.cpp @@ -865,8 +865,8 @@ void AbstractTest::SplineFromJson(const QJsonObject &itemObject, QSharedPointer< ReadPointValue(itemObject, QStringLiteral("p4"), p4); data->UpdateGObject(p4.id(), new VPointF(p4)); - VSpline *spl = new VSpline(p1, p4, angle1, angle1Formula, angle2, angle2Formula, c1Length, c1LengthFormula, - c2Length, c2LengthFormula); + auto *spl = new VSpline(p1, p4, angle1, angle1Formula, angle2, angle2Formula, c1Length, c1LengthFormula, c2Length, + c2LengthFormula); spl->SetApproximationScale(aScale); data->UpdateGObject(id, spl); } @@ -887,7 +887,7 @@ void AbstractTest::SplinePathFromJson(const QJsonObject &itemObject, QSharedPoin data->UpdateGObject(point.P().id(), new VPointF(point.P())); } - VSplinePath *path = new VSplinePath(points); + auto *path = new VSplinePath(points); path->SetApproximationScale(aScale); data->UpdateGObject(id, path); } diff --git a/src/libs/vtools/dialogs/dialogtoolbox.cpp b/src/libs/vtools/dialogs/dialogtoolbox.cpp index a25fd25f3..bf237ac73 100644 --- a/src/libs/vtools/dialogs/dialogtoolbox.cpp +++ b/src/libs/vtools/dialogs/dialogtoolbox.cpp @@ -245,11 +245,11 @@ void DeployFormula(QDialog *dialog, QPlainTextEdit *formula, QPushButton *button //--------------------------------------------------------------------------------------------------------------------- auto FilterObject(QObject *object, QEvent *event) -> bool { - if (QPlainTextEdit *plainTextEdit = qobject_cast(object)) + if (auto *plainTextEdit = qobject_cast(object)) { if (event->type() == QEvent::KeyPress) { - QKeyEvent *keyEvent = static_cast(event); + auto *keyEvent = static_cast(event); if ((keyEvent->key() == Qt::Key_Period) && (keyEvent->modifiers() & Qt::KeypadModifier)) { if (VAbstractApplication::VApp()->Settings()->GetOsSeparator()) diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp index 7bd7f76f9..fc45bd763 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp @@ -170,8 +170,7 @@ void DialogCubicBezierPath::ChosenObject(quint32 id, const SceneObject &type) if (path.CountPoints() == 1) { visPath->VisualMode(NULL_ID); - VAbstractMainWindow *window = - qobject_cast(VAbstractValApplication::VApp()->getMainWindow()); + auto *window = qobject_cast(VAbstractValApplication::VApp()->getMainWindow()); SCASSERT(window != nullptr) connect(visPath, &VisToolCubicBezierPath::ToolTip, window, &VAbstractMainWindow::ShowToolTip); } @@ -253,7 +252,7 @@ void DialogCubicBezierPath::PointChanged(int row) //--------------------------------------------------------------------------------------------------------------------- void DialogCubicBezierPath::currentPointChanged(int index) { - const quint32 id = qvariant_cast(ui->comboBoxPoint->itemData(index)); + const auto id = qvariant_cast(ui->comboBoxPoint->itemData(index)); try { diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp index 3593f9a01..4ecb0c691 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp @@ -113,7 +113,7 @@ auto DialogFlippingByAxis::GetOriginPointId() const -> quint32 void DialogFlippingByAxis::SetOriginPointId(quint32 value) { ChangeCurrentData(ui->comboBoxOriginPoint, value); - VisToolFlippingByAxis *operation = qobject_cast(vis); + auto *operation = qobject_cast(vis); SCASSERT(operation != nullptr) operation->SetOriginPointId(value); } @@ -206,12 +206,11 @@ void DialogFlippingByAxis::ShowDialog(bool click) stage1 = false; - VMainGraphicsScene *scene = - qobject_cast(VAbstractValApplication::VApp()->getCurrentScene()); + auto *scene = qobject_cast(VAbstractValApplication::VApp()->getCurrentScene()); SCASSERT(scene != nullptr) scene->clearSelection(); - VisToolFlippingByAxis *operation = qobject_cast(vis); + auto *operation = qobject_cast(vis); SCASSERT(operation != nullptr) operation->SetObjects(SourceToObjects(sourceObjects)); operation->VisualMode(); @@ -253,7 +252,7 @@ void DialogFlippingByAxis::SetSourceObjects(const QVector &value) sourceObjects = value; FillSourceList(); - VisToolFlippingByAxis *operation = qobject_cast(vis); + auto *operation = qobject_cast(vis); SCASSERT(operation != nullptr) operation->SetObjects(SourceToObjects(sourceObjects)); } @@ -276,7 +275,7 @@ void DialogFlippingByAxis::ChosenObject(quint32 id, const SceneObject &type) if (SetObject(id, ui->comboBoxOriginPoint, QString())) { - VisToolFlippingByAxis *operation = qobject_cast(vis); + auto *operation = qobject_cast(vis); SCASSERT(operation != nullptr) operation->SetOriginPointId(id); operation->RefreshGeometry(); @@ -317,7 +316,7 @@ void DialogFlippingByAxis::SelectedObject(bool selected, quint32 object, quint32 //--------------------------------------------------------------------------------------------------------------------- void DialogFlippingByAxis::SuffixChanged() { - QLineEdit *edit = qobject_cast(sender()); + auto *edit = qobject_cast(sender()); if (edit) { const QString suffix = edit->text(); @@ -357,7 +356,7 @@ void DialogFlippingByAxis::SuffixChanged() //--------------------------------------------------------------------------------------------------------------------- void DialogFlippingByAxis::GroupNameChanged() { - QLineEdit *edit = qobject_cast(sender()); + auto *edit = qobject_cast(sender()); if (edit) { const QString name = edit->text(); @@ -532,7 +531,7 @@ void DialogFlippingByAxis::SaveData() } } - VisToolFlippingByAxis *operation = qobject_cast(vis); + auto *operation = qobject_cast(vis); SCASSERT(operation != nullptr) operation->SetObjects(SourceToObjects(sourceObjects)); diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp b/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp index 337820474..bd0777604 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp @@ -112,7 +112,7 @@ auto DialogFlippingByLine::GetFirstLinePointId() const -> quint32 void DialogFlippingByLine::SetFirstLinePointId(quint32 value) { ChangeCurrentData(ui->comboBoxFirstLinePoint, value); - VisToolFlippingByLine *operation = qobject_cast(vis); + auto *operation = qobject_cast(vis); SCASSERT(operation != nullptr) operation->SetFirstLinePointId(value); } @@ -127,7 +127,7 @@ auto DialogFlippingByLine::GetSecondLinePointId() const -> quint32 void DialogFlippingByLine::SetSecondLinePointId(quint32 value) { ChangeCurrentData(ui->comboBoxSecondLinePoint, value); - VisToolFlippingByLine *operation = qobject_cast(vis); + auto *operation = qobject_cast(vis); SCASSERT(operation != nullptr) operation->SetSecondLinePointId(value); } @@ -200,12 +200,11 @@ void DialogFlippingByLine::ShowDialog(bool click) stage1 = false; - VMainGraphicsScene *scene = - qobject_cast(VAbstractValApplication::VApp()->getCurrentScene()); + auto *scene = qobject_cast(VAbstractValApplication::VApp()->getCurrentScene()); SCASSERT(scene != nullptr) scene->clearSelection(); - VisToolFlippingByLine *operation = qobject_cast(vis); + auto *operation = qobject_cast(vis); SCASSERT(operation != nullptr) operation->SetObjects(SourceToObjects(sourceObjects)); operation->VisualMode(); @@ -246,7 +245,7 @@ void DialogFlippingByLine::SetSourceObjects(const QVector &value) sourceObjects = value; FillSourceList(); - VisToolFlippingByLine *operation = qobject_cast(vis); + auto *operation = qobject_cast(vis); SCASSERT(operation != nullptr) operation->SetObjects(SourceToObjects(sourceObjects)); } @@ -272,7 +271,7 @@ void DialogFlippingByLine::ChosenObject(quint32 id, const SceneObject &type) if (SetObject(id, ui->comboBoxFirstLinePoint, tr("Select second line point"))) { number++; - VisToolFlippingByLine *operation = qobject_cast(vis); + auto *operation = qobject_cast(vis); SCASSERT(operation != nullptr) operation->SetFirstLinePointId(id); operation->RefreshGeometry(); @@ -294,7 +293,7 @@ void DialogFlippingByLine::ChosenObject(quint32 id, const SceneObject &type) number = 0; prepare = true; - VisToolFlippingByLine *operation = qobject_cast(vis); + auto *operation = qobject_cast(vis); SCASSERT(operation != nullptr) operation->SetSecondLinePointId(id); operation->RefreshGeometry(); @@ -339,7 +338,7 @@ void DialogFlippingByLine::SelectedObject(bool selected, quint32 object, quint32 //--------------------------------------------------------------------------------------------------------------------- void DialogFlippingByLine::SuffixChanged() { - QLineEdit *edit = qobject_cast(sender()); + auto *edit = qobject_cast(sender()); if (edit) { const QString suffix = edit->text(); @@ -379,7 +378,7 @@ void DialogFlippingByLine::SuffixChanged() //--------------------------------------------------------------------------------------------------------------------- void DialogFlippingByLine::GroupNameChanged() { - QLineEdit *edit = qobject_cast(sender()); + auto *edit = qobject_cast(sender()); if (edit) { const QString name = edit->text(); @@ -555,7 +554,7 @@ void DialogFlippingByLine::SaveData() } } - VisToolFlippingByLine *operation = qobject_cast(vis); + auto *operation = qobject_cast(vis); SCASSERT(operation != nullptr) operation->SetObjects(SourceToObjects(sourceObjects)); diff --git a/src/libs/vtools/dialogs/tools/dialogline.cpp b/src/libs/vtools/dialogs/tools/dialogline.cpp index d44ef20a1..2b775edaf 100644 --- a/src/libs/vtools/dialogs/tools/dialogline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogline.cpp @@ -91,7 +91,7 @@ void DialogLine::SetSecondPoint(quint32 value) { setCurrentPointId(ui->comboBoxSecondPoint, value); - VisToolLine *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetPoint2Id(value); } @@ -128,7 +128,7 @@ void DialogLine::SetFirstPoint(quint32 value) { setCurrentPointId(ui->comboBoxFirstPoint, value); - VisToolLine *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetPoint1Id(value); } @@ -161,7 +161,7 @@ void DialogLine::ShowVisualization() //--------------------------------------------------------------------------------------------------------------------- void DialogLine::SaveData() { - VisToolLine *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetPoint1Id(GetFirstPoint()); diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp index 925cc013e..ffa3f40e8 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp @@ -112,7 +112,7 @@ void DialogLineIntersect::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { - VisToolLineIntersect *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) switch (number) @@ -193,7 +193,7 @@ void DialogLineIntersect::SaveData() { pointName = ui->lineEditNamePoint->text(); - VisToolLineIntersect *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetLine1P1Id(GetP1Line1()); @@ -298,7 +298,7 @@ void DialogLineIntersect::SetP2Line2(quint32 value) { setCurrentPointId(ui->comboBoxP2Line2, value); - VisToolLineIntersect *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetLine2P2Id(value); } @@ -318,7 +318,7 @@ void DialogLineIntersect::SetP1Line2(quint32 value) { setCurrentPointId(ui->comboBoxP1Line2, value); - VisToolLineIntersect *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetLine2P1Id(value); } @@ -332,7 +332,7 @@ void DialogLineIntersect::SetP2Line1(quint32 value) { setCurrentPointId(ui->comboBoxP2Line1, value); - VisToolLineIntersect *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetLine1P2Id(value); } @@ -346,7 +346,7 @@ void DialogLineIntersect::SetP1Line1(quint32 value) { setCurrentPointId(ui->comboBoxP1Line1, value); - VisToolLineIntersect *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetLine1P1Id(value); } diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp index 6e1b145cc..bac7052f2 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp @@ -169,7 +169,7 @@ void DialogLineIntersectAxis::SetAngle(const QString &value) } ui->plainTextEditFormula->setPlainText(formulaAngle); - VisToolLineIntersectAxis *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetAngle(formulaAngle); @@ -187,7 +187,7 @@ void DialogLineIntersectAxis::SetBasePointId(quint32 value) { setCurrentPointId(ui->comboBoxAxisPoint, value); - VisToolLineIntersectAxis *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetAxisPointId(value); } @@ -203,7 +203,7 @@ void DialogLineIntersectAxis::SetFirstPointId(quint32 value) { setCurrentPointId(ui->comboBoxFirstLinePoint, value); - VisToolLineIntersectAxis *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetPoint1Id(value); } @@ -219,7 +219,7 @@ void DialogLineIntersectAxis::SetSecondPointId(quint32 value) { setCurrentPointId(ui->comboBoxSecondLinePoint, value); - VisToolLineIntersectAxis *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetPoint2Id(value); } @@ -410,7 +410,7 @@ void DialogLineIntersectAxis::SaveData() pointName = ui->lineEditNamePoint->text(); formulaAngle = ui->plainTextEditFormula->toPlainText(); - VisToolLineIntersectAxis *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetPoint1Id(GetFirstPointId()); diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp index 5fecfd8bb..ea20abdd9 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp @@ -101,7 +101,7 @@ void DialogPointFromArcAndTangent::SetArcId(quint32 value) { setCurrentArcId(ui->comboBoxArc, value); - VisToolPointFromArcAndTangent *point = qobject_cast(vis); + auto *point = qobject_cast(vis); SCASSERT(point != nullptr) point->SetArcId(value); } @@ -136,7 +136,7 @@ void DialogPointFromArcAndTangent::SetCrossCirclesPoint(CrossCirclesPoint p) { ui->comboBoxResult->setCurrentIndex(index); - VisToolPointFromArcAndTangent *point = qobject_cast(vis); + auto *point = qobject_cast(vis); SCASSERT(point != nullptr) point->SetCrossPoint(p); } @@ -149,7 +149,7 @@ void DialogPointFromArcAndTangent::ChosenObject(quint32 id, const SceneObject &t { if (type == SceneObject::Point || type == SceneObject::Arc) { - VisToolPointFromArcAndTangent *point = qobject_cast(vis); + auto *point = qobject_cast(vis); SCASSERT(point != nullptr) switch (number) diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp index 8ab6a3b2a..abbe84231 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp @@ -104,7 +104,7 @@ void DialogPointOfIntersection::SetSecondPointId(quint32 value) { setCurrentPointId(ui->comboBoxSecondPoint, value); - VisToolPointOfIntersection *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetPoint2Id(value); } @@ -121,7 +121,7 @@ void DialogPointOfIntersection::ChosenObject(quint32 id, const SceneObject &type { if (type == SceneObject::Point) { - VisToolPointOfIntersection *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) switch (number) @@ -158,7 +158,7 @@ void DialogPointOfIntersection::SaveData() { pointName = ui->lineEditNamePoint->text(); - VisToolPointOfIntersection *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetPoint1Id(GetFirstPointId()); @@ -200,7 +200,7 @@ void DialogPointOfIntersection::SetFirstPointId(quint32 value) { setCurrentPointId(ui->comboBoxFirstPoint, value); - VisToolPointOfIntersection *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetPoint1Id(value); } diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp index 1d6938888..e58f02528 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp @@ -106,7 +106,7 @@ void DialogPointOfIntersectionArcs::SetFirstArcId(quint32 value) { setCurrentArcId(ui->comboBoxArc1, value); - VisToolPointOfIntersectionArcs *point = qobject_cast(vis); + auto *point = qobject_cast(vis); SCASSERT(point != nullptr) point->SetArc1Id(value); } @@ -122,7 +122,7 @@ void DialogPointOfIntersectionArcs::SetSecondArcId(quint32 value) { setCurrentArcId(ui->comboBoxArc2, value); - VisToolPointOfIntersectionArcs *point = qobject_cast(vis); + auto *point = qobject_cast(vis); SCASSERT(point != nullptr) point->SetArc2Id(value); } @@ -141,7 +141,7 @@ void DialogPointOfIntersectionArcs::SetCrossArcPoint(CrossCirclesPoint p) { ui->comboBoxResult->setCurrentIndex(index); - VisToolPointOfIntersectionArcs *point = qobject_cast(vis); + auto *point = qobject_cast(vis); SCASSERT(point != nullptr) point->SetCrossPoint(p); } @@ -154,7 +154,7 @@ void DialogPointOfIntersectionArcs::ChosenObject(quint32 id, const SceneObject & { if (type == SceneObject::Arc) { - VisToolPointOfIntersectionArcs *point = qobject_cast(vis); + auto *point = qobject_cast(vis); SCASSERT(point != nullptr) switch (number) @@ -216,7 +216,7 @@ void DialogPointOfIntersectionArcs::SaveData() { pointName = ui->lineEditNamePoint->text(); - VisToolPointOfIntersectionArcs *point = qobject_cast(vis); + auto *point = qobject_cast(vis); SCASSERT(point != nullptr) point->SetArc1Id(GetFirstArcId()); diff --git a/src/libs/vtools/dialogs/tools/dialogtool.cpp b/src/libs/vtools/dialogs/tools/dialogtool.cpp index 37743f40f..1b11c8993 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtool.cpp @@ -432,7 +432,7 @@ void DialogTool::NewNodeItem(QListWidget *listWidget, const VPieceNode &node, bo if (canAddNewPoint) { - QListWidgetItem *item = new QListWidgetItem(name); + auto *item = new QListWidgetItem(name); item->setFont(NodeFont(item->font(), showExclusion ? node.IsExcluded() : false)); item->setData(Qt::UserRole, QVariant::fromValue(node)); listWidget->addItem(item); diff --git a/src/libs/vtools/dialogs/tools/dialogtool.h b/src/libs/vtools/dialogs/tools/dialogtool.h index c94e18f62..109edba44 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.h +++ b/src/libs/vtools/dialogs/tools/dialogtool.h @@ -292,8 +292,7 @@ template inline void DialogTool::AddVisualization() { if (prepare == false) { - VMainGraphicsScene *scene = - qobject_cast(VAbstractValApplication::VApp()->getCurrentScene()); + auto *scene = qobject_cast(VAbstractValApplication::VApp()->getCurrentScene()); SCASSERT(scene != nullptr) T *toolVis = qobject_cast(vis); diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp index 63c197f9d..486b205b3 100644 --- a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp @@ -103,7 +103,7 @@ void DialogTriangle::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { - VisToolTriangle *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) switch (number) @@ -176,7 +176,7 @@ void DialogTriangle::SaveData() { pointName = ui->lineEditNamePoint->text(); - VisToolTriangle *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetObject1Id(GetAxisP1Id()); @@ -239,7 +239,7 @@ void DialogTriangle::SetSecondPointId(const quint32 &value) { setCurrentPointId(ui->comboBoxSecondPoint, value); - VisToolTriangle *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetHypotenuseP2Id(value); } @@ -259,7 +259,7 @@ void DialogTriangle::SetFirstPointId(const quint32 &value) { setCurrentPointId(ui->comboBoxFirstPoint, value); - VisToolTriangle *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetHypotenuseP1Id(value); } @@ -273,7 +273,7 @@ void DialogTriangle::SetAxisP2Id(const quint32 &value) { setCurrentPointId(ui->comboBoxAxisP2, value); - VisToolTriangle *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetObject2Id(value); } @@ -287,7 +287,7 @@ void DialogTriangle::SetAxisP1Id(const quint32 &value) { setCurrentPointId(ui->comboBoxAxisP1, value); - VisToolTriangle *line = qobject_cast(vis); + auto *line = qobject_cast(vis); SCASSERT(line != nullptr) line->SetObject1Id(value); } diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp index b46c2baa4..456d11008 100644 --- a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp @@ -137,7 +137,7 @@ void DialogTrueDarts::SetFirstBasePointId(const quint32 &value) { setCurrentPointId(ui->comboBoxFirstBasePoint, value, FillComboBox::NoChildren, ch1, ch2); - VisToolTrueDarts *points = qobject_cast(vis); + auto *points = qobject_cast(vis); SCASSERT(points != nullptr) points->SetBaseLineP1Id(value); } @@ -153,7 +153,7 @@ void DialogTrueDarts::SetSecondBasePointId(const quint32 &value) { setCurrentPointId(ui->comboBoxSecondBasePoint, value, FillComboBox::NoChildren, ch1, ch2); - VisToolTrueDarts *points = qobject_cast(vis); + auto *points = qobject_cast(vis); SCASSERT(points != nullptr) points->SetBaseLineP2Id(value); } @@ -169,7 +169,7 @@ void DialogTrueDarts::SetFirstDartPointId(const quint32 &value) { setCurrentPointId(ui->comboBoxFirstDartPoint, value, FillComboBox::NoChildren, ch1, ch2); - VisToolTrueDarts *points = qobject_cast(vis); + auto *points = qobject_cast(vis); SCASSERT(points != nullptr) points->SetD1PointId(value); } @@ -185,7 +185,7 @@ void DialogTrueDarts::SetSecondDartPointId(const quint32 &value) { setCurrentPointId(ui->comboBoxSecondDartPoint, value, FillComboBox::NoChildren, ch1, ch2); - VisToolTrueDarts *points = qobject_cast(vis); + auto *points = qobject_cast(vis); SCASSERT(points != nullptr) points->SetD2PointId(value); } @@ -201,7 +201,7 @@ void DialogTrueDarts::SetThirdDartPointId(const quint32 &value) { setCurrentPointId(ui->comboBoxThirdDartPoint, value, FillComboBox::NoChildren, ch1, ch2); - VisToolTrueDarts *points = qobject_cast(vis); + auto *points = qobject_cast(vis); SCASSERT(points != nullptr) points->SetD3PointId(value); } @@ -221,7 +221,7 @@ void DialogTrueDarts::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { - VisToolTrueDarts *points = qobject_cast(vis); + auto *points = qobject_cast(vis); SCASSERT(points != nullptr) switch (number) @@ -362,7 +362,7 @@ void DialogTrueDarts::SaveData() d1PointName = ui->lineEditFirstNewDartPoint->text(); d2PointName = ui->lineEditSecondNewDartPoint->text(); - VisToolTrueDarts *points = qobject_cast(vis); + auto *points = qobject_cast(vis); SCASSERT(points != nullptr) points->SetBaseLineP1Id(GetFirstBasePointId()); @@ -379,7 +379,7 @@ void DialogTrueDarts::NameChanged(QLabel *labelEditNamePoint, const QString &poi { SCASSERT(labelEditNamePoint != nullptr) SCASSERT(secondPointName != nullptr) - QLineEdit *edit = qobject_cast(sender()); + auto *edit = qobject_cast(sender()); if (edit) { CheckName(edit, labelEditNamePoint, pointD1Name, pointD2Name, secondPointName, flagName); diff --git a/src/libs/vtools/dialogs/tools/piece/dialogduplicatedetail.cpp b/src/libs/vtools/dialogs/tools/piece/dialogduplicatedetail.cpp index 5affe33d2..f17720ed6 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogduplicatedetail.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogduplicatedetail.cpp @@ -67,7 +67,7 @@ void DialogDuplicateDetail::ShowDialog(bool click) return; } - VisToolDuplicateDetail *piece = qobject_cast(vis); + auto *piece = qobject_cast(vis); SCASSERT(piece != nullptr) m_mx = piece->Mx(); @@ -87,7 +87,7 @@ void DialogDuplicateDetail::ChosenObject(quint32 id, const SceneObject &type) { m_idDetail = id; - VAbstractTool *tool = qobject_cast(VAbstractPattern::getTool(m_idDetail)); + auto *tool = qobject_cast(VAbstractPattern::getTool(m_idDetail)); if (tool) { vis->SetData(tool->getData()); // Includes currentSeamAllowance variable we need diff --git a/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.cpp b/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.cpp index cee7ebd91..35e36f655 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.cpp @@ -101,7 +101,7 @@ auto DialogInsertNode::GetNodes() const -> QVector QVector nodes; for (qint32 i = 0; i < ui->listWidget->count(); ++i) { - VPieceNode const node = qvariant_cast(ui->listWidget->item(i)->data(Qt::UserRole)); + auto const node = qvariant_cast(ui->listWidget->item(i)->data(Qt::UserRole)); for (int n = 1; n <= nodeNumbers.value(node.GetId(), 1); ++n) { nodes.append(node); @@ -242,7 +242,7 @@ void DialogInsertNode::NodeSelected() return; } - VPieceNode const node = qvariant_cast(item->data(Qt::UserRole)); + auto const node = qvariant_cast(item->data(Qt::UserRole)); ui->spinBoxNodeNumber->setEnabled(true); ui->spinBoxNodeNumber->blockSignals(true); ui->spinBoxNodeNumber->setValue(nodeNumbers.value(node.GetId(), 1)); @@ -259,7 +259,7 @@ void DialogInsertNode::NodeNumberChanged(int val) return; } - VPieceNode const node = qvariant_cast(item->data(Qt::UserRole)); + auto const node = qvariant_cast(item->data(Qt::UserRole)); nodeNumbers[node.GetId()] = val; } diff --git a/src/libs/vtools/dialogs/tools/piece/dialogpatternmaterials.cpp b/src/libs/vtools/dialogs/tools/piece/dialogpatternmaterials.cpp index a84a09761..35b51aeab 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogpatternmaterials.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogpatternmaterials.cpp @@ -84,7 +84,7 @@ void DialogPatternMaterials::SetPatternMaterials(const QMap &list) for (int i = 0; i < userMaterialPlaceholdersQuantity; ++i) { - QTableWidgetItem *item = new QTableWidgetItem(per + pl_userMaterial + QString::number(i + 1) + per); + auto *item = new QTableWidgetItem(per + pl_userMaterial + QString::number(i + 1) + per); item->setFlags(item->flags() ^ Qt::ItemIsEditable); item->setTextAlignment(Qt::AlignLeft); diff --git a/src/libs/vtools/dialogs/tools/piece/dialogpin.cpp b/src/libs/vtools/dialogs/tools/piece/dialogpin.cpp index b2e8b7428..4733c41ef 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogpin.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogpin.cpp @@ -100,7 +100,7 @@ void DialogPin::SetPointId(quint32 id) { setCurrentPointId(ui->comboBoxPoint, id); - VisToolSpecialPoint *point = qobject_cast(vis); + auto *point = qobject_cast(vis); SCASSERT(point != nullptr) point->SetPointId(id); diff --git a/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp index 75244d7cc..cbe2195be 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp @@ -97,7 +97,7 @@ void DialogPlaceLabel::SetCenterPoint(quint32 id) if (not m_showMode) { - VisToolSpecialPoint *point = qobject_cast(vis); + auto *point = qobject_cast(vis); SCASSERT(point != nullptr) point->SetPointId(id); } diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp index eaa1e2cee..877deb27c 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp @@ -133,7 +133,7 @@ auto VToolFlippingByAxis::Create(VToolFlippingByAxisInitData initData) -> VToolF } VAbstractTool::AddRecord(initData.id, Tool::FlippingByAxis, initData.doc); - VToolFlippingByAxis *tool = new VToolFlippingByAxis(initData); + auto *tool = new VToolFlippingByAxis(initData); initData.scene->addItem(tool); InitOperationToolConnections(initData.scene, tool); VAbstractPattern::AddTool(initData.id, tool); diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp index 9d704bd27..466ada4d2 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp @@ -126,7 +126,7 @@ auto VToolFlippingByLine::Create(VToolFlippingByLineInitData initData) -> VToolF } VAbstractTool::AddRecord(initData.id, Tool::FlippingByLine, initData.doc); - VToolFlippingByLine *tool = new VToolFlippingByLine(initData); + auto *tool = new VToolFlippingByLine(initData); initData.scene->addItem(tool); InitOperationToolConnections(initData.scene, tool); VAbstractPattern::AddTool(initData.id, tool); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp index a92896a75..c41ce5626 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp @@ -155,7 +155,7 @@ auto VToolArcWithLength::Create(VToolArcWithLengthInitData &initData) -> VToolAr if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::ArcWithLength, initData.doc); - VToolArcWithLength *toolArc = new VToolArcWithLength(initData); + auto *toolArc = new VToolArcWithLength(initData); initData.scene->addItem(toolArc); InitArcToolConnections(initData.scene, toolArc); VAbstractPattern::AddTool(initData.id, toolArc); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp index aa6e45ee8..757c4cf2e 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp @@ -157,9 +157,8 @@ auto VToolEllipticalArc::Create(VToolEllipticalArcInitData &initData) -> VToolEl calcRotationAngle = CheckFormula(initData.id, initData.rotationAngle, initData.data); const VPointF c = *initData.data->GeometricObject(initData.center); - VEllipticalArc *elArc = - new VEllipticalArc(c, calcRadius1, calcRadius2, initData.radius1, initData.radius2, calcF1, initData.f1, calcF2, - initData.f2, calcRotationAngle, initData.rotationAngle); + auto *elArc = new VEllipticalArc(c, calcRadius1, calcRadius2, initData.radius1, initData.radius2, calcF1, + initData.f1, calcF2, initData.f2, calcRotationAngle, initData.rotationAngle); elArc->SetColor(initData.color); elArc->SetPenStyle(initData.penStyle); elArc->SetApproximationScale(initData.approximationScale); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp index 50b602cc4..b2f85b464 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp @@ -128,7 +128,7 @@ auto VToolSplinePath::Create(const QPointer &dialog, VMainGraphicsSc initData.typeCreation = Source::FromGui; initData.notes = dialogTool->GetNotes(); - VSplinePath *path = new VSplinePath(dialogTool->GetPath()); + auto *path = new VSplinePath(dialogTool->GetPath()); for (qint32 i = 0; i < path->CountPoints(); ++i) { doc->IncrementReferens((*path)[i].P().getIdTool()); @@ -170,7 +170,7 @@ auto VToolSplinePath::Create(VToolSplinePathInitData &initData, VSplinePath *pat if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::SplinePath, initData.doc); - VToolSplinePath *spl = new VToolSplinePath(initData); + auto *spl = new VToolSplinePath(initData); initData.scene->addItem(spl); InitSplinePathToolConnections(initData.scene, spl); VAbstractPattern::AddTool(initData.id, spl); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp index e1aaf61d5..528bed57a 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp @@ -143,7 +143,7 @@ auto VToolCutSplinePath::Create(VToolCutInitData &initData) -> VToolCutSplinePat SCASSERT(splPath != nullptr) // Declare special variable "CurrentLength" - VCurveLength *length = + auto *length = new VCurveLength(initData.baseCurveId, initData.baseCurveId, splPath.data(), *initData.data->GetPatternUnit()); length->SetName(currentLength); initData.data->AddVariable(length); @@ -228,7 +228,7 @@ auto VToolCutSplinePath::CutSplinePath(qreal length, const QSharedPointerCutSplinePath(length, p1, p2, spl1p2, spl1p3, spl2p2, spl2p3, pName); - VPointF *p = new VPointF(point); + auto *p = new VPointF(point); p->setName(pName); const QVector points = splPath->GetSplinePath(); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp index 57a17bdd7..4a3a27773 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp @@ -175,7 +175,7 @@ auto VToolBisector::Create(VToolBisectorInitData &initData) -> VToolBisector * VToolBisector::FindPoint(static_cast(*firstPoint), static_cast(*secondPoint), static_cast(*thirdPoint), VAbstractValApplication::VApp()->toPixel(result)); - VPointF *p = new VPointF(fPoint, initData.name, initData.mx, initData.my); + auto *p = new VPointF(fPoint, initData.name, initData.mx, initData.my); p->SetShowLabel(initData.showLabel); if (initData.typeCreation == Source::FromGui) @@ -196,7 +196,7 @@ auto VToolBisector::Create(VToolBisectorInitData &initData) -> VToolBisector * if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::Bisector, initData.doc); - VToolBisector *point = new VToolBisector(initData); + auto *point = new VToolBisector(initData); initData.scene->addItem(point); InitToolConnections(initData.scene, point); VAbstractPattern::AddTool(initData.id, point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp index 853ca9804..636cabac5 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp @@ -139,7 +139,7 @@ auto VToolEndLine::Create(VToolEndLineInitData &initData) -> VToolEndLine * line.setLength( VAbstractValApplication::VApp()->toPixel(CheckFormula(initData.id, initData.formulaLength, initData.data))); - VPointF *p = new VPointF(line.p2(), initData.name, initData.mx, initData.my); + auto *p = new VPointF(line.p2(), initData.name, initData.mx, initData.my); p->SetShowLabel(initData.showLabel); if (initData.typeCreation == Source::FromGui) @@ -160,7 +160,7 @@ auto VToolEndLine::Create(VToolEndLineInitData &initData) -> VToolEndLine * if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::EndLine, initData.doc); - VToolEndLine *point = new VToolEndLine(initData); + auto *point = new VToolEndLine(initData); initData.scene->addItem(point); InitToolConnections(initData.scene, point); VAbstractPattern::AddTool(initData.id, point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp index 25763caf7..7e57d8bd4 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp @@ -141,7 +141,7 @@ auto VToolHeight::Create(VToolHeightInitData initData) -> VToolHeight * QPointF const pHeight = FindPoint(QLineF(static_cast(*p1Line), static_cast(*p2Line)), static_cast(*basePoint)); - VPointF *p = new VPointF(pHeight, initData.name, initData.mx, initData.my); + auto *p = new VPointF(pHeight, initData.name, initData.mx, initData.my); p->SetShowLabel(initData.showLabel); if (initData.typeCreation == Source::FromGui) @@ -166,7 +166,7 @@ auto VToolHeight::Create(VToolHeightInitData initData) -> VToolHeight * if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::Height, initData.doc); - VToolHeight *point = new VToolHeight(initData); + auto *point = new VToolHeight(initData); initData.scene->addItem(point); InitToolConnections(initData.scene, point); VAbstractPattern::AddTool(initData.id, point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp index 3e8f052f1..914f3d00b 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp @@ -141,7 +141,7 @@ auto VToolLineIntersectAxis::Create(VToolLineIntersectAxisInitData &initData) -> : qWarning() << VAbstractValApplication::warningMessageSignature + errorMsg; } - VPointF *p = new VPointF(fPoint, initData.name, initData.mx, initData.my); + auto *p = new VPointF(fPoint, initData.name, initData.mx, initData.my); p->SetShowLabel(initData.showLabel); if (initData.typeCreation == Source::FromGui) @@ -166,7 +166,7 @@ auto VToolLineIntersectAxis::Create(VToolLineIntersectAxisInitData &initData) -> if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::LineIntersectAxis, initData.doc); - VToolLineIntersectAxis *point = new VToolLineIntersectAxis(initData); + auto *point = new VToolLineIntersectAxis(initData); initData.scene->addItem(point); InitToolConnections(initData.scene, point); VAbstractPattern::AddTool(initData.id, point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp index 64e25b113..22393ff88 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp @@ -141,7 +141,7 @@ auto VToolNormal::Create(VToolNormalInitData initData) -> VToolNormal * QPointF const fPoint = VToolNormal::FindPoint(static_cast(*firstPoint), static_cast(*secondPoint), VAbstractValApplication::VApp()->toPixel(result), initData.angle); - VPointF *p = new VPointF(fPoint, initData.name, initData.mx, initData.my); + auto *p = new VPointF(fPoint, initData.name, initData.mx, initData.my); p->SetShowLabel(initData.showLabel); if (initData.typeCreation == Source::FromGui) @@ -162,7 +162,7 @@ auto VToolNormal::Create(VToolNormalInitData initData) -> VToolNormal * if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::Normal, initData.doc); - VToolNormal *point = new VToolNormal(initData); + auto *point = new VToolNormal(initData); initData.scene->addItem(point); InitToolConnections(initData.scene, point); VAbstractPattern::AddTool(initData.id, point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp index 33288d579..bab3b19e9 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp @@ -198,7 +198,7 @@ auto VToolShoulderPoint::Create(VToolShoulderPointInitData &initData) -> VToolSh static_cast(*firstPoint), static_cast(*secondPoint), static_cast(*shoulderPoint), VAbstractValApplication::VApp()->toPixel(result)); - VPointF *p = new VPointF(fPoint, initData.name, initData.mx, initData.my); + auto *p = new VPointF(fPoint, initData.name, initData.mx, initData.my); p->SetShowLabel(initData.showLabel); if (initData.typeCreation == Source::FromGui) @@ -221,7 +221,7 @@ auto VToolShoulderPoint::Create(VToolShoulderPointInitData &initData) -> VToolSh if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::ShoulderPoint, initData.doc); - VToolShoulderPoint *point = new VToolShoulderPoint(initData); + auto *point = new VToolShoulderPoint(initData); initData.scene->addItem(point); InitToolConnections(initData.scene, point); VAbstractPattern::AddTool(initData.id, point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp index dd66695d6..cd4420773 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp @@ -106,7 +106,7 @@ void VToolBasePoint::SetDialog() //--------------------------------------------------------------------------------------------------------------------- auto VToolBasePoint::Create(VToolBasePointInitData initData) -> VToolBasePoint * { - VPointF *point = new VPointF(initData.x, initData.y, initData.name, initData.mx, initData.my); + auto *point = new VPointF(initData.x, initData.y, initData.name, initData.mx, initData.my); point->SetShowLabel(initData.showLabel); if (initData.typeCreation == Source::FromGui) @@ -125,7 +125,7 @@ auto VToolBasePoint::Create(VToolBasePointInitData initData) -> VToolBasePoint * if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::BasePoint, initData.doc); - VToolBasePoint *spoint = new VToolBasePoint(initData); + auto *spoint = new VToolBasePoint(initData); initData.scene->addItem(spoint); InitToolConnections(initData.scene, spoint); VAbstractPattern::AddTool(initData.id, spoint); @@ -165,7 +165,7 @@ void VToolBasePoint::AddToFile() patternPiece.appendChild(doc->createElement(VAbstractPattern::TagModeling)); patternPiece.appendChild(doc->createElement(VAbstractPattern::TagDetails)); - AddPatternPiece *addPP = new AddPatternPiece(patternPiece, doc, namePP); + auto *addPP = new AddPatternPiece(patternPiece, doc, namePP); connect(addPP, &AddPatternPiece::ClearScene, doc, &VAbstractPattern::ClearScene); connect(addPP, &AddPatternPiece::NeedFullParsing, doc, &VAbstractPattern::NeedFullParsing); VAbstractApplication::VApp()->getUndoStack()->push(addPP); @@ -191,13 +191,13 @@ auto VToolBasePoint::itemChange(QGraphicsItem::GraphicsItemChange change, const // value - this is new position. QPointF const newPos = value.toPointF(); - MoveSPoint *moveSP = new MoveSPoint(doc, newPos.x(), newPos.y(), m_id, this->scene()); + auto *moveSP = new MoveSPoint(doc, newPos.x(), newPos.y(), m_id, this->scene()); connect(moveSP, &MoveSPoint::NeedLiteParsing, doc, &VAbstractPattern::LiteParseTree); VAbstractApplication::VApp()->getUndoStack()->push(moveSP); const QList viewList = scene()->views(); if (not viewList.isEmpty()) { - if (VMainGraphicsView *view = qobject_cast(viewList.at(0))) + if (auto *view = qobject_cast(viewList.at(0))) { view->EnsureItemVisibleWithDelay(this, VMainGraphicsView::scrollDelay); } @@ -249,7 +249,7 @@ void VToolBasePoint::DeleteToolWithConfirm(bool ask) } qCDebug(vTool, "Begin deleting."); - DeletePatternPiece *deletePP = new DeletePatternPiece(doc, nameActivDraw); + auto *deletePP = new DeletePatternPiece(doc, nameActivDraw); connect(deletePP, &DeletePatternPiece::NeedFullParsing, doc, &VAbstractPattern::NeedFullParsing); VAbstractApplication::VApp()->getUndoStack()->push(deletePP); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp index b7603dcf8..db53cb3a5 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp @@ -156,7 +156,7 @@ auto VToolLineIntersect::Create(VToolLineIntersectInitData initData) -> VToolLin : qWarning() << VAbstractValApplication::warningMessageSignature + errorMsg; } - VPointF *p = new VPointF(fPoint, initData.name, initData.mx, initData.my); + auto *p = new VPointF(fPoint, initData.name, initData.mx, initData.my); p->SetShowLabel(initData.showLabel); if (initData.typeCreation == Source::FromGui) @@ -183,7 +183,7 @@ auto VToolLineIntersect::Create(VToolLineIntersectInitData initData) -> VToolLin if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::LineIntersect, initData.doc); - VToolLineIntersect *point = new VToolLineIntersect(initData); + auto *point = new VToolLineIntersect(initData); initData.scene->addItem(point); InitToolConnections(initData.scene, point); VAbstractPattern::AddTool(initData.id, point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp index a445d1b4d..66ecc5fb5 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp @@ -123,7 +123,7 @@ auto VToolPointFromArcAndTangent::Create(VToolPointFromArcAndTangentInitData ini qWarning() << VAbstractValApplication::warningMessageSignature + errorMsg; } - VPointF *p = new VPointF(point, initData.name, initData.mx, initData.my); + auto *p = new VPointF(point, initData.name, initData.mx, initData.my); p->SetShowLabel(initData.showLabel); if (initData.typeCreation == Source::FromGui) @@ -142,7 +142,7 @@ auto VToolPointFromArcAndTangent::Create(VToolPointFromArcAndTangentInitData ini if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::PointFromArcAndTangent, initData.doc); - VToolPointFromArcAndTangent *point = new VToolPointFromArcAndTangent(initData); + auto *point = new VToolPointFromArcAndTangent(initData); initData.scene->addItem(point); InitToolConnections(initData.scene, point); VAbstractPattern::AddTool(initData.id, point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp index de0efe2c6..51b1202b0 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp @@ -222,7 +222,7 @@ auto VToolPointOfContact::Create(VToolPointOfContactInitData &initData) -> VTool : qWarning() << VAbstractValApplication::warningMessageSignature + errorMsg; } - VPointF *p = new VPointF(fPoint, initData.name, initData.mx, initData.my); + auto *p = new VPointF(fPoint, initData.name, initData.mx, initData.my); p->SetShowLabel(initData.showLabel); if (initData.typeCreation == Source::FromGui) @@ -247,7 +247,7 @@ auto VToolPointOfContact::Create(VToolPointOfContactInitData &initData) -> VTool if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::PointOfContact, initData.doc); - VToolPointOfContact *point = new VToolPointOfContact(initData); + auto *point = new VToolPointOfContact(initData); initData.scene->addItem(point); InitToolConnections(initData.scene, point); VAbstractPattern::AddTool(initData.id, point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp index 3370e4f04..30330a293 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp @@ -129,7 +129,7 @@ auto VToolPointOfIntersection::Create(VToolPointOfIntersectionInitData initData) QPointF const point(firstPoint->x(), secondPoint->y()); - VPointF *p = new VPointF(point, initData.name, initData.mx, initData.my); + auto *p = new VPointF(point, initData.name, initData.mx, initData.my); p->SetShowLabel(initData.showLabel); if (initData.typeCreation == Source::FromGui) @@ -148,7 +148,7 @@ auto VToolPointOfIntersection::Create(VToolPointOfIntersectionInitData initData) if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::PointOfIntersection, initData.doc); - VToolPointOfIntersection *point = new VToolPointOfIntersection(initData); + auto *point = new VToolPointOfIntersection(initData); initData.scene->addItem(point); InitToolConnections(initData.scene, point); VAbstractPattern::AddTool(initData.id, point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp index dc8fec165..2a46eb7ce 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp @@ -123,7 +123,7 @@ auto VToolPointOfIntersectionArcs::Create(VToolPointOfIntersectionArcsInitData i qWarning() << VAbstractValApplication::warningMessageSignature + errorMsg; } - VPointF *p = new VPointF(point, initData.name, initData.mx, initData.my); + auto *p = new VPointF(point, initData.name, initData.mx, initData.my); p->SetShowLabel(initData.showLabel); if (initData.typeCreation == Source::FromGui) @@ -142,7 +142,7 @@ auto VToolPointOfIntersectionArcs::Create(VToolPointOfIntersectionArcsInitData i if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::PointOfIntersectionArcs, initData.doc); - VToolPointOfIntersectionArcs *point = new VToolPointOfIntersectionArcs(initData); + auto *point = new VToolPointOfIntersectionArcs(initData); initData.scene->addItem(point); InitToolConnections(initData.scene, point); VAbstractPattern::AddTool(initData.id, point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp index d38e58540..1db2c4327 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp @@ -141,7 +141,7 @@ auto VToolPointOfIntersectionCircles::Create(VToolPointOfIntersectionCirclesInit : qWarning() << VAbstractValApplication::warningMessageSignature + errorMsg; } - VPointF *p = new VPointF(point, initData.name, initData.mx, initData.my); + auto *p = new VPointF(point, initData.name, initData.mx, initData.my); p->SetShowLabel(initData.showLabel); if (initData.typeCreation == Source::FromGui) @@ -160,7 +160,7 @@ auto VToolPointOfIntersectionCircles::Create(VToolPointOfIntersectionCirclesInit if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::PointOfIntersectionCircles, initData.doc); - VToolPointOfIntersectionCircles *point = new VToolPointOfIntersectionCircles(initData); + auto *point = new VToolPointOfIntersectionCircles(initData); initData.scene->addItem(point); InitToolConnections(initData.scene, point); VAbstractPattern::AddTool(initData.id, point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp index 7f7d8f748..4d7d34467 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp @@ -422,8 +422,8 @@ auto VToolSinglePoint::InitSegments(GOType curveType, qreal segLength, const VPo spl->CutSpline(0, spl1p2, spl1p3, spl2p2, spl2p3, p->name()); } - VSpline *spl1 = new VSpline(spl->GetP1(), spl1p2, spl1p3, *p); - VSpline *spl2 = new VSpline(*p, spl2p2, spl2p3, spl->GetP4()); + auto *spl1 = new VSpline(spl->GetP1(), spl1p2, spl1p3, *p); + auto *spl2 = new VSpline(*p, spl2p2, spl2p3, spl->GetP4()); if (not VFuzzyComparePossibleNulls(segLength, -1)) { diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h index 89e3593c7..052b81c48 100644 --- a/src/libs/vtools/tools/drawTools/vdrawtool.h +++ b/src/libs/vtools/tools/drawTools/vdrawtool.h @@ -216,7 +216,7 @@ void VDrawTool::ContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 itemI // add the menu "remove from group" to the context menu QMap groupsContainingItem = doc->GetGroupsContainingItem(this->getId(), itemId, true); - QActionGroup *actionsRemoveFromGroup = new QActionGroup(this); + auto *actionsRemoveFromGroup = new QActionGroup(this); if (not groupsContainingItem.empty()) { QMenu *menuRemoveFromGroup = diff --git a/src/libs/vtools/tools/drawTools/vtoolline.cpp b/src/libs/vtools/tools/drawTools/vtoolline.cpp index 2d8983b04..369c977a0 100644 --- a/src/libs/vtools/tools/drawTools/vtoolline.cpp +++ b/src/libs/vtools/tools/drawTools/vtoolline.cpp @@ -469,7 +469,7 @@ void VToolLine::ShowVisualization(bool show) } else { - if (VisToolLine *visual = qobject_cast(vis)) + if (auto *visual = qobject_cast(vis)) { visual->show(); } diff --git a/src/libs/vtools/tools/nodeDetails/vnodearc.cpp b/src/libs/vtools/tools/nodeDetails/vnodearc.cpp index e48e63dc4..56b464014 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodearc.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodearc.cpp @@ -61,7 +61,7 @@ void VNodeArc::Create(const VAbstractNodeInitData &initData) if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::NodeArc, initData.doc); - VNodeArc *arc = new VNodeArc(initData); + auto *arc = new VNodeArc(initData); VAbstractPattern::AddTool(initData.id, arc); if (initData.idTool != NULL_ID) diff --git a/src/libs/vtools/tools/nodeDetails/vnodeellipticalarc.cpp b/src/libs/vtools/tools/nodeDetails/vnodeellipticalarc.cpp index 02747e1ab..5c5db1707 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodeellipticalarc.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodeellipticalarc.cpp @@ -44,7 +44,7 @@ void VNodeEllipticalArc::Create(const VAbstractNodeInitData &initData) if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::NodeElArc, initData.doc); - VNodeEllipticalArc *arc = new VNodeEllipticalArc(initData); + auto *arc = new VNodeEllipticalArc(initData); VAbstractPattern::AddTool(initData.id, arc); if (initData.idTool != NULL_ID) diff --git a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp index efe07b5e5..735601783 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp @@ -61,7 +61,7 @@ void VNodeSplinePath::Create(const VAbstractNodeInitData &initData) if (initData.parse == Document::FullParse) { VAbstractTool::AddRecord(initData.id, Tool::NodeSplinePath, initData.doc); - VNodeSplinePath *splPath = new VNodeSplinePath(initData); + auto *splPath = new VNodeSplinePath(initData); VAbstractPattern::AddTool(initData.id, splPath); if (initData.idTool != NULL_ID) diff --git a/src/libs/vtools/tools/nodeDetails/vtoolpin.cpp b/src/libs/vtools/tools/nodeDetails/vtoolpin.cpp index 410b58900..bb423db63 100644 --- a/src/libs/vtools/tools/nodeDetails/vtoolpin.cpp +++ b/src/libs/vtools/tools/nodeDetails/vtoolpin.cpp @@ -72,7 +72,7 @@ auto VToolPin::Create(VToolPinInitData initData) -> VToolPin * initData.data->UpdateId(initData.id); return nullptr;// Just ignore } - VPointF *pinPoint = new VPointF(*point); + auto *pinPoint = new VPointF(*point); pinPoint->setIdObject(initData.pointId); pinPoint->setMode(Draw::Modeling); initData.data->UpdateGObject(initData.id, pinPoint); diff --git a/src/libs/vtools/tools/vabstracttool.cpp b/src/libs/vtools/tools/vabstracttool.cpp index 852e85531..294b89981 100644 --- a/src/libs/vtools/tools/vabstracttool.cpp +++ b/src/libs/vtools/tools/vabstracttool.cpp @@ -241,7 +241,7 @@ void VAbstractTool::DeleteToolWithConfirm(bool ask) void VAbstractTool::PerformDelete() { qCDebug(vTool, "Begin deleting."); - DelTool *delTool = new DelTool(doc, m_id); + auto *delTool = new DelTool(doc, m_id); connect(delTool, &DelTool::NeedFullParsing, doc, &VAbstractPattern::NeedFullParsing); VAbstractApplication::VApp()->getUndoStack()->push(delTool); } diff --git a/src/libs/vtools/undocommands/label/movedoublelabel.cpp b/src/libs/vtools/undocommands/label/movedoublelabel.cpp index be15e45f7..058745b32 100644 --- a/src/libs/vtools/undocommands/label/movedoublelabel.cpp +++ b/src/libs/vtools/undocommands/label/movedoublelabel.cpp @@ -88,7 +88,7 @@ MoveDoubleLabel::MoveDoubleLabel(VAbstractPattern *doc, const QPointF &pos, Move //--------------------------------------------------------------------------------------------------------------------- auto MoveDoubleLabel::mergeWith(const QUndoCommand *command) -> bool { - const MoveDoubleLabel *moveCommand = static_cast(command); + const auto *moveCommand = static_cast(command); SCASSERT(moveCommand != nullptr) if (moveCommand->GetPointId() != nodeId || @@ -151,7 +151,7 @@ void MoveDoubleLabel::Do(const QPointF &pos) QString().setNum(VAbstractValApplication::VApp()->fromPixel(pos.y()))); } - if (VDrawTool *tool = qobject_cast(VAbstractPattern::getTool(m_idTool))) + if (auto *tool = qobject_cast(VAbstractPattern::getTool(m_idTool))) { tool->ChangeLabelPosition(nodeId, pos); } diff --git a/src/libs/vtools/undocommands/label/operationmovelabel.cpp b/src/libs/vtools/undocommands/label/operationmovelabel.cpp index 78b150d5a..c8f2d5498 100644 --- a/src/libs/vtools/undocommands/label/operationmovelabel.cpp +++ b/src/libs/vtools/undocommands/label/operationmovelabel.cpp @@ -68,7 +68,7 @@ OperationMoveLabel::OperationMoveLabel(quint32 idTool, VAbstractPattern *doc, co //--------------------------------------------------------------------------------------------------------------------- auto OperationMoveLabel::mergeWith(const QUndoCommand *command) -> bool { - const OperationMoveLabel *moveCommand = static_cast(command); + const auto *moveCommand = static_cast(command); SCASSERT(moveCommand != nullptr) if (moveCommand->GetToolId() != m_idTool && moveCommand->GetPointId() != nodeId) @@ -101,7 +101,7 @@ void OperationMoveLabel::Do(const QPointF &pos) doc->SetAttribute(domElement, AttrMx, QString().setNum(VAbstractValApplication::VApp()->fromPixel(pos.x()))); doc->SetAttribute(domElement, AttrMy, QString().setNum(VAbstractValApplication::VApp()->fromPixel(pos.y()))); - if (VDrawTool *tool = qobject_cast(VAbstractPattern::getTool(m_idTool))) + if (auto *tool = qobject_cast(VAbstractPattern::getTool(m_idTool))) { tool->ChangeLabelPosition(nodeId, pos); } diff --git a/src/libs/vtools/undocommands/label/operationshowlabel.cpp b/src/libs/vtools/undocommands/label/operationshowlabel.cpp index 0c2a9d3ea..39ed3deba 100644 --- a/src/libs/vtools/undocommands/label/operationshowlabel.cpp +++ b/src/libs/vtools/undocommands/label/operationshowlabel.cpp @@ -86,7 +86,7 @@ void OperationShowLabel::Do(bool visible) { doc->SetAttribute(domElement, AttrShowLabel, visible); - if (VDrawTool *tool = qobject_cast(VAbstractPattern::getTool(m_idTool))) + if (auto *tool = qobject_cast(VAbstractPattern::getTool(m_idTool))) { tool->SetLabelVisible(nodeId, visible); } diff --git a/src/libs/vtools/undocommands/label/showdoublelabel.cpp b/src/libs/vtools/undocommands/label/showdoublelabel.cpp index 3467f18c7..41be0848d 100644 --- a/src/libs/vtools/undocommands/label/showdoublelabel.cpp +++ b/src/libs/vtools/undocommands/label/showdoublelabel.cpp @@ -106,7 +106,7 @@ void ShowDoubleLabel::Do(bool visible) doc->SetAttribute(domElement, AttrShowLabel2, visible); } - if (VDrawTool *tool = qobject_cast(VAbstractPattern::getTool(m_idTool))) + if (auto *tool = qobject_cast(VAbstractPattern::getTool(m_idTool))) { tool->SetLabelVisible(nodeId, visible); } diff --git a/src/libs/vtools/undocommands/label/showlabel.cpp b/src/libs/vtools/undocommands/label/showlabel.cpp index 06edb7a68..c6f8b1e45 100644 --- a/src/libs/vtools/undocommands/label/showlabel.cpp +++ b/src/libs/vtools/undocommands/label/showlabel.cpp @@ -81,7 +81,7 @@ void ShowLabel::Do(bool visible) { doc->SetAttribute(domElement, AttrShowLabel, visible); - if (VAbstractTool *tool = qobject_cast(VAbstractPattern::getTool(nodeId))) + if (auto *tool = qobject_cast(VAbstractPattern::getTool(nodeId))) { tool->SetLabelVisible(nodeId, visible); } diff --git a/src/libs/vtools/undocommands/movepiece.cpp b/src/libs/vtools/undocommands/movepiece.cpp index aa9846f41..86a4e3cbc 100644 --- a/src/libs/vtools/undocommands/movepiece.cpp +++ b/src/libs/vtools/undocommands/movepiece.cpp @@ -82,7 +82,7 @@ void MovePiece::redo() // cppcheck-suppress unusedFunction auto MovePiece::mergeWith(const QUndoCommand *command) -> bool { - const MovePiece *moveCommand = static_cast(command); + const auto *moveCommand = static_cast(command); SCASSERT(moveCommand != nullptr) const quint32 id = moveCommand->getDetId(); @@ -112,7 +112,7 @@ void MovePiece::Do(qreal x, qreal y) { SaveCoordinates(domElement, x, y); - VToolSeamAllowance *tool = qobject_cast(VAbstractPattern::getTool(nodeId)); + auto *tool = qobject_cast(VAbstractPattern::getTool(nodeId)); if (tool) { tool->Move(x, y); diff --git a/src/libs/vtools/undocommands/movesplinepath.cpp b/src/libs/vtools/undocommands/movesplinepath.cpp index 25133536a..84f007646 100644 --- a/src/libs/vtools/undocommands/movesplinepath.cpp +++ b/src/libs/vtools/undocommands/movesplinepath.cpp @@ -71,7 +71,7 @@ void MoveSplinePath::redo() //--------------------------------------------------------------------------------------------------------------------- auto MoveSplinePath::mergeWith(const QUndoCommand *command) -> bool { - const MoveSplinePath *moveCommand = static_cast(command); + const auto *moveCommand = static_cast(command); SCASSERT(moveCommand != nullptr) const quint32 id = moveCommand->getSplinePathId(); diff --git a/src/libs/vtools/undocommands/renamepp.cpp b/src/libs/vtools/undocommands/renamepp.cpp index 50dcfc092..840a1f9e0 100644 --- a/src/libs/vtools/undocommands/renamepp.cpp +++ b/src/libs/vtools/undocommands/renamepp.cpp @@ -67,7 +67,7 @@ void RenamePP::redo() //--------------------------------------------------------------------------------------------------------------------- auto RenamePP::mergeWith(const QUndoCommand *command) -> bool { - const RenamePP *renameCommand = static_cast(command); + const auto *renameCommand = static_cast(command); SCASSERT(renameCommand != nullptr) const QString oldName = renameCommand->getOldPPname(); diff --git a/src/libs/vtools/undocommands/savepiecepathoptions.cpp b/src/libs/vtools/undocommands/savepiecepathoptions.cpp index 94e27bdd9..bb35a1005 100644 --- a/src/libs/vtools/undocommands/savepiecepathoptions.cpp +++ b/src/libs/vtools/undocommands/savepiecepathoptions.cpp @@ -72,7 +72,7 @@ void SavePiecePathOptions::undo() if (m_pieceId != NULL_ID) { - if (VToolSeamAllowance *tool = qobject_cast(VAbstractPattern::getTool(m_pieceId))) + if (auto *tool = qobject_cast(VAbstractPattern::getTool(m_pieceId))) { tool->RefreshGeometry(); } @@ -104,7 +104,7 @@ void SavePiecePathOptions::redo() if (m_pieceId != NULL_ID) { - if (VToolSeamAllowance *tool = qobject_cast(VAbstractPattern::getTool(m_pieceId))) + if (auto *tool = qobject_cast(VAbstractPattern::getTool(m_pieceId))) { tool->RefreshGeometry(); } @@ -119,7 +119,7 @@ void SavePiecePathOptions::redo() //--------------------------------------------------------------------------------------------------------------------- auto SavePiecePathOptions::mergeWith(const QUndoCommand *command) -> bool { - const SavePiecePathOptions *saveCommand = static_cast(command); + const auto *saveCommand = static_cast(command); SCASSERT(saveCommand != nullptr); if (saveCommand->PathId() != nodeId) diff --git a/src/libs/vtools/undocommands/savetooloptions.cpp b/src/libs/vtools/undocommands/savetooloptions.cpp index 2b89fa843..f9cbf84d9 100644 --- a/src/libs/vtools/undocommands/savetooloptions.cpp +++ b/src/libs/vtools/undocommands/savetooloptions.cpp @@ -99,7 +99,7 @@ auto SaveToolOptions::Missing(const QList &list1, const QList //--------------------------------------------------------------------------------------------------------------------- auto SaveToolOptions::mergeWith(const QUndoCommand *command) -> bool { - const SaveToolOptions *saveCommand = static_cast(command); + const auto *saveCommand = static_cast(command); if (saveCommand->getToolId() != nodeId) { diff --git a/src/libs/vwidgets/fancytabbar/fancytabbar.cpp b/src/libs/vwidgets/fancytabbar/fancytabbar.cpp index 00d75f4b1..7ad21e35c 100644 --- a/src/libs/vwidgets/fancytabbar/fancytabbar.cpp +++ b/src/libs/vwidgets/fancytabbar/fancytabbar.cpp @@ -664,7 +664,7 @@ auto FancyTabBar::IsTabEnabled(int index) const -> bool //--------------------------------------------------------------------------------------------------------------------- void FancyTabBar::InsertTab(int index, const QIcon &icon, const QString &label) { - FancyTab *tab = new FancyTab(this); + auto *tab = new FancyTab(this); tab->m_icon = icon; tab->m_text = label; m_attachedTabs.insert(index, tab); diff --git a/src/libs/vwidgets/global.cpp b/src/libs/vwidgets/global.cpp index 09dc1feb1..dbd40b36f 100644 --- a/src/libs/vwidgets/global.cpp +++ b/src/libs/vwidgets/global.cpp @@ -104,7 +104,7 @@ auto ItemShapeFromPath(const QPainterPath &path, const QPen &pen) -> QPainterPat { // We unfortunately need this hack as QPainterPathStroker will set a width of 1.0 // if we pass a value of 0.0 to QPainterPathStroker::setWidth() - const qreal penWidthZero = qreal(0.00000001); + const auto penWidthZero = qreal(0.00000001); if (path == QPainterPath() || pen == Qt::NoPen) { diff --git a/src/libs/vwidgets/qtcolorpicker.cpp b/src/libs/vwidgets/qtcolorpicker.cpp index 441e73035..369ae0f65 100644 --- a/src/libs/vwidgets/qtcolorpicker.cpp +++ b/src/libs/vwidgets/qtcolorpicker.cpp @@ -827,7 +827,7 @@ void ColorPickerPopup::keyPressEvent(QKeyEvent *e) QWidget *w = widgetAt[curRow][curCol]; if ((w != nullptr) && w->inherits("ColorPickerItem")) { - ColorPickerItem *wi = reinterpret_cast(w); + auto *wi = reinterpret_cast(w); wi->setSelected(true); QLayoutItem *layoutItem; @@ -852,7 +852,7 @@ void ColorPickerPopup::keyPressEvent(QKeyEvent *e) } else if (w && w->inherits("QPushButton")) { - ColorPickerItem *wi = reinterpret_cast(w); + auto *wi = reinterpret_cast(w); wi->setSelected(true); QLayoutItem *layoutItem; diff --git a/src/libs/vwidgets/vcomboboxdelegate.cpp b/src/libs/vwidgets/vcomboboxdelegate.cpp index 9ef4488a3..be681a049 100644 --- a/src/libs/vwidgets/vcomboboxdelegate.cpp +++ b/src/libs/vwidgets/vcomboboxdelegate.cpp @@ -45,7 +45,7 @@ auto VComboBoxDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem Q_UNUSED(option) Q_UNUSED(index) - QComboBox *editor = new QComboBox(parent); + auto *editor = new QComboBox(parent); editor->addItems(m_items); return editor; @@ -56,7 +56,7 @@ void VComboBoxDelegate::setEditorData(QWidget *editor, const QModelIndex &index) { const QString value = index.model()->data(index, Qt::EditRole).toString(); - QComboBox *comboBox = static_cast(editor); + auto *comboBox = static_cast(editor); const int cIndex = comboBox->findText(value); if (cIndex != -1) @@ -68,7 +68,7 @@ void VComboBoxDelegate::setEditorData(QWidget *editor, const QModelIndex &index) //--------------------------------------------------------------------------------------------------------------------- void VComboBoxDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const { - QComboBox *comboBox = static_cast(editor); + auto *comboBox = static_cast(editor); QString value; const int cIndex = comboBox->currentIndex(); diff --git a/src/libs/vwidgets/vplaintextedit.cpp b/src/libs/vwidgets/vplaintextedit.cpp index b63cbba80..1d0b16b7b 100644 --- a/src/libs/vwidgets/vplaintextedit.cpp +++ b/src/libs/vwidgets/vplaintextedit.cpp @@ -136,7 +136,7 @@ void VPlainTextEdit::MatchParentheses() //--------------------------------------------------------------------------------------------------------------------- auto VPlainTextEdit::MatchLeftParenthesis(QTextBlock currentBlock, int i, int numLeftParentheses) -> bool { - VTextBlockData *data = static_cast(currentBlock.userData()); + auto *data = static_cast(currentBlock.userData()); QVector const infos = data->Parentheses(); int const docPos = currentBlock.position(); @@ -171,7 +171,7 @@ auto VPlainTextEdit::MatchLeftParenthesis(QTextBlock currentBlock, int i, int nu //--------------------------------------------------------------------------------------------------------------------- auto VPlainTextEdit::MatchRightParenthesis(QTextBlock currentBlock, int i, int numRightParentheses) -> bool { - VTextBlockData *data = static_cast(currentBlock.userData()); + auto *data = static_cast(currentBlock.userData()); QVector const parentheses = data->Parentheses(); int const docPos = currentBlock.position(); diff --git a/src/libs/vwidgets/vwidgetpopup.cpp b/src/libs/vwidgets/vwidgetpopup.cpp index 9f96368d4..e848bbc63 100644 --- a/src/libs/vwidgets/vwidgetpopup.cpp +++ b/src/libs/vwidgets/vwidgetpopup.cpp @@ -96,8 +96,8 @@ void VWidgetPopup::PopupMessage(QWidget *w, const QString &msg) { SCASSERT(w != nullptr) - VWidgetPopup *popup = new VWidgetPopup(w); - QLabel *label = new QLabel(msg); + auto *popup = new VWidgetPopup(w); + auto *label = new QLabel(msg); QFont f = label->font(); f.setBold(true); f.setPixelSize(16);