Declare variables inside the loop.

appveyor.yml

@@ -660,7 +660,7 @@ for:
     - qbs config defaultProfile qt6
     - qbs config profiles.qt6.baseProfile clang
     - conan install . -s os=Macos --build=missing -o with_crash_reporting=True -pr=valentina
-    - git fetch --tags
+    - git fetch --all --tags
     - git describe --always HEAD
     - qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:true moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix xerces-c)/lib/pkgconfig,$(brew --prefix qt6)/lib/pkgconfig,$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix qt6)/lib,$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir project.enableConan:true project.conanWithCrashReporting:true project.conanProfiles:valentina
     - export QTDIR=$(brew --prefix qt6)
@@ -864,7 +864,8 @@ for:
     - qbs config defaultProfile qt5
     - qbs config profiles.qt5.baseProfile clang
     - conan install . -s os=Macos --build=missing -o with_crash_reporting=True -pr=valentina
-    - git fetch --tags
+    - git fetch --all --tags
+    - git describe --always HEAD
     - qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt5 project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:true "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:${QTDIR}/lib modules.macdeployqt.pluginspath:${QTDIR}/plugins modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir project.enableConan:true project.conanWithCrashReporting:true project.conanProfiles:valentina
     - export CRASH_QT_VERSION=$($QTDIR/bin/qmake -query QT_VERSION | awk -F. '{print $1 "_" $2}')
     - export CRASH_SHORT_SHA=$(git log --pretty=format:%h -n 1)

src/app/tape/tmainwindow.cpp

@@ -2611,8 +2611,7 @@ void TMainWindow::ExportToIndividual()
     VMeasurements individualMeasurements(m_mUnit, tmpData.data());
 
     const QMap<int, QSharedPointer<VMeasurement>> orderedTable = OrderedMeasurements();
-    QMap<int, QSharedPointer<VMeasurement>>::const_iterator iMap;
-    for (iMap = orderedTable.constBegin(); iMap != orderedTable.constEnd(); ++iMap)
+    for (auto iMap = orderedTable.constBegin(); iMap != orderedTable.constEnd(); ++iMap)
     {
         const QSharedPointer<VMeasurement> &meash = iMap.value();
         individualMeasurements.AddEmpty(meash->GetName());
@@ -4680,8 +4679,7 @@ auto TMainWindow::OrderedMeasurements() const -> QMap<int, QSharedPointer<VMeasu
 {
     const QMap<QString, QSharedPointer<VMeasurement>> table = m_data->DataMeasurementsWithSeparators();
     QMap<int, QSharedPointer<VMeasurement>> orderedTable;
-    QMap<QString, QSharedPointer<VMeasurement>>::const_iterator iterMap;
-    for (iterMap = table.constBegin(); iterMap != table.constEnd(); ++iterMap)
+    for (auto iterMap = table.constBegin(); iterMap != table.constEnd(); ++iterMap)
     {
         const QSharedPointer<VMeasurement> &meash = iterMap.value();
         orderedTable.insert(meash->Index(), meash);

src/app/valentina/dialogs/dialogincrements.cpp

@@ -1401,10 +1401,9 @@ void DialogIncrements::FillIncrementsTable(QTableWidget *table,
     table->blockSignals(true);
     table->clearContents();
 
-    QMap<QString, QSharedPointer<VIncrement>>::const_iterator i;
     QMap<quint32, QString> map;
     // Sorting QHash by id
-    for (i = increments.constBegin(); i != increments.constEnd(); ++i)
+    for (auto i = increments.constBegin(); i != increments.constEnd(); ++i)
     {
         const QSharedPointer<VIncrement> &incr = i.value();
         if (takePreviewCalculations == incr->IsPreviewCalculation())

src/app/valentina/mainwindow.cpp

@@ -1950,10 +1950,9 @@ void MainWindow::ExportToCSVData(const QString &fileName, bool withHeader, int m
 
     auto SavePreviewCalculation = [&currentRow, &csv, increments](bool save)
     {
-        QMap<QString, QSharedPointer<VIncrement>>::const_iterator i;
         QMap<quint32, QString> map;
         // Sorting QHash by id
-        for (i = increments.constBegin(); i != increments.constEnd(); ++i)
+        for (auto i = increments.constBegin(); i != increments.constEnd(); ++i)
         {
             const QSharedPointer<VIncrement> &incr = i.value();
             if (incr->IsPreviewCalculation() == save)

src/app/valentina/mainwindowsnogui.cpp

@@ -905,8 +905,7 @@ auto MainWindowsNoGUI::PrepareDetailsForLayout(const QVector<DetailForLayout> &d
     layoutDetails.reserve(details.size());
     const QFuture<VLayoutPiece> future = futureWatcher.future();
 
-    QFuture<VLayoutPiece>::const_iterator i;
-    for (i = future.constBegin(); i != future.constEnd(); ++i)
+    for (auto i = future.constBegin(); i != future.constEnd(); ++i)
     {
         layoutDetails.append(*i);
     }

src/app/valentina/xml/vpattern.cpp

@@ -4668,15 +4668,19 @@ template <typename T> auto VPattern::ToolBoundingRect(const QRectF &rec, quint32
     QRectF recTool = rec;
     if (tools.contains(id))
     {
-        const T *vTool = qobject_cast<T *>(tools.value(id));
-        SCASSERT(vTool != nullptr)
+        if (const T *vTool = qobject_cast<T *>(tools.value(id)); vTool != nullptr)
+        {
+            QRectF childrenRect = vTool->childrenBoundingRect();
+            // map to scene coordinate.
+            childrenRect.translate(vTool->scenePos());
 
-        QRectF childrenRect = vTool->childrenBoundingRect();
-        // map to scene coordinate.
-        childrenRect.translate(vTool->scenePos());
-
-        recTool = recTool.united(vTool->sceneBoundingRect());
-        recTool = recTool.united(childrenRect);
+            recTool = recTool.united(vTool->sceneBoundingRect());
+            recTool = recTool.united(childrenRect);
+        }
+        else
+        {
+            qDebug() << "qobject_cast failed for tool with id=" << id;
+        }
     }
     else
     {

src/libs/qmuparser/qmuparserbase.cpp

@@ -1910,8 +1910,6 @@ void QmuParserBase::Eval(qreal *results, int nBulkSize) const
 {
     CreateRPN();
 
-    int i = 0;
-
 #ifdef QMUP_USE_OPENMP
 // #define DEBUG_OMP_STUFF
 #ifdef DEBUG_OMP_STUFF
@@ -1924,7 +1922,7 @@ void QmuParserBase::Eval(qreal *results, int nBulkSize) const
     omp_set_num_threads(nMaxThreads);
 
 #pragma omp parallel for schedule(static, nBulkSize / nMaxThreads) private(nThreadID)
-    for (i = 0; i < nBulkSize; ++i)
+    for (int i = 0; i < nBulkSize; ++i)
     {
         int nThreadID = omp_get_thread_num();
         results[i] = ParseCmdCodeBulk(i, nThreadID);
@@ -1953,7 +1951,7 @@ void QmuParserBase::Eval(qreal *results, int nBulkSize) const
 #endif
 
 #else
-    for (i = 0; i < nBulkSize; ++i)
+    for (int i = 0; i < nBulkSize; ++i)
     {
         results[i] = ParseCmdCodeBulk(i, 0);
     }

src/libs/vdxf/libdxfrw/intern/drw_textcodec.cpp

@@ -234,8 +234,7 @@ auto DRW_Converter::toUtf8(const std::string &s) -> std::string
 {
     std::string result;
     unsigned int j = 0;
-    unsigned int i = 0;
-    for (i = 0; i < s.length(); i++)
+    for (unsigned int i = 0; i < s.length(); i++)
     {
         auto c = static_cast<unsigned char>(s.at(i));
         if (c < 0x80)

src/libs/vlayout/vabstractpiece.h

@@ -620,10 +620,9 @@ template <class T> inline auto VAbstractPiece::CheckLoops(QVector<T> points) ->
     }
 
     bool loopFound = false;
-    qint32 i;
     const int maxLoops = 10000; // limit number of loops to be removed
 
-    for (i = 0; i < maxLoops; ++i)
+    for (qint32 i = 0; i < maxLoops; ++i)
     {
         points = CheckLoop(points, loopFound);
         if (not loopFound)
@@ -646,8 +645,7 @@ template <class T> inline auto VAbstractPiece::CheckLoop(const QVector<T> &point
     QVector<T> ekvPoints;
     ekvPoints.reserve(points.size());
 
-    qint32 i;
-    for (i = 0; i < points.size(); ++i)
+    for (qint32 i = 0; i < points.size(); ++i)
     {
         /*Last three points no need to check.*/
         /*Triangle can not contain a loop*/

src/libs/vmisc/qxtcsvmodel.cpp

@@ -601,9 +601,8 @@ auto QxtCsvModel::toCSV(QIODevice *dest, QString &error, bool withHeader, QChar
     -> bool
 {
     const QxtCsvModelPrivate &d_ptr = qxt_d();
-    int row, col, rows, cols;
-    rows = rowCount();
-    cols = columnCount();
+    int rows = rowCount();
+    int cols = columnCount();
     QString data;
     if (not dest->isOpen() && not dest->open(QIODevice::WriteOnly | QIODevice::Truncate))
     {
@@ -624,7 +623,7 @@ auto QxtCsvModel::toCSV(QIODevice *dest, QString &error, bool withHeader, QChar
     if (withHeader)
     {
         data = QString();
-        for (col = 0; col < cols; ++col)
+        for (int col = 0; col < cols; ++col)
         {
             if (col > 0)
             {
@@ -634,11 +633,11 @@ auto QxtCsvModel::toCSV(QIODevice *dest, QString &error, bool withHeader, QChar
         }
         stream << data << Qt::endl;
     }
-    for (row = 0; row < rows; ++row)
+    for (int row = 0; row < rows; ++row)
     {
         const QStringList &rowData = d_ptr.csvData[row];
         data = QString();
-        for (col = 0; col < cols; ++col)
+        for (int col = 0; col < cols; ++col)
         {
             if (col > 0)
             {

src/libs/vmisc/svgfont/vsvgpathtokenizer.cpp

@@ -163,7 +163,6 @@ void PathArc(QPainterPath &path, qreal rx, qreal ry, qreal x_axis_rotation, int
     qreal x0, y0, x1, y1, xc, yc;
     qreal d, sfactor, sfactor_sq;
     qreal th0, th1, th_arc;
-    int i, n_segs;
     qreal dx, dy, dx1, dy1, Px, Py, check;
     rx = qAbs(rx);
     ry = qAbs(ry);
@@ -223,8 +222,8 @@ void PathArc(QPainterPath &path, qreal rx, qreal ry, qreal x_axis_rotation, int
     {
         th_arc -= 2 * V_PI;
     }
-    n_segs = qCeil(qAbs(th_arc / (V_PI * 0.5 + 0.001)));
-    for (i = 0; i < n_segs; i++)
+    int n_segs = qCeil(qAbs(th_arc / (V_PI * 0.5 + 0.001)));
+    for (int i = 0; i < n_segs; i++)
     {
         PathArcSegment(path, xc, yc, th0 + i * th_arc / n_segs, th0 + (i + 1) * th_arc / n_segs, rx, ry,
                        x_axis_rotation);

src/libs/vobj/delaunay.cpp

@@ -178,14 +178,13 @@ static void halfedge_free(halfedge_t *d)
 void del_free_halfedges(delaunay_t *del);
 void del_free_halfedges(delaunay_t *del)
 {
-    quint32 i;
     halfedge_t *d, *sig;
 
     /* if there is nothing to do */
     if (del->points == nullptr)
         return;
 
-    for (i = 0; i <= (del->end_point - del->start_point); i++)
+    for (quint32 i = 0; i <= (del->end_point - del->start_point); i++)
     {
         /* free all the halfedges around the point */
         d = del->points[i]->he;
@@ -985,7 +984,6 @@ static void build_halfedge_face(delaunay_t *del, halfedge_t *d)
 void del_build_faces(delaunay_t *del);
 void del_build_faces(delaunay_t *del)
 {
-    quint32 i;
     halfedge_t *curr;
 
     del->num_faces = 0;
@@ -994,7 +992,7 @@ void del_build_faces(delaunay_t *del)
     /* build external face first */
     build_halfedge_face(del, del->rightmost_he->pair);
 
-    for (i = del->start_point; i <= del->end_point; i++)
+    for (quint32 i = del->start_point; i <= del->end_point; i++)
     {
         curr = del->points[i]->he;
 

src/libs/vobj/predicates.cpp

@@ -446,7 +446,6 @@ auto scale_expansion_zeroelim(int elen, qreal *e, qreal b, qreal *h) -> int /* e
     qreal hh;
     INEXACT qreal product1;
     qreal product0;
-    int eindex, hindex;
     qreal enow;
     INEXACT qreal bvirt;
     qreal avirt, bround, around;
@@ -457,12 +456,12 @@ auto scale_expansion_zeroelim(int elen, qreal *e, qreal b, qreal *h) -> int /* e
 
     Split(b, bhi, blo);
     Two_Product_Presplit(e[0], b, bhi, blo, Q, hh);
-    hindex = 0;
+    int hindex = 0;
     if (hh != 0)
     {
         h[hindex++] = hh;
     }
-    for (eindex = 1; eindex < elen; eindex++)
+    for (int eindex = 1; eindex < elen; eindex++)
     {
         enow = e[eindex];
         Two_Product_Presplit(enow, b, bhi, blo, product1, product0);
@@ -495,10 +494,9 @@ auto scale_expansion_zeroelim(int elen, qreal *e, qreal b, qreal *h) -> int /* e
 auto estimate(int elen, qreal *e) -> qreal
 {
     qreal Q;
-    int eindex;
 
     Q = e[0];
-    for (eindex = 1; eindex < elen; eindex++)
+    for (int eindex = 1; eindex < elen; eindex++)
     {
         Q += e[eindex];
     }

src/libs/vpatterndb/vcontainer.cpp

@@ -428,8 +428,7 @@ void VContainer::ClearVariables(const QVector<VarType> &types)
         }
         else
         {
-            QHash<QString, QSharedPointer<VInternalVariable>>::iterator i;
-            for (i = d->variables.begin(); i != d->variables.end();)
+            for (auto i = d->variables.begin(); i != d->variables.end();)
             {
                 if (types.contains(i.value()->GetType()))
                 {
@@ -712,8 +711,7 @@ template <typename T> auto VContainer::DataVar(const VarType &type) const -> QMa
 {
     QMap<QString, QSharedPointer<T>> map;
     // Sorting QHash by id
-    QHash<QString, QSharedPointer<VInternalVariable>>::const_iterator i;
-    for (i = d->variables.constBegin(); i != d->variables.constEnd(); ++i)
+    for (auto i = d->variables.constBegin(); i != d->variables.constEnd(); ++i)
     {
         if (i.value()->GetType() == type)
         {

src/libs/vpropertyexplorer/plugins/vobjectproperty.cpp

@@ -27,14 +27,14 @@
 
 #include "../vproperty_p.h"
 
-VPE::VObjectProperty::VObjectProperty(const QString& name)
-    : VProperty(name,
+VPE::VObjectProperty::VObjectProperty(const QString &name)
+  : VProperty(name,
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-                QMetaType::UInt),
+              QMetaType::UInt),
 #else
-                QVariant::UInt),
+              QVariant::UInt),
 #endif
-      objects()
+    objects()
 {
     VProperty::d_ptr->VariantValue = 0;
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -58,7 +58,7 @@ auto VPE::VObjectProperty::data(int column, int role) const -> QVariant
     {
         return VProperty::d_ptr->VariantValue;
     }
-    
+
     if (column == DPC_Data && Qt::EditRole == role)
     {
         return tmpEditor->currentIndex();
@@ -78,7 +78,7 @@ auto VPE::VObjectProperty::createEditor(QWidget *parent, const QStyleOptionViewI
     FillList(tmpEditor, objects);
     tmpEditor->setCurrentIndex(tmpEditor->findData(VProperty::d_ptr->VariantValue.toUInt()));
     connect(tmpEditor, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
-                     &VObjectProperty::currentIndexChanged);
+            &VObjectProperty::currentIndexChanged);
 
     VProperty::d_ptr->editor = tmpEditor;
     return VProperty::d_ptr->editor;
@@ -137,7 +137,7 @@ auto VPE::VObjectProperty::getObjects() const -> QMap<QString, quint32>
 }
 
 //! Sets the value of the property
-void VPE::VObjectProperty::setValue(const QVariant& value)
+void VPE::VObjectProperty::setValue(const QVariant &value)
 {
     VProperty::d_ptr->VariantValue = value;
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -166,15 +166,14 @@ void VPE::VObjectProperty::currentIndexChanged(int index)
 {
     Q_UNUSED(index)
     auto *event = new UserChangeEvent();
-    QCoreApplication::postEvent ( VProperty::d_ptr->editor, event );
+    QCoreApplication::postEvent(VProperty::d_ptr->editor, event);
 }
 
 void VPE::VObjectProperty::FillList(QComboBox *box, const QMap<QString, quint32> &list) const
 {
     box->clear();
 
-    QMap<QString, quint32>::const_iterator i;
-    for (i = list.constBegin(); i != list.constEnd(); ++i)
+    for (auto i = list.constBegin(); i != list.constEnd(); ++i)
     {
         box->addItem(i.key(), i.value());
     }

src/libs/vtools/dialogs/dialogtoolbox.cpp

@@ -192,7 +192,7 @@ auto RowNode(QListWidget *listWidget, int i) -> VPieceNode
     }
 
     const QListWidgetItem *rowItem = listWidget->item(i);
-    SCASSERT(rowItem != nullptr);
+    SCASSERT(rowItem != nullptr)
     return qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
 }
 
@@ -403,7 +403,7 @@ auto FindNotExcludedNeighborNodeDown(QListWidget *listWidget, int candidate) ->
     do
     {
         const QListWidgetItem *rowItem = listWidget->item(i);
-        SCASSERT(rowItem != nullptr);
+        SCASSERT(rowItem != nullptr)
         rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
 
         if (not rowNode.IsExcluded())
@@ -449,7 +449,7 @@ auto FindNotExcludedNeighborNodeUp(QListWidget *listWidget, int candidate) -> in
     do
     {
         const QListWidgetItem *rowItem = listWidget->item(i);
-        SCASSERT(rowItem != nullptr);
+        SCASSERT(rowItem != nullptr)
         rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
 
         if (not rowNode.IsExcluded())
@@ -493,7 +493,7 @@ auto FindNotExcludedNodeDown(QListWidget *listWidget, int candidate) -> int
     do
     {
         const QListWidgetItem *rowItem = listWidget->item(i);
-        SCASSERT(rowItem != nullptr);
+        SCASSERT(rowItem != nullptr)
         rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
 
         if (not rowNode.IsExcluded())
@@ -523,7 +523,7 @@ auto FindNotExcludedNodeUp(QListWidget *listWidget, int candidate) -> int
     do
     {
         const QListWidgetItem *rowItem = listWidget->item(i);
-        SCASSERT(rowItem != nullptr);
+        SCASSERT(rowItem != nullptr)
         rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
 
         if (not rowNode.IsExcluded())
@@ -596,7 +596,7 @@ auto EachPointLabelIsUnique(QListWidget *listWidget) -> bool
     for (int i = 0; i < listWidget->count(); ++i)
     {
         const QListWidgetItem *rowItem = listWidget->item(i);
-        SCASSERT(rowItem != nullptr);
+        SCASSERT(rowItem != nullptr)
         const auto rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
         if (rowNode.GetTypeTool() == Tool::NodePoint && not rowNode.IsExcluded())
         {
@@ -802,7 +802,7 @@ auto FindNotExcludedPointDown(QListWidget *listWidget, int start) -> int
     do
     {
         const QListWidgetItem *rowItem = listWidget->item(i);
-        SCASSERT(rowItem != nullptr);
+        SCASSERT(rowItem != nullptr)
         auto rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
 
         if (not rowNode.IsExcluded() && rowNode.GetTypeTool() == Tool::NodePoint && rowNode.GetId() != NULL_ID)
@@ -839,7 +839,7 @@ auto FindNotExcludedCurveDown(QListWidget *listWidget, int start) -> int
     do
     {
         const QListWidgetItem *rowItem = listWidget->item(i);
-        SCASSERT(rowItem != nullptr);
+        SCASSERT(rowItem != nullptr)
         auto rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
 
         if (not rowNode.IsExcluded() && rowNode.GetTypeTool() != Tool::NodePoint && rowNode.GetId() != NULL_ID)
@@ -1007,7 +1007,7 @@ auto NodeRowIndex(QListWidget *listWidget, quint32 id) -> int
     for (int i = 0, sz = listWidget->count(); i < sz; ++i)
     {
         const QListWidgetItem *rowItem = listWidget->item(i);
-        SCASSERT(rowItem != nullptr);
+        SCASSERT(rowItem != nullptr)
         auto rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
 
         if (id == rowNode.GetId())

src/libs/vtools/dialogs/tools/dialogtool.cpp

@@ -203,9 +203,8 @@ void DialogTool::FillComboBoxSplines(QComboBox *box) const
     box->blockSignals(true);
 
     const auto *const objs = data->CalculationGObjects();
-    QHash<quint32, QSharedPointer<VGObject>>::const_iterator i;
     QMap<QString, quint32> list;
-    for (i = objs->constBegin(); i != objs->constEnd(); ++i)
+    for (auto i = objs->constBegin(); i != objs->constEnd(); ++i)
     {
         if (i.key() != toolId && IsSpline(i.value()))
         {
@@ -224,9 +223,8 @@ void DialogTool::FillComboBoxSplinesPath(QComboBox *box) const
     box->blockSignals(true);
 
     const auto *const objs = data->CalculationGObjects();
-    QHash<quint32, QSharedPointer<VGObject>>::const_iterator i;
     QMap<QString, quint32> list;
-    for (i = objs->constBegin(); i != objs->constEnd(); ++i)
+    for (auto i = objs->constBegin(); i != objs->constEnd(); ++i)
     {
         if (i.key() != toolId && IsSplinePath(i.value()))
         {
@@ -244,8 +242,7 @@ void DialogTool::FillComboBoxCurves(QComboBox *box) const
     SCASSERT(box != nullptr)
     const auto *const objs = data->CalculationGObjects();
     QMap<QString, quint32> list;
-    QHash<quint32, QSharedPointer<VGObject>>::const_iterator i;
-    for (i = objs->constBegin(); i != objs->constEnd(); ++i)
+    for (auto i = objs->constBegin(); i != objs->constEnd(); ++i)
     {
         if (i.key() != toolId)
         {
@@ -780,9 +777,8 @@ void DialogTool::FillCombo(QComboBox *box, GOType gType, FillComboBox rule, cons
     box->blockSignals(true);
 
     const QHash<quint32, QSharedPointer<VGObject>> *objs = data->CalculationGObjects();
-    QHash<quint32, QSharedPointer<VGObject>>::const_iterator i;
     QMap<QString, quint32> list;
-    for (i = objs->constBegin(); i != objs->constEnd(); ++i)
+    for (auto i = objs->constBegin(); i != objs->constEnd(); ++i)
     {
         if (rule == FillComboBox::NoChildren)
         {

src/libs/vtools/dialogs/tools/piece/dialoginsertnode.cpp

@@ -216,7 +216,7 @@ void DialogInsertNode::ShowContextMenu(const QPoint &pos)
     QScopedPointer<QMenu> const menu(new QMenu());
 
     QListWidgetItem *rowItem = ui->listWidget->item(row);
-    SCASSERT(rowItem != nullptr);
+    SCASSERT(rowItem != nullptr)
 
     QAction *actionDelete = menu->addAction(FromTheme(VThemeIcon::EditDelete), tr("Delete"));
 

src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp

@@ -351,7 +351,7 @@ void DialogPiecePath::ShowContextMenu(const QPoint &pos)
     }
 
     QListWidgetItem *rowItem = ui->listWidget->item(row);
-    SCASSERT(rowItem != nullptr);
+    SCASSERT(rowItem != nullptr)
     auto rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
 
     QMenu menu;

src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp

@@ -1091,7 +1091,7 @@ void DialogSeamAllowance::ShowMainPathContextMenu(const QPoint &pos)
     }
 
     QListWidgetItem *rowItem = uiTabPaths->listWidgetMainPath->item(row);
-    SCASSERT(rowItem != nullptr);
+    SCASSERT(rowItem != nullptr)
     auto rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
 
     QMenu menu;
@@ -1200,7 +1200,7 @@ void DialogSeamAllowance::ShowCustomSAContextMenu(const QPoint &pos)
     QAction *actionOption = menu->addAction(FromTheme(VThemeIcon::PreferencesOther), tr("Options"));
 
     QListWidgetItem *rowItem = uiTabPaths->listWidgetCustomSA->item(row);
-    SCASSERT(rowItem != nullptr);
+    SCASSERT(rowItem != nullptr)
     auto record = qvariant_cast<CustomSARecord>(rowItem->data(Qt::UserRole));
 
     QAction *actionReverse = menu->addAction(tr("Reverse"));
@@ -1260,7 +1260,7 @@ void DialogSeamAllowance::ShowInternalPathsContextMenu(const QPoint &pos)
     else if (selectedAction == actionOption)
     {
         QListWidgetItem *rowItem = uiTabPaths->listWidgetInternalPaths->item(row);
-        SCASSERT(rowItem != nullptr);
+        SCASSERT(rowItem != nullptr)
         const auto pathId = qvariant_cast<quint32>(rowItem->data(Qt::UserRole));
 
         auto *dialog = new DialogPiecePath(data, m_doc, pathId, this);
@@ -1306,7 +1306,7 @@ void DialogSeamAllowance::ShowPlaceLabelsContextMenu(const QPoint &pos)
     }
 
     QListWidgetItem *rowItem = uiTabPlaceLabels->listWidgetPlaceLabels->item(row);
-    SCASSERT(rowItem != nullptr);
+    SCASSERT(rowItem != nullptr)
     const auto labelId = qvariant_cast<quint32>(rowItem->data(Qt::UserRole));
     VPlaceLabelItem currentLabel = CurrentPlaceLabel(labelId);
 
@@ -1589,7 +1589,7 @@ void DialogSeamAllowance::CSAStartPointChanged(int index)
     }
 
     QListWidgetItem *rowItem = uiTabPaths->listWidgetCustomSA->item(row);
-    SCASSERT(rowItem != nullptr);
+    SCASSERT(rowItem != nullptr)
     auto record = qvariant_cast<CustomSARecord>(rowItem->data(Qt::UserRole));
     record.startPoint = uiTabPaths->comboBoxStartPoint->currentData().toUInt();
     rowItem->setData(Qt::UserRole, QVariant::fromValue(record));
@@ -1607,7 +1607,7 @@ void DialogSeamAllowance::CSAEndPointChanged(int index)
     }
 
     QListWidgetItem *rowItem = uiTabPaths->listWidgetCustomSA->item(row);
-    SCASSERT(rowItem != nullptr);
+    SCASSERT(rowItem != nullptr)
     auto record = qvariant_cast<CustomSARecord>(rowItem->data(Qt::UserRole));
     record.endPoint = uiTabPaths->comboBoxEndPoint->currentData().toUInt();
     rowItem->setData(Qt::UserRole, QVariant::fromValue(record));
@@ -1635,7 +1635,7 @@ void DialogSeamAllowance::CSAIncludeTypeChanged(int index)
     }
 
     QListWidgetItem *rowItem = uiTabPaths->listWidgetCustomSA->item(row);
-    SCASSERT(rowItem != nullptr);
+    SCASSERT(rowItem != nullptr)
     auto record = qvariant_cast<CustomSARecord>(rowItem->data(Qt::UserRole));
     record.includeType = static_cast<PiecePathIncludeType>(uiTabPaths->comboBoxIncludeType->currentData().toUInt());
     rowItem->setData(Qt::UserRole, QVariant::fromValue(record));
@@ -3483,7 +3483,7 @@ auto DialogSeamAllowance::MirrorLineIsValid() const -> bool
     for (int i = 0; i < uiTabPaths->listWidgetMainPath->count(); ++i)
     {
         const QListWidgetItem *rowItem = uiTabPaths->listWidgetMainPath->item(i);
-        SCASSERT(rowItem != nullptr);
+        SCASSERT(rowItem != nullptr)
         const auto rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
         if (rowNode.GetTypeTool() == Tool::NodePoint && not rowNode.IsExcluded())
         {
@@ -3836,7 +3836,7 @@ void DialogSeamAllowance::InitMainPathTab()
                 }
 
                 QListWidgetItem *rowItem = uiTabPaths->listWidgetMainPath->item(row);
-                SCASSERT(rowItem != nullptr);
+                SCASSERT(rowItem != nullptr)
                 auto rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
 
                 rowNode.SetReverse(not rowNode.GetReverse());
@@ -3855,7 +3855,7 @@ void DialogSeamAllowance::InitMainPathTab()
                 }
 
                 QListWidgetItem *rowItem = uiTabPaths->listWidgetMainPath->item(row);
-                SCASSERT(rowItem != nullptr);
+                SCASSERT(rowItem != nullptr)
                 auto rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
 
                 rowNode.SetExcluded(not rowNode.IsExcluded());
@@ -3875,7 +3875,7 @@ void DialogSeamAllowance::InitMainPathTab()
                 }
 
                 QListWidgetItem *rowItem = uiTabPaths->listWidgetMainPath->item(row);
-                SCASSERT(rowItem != nullptr);
+                SCASSERT(rowItem != nullptr)
                 auto rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
 
                 rowNode.SetTurnPoint(not rowNode.IsTurnPoint());
@@ -3894,7 +3894,7 @@ void DialogSeamAllowance::InitMainPathTab()
                 }
 
                 QListWidgetItem *rowItem = uiTabPaths->listWidgetMainPath->item(row);
-                SCASSERT(rowItem != nullptr);
+                SCASSERT(rowItem != nullptr)
                 auto rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
 
                 rowNode.SetCheckUniqueness(not rowNode.IsCheckUniqueness());
@@ -3913,7 +3913,7 @@ void DialogSeamAllowance::InitMainPathTab()
                 }
 
                 QListWidgetItem *rowItem = uiTabPaths->listWidgetMainPath->item(row);
-                SCASSERT(rowItem != nullptr);
+                SCASSERT(rowItem != nullptr)
                 auto rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
 
                 rowNode.SetPassmark(checked);
@@ -5565,7 +5565,7 @@ void DialogSeamAllowance::SetOptionControls()
     }
 
     QListWidgetItem *rowItem = uiTabPaths->listWidgetMainPath->item(row);
-    SCASSERT(rowItem != nullptr);
+    SCASSERT(rowItem != nullptr)
     auto rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
 
     if (rowNode.GetTypeTool() != Tool::NodePoint)

src/libs/vtools/tools/vabstracttool.cpp

@@ -331,8 +331,7 @@ auto VAbstractTool::PointsList() const -> QMap<QString, quint32>
 {
     const QHash<quint32, QSharedPointer<VGObject>> *objs = data.CalculationGObjects();
     QMap<QString, quint32> list;
-    QHash<quint32, QSharedPointer<VGObject>>::const_iterator i;
-    for (i = objs->constBegin(); i != objs->constEnd(); ++i)
+    for (auto i = objs->constBegin(); i != objs->constEnd(); ++i)
     {
         if (i.key() != m_id)
         {