palo
/
valentina
mirror of https://gitlab.com/smart-pattern/valentina.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactoring. Replacing all Q_FOREACH/foreach loops with the c++ range-based 

loops.

--HG--
branch : develop
master
Roman Telezhynskyi 2018-04-03 11:15:58 +03:00
parent 3252130f36
commit 6b6a2632a9
39 changed files with 106 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -41,6 +41,8 @@ win32 {
../../../dist/win/msvcr120.dll
}
DEFINES += QT_NO_FOREACH
macx{
# QTBUG-31034 qmake doesn't allow override QMAKE_CXX
CONFIG+=no_ccache

4
src/app/valentina/core/vformulaproperty.cpp
View File

@ -139,8 +139,8 @@ VPE::VProperty *VFormulaProperty::clone(bool include_children, VProperty *contai
if (!include_children)
{
QList<VProperty*> tmpChildren = container->getChildren();
foreach (VProperty* tmpChild, tmpChildren)
const QList<VProperty*> tmpChildren = container->getChildren();
for (auto tmpChild : tmpChildren)
{
container->removeChild(tmpChild);
delete tmpChild;

2
src/app/valentina/dialogs/dialogsavelayout.cpp
View File

@ -95,7 +95,7 @@ DialogSaveLayout::DialogSaveLayout(int count, Draw mode, const QString &fileName
}
}
foreach (auto& v, InitFormats())
for (auto &v : InitFormats())
{
ui->comboBoxFormat->addItem(v.first, QVariant(static_cast<int>(v.second)));
}

2
src/app/valentina/dialogs/vabstractlayoutdialog.cpp
View File

@ -62,7 +62,7 @@ void VAbstractLayoutDialog::InitTemplates(QComboBox *comboBoxTemplates)
const QString pdi = QString("(%1ppi)").arg(PrintDPI);
auto cntr = static_cast<VIndexType>(PaperSizeTemplate::A0);
foreach(const auto& v, pageFormatNames)
for(const auto& v : pageFormatNames)
{
if (cntr <= static_cast<int>(PaperSizeTemplate::Legal))
{

2
src/libs/ifc/xml/vabstractpattern.cpp
View File

@ -260,7 +260,7 @@ QStringList VAbstractPattern::ListMeasurements() const
QSet<QString> measurements;
QSet<QString> others = futureIncrements.result().toSet();
foreach (const QString &token, tokens)
for (const auto &token : tokens)
{
if (token == QChar('-') || measurements.contains(token) || others.contains(token))
{

2
src/libs/ifc/xml/vvitconverter.cpp
View File

@ -207,7 +207,7 @@ void VVITConverter::ConvertMeasurementsToV0_3_0()
// This has the same effect as a .values(), just isn't as elegant
const QList<QString> list = names.values( keys.at(i) );
foreach(const QString &val, list )
for(const auto &val : list)
{
const QDomNodeList nodeList = this->elementsByTagName(val);
if (nodeList.isEmpty())

2
src/libs/ifc/xml/vvstconverter.cpp
View File

@ -222,7 +222,7 @@ void VVSTConverter::ConvertMeasurementsToV0_4_0()
// This has the same effect as a .values(), just isn't as elegant
const QList<QString> list = names.values( keys.at(i) );
foreach(const QString &val, list )
for(const auto &val : list)
{
const QDomNodeList nodeList = this->elementsByTagName(val);
if (nodeList.isEmpty())

27
src/libs/vdxf/vdxfengine.cpp
View File

@ -681,32 +681,29 @@ void VDxfEngine::ExportAAMADraw(dx_ifaceBlock *detailBlock, const VLayoutPiece &
if (not detail.IsHideMainPath())
{
QVector<QPointF> poly = detail.GetContourPoints();
DRW_Entity *e = AAMAPolygon(poly, "8", true);
if (e)
if (DRW_Entity *e = AAMAPolygon(poly, "8", true))
{
detailBlock->ent.push_back(e);
}
}
QVector<QVector<QPointF>> drawIntCut = detail.InternalPathsForCut(false);
for(int j = 0; j < drawIntCut.size(); ++j)
const QVector<QVector<QPointF>> drawIntCut = detail.InternalPathsForCut(false);
for(auto &intCut : drawIntCut)
{
DRW_Entity *e = AAMAPolygon(drawIntCut.at(j), "8", false);
if (e)
if (DRW_Entity *e = AAMAPolygon(intCut, "8", false))
{
detailBlock->ent.push_back(e);
}
}
const QVector<VLayoutPlaceLabel> labels = detail.GetPlaceLabels();
foreach(const VLayoutPlaceLabel &label, labels)
for(auto &label : labels)
{
if (label.type != PlaceLabelType::Doubletree && label.type != PlaceLabelType::Button)
{
foreach(const QPolygonF &p, label.shape)
for(auto &p : qAsConst(label.shape))
{
DRW_Entity *e = AAMAPolygon(p, "8", false);
if (e)
if (DRW_Entity *e = AAMAPolygon(p, "8", false))
{
detailBlock->ent.push_back(e);
}
@ -719,10 +716,9 @@ void VDxfEngine::ExportAAMADraw(dx_ifaceBlock *detailBlock, const VLayoutPiece &
void VDxfEngine::ExportAAMAIntcut(dx_ifaceBlock *detailBlock, const VLayoutPiece &detail)
{
QVector<QVector<QPointF>> drawIntCut = detail.InternalPathsForCut(true);
for(int j = 0; j < drawIntCut.size(); ++j)
for(auto &intCut : drawIntCut)
{
DRW_Entity *e = AAMAPolygon(drawIntCut.at(j), "11", false);
if (e)
if (DRW_Entity *e = AAMAPolygon(intCut, "11", false))
{
detailBlock->ent.push_back(e);
}
@ -751,8 +747,7 @@ void VDxfEngine::ExportAAMAGrainline(dx_ifaceBlock *detailBlock, const VLayoutPi
const QVector<QPointF> grainline = detail.GetGrainline();
if (grainline.count() > 1)
{
DRW_Entity *e = AAMALine(QLineF(grainline.first(), grainline.last()), "7");
if (e)
if (DRW_Entity *e = AAMALine(QLineF(grainline.first(), grainline.last()), "7"))
{
detailBlock->ent.push_back(e);
}
@ -795,7 +790,7 @@ void VDxfEngine::ExportAAMADrill(dx_ifaceBlock *detailBlock, const VLayoutPiece
{
const QVector<VLayoutPlaceLabel> labels = detail.GetPlaceLabels();
foreach(const VLayoutPlaceLabel &label, labels)
for(auto &label : labels)
{
if (label.type == PlaceLabelType::Doubletree || label.type == PlaceLabelType::Button)
{

4
src/libs/vformat/vmeasurements.cpp
View File

@ -658,13 +658,13 @@ bool VMeasurements::IsDefinedKnownNamesValid() const
QStringList names = AllGroupNames();
QSet<QString> set;
foreach (const QString &var, names)
for (const auto &var : names)
{
set.insert(var);
}
names = ListKnown();
foreach (const QString &var, names)
for (const auto &var : qAsConst(names))
{
if (not set.contains(var))
{

2
src/libs/vlayout/vabstractpiece.cpp
View File

@ -1017,7 +1017,7 @@ bool VAbstractPiece::IsEkvPointOnLine(const VSAPoint &iPoint, const VSAPoint &pr
QPainterPath VAbstractPiece::PlaceLabelImgPath(const PlaceLabelImg &img)
{
QPainterPath path;
foreach(const QPolygonF &p, img)
for (auto &p : img)
{
if (not p.isEmpty())
{

4
src/libs/vlayout/vlayoutpiece.cpp
View File

@ -470,12 +470,12 @@ template <>
QVector<VLayoutPlaceLabel> VLayoutPiece::Map<VLayoutPlaceLabel>(const QVector<VLayoutPlaceLabel> &points) const
{
QVector<VLayoutPlaceLabel> p;
foreach (const VLayoutPlaceLabel &label, points)
for (auto &label : points)
{
VLayoutPlaceLabel mappedLabel;
mappedLabel.type = label.type;
mappedLabel.center = d->matrix.map(label.center);
foreach (const QPolygonF &p, label.shape)
for (const auto &p : label.shape)
{
mappedLabel.shape.append(d->matrix.map(p));
}

3
src/libs/vmisc/dialogs/dialogexporttocsv.cpp
View File

@ -46,7 +46,8 @@ DialogExportToCSV::DialogExportToCSV(QWidget *parent)
{
ui->setupUi(this);
foreach (int mib, QTextCodec::availableMibs())
const QList<int> mibs = QTextCodec::availableMibs();
for (auto mib : mibs)
{
ui->comboBoxCodec->addItem(QTextCodec::codecForMib(mib)->name(), mib);
}

8
src/libs/vmisc/vtablesearch.cpp
View File

@ -105,7 +105,7 @@ void VTableSearch::Find(const QString &term)
if (not searchList.isEmpty())
{
foreach(QTableWidgetItem *item, searchList)
for (auto item : qAsConst(searchList))
{
item->setBackground(Qt::yellow);
}
@ -158,7 +158,7 @@ void VTableSearch::RemoveRow(int row)
if (row <= indexRow)
{
foreach(QTableWidgetItem *item, searchList)
for (auto item : qAsConst(searchList))
{
if (item->row() == row)
{
@ -180,7 +180,7 @@ void VTableSearch::AddRow(int row)
if (row <= indexRow)
{
foreach(QTableWidgetItem *item, searchList)
for (auto item : qAsConst(searchList))
{
if (item->row() == row)
{
@ -202,7 +202,7 @@ void VTableSearch::RefreshList(const QString &term)
searchList = table->findItems(term, Qt::MatchContains);
foreach(QTableWidgetItem *item, searchList)
for (auto item : qAsConst(searchList))
{
item->setBackground(Qt::yellow);
}

8
src/libs/vpatterndb/vpiece.cpp
View File

@ -681,22 +681,22 @@ QList<quint32> VPiece::Dependencies() const
{
QList<quint32> list = d->m_path.Dependencies();
foreach (const CustomSARecord &record, d->m_customSARecords)
for (auto &record : d->m_customSARecords)
{
list.append(record.path);
}
foreach (const quint32 &value, d->m_internalPaths)
for (auto &value : d->m_internalPaths)
{
list.append(value);
}
foreach (const quint32 &value, d->m_pins)
for (auto &value : d->m_pins)
{
list.append(value);
}
foreach (const quint32 &value, d->m_placeLabels)
for (auto &value : d->m_placeLabels)
{
list.append(value);
}

2
src/libs/vpatterndb/vpiecepath.cpp
View File

@ -505,7 +505,7 @@ VSAPoint VPiecePath::EndSegment(const VContainer *data, const QVector<VPieceNode
QList<quint32> VPiecePath::Dependencies() const
{
QList<quint32> list;
foreach (const VPieceNode &node, d->m_nodes)
for (auto &node : d->m_nodes)
{
list.append(node.GetId());
}

7
src/libs/vpropertyexplorer/checkablemessagebox.cpp
View File

@ -222,7 +222,9 @@ QPushButton *CheckableMessageBox::addButton(const QString &text, QDialogButtonBo
QDialogButtonBox::StandardButton CheckableMessageBox::defaultButton() const
{
foreach (QAbstractButton *b, d->buttonBox->buttons())
const QList<QAbstractButton *> buttons = d->buttonBox->buttons();
for (auto b : buttons)
{
if (QPushButton *pb = qobject_cast<QPushButton *>(b))
{
if (pb->isDefault())
@ -230,6 +232,7 @@ QDialogButtonBox::StandardButton CheckableMessageBox::defaultButton() const
return d->buttonBox->standardButton(pb);
}
}
}
return QDialogButtonBox::NoButton;
}
@ -429,7 +432,7 @@ bool CheckableMessageBox::hasSuppressedQuestions(QSettings *settings)
//Q_ASSERT(settings, return false);
bool hasSuppressed = false;
settings->beginGroup(QLatin1String(kDoNotAskAgainKey));
foreach (const QString &subKey, settings->childKeys())
for (auto &subKey : settings->childKeys())
{
if (settings->value(subKey, false).toBool())
{

4
src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.cpp
View File

@ -115,8 +115,8 @@ VPE::VProperty* VPE::QVector3DProperty::clone(bool include_children, VProperty*
if (!include_children)
{
QList<VProperty*> tmpChildren = container->getChildren();
foreach (VProperty* tmpChild, tmpChildren)
const QList<VProperty*> tmpChildren = container->getChildren();
for (auto tmpChild : tmpChildren)
{
container->removeChild(tmpChild);
delete tmpChild;

2
src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.cpp
View File

@ -245,7 +245,7 @@ bool VPE::VFileEditWidget::checkFileFilter(const QString& file) const
return false;
}
foreach(QString tmpFilter, FilterList)
for (auto &tmpFilter : FilterList)
{
QRegExp tmpRegExpFilter(tmpFilter, Qt::CaseInsensitive, QRegExp::Wildcard);
if (tmpRegExpFilter.exactMatch(file))

4
src/libs/vpropertyexplorer/plugins/vpointfproperty.cpp
View File

@ -114,8 +114,8 @@ VPE::VProperty *VPE::VPointFProperty::clone(bool include_children, VProperty *co
if (!include_children)
{
QList<VProperty*> tmpChildren = container->getChildren();
foreach(VProperty* tmpChild, tmpChildren)
const QList<VProperty*> tmpChildren = container->getChildren();
for(auto tmpChild : tmpChildren)
{
container->removeChild(tmpChild);
delete tmpChild;

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

@ -350,9 +350,11 @@ QMap<QString, QVariant> VPE::VProperty::getSettings() const
{
QMap<QString, QVariant> tmpResult;
QStringList tmpKeyList = getSettingKeys();
foreach(const QString& tmpKey, tmpKeyList)
const QStringList tmpKeyList = getSettingKeys();
for(auto &tmpKey : tmpKeyList)
{
tmpResult.insert(tmpKey, getSetting(tmpKey));
}
return tmpResult;
}
@ -392,8 +394,11 @@ VPE::VProperty* VPE::VProperty::clone(bool include_children, VProperty* containe
if (include_children)
{
foreach(VProperty* tmpChild, d_ptr->Children)
const QList<VProperty*> children = d_ptr->Children;
for (auto tmpChild : children)
{
container->addChild(tmpChild->clone(true));
}
}
return container;

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

@ -213,9 +213,9 @@ void VPE::VPropertyFormView::connectPropertyFormWidget(VPropertyFormWidget *widg
connect(widget, &VPropertyFormWidget::propertyDataSubmitted, this, &VPropertyFormView::dataSubmitted,
Qt::UniqueConnection);
QList<VPropertyFormWidget*> tmpList = widget->getChildPropertyFormWidgets();
const QList<VPropertyFormWidget*> tmpList = widget->getChildPropertyFormWidgets();
foreach(VPropertyFormWidget* tmpEditorWidget, tmpList)
for (auto tmpEditorWidget : tmpList)
{
connectPropertyFormWidget(tmpEditorWidget);
}

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

@ -268,8 +268,8 @@ void VPE::VPropertyFormWidget::setCommitBehaviour(bool auto_commit)
{
d_ptr->UpdateEditors = auto_commit;
QList<VPropertyFormWidget*> tmpChildFormWidgets = getChildPropertyFormWidgets();
foreach(VPropertyFormWidget* tmpChild, tmpChildFormWidgets)
const QList<VPropertyFormWidget*> tmpChildFormWidgets = getChildPropertyFormWidgets();
for (auto tmpChild : tmpChildFormWidgets)
{
if (tmpChild)
{
@ -281,7 +281,7 @@ void VPE::VPropertyFormWidget::setCommitBehaviour(bool auto_commit)
QList<VPE::VPropertyFormWidget *> VPE::VPropertyFormWidget::getChildPropertyFormWidgets() const
{
QList<VPropertyFormWidget *> tmpResult;
foreach(const VPropertyFormWidgetPrivate::SEditorWidget& tmpEditorWidget, d_ptr->EditorWidgets)
for (auto &tmpEditorWidget : d_ptr->EditorWidgets)
{
if (tmpEditorWidget.FormWidget)
{

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

@ -204,9 +204,11 @@ VPE::VPropertySet* VPE::VPropertySet::clone() const
{
VPropertySet* tmpResult = new VPropertySet();
foreach(VProperty* tmpProperty, d_ptr->RootProperties)
const QList<VProperty*> rootProperties = d_ptr->RootProperties;
for (auto tmpProperty : rootProperties)
{
cloneProperty(tmpProperty, nullptr, tmpResult);
}
return tmpResult;
}
@ -219,7 +221,7 @@ bool VPE::VPropertySet::hasProperty(VProperty *property, VProperty *parent) cons
}
const QList<VProperty*>& tmpChildrenList = (parent != nullptr ? parent->getChildren() : d_ptr->RootProperties);
foreach(VProperty* tmpProp, tmpChildrenList)
for(auto tmpProp : tmpChildrenList)
{
if (tmpProp && (tmpProp == property || hasProperty(property, tmpProp)))
{
@ -253,13 +255,17 @@ void VPE::VPropertySet::cloneProperty(VProperty* property_to_clone, VProperty *p
void VPE::VPropertySet::removePropertyFromSet(VProperty *prop)
{
// Remove all the children
foreach(VProperty* tmpChild, prop->getChildren())
const QList<VPE::VProperty*>& children = prop->getChildren();
for (auto tmpChild : children)
{
removeProperty(tmpChild);
}
QList<QString> tmpKeys = d_ptr->Properties.keys(prop);
foreach(const QString& tmpID, tmpKeys)
const QList<QString> tmpKeys = d_ptr->Properties.keys(prop);
for (auto &tmpID : tmpKeys)
{
d_ptr->Properties.remove(tmpID);
}
// Remove from list
d_ptr->RootProperties.removeAll(prop);

2
src/libs/vpropertyexplorer/vserializedproperty.cpp
View File

@ -61,7 +61,7 @@ void VPE::VSerializedProperty::initChildren(const VProperty *property, const VPr
if (property && set)
{
const QList<VProperty*>& tmpChildren = property->getChildren();
foreach(const VProperty* tmpChild, tmpChildren)
for (auto tmpChild : tmpChildren)
{
QString tmpChildID = set->getPropertyID(property);
Children.append(VSerializedProperty(tmpChild, tmpChildID, set));

6
src/libs/vtest/abstracttest.cpp
View File

@ -163,9 +163,9 @@ bool AbstractTest::CopyRecursively(const QString &srcFilePath, const QString &tg
return false;
}
QDir sourceDir(srcFilePath);
QStringList fileNames = sourceDir.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden |
QDir::System);
foreach (const QString &fileName, fileNames)
const QStringList fileNames = sourceDir.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot |
QDir::Hidden | QDir::System);
for (auto &fileName : fileNames)
{
const QString newSrcFilePath = srcFilePath + QDir::separator() + fileName;
const QString newTgtFilePath = tgtFilePath + QDir::separator() + fileName;

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

@ -106,7 +106,7 @@ QPointF GetOriginPoint(const QVector<quint32> objects, const VContainer *data, q
originObjects.append(data->GeometricObject<VAbstractCurve>(id)->GetPoints());
#else
const QVector<QPointF> points = data->GeometricObject<VAbstractCurve>(id)->GetPoints();
foreach (const QPointF &point, points)
for (auto &point : points)
{
originObjects.append(point);
}

6
src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp
View File

@ -174,7 +174,7 @@ void VAbstractSpline::AllowHover(bool enabled)
// Manually handle hover events. Need for setting cursor for not selectable paths.
m_acceptHoverEvents = enabled;
foreach (auto *point, controlPoints)
for (auto point : qAsConst(controlPoints))
{
point->setAcceptHoverEvents(enabled);
}
@ -185,7 +185,7 @@ void VAbstractSpline::AllowSelecting(bool enabled)
{
setFlag(QGraphicsItem::ItemIsSelectable, enabled);
foreach (auto *point, controlPoints)
for (auto point : qAsConst(controlPoints))
{
point->setFlag(QGraphicsItem::ItemIsSelectable, enabled);
}
@ -424,7 +424,7 @@ void VAbstractSpline::CurveSelected(bool selected)
{
setSelected(selected);
foreach (auto *point, controlPoints)
for (auto point : qAsConst(controlPoints))
{
point->blockSignals(true);
point->setSelected(selected);

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

@ -294,7 +294,7 @@ void VToolSpline::EnableToolMove(bool move)
{
this->setFlag(QGraphicsItem::ItemIsMovable, move);
foreach (auto *point, controlPoints)
for (auto point : qAsConst(controlPoints))
{
point->setFlag(QGraphicsItem::ItemIsMovable, move);
}
@ -562,7 +562,7 @@ bool VToolSpline::IsMovable() const
void VToolSpline::RefreshCtrlPoints()
{
// Very important to disable control points. Without it the pogram can't move the curve.
foreach (auto *point, controlPoints)
for (auto point : qAsConst(controlPoints))
{
point->setFlag(QGraphicsItem::ItemSendsGeometryChanges, false);
}
@ -595,7 +595,7 @@ void VToolSpline::RefreshCtrlPoints()
controlPoints[0]->blockSignals(false);
controlPoints[1]->blockSignals(false);
foreach (auto *point, controlPoints)
for (auto point : qAsConst(controlPoints))
{
point->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
}

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

@ -293,7 +293,7 @@ void VToolSplinePath::EnableToolMove(bool move)
{
this->setFlag(QGraphicsItem::ItemIsMovable, move);
foreach (auto *point, controlPoints)
for (auto point : qAsConst(controlPoints))
{
point->setFlag(QGraphicsItem::ItemIsMovable, move);
}
@ -727,7 +727,7 @@ bool VToolSplinePath::IsMovable(int index) const
void VToolSplinePath::RefreshCtrlPoints()
{
// Very important to disable control points. Without it the pogram can't move the curve.
foreach (auto *point, controlPoints)
for (auto point : qAsConst(controlPoints))
{
point->setFlag(QGraphicsItem::ItemSendsGeometryChanges, false);
}
@ -765,7 +765,7 @@ void VToolSplinePath::RefreshCtrlPoints()
controlPoints[j-1]->blockSignals(false);
}
foreach (auto *point, controlPoints)
for (auto point : qAsConst(controlPoints))
{
point->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
}

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

@ -1442,7 +1442,7 @@ void VToolSeamAllowance::SaveDialogChange(const QString &undoText)
{
qApp->getUndoStack()->beginMacro(undoText.isEmpty() ? saveCommand->text(): undoText);
foreach (QUndoCommand* command, undocommands)
for (auto command : undocommands)
{
qApp->getUndoStack()->push(command);
}

2
src/libs/vwidgets/fancytabbar/fancytabbar.cpp
View File

@ -88,7 +88,7 @@ QSize FancyTabBar::TabSizeHint(bool minimum) const
if (words.size() > 1)
{
QString sentence;
foreach(const QString & word, words)
for (auto &word : words)
{
sentence = sentence.isEmpty() ? sentence = word : sentence + QLatin1Char(' ') + word;

3
src/libs/vwidgets/fancytabbar/stylehelper.cpp
View File

@ -114,7 +114,8 @@ void StyleHelper::setBaseColor(const QColor &newcolor)
if (color.isValid() && color != m_baseColor)
{
m_baseColor = color;
foreach (QWidget *w, QApplication::topLevelWidgets())
const QWidgetList widgets = QApplication::topLevelWidgets();
for (auto w : widgets)
{
w->update();
}

5
src/libs/vwidgets/vmaingraphicsscene.cpp
View File

@ -209,7 +209,7 @@ void VMainGraphicsScene::InitOrigins()
//---------------------------------------------------------------------------------------------------------------------
void VMainGraphicsScene::SetOriginsVisible(bool visible)
{
foreach (QGraphicsItem *item, origins)
for (auto item : qAsConst(origins))
{
item->setVisible(visible);
}
@ -225,7 +225,8 @@ QPointF VMainGraphicsScene::getScenePos() const
QRectF VMainGraphicsScene::VisibleItemsBoundingRect() const
{
QRectF rect;
foreach(QGraphicsItem *item, items())
const QList<QGraphicsItem *> qItems = items();
for (auto item : qItems)
{
if(not item->isVisible())
{

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

@ -692,7 +692,8 @@ void VMainGraphicsView::NewSceneRect(QGraphicsScene *sc, QGraphicsView *view, QG
else
{
QRectF rect = item->sceneBoundingRect();
foreach(QGraphicsItem *child, item->childItems())
const QList<QGraphicsItem *> children = item->childItems();
for (auto child : children)
{
if(child->isVisible())
{

10
src/test/TranslationsTest/qttestmainlambda.cpp
View File

@ -51,16 +51,16 @@ int main(int argc, char** argv)
ASSERT_TEST(new TST_TSTranslation());
const QStringList locales = SupportedLocales();
for(int l = 0, sz = locales.size(); l < sz; ++l)
for(auto &locale : locales)
{
for(quint32 s = 0; s < TST_MeasurementRegExp::systemCounts; ++s)
{
ASSERT_TEST(new TST_MeasurementRegExp(s, locales.at(l)));
ASSERT_TEST(new TST_MeasurementRegExp(s, locale));
}
ASSERT_TEST(new TST_TSLocaleTranslation(locales.at(l)));
ASSERT_TEST(new TST_BuitInRegExp(locales.at(l)));
ASSERT_TEST(new TST_QmuParserErrorMsg(locales.at(l)));
ASSERT_TEST(new TST_TSLocaleTranslation(locale));
ASSERT_TEST(new TST_BuitInRegExp(locale));
ASSERT_TEST(new TST_QmuParserErrorMsg(locale));
}
return status;

6
src/test/TranslationsTest/tst_buitinregexp.cpp
View File

@ -183,11 +183,11 @@ void TST_BuitInRegExp::TestCheckInternalVaribleRegExp_data()
QTest::addColumn<QString>("var");
QTest::addColumn<QString>("originalName");
foreach(const QString &var, builInVariables)
for (auto &var : qAsConst(builInVariables))
{
const QString tag = QString("Locale: '%1'. Var '%2'").arg(m_locale, var);
const QStringList originalNames = AllNames();
foreach(const QString &str, originalNames)
for (auto &str : originalNames)
{
QTest::newRow(qUtf8Printable(tag)) << var << str;
}
@ -254,7 +254,7 @@ void TST_BuitInRegExp::PrepareData()
QTest::addColumn<QString>("originalName");
foreach(const QString &str, originalNames)
for (auto &str : originalNames)
{
const QString tag = QString("Locale: '%1'. Name '%2'").arg(m_locale, str);
QTest::newRow(qUtf8Printable(tag)) << str;

2
src/test/TranslationsTest/tst_measurementregexp.cpp
View File

@ -170,7 +170,7 @@ void TST_MeasurementRegExp::PrepareData()
QTest::addColumn<QString>("originalName");
foreach(const QString &str, originalNames)
for (auto &str : originalNames)
{
const QString tag = QString("System: '%1', locale: '%2'. Name '%3'").arg(m_system, m_locale, str);
QTest::newRow(qUtf8Printable(tag)) << str;

2
src/test/ValentinaTest/tst_nameregexp.cpp
View File

@ -169,7 +169,7 @@ void TST_NameRegExp::TestOriginalMeasurementNamesRegExp_data()
QTest::addColumn<QString>("str");
const QStringList originalNames = AllGroupNames();
foreach(const QString &str, originalNames)
for (auto &str : originalNames)
{
const QString name = QString("Measurement '%1'").arg(str);
QTest::newRow(qUtf8Printable(name)) << str;

2
src/test/ValentinaTest/tst_vcommandline.cpp
View File

@ -48,7 +48,7 @@ void TST_VCommandLine::UniqueKeys()
const QStringList options = AllKeys();
QSet<QString> unique;
foreach(const QString &str, options)
for (auto &str : options)
{
const QString message = QString("Options '%1' is not unique!").arg(str);
QVERIFY2(not unique.contains(str), qUtf8Printable(message));