diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp
index 5d46ecea825c21be96402c14c01972395e4d66e2..f53fe81d669e4300d8bb26c0bc5f6afffd81c807 100644
--- a/Applications/ApplicationsLib/ProjectData.cpp
+++ b/Applications/ApplicationsLib/ProjectData.cpp
@@ -195,8 +195,8 @@ bool ProjectData::isMeshNameUniqueAndProvideUniqueName(std::string& name) const
if (count > 1)
cpName = cpName + "-" + std::to_string(count);
- for (auto it : _mesh_vec)
- if (cpName.compare(it->getName()) == 0)
+ for (auto mesh : _mesh_vec)
+ if (cpName.compare(mesh->getName()) == 0)
isUnique = false;
}
diff --git a/Applications/DataExplorer/Base/RecentFiles.cpp b/Applications/DataExplorer/Base/RecentFiles.cpp
index 4865272e7a9801ff60fef75227fea242119092c7..cd42c62b60245bb826e8245a57225907decb2c65 100644
--- a/Applications/DataExplorer/Base/RecentFiles.cpp
+++ b/Applications/DataExplorer/Base/RecentFiles.cpp
@@ -24,12 +24,12 @@ RecentFiles::RecentFiles(QObject* parent, const char* slot,
: QObject(parent), _settingsName(std::move(settingsName))
{
_filesMenu = new QMenu(tr("Recent files"));
- for (auto& _fileAction : _fileActions)
+ for (auto& fileAction : _fileActions)
{
- _fileAction = new QAction(this);
- _fileAction->setVisible(false);
- connect(_fileAction, SIGNAL(triggered()), parent, slot);
- _filesMenu->addAction(_fileAction);
+ fileAction = new QAction(this);
+ fileAction->setVisible(false);
+ connect(fileAction, SIGNAL(triggered()), parent, slot);
+ _filesMenu->addAction(fileAction);
}
updateRecentFileActions();
}
diff --git a/Applications/DataExplorer/DataView/ColorTableModel.cpp b/Applications/DataExplorer/DataView/ColorTableModel.cpp
index d28f5d3a3ac2d25a931b6d0ebbef1eb9c3789b0e..b8ff1fc4ee6f30c18e095c4cb031f8d0cfacc8e6 100644
--- a/Applications/DataExplorer/DataView/ColorTableModel.cpp
+++ b/Applications/DataExplorer/DataView/ColorTableModel.cpp
@@ -80,10 +80,10 @@ bool ColorTableModel::buildTable(const std::map<std::string, DataHolderLib::Colo
int count = 0;
beginInsertRows(QModelIndex(), 0, colorLookupTable.size() - 1);
- for (const auto& it : colorLookupTable)
+ for (const auto& row : colorLookupTable)
{
- QColor color((*(it.second))[0], (*(it.second))[1], (*(it.second))[2]);
- QString name(QString::fromStdString(it.first));
+ QColor color((*row.second)[0], (*row.second)[1], (*row.second)[2]);
+ QString name(QString::fromStdString(row.first));
/* Saudi Arabia strat names *
if (it->first.compare("1")==0) name="Buweib";
diff --git a/Applications/DataExplorer/DataView/CondFromRasterDialog.cpp b/Applications/DataExplorer/DataView/CondFromRasterDialog.cpp
index 294dd5ded1b9276a0a3dacb224d7e64ca9bc6997..9656c54c7d834d89b732dce99cb3cbde97f19747 100644
--- a/Applications/DataExplorer/DataView/CondFromRasterDialog.cpp
+++ b/Applications/DataExplorer/DataView/CondFromRasterDialog.cpp
@@ -34,8 +34,8 @@ CondFromRasterDialog::CondFromRasterDialog(std::vector<MeshLib::Mesh*> msh_vec,
this->scalingEdit->setText("1.0");
this->scalingEdit->setValidator (_scale_validator);
- for (auto it : _msh_vec)
- this->meshBox->addItem(QString::fromStdString(it->getName()));
+ for (auto mesh : _msh_vec)
+ this->meshBox->addItem(QString::fromStdString(mesh->getName()));
this->directButton->setChecked(true);
}
@@ -86,10 +86,10 @@ void CondFromRasterDialog::accept()
}
MeshLib::Mesh* mesh(nullptr);
- for (auto i : _msh_vec)
- if (i->getName().compare(mesh_name) == 0)
+ for (auto mesh_ : _msh_vec)
+ if (mesh_->getName().compare(mesh_name) == 0)
{
- mesh = i;
+ mesh = mesh_;
break;
}
diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp b/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp
index 9e9069eb262e3bbf623005d055c81ccad269bf36..1b7b3f6d7b71ec5b80482848c155cc31a06a4030 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp
@@ -129,14 +129,15 @@ int DiagramPrefsDialog::loadFile(const QString &filename)
{
if (DiagramList::readList(filename, _list))
{
- for (auto& i : _list)
+ for (auto& item : _list)
{
- //_list[i]->setName(stationTypeLabel->text() + ": " + stationNameLabel->text());
- i->setXLabel("Time");
- //_list[i]->setYLabel("Water Level");
- i->setXUnit("day");
- //_list[i]->setYUnit("metres");
- i->setColor(QColor(Qt::red));
+ // item->setName(stationTypeLabel->text() + ": " +
+ // stationNameLabel->text());
+ item->setXLabel("Time");
+ // item->setYLabel("Water Level");
+ item->setXUnit("day");
+ // item->setYUnit("metres");
+ item->setColor(QColor(Qt::red));
}
fromDateLine->setText(_list[0]->getStartDate().toString("dd.MM.yyyy")); //QString::number(_list[0]->minXValue()));
QDateTime endDate =
@@ -170,9 +171,9 @@ int DiagramPrefsDialog::loadList(const std::vector< std::pair<QDateTime, float>
void DiagramPrefsDialog::createVisibilityCheckboxes()
{
- for (auto& i : _list)
+ for (auto& item : _list)
{
- QCheckBox* box = new QCheckBox(i->getName());
+ QCheckBox* box = new QCheckBox(item->getName());
box->setChecked(true);
this->CheckBoxLayout->addWidget(box);
_visability.push_back(box);
diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp b/Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp
index b0b39e049ad8fc8ac5b098d7c6e82ee22cc60979..30830295d15e1ac92df3e1429cc8a45106238315 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp
@@ -50,20 +50,20 @@ DiagramScene::~DiagramScene()
delete _yLabel;
delete _xUnit;
delete _yUnit;
- for (auto& _graphCaption : _graphCaptions)
- delete _graphCaption;
+ for (auto& graphCaption : _graphCaptions)
+ delete graphCaption;
_graphCaptions.clear();
- for (auto& _graph : _graphs)
- delete _graph;
+ for (auto& graph : _graphs)
+ delete graph;
_graphs.clear();
- for (auto& i : _xTicksText)
- delete i;
+ for (auto& text : _xTicksText)
+ delete text;
_xTicksText.clear();
- for (auto& i : _yTicksText)
- delete i;
+ for (auto& text : _yTicksText)
+ delete text;
_yTicksText.clear();
- for (auto& _list : _lists)
- delete _list;
+ for (auto& list : _lists)
+ delete list;
_lists.clear();
}
@@ -105,8 +105,8 @@ void DiagramScene::addGraph(DiagramList* list)
constructGrid();
_lists.push_back(list);
- for (auto& _list : _lists)
- drawGraph(_list);
+ for (auto& list : _lists)
+ drawGraph(list);
update();
}
@@ -163,14 +163,14 @@ void DiagramScene::clearGrid()
{
removeItem(_grid);
- for (auto& i : _xTicksText)
- removeItem(i);
- for (auto& j : _yTicksText)
- removeItem(j);
- for (auto& _graph : _graphs)
- removeItem(_graph);
- for (auto& _graphCaption : _graphCaptions)
- removeItem(_graphCaption);
+ for (auto& text : _xTicksText)
+ removeItem(text);
+ for (auto& text : _yTicksText)
+ removeItem(text);
+ for (auto& graph : _graphs)
+ removeItem(graph);
+ for (auto& graphCaption : _graphCaptions)
+ removeItem(graphCaption);
_xTicksText.clear();
_yTicksText.clear();
diff --git a/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp b/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
index 4ac3c4f84478fa0fcc4858ed79fbbcbba3ccc10f..cb218b176b633cedcd2c6e7a297686a7b37c43da 100644
--- a/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
+++ b/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
@@ -126,8 +126,8 @@ int DirectConditionGenerator::writeToFile(const std::string &name) const
if (out)
{
- for (const auto& _direct_value : _direct_values)
- out << _direct_value.first << "\t" << _direct_value.second << "\n";
+ for (const auto& direct_value : _direct_values)
+ out << direct_value.first << "\t" << direct_value.second << "\n";
out.close();
}
diff --git a/Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp b/Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp
index dd45779a6f7c47dfd2cc41d728bb84aee5498f0e..ce656d0089999b8ba6968fccaa4089a1ad32c8dc 100644
--- a/Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp
+++ b/Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp
@@ -90,11 +90,11 @@ void GMSHPrefsDialog::on_selectGeoButton_pressed()
QModelIndexList selected = this->allGeoView->selectionModel()->selectedIndexes();
QStringList list = _selGeo->stringList();
- for (auto& it : selected)
+ for (auto& index : selected)
{
- list.append(it.data().toString());
+ list.append(index.data().toString());
- _allGeo->removeRow(it.row());
+ _allGeo->removeRow(index.row());
}
_selGeo->setStringList(list);
}
@@ -104,11 +104,11 @@ void GMSHPrefsDialog::on_deselectGeoButton_pressed()
QModelIndexList selected = this->selectedGeoView->selectionModel()->selectedIndexes();
QStringList list = _allGeo->stringList();
- for (auto& it : selected)
+ for (auto& index : selected)
{
- list.append(it.data().toString());
+ list.append(index.data().toString());
- _selGeo->removeRow(it.row());
+ _selGeo->removeRow(index.row());
}
_allGeo->setStringList(list);
}
@@ -179,7 +179,7 @@ void GMSHPrefsDialog::reject()
std::vector<std::string> GMSHPrefsDialog::getSelectedObjects(QStringList list)
{
std::vector<std::string> indexList;
- for (auto& it : list)
- indexList.push_back(it.toStdString());
+ for (auto& index : list)
+ indexList.push_back(index.toStdString());
return indexList;
}
diff --git a/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
index b246bcedac72a24f7326995bba79fa5e657c8f88..6edb41fb1f3154f40221813651e2a34ddf3384e6 100644
--- a/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
+++ b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
@@ -26,8 +26,9 @@ GeoOnMeshMappingDialog::GeoOnMeshMappingDialog(
{
setupUi(this);
- for (const auto& i : mesh_vec)
- this->meshNameComboBox->addItem(QString::fromStdString(i->getName()));
+ for (const auto& mesh : mesh_vec)
+ this->meshNameComboBox->addItem(
+ QString::fromStdString(mesh->getName()));
}
GeoOnMeshMappingDialog::~GeoOnMeshMappingDialog() = default;
diff --git a/Applications/DataExplorer/DataView/GeoTreeModel.cpp b/Applications/DataExplorer/DataView/GeoTreeModel.cpp
index 81e94ad119771736648dd751a2c6bbb7f695e922..1b412c53f9bb81f1449f292c41e724a6082d238d 100644
--- a/Applications/DataExplorer/DataView/GeoTreeModel.cpp
+++ b/Applications/DataExplorer/DataView/GeoTreeModel.cpp
@@ -110,12 +110,12 @@ void GeoTreeModel::addPolylineList(QString geoName, GeoLib::PolylineVec const& p
void GeoTreeModel::appendPolylines(const std::string &name, GeoLib::PolylineVec const& polylineVec)
{
- for (auto& _list : _lists)
+ for (auto& list : _lists)
{
- if (name.compare(_list->data(0).toString().toStdString()) == 0)
- for (int j = 0; j < _list->childCount(); j++)
+ if (name.compare(list->data(0).toString().toStdString()) == 0)
+ for (int j = 0; j < list->childCount(); j++)
{
- auto* parent = static_cast<GeoObjectListItem*>(_list->child(j));
+ auto* parent = static_cast<GeoObjectListItem*>(list->child(j));
if (GeoLib::GEOTYPE::POLYLINE == parent->getType())
{
beginResetModel();
@@ -200,14 +200,14 @@ void GeoTreeModel::addSurfaceList(QString geoName, GeoLib::SurfaceVec const& sur
void GeoTreeModel::appendSurfaces(const std::string &name, GeoLib::SurfaceVec const& surfaceVec)
{
- for (auto& _list : _lists)
+ for (auto& list : _lists)
{
- if (name.compare(_list->data(0).toString().toStdString()) == 0)
+ if (name.compare(list->data(0).toString().toStdString()) == 0)
{
- int nChildren = _list->childCount();
+ int nChildren = list->childCount();
for (int j = 0; j < nChildren; j++)
{
- auto* parent = static_cast<GeoObjectListItem*>(_list->child(j));
+ auto* parent = static_cast<GeoObjectListItem*>(list->child(j));
if (GeoLib::GEOTYPE::SURFACE == parent->getType())
{
beginResetModel();
diff --git a/Applications/DataExplorer/DataView/LineEditDialog.cpp b/Applications/DataExplorer/DataView/LineEditDialog.cpp
index 54e4e719b066b22c3669e67cc331fa146b5bceaf..abed2ee8e3fabf81d53e4359809a7f679e68c64c 100644
--- a/Applications/DataExplorer/DataView/LineEditDialog.cpp
+++ b/Applications/DataExplorer/DataView/LineEditDialog.cpp
@@ -50,11 +50,11 @@ void LineEditDialog::on_selectPlyButton_pressed()
QModelIndexList selected = this->allPlyView->selectionModel()->selectedIndexes();
QStringList list = _selPly->stringList();
- for (auto& it : selected)
+ for (auto& index : selected)
{
- list.append(it.data().toString());
+ list.append(index.data().toString());
- _allPly->removeRow(it.row());
+ _allPly->removeRow(index.row());
}
_selPly->setStringList(list);
}
@@ -64,11 +64,11 @@ void LineEditDialog::on_deselectPlyButton_pressed()
QModelIndexList selected = this->selectedPlyView->selectionModel()->selectedIndexes();
QStringList list = _allPly->stringList();
- for (auto& it : selected)
+ for (auto& index : selected)
{
- list.append(it.data().toString());
+ list.append(index.data().toString());
- _selPly->removeRow(it.row());
+ _selPly->removeRow(index.row());
}
_allPly->setStringList(list);
}
@@ -105,9 +105,9 @@ void LineEditDialog::reject()
std::vector<std::size_t> LineEditDialog::getSelectedIndeces(QStringList list)
{
std::vector<std::size_t> indexList;
- for (auto& it : list)
+ for (auto& index : list)
{
- QString s = it.mid(5, it.indexOf(" ") - 5);
+ QString s = index.mid(5, index.indexOf(" ") - 5);
indexList.push_back(s.toInt());
}
return indexList;
diff --git a/Applications/DataExplorer/DataView/MergeGeometriesDialog.cpp b/Applications/DataExplorer/DataView/MergeGeometriesDialog.cpp
index 171935d53d461cc5c361b2302f54581fa1292f35..b82b4ca295978973f7c2a3ac6fe8007bd0ce656d 100644
--- a/Applications/DataExplorer/DataView/MergeGeometriesDialog.cpp
+++ b/Applications/DataExplorer/DataView/MergeGeometriesDialog.cpp
@@ -68,11 +68,11 @@ void MergeGeometriesDialog::on_selectGeoButton_pressed()
QModelIndexList selected = this->allGeoView->selectionModel()->selectedIndexes();
QStringList list = _selGeo->stringList();
- for (auto& it : selected)
+ for (auto& index : selected)
{
- list.append(it.data().toString());
+ list.append(index.data().toString());
- _allGeo->removeRow(it.row());
+ _allGeo->removeRow(index.row());
}
_selGeo->setStringList(list);
}
@@ -82,11 +82,11 @@ void MergeGeometriesDialog::on_deselectGeoButton_pressed()
QModelIndexList selected = this->selectedGeoView->selectionModel()->selectedIndexes();
QStringList list = _allGeo->stringList();
- for (auto& it : selected)
+ for (auto& index : selected)
{
- list.append(it.data().toString());
+ list.append(index.data().toString());
- _selGeo->removeRow(it.row());
+ _selGeo->removeRow(index.row());
}
_allGeo->setStringList(list);
}
@@ -108,8 +108,8 @@ std::vector<std::string> const MergeGeometriesDialog::getSelectedGeometries() co
{
std::vector<std::string> indexList;
QStringList const& list (_selGeo->stringList());
- for (const auto& it : list)
- indexList.push_back(it.toStdString());
+ for (const auto& index : list)
+ indexList.push_back(index.toStdString());
return indexList;
}
diff --git a/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp b/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
index 85df5da45624f05a133327b31bebe592c2e2dfc1..18539fe97dba7073417c2ccf03edefb6f969e593 100644
--- a/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
@@ -32,8 +32,8 @@ MeshAnalysisDialog::MeshAnalysisDialog(
if (mesh_vec.empty())
this->startButton->setDisabled(true);
- for (const auto& i : mesh_vec)
- this->meshListBox->addItem(QString::fromStdString(i->getName()));
+ for (const auto& mesh : mesh_vec)
+ this->meshListBox->addItem(QString::fromStdString(mesh->getName()));
auto* collapse_threshold_validator =
new StrictDoubleValidator(0, 1000000, 7, this);
diff --git a/Applications/DataExplorer/DataView/StationTreeModel.cpp b/Applications/DataExplorer/DataView/StationTreeModel.cpp
index bca445cdf6808b91bf417cdff224b263a45931e1..c80ac9421853bccecdcc3836b719eca20df504d6 100644
--- a/Applications/DataExplorer/DataView/StationTreeModel.cpp
+++ b/Applications/DataExplorer/DataView/StationTreeModel.cpp
@@ -178,7 +178,7 @@ void StationTreeModel::removeStationList(QModelIndex index)
*/
void StationTreeModel::removeStationList(const std::string &name)
{
- for (auto& _list : _lists)
- if (name.compare(_list->data(0).toString().toStdString()) == 0)
- removeStationList(createIndex(_list->row(), 0, _list));
+ for (auto& list : _lists)
+ if (name.compare(list->data(0).toString().toStdString()) == 0)
+ removeStationList(createIndex(list->row(), 0, list));
}
diff --git a/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp b/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp
index 3a5f5297cd8244fca0e43ad36bd879e3f5664826..2891723f45194e5f6186ab5d0327e084637fb578 100644
--- a/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp
@@ -41,8 +41,8 @@ VtkAlgorithmProperties::~VtkAlgorithmProperties()
_property->Delete();
if (_texture != nullptr) _texture->Delete();
- for (auto& it : _lut)
- it.second->Delete();
+ for (auto& row : _lut)
+ row.second->Delete();
delete _algorithmUserProperties;
delete _algorithmUserVectorProperties;
}
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp
index c7f37840f6af6dc08c32a6249fa6bb461ede5d0a..e791d1abbce740eb9102d51ef75daa17fde9a622 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp
@@ -33,8 +33,8 @@ VtkCompositeNodeSelectionFilter::VtkCompositeNodeSelectionFilter( vtkAlgorithm*
VtkCompositeNodeSelectionFilter::~VtkCompositeNodeSelectionFilter()
{
- for (auto& i : _selection)
- delete i;
+ for (auto& item : _selection)
+ delete item;
}
void VtkCompositeNodeSelectionFilter::init()
@@ -62,11 +62,11 @@ void VtkCompositeNodeSelectionFilter::init()
void VtkCompositeNodeSelectionFilter::setSelectionArray(const std::vector<unsigned> &point_indeces)
{
- for (unsigned int point_indece : point_indeces)
+ for (unsigned int point_index : point_indeces)
{
double* coords = static_cast<vtkDataSetAlgorithm*>(_inputAlgorithm)
->GetOutput()
- ->GetPoint(point_indece);
+ ->GetPoint(point_index);
auto* p(new GeoLib::Point(coords[0], coords[1], coords[2]));
_selection.push_back(p);
}
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h
index 7c87da974414f2c67e053d6af3e71475701a9b8e..cad0cdac583472faeaa5bcab5e92d8cde1034fae 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h
@@ -28,7 +28,7 @@ public:
void init() override;
- /// Sets the point indeces to be highlighted
+ /// Sets the point indices to be highlighted
void setSelectionArray(const std::vector<unsigned> &point_indeces);
private:
diff --git a/Applications/DataExplorer/VtkVis/VtkPointsSource.cpp b/Applications/DataExplorer/VtkVis/VtkPointsSource.cpp
index 8c5ee2b0a51f0f390c42be19d581cfee9921756c..8d5639d15b3f177f61c5eb7d3c56ffcf35f6fc68 100644
--- a/Applications/DataExplorer/VtkVis/VtkPointsSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkPointsSource.cpp
@@ -51,9 +51,9 @@ void VtkPointsSource::PrintSelf( ostream& os, vtkIndent indent )
os << indent << "== VtkPointsSource ==" << "\n";
int i = 0;
- for (auto _point : *_points)
+ for (auto point : *_points)
{
- const double* coords = _point->getCoords();
+ const double* coords = point->getCoords();
os << indent << "Point " << i << " (" << coords[0] << ", " << coords[1] << ", " <<
coords[2] << ")\n";
i++;
@@ -95,9 +95,9 @@ int VtkPointsSource::RequestData( vtkInformation* request,
// Generate points and vertices
unsigned i = 0;
- for (auto _point : *_points)
+ for (auto point : *_points)
{
- double coords[3] = {(*_point)[0], (*_point)[1], (*_point)[2]};
+ double coords[3] = {(*point)[0], (*point)[1], (*point)[2]};
newPoints->SetPoint(i, coords);
newVerts->InsertNextCell(1);
newVerts->InsertCellPoint(i);
diff --git a/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
index eb162fe53950719ee11e9a6560f6ddedf2126ad9..cc4e73e062f0c8018a5d893f224abcdc6a86b5dc 100644
--- a/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
@@ -54,13 +54,13 @@ void VtkPolylinesSource::PrintSelf( ostream& os, vtkIndent indent )
if (_polylines->empty())
return;
- for (auto _polyline : *_polylines)
+ for (auto polyline : *_polylines)
{
os << indent << "== Polyline ==" << "\n";
- int numPoints = _polyline->getNumberOfPoints();
+ int numPoints = polyline->getNumberOfPoints();
for (int i = 0; i < numPoints; i++)
{
- const GeoLib::Point* point = _polyline->getPoint(i);
+ const GeoLib::Point* point = polyline->getPoint(i);
const double* coords = point->getCoords();
os << indent << "Point " << i << " (" << coords[0] << ", " << coords[1] <<
", " << coords[2] << ")\n";
diff --git a/Applications/DataExplorer/VtkVis/VtkStationSource.cpp b/Applications/DataExplorer/VtkVis/VtkStationSource.cpp
index ee10fdded3dccd2c83b80c5ff333623a14bcd7f5..2fce1f466606ec5dbec86f2899bc8f6b7b5b8dbc 100644
--- a/Applications/DataExplorer/VtkVis/VtkStationSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkStationSource.cpp
@@ -54,9 +54,9 @@ void VtkStationSource::PrintSelf( ostream& os, vtkIndent indent )
os << indent << "== VtkStationSource ==" << "\n";
int i = 0;
- for (auto _station : *_stations)
+ for (auto station : *_stations)
{
- const double* coords = _station->getCoords();
+ const double* coords = station->getCoords();
os << indent << "Station " << i << " (" << coords[0] << ", " << coords[1] <<
", " << coords[2] << ")\n";
i++;
@@ -122,23 +122,23 @@ int VtkStationSource::RequestData( vtkInformation* request,
std::size_t site_count(0);
// Generate graphic objects
- for (auto _station : *_stations)
+ for (auto station : *_stations)
{
- double coords[3] = {(*_station)[0], (*_station)[1], (*_station)[2]};
+ double coords[3] = {(*station)[0], (*station)[1], (*station)[2]};
vtkIdType sid = newStations->InsertNextPoint(coords);
station_ids->InsertNextValue(site_count);
if (useStationValues)
station_values->InsertNextValue(
- static_cast<GeoLib::Station*>(_station)->getStationValue());
+ static_cast<GeoLib::Station*>(station)->getStationValue());
if (!isBorehole)
newVerts->InsertNextCell(1, &sid);
else
{
std::vector<GeoLib::Point*> profile =
- static_cast<GeoLib::StationBorehole*>(_station)->getProfile();
+ static_cast<GeoLib::StationBorehole*>(station)->getProfile();
std::vector<std::string> soilNames =
- static_cast<GeoLib::StationBorehole*>(_station)->getSoilNames();
+ static_cast<GeoLib::StationBorehole*>(station)->getSoilNames();
const std::size_t nLayers = profile.size();
for (std::size_t i = 1; i < nLayers; i++)
@@ -155,7 +155,7 @@ int VtkStationSource::RequestData( vtkInformation* request,
strat_ids->InsertNextValue(this->GetIndexByName(soilNames[i]));
if (useStationValues)
station_values->InsertNextValue(
- static_cast<GeoLib::Station*>(_station)
+ static_cast<GeoLib::Station*>(station)
->getStationValue());
}
lastMaxIndex++;
diff --git a/Applications/DataExplorer/VtkVis/VtkSurfacesSource.cpp b/Applications/DataExplorer/VtkVis/VtkSurfacesSource.cpp
index 27b12c9feec3c42c64283eb2d9b7ec54d07e10ab..86067186e9450c6ee39ef023bdfb07018ce69d6c 100644
--- a/Applications/DataExplorer/VtkVis/VtkSurfacesSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkSurfacesSource.cpp
@@ -91,16 +91,16 @@ int VtkSurfacesSource::RequestData( vtkInformation* request,
}
vtkIdType count(0);
- for (auto _surface : *_surfaces)
+ for (auto surface : *_surfaces)
{
- const std::size_t nTriangles = _surface->getNumberOfTriangles();
+ const std::size_t nTriangles = surface->getNumberOfTriangles();
for (std::size_t i = 0; i < nTriangles; ++i)
{
vtkTriangle* new_tri = vtkTriangle::New();
new_tri->GetPointIds()->SetNumberOfIds(3);
- const GeoLib::Triangle* triangle = (*_surface)[i];
+ const GeoLib::Triangle* triangle = (*surface)[i];
for (std::size_t j = 0; j < 3; ++j)
new_tri->GetPointIds()->SetId(j, ((*triangle)[j]));
newPolygons->InsertNextCell(new_tri);
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp b/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
index 67dab85f5509a5f136df6556d325ea282d6dcd9f..d54472e5101b1e8f5a5f4c7f34c58172c7d7b6eb 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
@@ -91,9 +91,9 @@ bool VtkVisPipeline::setData( const QModelIndex &index, const QVariant &value,
void VtkVisPipeline::addLight(const GeoLib::Point &pos)
{
double lightPos[3];
- for (auto& _light : _lights)
+ for (auto& light : _lights)
{
- _light->GetPosition(lightPos);
+ light->GetPosition(lightPos);
if (pos[0] == lightPos[0] && pos[1] == lightPos[1] && pos[2] == lightPos[2])
return;
}
@@ -106,11 +106,11 @@ void VtkVisPipeline::addLight(const GeoLib::Point &pos)
vtkLight* VtkVisPipeline::getLight(const GeoLib::Point &pos) const
{
double lightPos[3];
- for (auto _light : _lights)
+ for (auto light : _lights)
{
- _light->GetPosition(lightPos);
+ light->GetPosition(lightPos);
if (pos[0] == lightPos[0] && pos[1] == lightPos[1] && pos[2] == lightPos[2])
- return _light;
+ return light;
}
return nullptr;
}
diff --git a/Applications/FileIO/Gmsh/GMSHInterface.cpp b/Applications/FileIO/Gmsh/GMSHInterface.cpp
index f935da9c038bc753a3dd0df3046e9e6f44d5f958..43e497936b7eb3f4fd998cfb08c4a776f5343932 100644
--- a/Applications/FileIO/Gmsh/GMSHInterface.cpp
+++ b/Applications/FileIO/Gmsh/GMSHInterface.cpp
@@ -192,9 +192,9 @@ int GMSHInterface::writeGMSHInputFile(std::ostream& out)
}
// *** init mesh density strategies
- for (auto& it : _polygon_tree_list)
+ for (auto& polygon_tree : _polygon_tree_list)
{
- it->initMeshDensityStrategy();
+ polygon_tree->initMeshDensityStrategy();
}
// *** create GMSH data structures
@@ -203,9 +203,9 @@ int GMSHInterface::writeGMSHInputFile(std::ostream& out)
for (std::size_t k(0); k<n_merged_pnts; k++) {
_gmsh_pnts[k] = nullptr;
}
- for (auto& it : _polygon_tree_list)
+ for (auto& polygon_tree : _polygon_tree_list)
{
- it->createGMSHPoints(_gmsh_pnts);
+ polygon_tree->createGMSHPoints(_gmsh_pnts);
}
// *** finally write data :-)
diff --git a/Applications/FileIO/Gmsh/GMSHPolygonTree.cpp b/Applications/FileIO/Gmsh/GMSHPolygonTree.cpp
index 14c4db24ef137a16acdd6f42cc67b6d2a47c5c5c..f89729114b4c150e335c35d2b66697c1d987e4a8 100644
--- a/Applications/FileIO/Gmsh/GMSHPolygonTree.cpp
+++ b/Applications/FileIO/Gmsh/GMSHPolygonTree.cpp
@@ -53,9 +53,9 @@ void GMSHPolygonTree::markSharedSegments()
if (_parent == nullptr)
return;
- for (auto& it : _children)
+ for (auto& child : _children)
{
- std::size_t const n_pnts(it->getPolygon()->getNumberOfPoints());
+ std::size_t const n_pnts(child->getPolygon()->getNumberOfPoints());
for (std::size_t k(1); k<n_pnts; k++) {
if (GeoLib::containsEdge(*(_parent->getPolygon()),
_node_polygon->getPointID(k-1),
@@ -281,9 +281,9 @@ void GMSHPolygonTree::createGMSHPoints(std::vector<GMSHPoint*> & gmsh_pnts) cons
}
// walk through children
- for (auto it : _children)
+ for (auto child : _children)
{
- dynamic_cast<GMSHPolygonTree*>(it)->createGMSHPoints(gmsh_pnts);
+ dynamic_cast<GMSHPolygonTree*>(child)->createGMSHPoints(gmsh_pnts);
}
}
@@ -334,10 +334,10 @@ void GMSHPolygonTree::writeLineConstraints(std::size_t& line_offset,
void GMSHPolygonTree::writeSubPolygonsAsLineConstraints(std::size_t &line_offset, std::size_t sfc_number, std::ostream& out) const
{
- for (auto it : _children)
+ for (auto child : _children)
{
- dynamic_cast<GMSHPolygonTree*>(it)->writeSubPolygonsAsLineConstraints(
- line_offset, sfc_number, out);
+ dynamic_cast<GMSHPolygonTree*>(child)
+ ->writeSubPolygonsAsLineConstraints(line_offset, sfc_number, out);
}
if (_parent != nullptr)
diff --git a/Applications/Utils/OGSFileConverter/FileListDialog.cpp b/Applications/Utils/OGSFileConverter/FileListDialog.cpp
index 184f53e1d9733255105ac06d76cd1bbf4f0c0335..2b4cee0d2511f890bdbad261fc49ef415931ba49 100644
--- a/Applications/Utils/OGSFileConverter/FileListDialog.cpp
+++ b/Applications/Utils/OGSFileConverter/FileListDialog.cpp
@@ -61,8 +61,8 @@ void FileListDialog::on_addButton_pressed()
void FileListDialog::on_removeButton_pressed()
{
QModelIndexList selected = this->listView->selectionModel()->selectedIndexes();
- for (auto& it : selected)
- this->_allFiles.removeRow(it.row());
+ for (auto& item : selected)
+ this->_allFiles.removeRow(item.row());
}
void FileListDialog::on_browseButton_pressed()
diff --git a/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp b/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp
index a18a3d57f2f84cd749c775190ed74184558b45e2..1dd6515885f7f518b1ae70165dd9cfcae2944301 100644
--- a/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp
+++ b/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp
@@ -45,15 +45,15 @@ void OGSFileConverter::convertGML2GLI(const QStringList &input, const QString &o
GeoLib::GEOObjects geo_objects;
GeoLib::IO::XmlGmlInterface xml(geo_objects);
- for (const auto& it : input)
+ for (const auto& input_string : input)
{
- const QFileInfo fi(it);
+ const QFileInfo fi(input_string);
const std::string output_str = QString(output + "/" + fi.completeBaseName() + ".gli").toStdString();
if (fileExists(output_str))
continue;
- if (!xml.readFile(it))
+ if (!xml.readFile(input_string))
{
OGSError::box("Error reading geometry " + fi.fileName());
continue;
@@ -76,9 +76,9 @@ void OGSFileConverter::convertGLI2GML(const QStringList &input, const QString &o
GeoLib::GEOObjects geo_objects;
GeoLib::IO::XmlGmlInterface xml(geo_objects);
- for (const auto& it : input)
+ for (const auto& input_string : input)
{
- const QFileInfo fi(it);
+ const QFileInfo fi(input_string);
const std::string output_str = QString(output + "/" + fi.completeBaseName() + ".gml").toStdString();
if (fileExists(output_str))
@@ -87,12 +87,12 @@ void OGSFileConverter::convertGLI2GML(const QStringList &input, const QString &o
std::string unique_name;
std::vector<std::string> errors;
- GeoLib::IO::Legacy::readGLIFileV4(it.toStdString(), geo_objects,
- unique_name, errors);
+ GeoLib::IO::Legacy::readGLIFileV4(input_string.toStdString(),
+ geo_objects, unique_name, errors);
if (errors.empty() || (errors.size()==1 && errors[0].compare("[readSurface] polyline for surface not found!")==0))
{
std::string const geo_name =
- BaseLib::extractBaseName(it.toStdString());
+ BaseLib::extractBaseName(input_string.toStdString());
xml.setNameForExport(geo_name);
xml.writeToFile(output_str);
geo_objects.removeSurfaceVec(geo_name);
@@ -111,16 +111,16 @@ void OGSFileConverter::convertVTU2MSH(const QStringList &input, const QString &o
if (input.empty())
return;
- for (const auto& it : input)
+ for (const auto& input_string : input)
{
- const QFileInfo fi(it);
+ const QFileInfo fi(input_string);
const std::string output_str = QString(output + "/" + fi.completeBaseName() + ".msh").toStdString();
if (fileExists(output_str))
continue;
- MeshLib::Mesh const* const mesh(
- MeshLib::IO::VtuInterface::readVTUFile(it.toStdString().c_str()));
+ MeshLib::Mesh const* const mesh(MeshLib::IO::VtuInterface::readVTUFile(
+ input_string.toStdString().c_str()));
if (mesh == nullptr)
{
OGSError::box("Error reading mesh " + fi.fileName());
@@ -139,9 +139,9 @@ void OGSFileConverter::convertMSH2VTU(const QStringList &input, const QString &o
if (input.empty())
return;
- for (const auto& it : input)
+ for (const auto& input_string : input)
{
- const QFileInfo fi(it);
+ const QFileInfo fi(input_string);
const std::string output_str = QString(output + "/" + fi.completeBaseName() + ".vtu").toStdString();
if (fileExists(output_str))
@@ -149,7 +149,7 @@ void OGSFileConverter::convertMSH2VTU(const QStringList &input, const QString &o
MeshLib::IO::Legacy::MeshIO meshIO;
MeshLib::Mesh const* const mesh(
- meshIO.loadMeshFromFile(it.toStdString()));
+ meshIO.loadMeshFromFile(input_string.toStdString()));
if (mesh == nullptr)
{
OGSError::box("Error reading mesh " + fi.fileName());
diff --git a/GeoLib/EarClippingTriangulation.cpp b/GeoLib/EarClippingTriangulation.cpp
index 085f8d4c33afd2351e21721baef0ee45aeca9453..ff94ca1fb9f982622539d5d1cbc2e8fee3c4baa2 100644
--- a/GeoLib/EarClippingTriangulation.cpp
+++ b/GeoLib/EarClippingTriangulation.cpp
@@ -114,11 +114,11 @@ void EarClippingTriangulation::ensureCWOrientation ()
bool EarClippingTriangulation::isEar(std::size_t v0, std::size_t v1, std::size_t v2) const
{
- for (unsigned long it : _vertex_list)
+ for (unsigned long v : _vertex_list)
{
- if (it != v0 && it != v1 && it != v2)
+ if (v != v0 && v != v1 && v != v2)
{
- if (MathLib::isPointInTriangle(*_pnts[it], *_pnts[v0], *_pnts[v1],
+ if (MathLib::isPointInTriangle(*_pnts[v], *_pnts[v0], *_pnts[v1],
*_pnts[v2]))
{
return false;
diff --git a/GeoLib/GEOObjects.cpp b/GeoLib/GEOObjects.cpp
index dff35a46c871752316e813b68e47303b4cb6a484..5fbe3e6322e107bf07e50a06c3f8165d40df73c7 100644
--- a/GeoLib/GEOObjects.cpp
+++ b/GeoLib/GEOObjects.cpp
@@ -28,14 +28,14 @@ GEOObjects::GEOObjects() = default;
GEOObjects::~GEOObjects()
{
// delete surfaces
- for (auto & _sfc_vec : _sfc_vecs)
- delete _sfc_vec;
+ for (auto& surface : _sfc_vecs)
+ delete surface;
// delete polylines
- for (auto & _ply_vec : _ply_vecs)
- delete _ply_vec;
+ for (auto& polyline : _ply_vecs)
+ delete polyline;
// delete points
- for (auto & _pnt_vec : _pnt_vecs)
- delete _pnt_vec;
+ for (auto& point : _pnt_vecs)
+ delete point;
}
void GEOObjects::addPointVec(
@@ -105,12 +105,12 @@ void GEOObjects::addStationVec(std::unique_ptr<std::vector<Point*>> stations,
const std::vector<GeoLib::Point*>* GEOObjects::getStationVec(
const std::string& name) const
{
- for (auto _pnt_vec : _pnt_vecs)
+ for (auto point : _pnt_vecs)
{
- if (_pnt_vec->getName().compare(name) == 0 &&
- _pnt_vec->getType() == PointVec::PointType::STATION)
+ if (point->getName().compare(name) == 0 &&
+ point->getType() == PointVec::PointType::STATION)
{
- return _pnt_vec->getVector();
+ return point->getVector();
}
}
DBUG("GEOObjects::getStationVec() - No entry found with name \"%s\".", name.c_str());
@@ -294,8 +294,8 @@ bool GEOObjects::isUniquePointVecName(std::string &name)
if (count > 1)
cpName = cpName + "-" + std::to_string(count);
- for (auto & _pnt_vec : _pnt_vecs)
- if ( cpName.compare(_pnt_vec->getName()) == 0 )
+ for (auto& point : _pnt_vecs)
+ if (cpName.compare(point->getName()) == 0)
isUnique = false;
}
@@ -313,14 +313,14 @@ bool GEOObjects::isUniquePointVecName(std::string &name)
bool GEOObjects::isPntVecUsed (const std::string &name) const
{
// search dependent data structures (Polyline)
- for (auto _ply_vec : _ply_vecs)
+ for (auto polyline : _ply_vecs)
{
- if ((_ply_vec->getName()).compare(name) == 0)
+ if ((polyline->getName()).compare(name) == 0)
return true;
}
- for (auto _sfc_vec : _sfc_vecs)
+ for (auto surface : _sfc_vecs)
{
- if ((_sfc_vec->getName()).compare(name) == 0)
+ if ((surface->getName()).compare(name) == 0)
return true;
}
@@ -329,17 +329,17 @@ bool GEOObjects::isPntVecUsed (const std::string &name) const
void GEOObjects::getStationVectorNames(std::vector<std::string>& names) const
{
- for (auto _pnt_vec : _pnt_vecs)
- if (_pnt_vec->getType() == PointVec::PointType::STATION)
- names.push_back(_pnt_vec->getName());
+ for (auto point : _pnt_vecs)
+ if (point->getType() == PointVec::PointType::STATION)
+ names.push_back(point->getName());
}
void GEOObjects::getGeometryNames (std::vector<std::string>& names) const
{
names.clear ();
- for (auto _pnt_vec : _pnt_vecs)
- if (_pnt_vec->getType() == PointVec::PointType::POINT)
- names.push_back(_pnt_vec->getName());
+ for (auto point : _pnt_vecs)
+ if (point->getType() == PointVec::PointType::POINT)
+ names.push_back(point->getName());
}
const std::string GEOObjects::getElementNameByID(const std::string &geometry_name, GeoLib::GEOTYPE type, std::size_t id) const
diff --git a/GeoLib/PointVec.cpp b/GeoLib/PointVec.cpp
index 837e473c16800490b67f1d836ed65d9d5d0d2729..19fab788d5c8eb221c24f0bf53f29c9145f57b37 100644
--- a/GeoLib/PointVec.cpp
+++ b/GeoLib/PointVec.cpp
@@ -199,9 +199,9 @@ void PointVec::correctNameIDMapping()
{
// create mapping id -> name using the std::vector id_names
std::vector<std::string> id_names(_pnt_id_map.size(), std::string(""));
- for (auto& it : *_name_id_map)
+ for (auto& id_name_pair : *_name_id_map)
{
- id_names[it.second] = it.first;
+ id_names[id_name_pair.second] = id_name_pair.first;
}
for (auto it = _name_id_map->begin(); it != _name_id_map->end();)
diff --git a/GeoLib/Polygon.cpp b/GeoLib/Polygon.cpp
index df98e74747cadf7d07c744a7a7c36a0b9ad10763..daa2a28aa491939dc91d3663c53a5460763819c5 100644
--- a/GeoLib/Polygon.cpp
+++ b/GeoLib/Polygon.cpp
@@ -48,10 +48,10 @@ Polygon::Polygon(Polygon const& other)
Polygon::~Polygon()
{
// remove polygons from list
- for (auto& it : _simple_polygon_list)
+ for (auto& polygon : _simple_polygon_list)
// the first entry of the list can be a pointer the object itself
- if (it != this)
- delete it;
+ if (polygon != this)
+ delete polygon;
}
bool Polygon::initialise ()
@@ -233,10 +233,10 @@ bool Polygon::getNextIntersectionPointPolygonLine(
}
}
} else {
- for (auto polygon_it : _simple_polygon_list)
+ for (auto polygon : _simple_polygon_list)
{
- Polygon const& polygon(*polygon_it);
- for (auto seg_it(polygon.begin()); seg_it != polygon.end(); ++seg_it)
+ for (auto seg_it(polygon->begin()); seg_it != polygon->end();
+ ++seg_it)
{
if (GeoLib::lineSegmentIntersect(*seg_it, seg, intersection)) {
seg_num = seg_it.getSegmentNumber();
@@ -258,8 +258,8 @@ void Polygon::computeListOfSimplePolygons ()
splitPolygonAtPoint (_simple_polygon_list.begin());
splitPolygonAtIntersection (_simple_polygon_list.begin());
- for (auto& it : _simple_polygon_list)
- it->initialise();
+ for (auto& polygon : _simple_polygon_list)
+ polygon->initialise();
}
EdgeType Polygon::getEdgeType (std::size_t k, GeoLib::Point const & pnt) const
diff --git a/GeoLib/QuadTree.h b/GeoLib/QuadTree.h
index d5132cbb9f5364b37a4fe50749b5fa66d45a40e7..4a40d60ccf88d2bef2c33255df9e9672a84c872a 100644
--- a/GeoLib/QuadTree.h
+++ b/GeoLib/QuadTree.h
@@ -59,8 +59,8 @@ public:
assert (_max_points_per_leaf > 0);
// init children
- for (auto& k : _children)
- k = nullptr;
+ for (auto& child : _children)
+ child = nullptr;
if ((_ur[0] - _ll[0]) > (_ur[1] - _ll[1]))
_ur[1] = _ll[1] + _ur[0] - _ll[0];
@@ -75,9 +75,9 @@ public:
*/
~QuadTree()
{
- for (auto& k : _children)
+ for (auto& child : _children)
{
- delete k;
+ delete child;
}
}
@@ -95,9 +95,9 @@ public:
if ((*pnt)[1] >= _ur[1]) return false;
if (!_is_leaf) {
- for (auto& k : _children)
+ for (auto& child : _children)
{
- if (k->addPoint(pnt))
+ if (child->addPoint(pnt))
return true;
}
return false;
@@ -189,8 +189,8 @@ public:
if (_is_leaf)
leaf_list.push_back (this);
else
- for (auto& k : _children)
- k->getLeafs(leaf_list);
+ for (auto& child : _children)
+ child->getLeafs(leaf_list);
}
const std::vector<POINT const*>& getPoints () const { return _pnts; }
@@ -247,11 +247,11 @@ public:
if (max_depth < _depth)
max_depth = _depth;
- for (auto& k : _children)
+ for (auto& child : _children)
{
- if (k)
+ if (child)
{
- k->getMaxDepth(max_depth);
+ child->getMaxDepth(max_depth);
}
}
}
@@ -386,8 +386,8 @@ private:
_max_points_per_leaf(max_points_per_leaf)
{
// init children
- for (auto& k : _children)
- k = nullptr;
+ for (auto& child : _children)
+ child = nullptr;
}
void splitNode ()
diff --git a/GeoLib/Surface.cpp b/GeoLib/Surface.cpp
index 1e6f511df0870715beda71e3798a631c5312aeae..e3d8b72f799601303402b9f024bd51bc4e1bf3e5 100644
--- a/GeoLib/Surface.cpp
+++ b/GeoLib/Surface.cpp
@@ -109,10 +109,10 @@ Surface* Surface::createSurface(const Polyline& ply)
// create surfaces from simple polygons
const std::list<GeoLib::Polygon*>& list_of_simple_polygons(
polygon->getListOfSimplePolygons());
- for (auto list_of_simple_polygon : list_of_simple_polygons)
+ for (auto simple_polygon : list_of_simple_polygons)
{
std::list<GeoLib::Triangle> triangles;
- GeoLib::EarClippingTriangulation(list_of_simple_polygon, triangles);
+ GeoLib::EarClippingTriangulation(simple_polygon, triangles);
// add Triangles to Surface
std::list<GeoLib::Triangle>::const_iterator it(triangles.begin());
diff --git a/MaterialLib/Fluid/Viscosity/WaterViscosityIAPWS.cpp b/MaterialLib/Fluid/Viscosity/WaterViscosityIAPWS.cpp
index 756472283555b2fbdf4c63beb80163d9e8712498..cdddd6b1ab2d4d8c5e0a36adb89e345a02d64b66 100644
--- a/MaterialLib/Fluid/Viscosity/WaterViscosityIAPWS.cpp
+++ b/MaterialLib/Fluid/Viscosity/WaterViscosityIAPWS.cpp
@@ -79,9 +79,9 @@ double computeBarMu0Factor(const double barT)
{
double sum_val = 0.;
double barT_i = 1.;
- for (double i : Hi)
+ for (double value : Hi)
{
- sum_val += (i / barT_i);
+ sum_val += (value / barT_i);
barT_i *= barT;
}
return sum_val;
diff --git a/MeshLib/Mesh.cpp b/MeshLib/Mesh.cpp
index 30747ef61390b9e05fd9989b653856fed14d7b7a..6710601d2508b827153a6372fe8812e1d4c7f29c 100644
--- a/MeshLib/Mesh.cpp
+++ b/MeshLib/Mesh.cpp
@@ -149,19 +149,19 @@ void Mesh::setDimension()
void Mesh::setElementsConnectedToNodes()
{
- for (auto& _element : _elements)
+ for (auto& element : _elements)
{
- const unsigned nNodes(_element->getNumberOfNodes());
+ const unsigned nNodes(element->getNumberOfNodes());
for (unsigned j=0; j<nNodes; ++j)
- _element->_nodes[j]->addElement(_element);
+ element->_nodes[j]->addElement(element);
}
}
void Mesh::resetElementsConnectedToNodes()
{
- for (auto& _node : _nodes)
- if (_node)
- _node->clearElements();
+ for (auto& node : _nodes)
+ if (node)
+ node->clearElements();
this->setElementsConnectedToNodes();
}
diff --git a/MeshLib/Properties.cpp b/MeshLib/Properties.cpp
index 7cdd6beae9fe3bfaadd1d467a77e091b1900e0f2..5baeb162975abab5fcd8126cacc6b516ffdda186 100644
--- a/MeshLib/Properties.cpp
+++ b/MeshLib/Properties.cpp
@@ -52,19 +52,20 @@ Properties Properties::excludeCopyProperties(
std::vector<std::size_t> const& exclude_node_ids) const
{
Properties exclude_copy;
- for (auto property_vector : _properties) {
- if (property_vector.second->getMeshItemType() == MeshItemType::Cell) {
- exclude_copy._properties.insert(
- std::make_pair(property_vector.first,
- property_vector.second->clone(exclude_elem_ids))
- );
+ for (auto name_vector_pair : _properties)
+ {
+ if (name_vector_pair.second->getMeshItemType() == MeshItemType::Cell)
+ {
+ exclude_copy._properties.insert(std::make_pair(
+ name_vector_pair.first,
+ name_vector_pair.second->clone(exclude_elem_ids)));
}
- else if (property_vector.second->getMeshItemType() == MeshItemType::Node)
+ else if (name_vector_pair.second->getMeshItemType() ==
+ MeshItemType::Node)
{
- exclude_copy._properties.insert(
- std::make_pair(property_vector.first,
- property_vector.second->clone(exclude_node_ids))
- );
+ exclude_copy._properties.insert(std::make_pair(
+ name_vector_pair.first,
+ name_vector_pair.second->clone(exclude_node_ids)));
}
}
return exclude_copy;
@@ -74,18 +75,18 @@ Properties Properties::excludeCopyProperties(
std::vector<MeshItemType> const& exclude_mesh_item_types) const
{
Properties new_properties;
- for (auto property_vector : _properties) {
+ for (auto name_vector_pair : _properties)
+ {
if (std::find(exclude_mesh_item_types.begin(),
exclude_mesh_item_types.end(),
- property_vector.second->getMeshItemType()) !=
+ name_vector_pair.second->getMeshItemType()) !=
exclude_mesh_item_types.end())
continue;
std::vector<std::size_t> const exclude_positions{};
new_properties._properties.insert(
- std::make_pair(property_vector.first,
- property_vector.second->clone(exclude_positions))
- );
+ std::make_pair(name_vector_pair.first,
+ name_vector_pair.second->clone(exclude_positions)));
}
return new_properties;
}
@@ -94,17 +95,19 @@ Properties::Properties(Properties const& properties)
: _properties(properties._properties)
{
std::vector<std::size_t> exclude_positions;
- for (auto& _propertie : _properties)
+ for (auto& name_vector_pair : _properties)
{
- PropertyVectorBase* t(_propertie.second->clone(exclude_positions));
- _propertie.second = t;
+ PropertyVectorBase* t(
+ name_vector_pair.second->clone(exclude_positions));
+ name_vector_pair.second = t;
}
}
Properties::~Properties()
{
- for (auto property_vector : _properties) {
- delete property_vector.second;
+ for (auto name_vector_pair : _properties)
+ {
+ delete name_vector_pair.second;
}
}
diff --git a/Tests/GeoLib/TestAABB.cpp b/Tests/GeoLib/TestAABB.cpp
index f5b864652871111c40cf66f721d63944d84d68c4..31db275f6e220b1ff91872d6a37841a981b93972 100644
--- a/Tests/GeoLib/TestAABB.cpp
+++ b/Tests/GeoLib/TestAABB.cpp
@@ -54,9 +54,9 @@ TEST(GeoLibAABB, RandomNumberOfPointersToRandomPoints)
ASSERT_GE(half_box_size, max_pnt[1]) << "coordinate 1 of max_pnt is greater than " << half_box_size;
ASSERT_GE(half_box_size, max_pnt[2]) << "coordinate 2 of max_pnt is greater than " << half_box_size;
- for (auto& it : pnts_list)
+ for (auto& point : pnts_list)
{
- delete it;
+ delete point;
}
}
@@ -125,9 +125,9 @@ TEST(GeoLibAABB, RandomNumberOfPointersToRandomPointsInAVector)
ASSERT_GE(half_box_size, max_pnt[1]) << "coordinate 1 of max_pnt is greater than " << half_box_size;
ASSERT_GE(half_box_size, max_pnt[2]) << "coordinate 2 of max_pnt is greater than " << half_box_size;
- for (auto& pnt : pnts)
+ for (auto& point : pnts)
{
- delete pnt;
+ delete point;
}
}