From fbbcbe7db03c034724791bd8280f6e0ee9b3ce50 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 11 Nov 2021 20:48:58 +0100
Subject: [PATCH] auto in front of dynamic cast
---
Core/Export/PyFmt2.cpp | 10 ++++-----
Core/Simulation/ISimulation2D.cpp | 4 ++--
GUI/Model/Fit/FitParameterHelper.cpp | 2 +-
GUI/Model/Fit/ParameterTuningModel.cpp | 2 +-
GUI/Model/From/FromDomain.cpp | 22 +++++++++----------
GUI/Model/Instrument/BeamDistributionItem.cpp | 4 ++--
GUI/Model/Job/JobModel.cpp | 6 ++---
GUI/Model/Sample/GUIDomainSampleVisitor.cpp | 8 +++----
GUI/Model/Sample/InterferenceItems.cpp | 4 ++--
GUI/Model/Session/SessionItem.h | 6 ++---
GUI/View/Common/ItemComboToolBar.cpp | 2 +-
GUI/View/Compare/FitComparisonWidget.cpp | 2 +-
GUI/View/Compare/FitComparisonWidget1D.cpp | 2 +-
GUI/View/Fit/FitParameterWidget.cpp | 2 +-
GUI/View/Info/CautionSign.cpp | 2 +-
GUI/View/Intensity/IntensityDataCanvas.cpp | 2 +-
GUI/View/Job/JobListViewDelegate.cpp | 4 ++--
GUI/View/Job/JobResultsPresenter.cpp | 8 +++----
GUI/View/Mask/IShape2DView.cpp | 4 ++--
GUI/View/Mask/MaskEditorActions.cpp | 2 +-
GUI/View/Mask/MaskGraphicsScene.cpp | 2 +-
GUI/View/Mask/MaskGraphicsView.cpp | 4 ++--
GUI/View/Mask/MaskResultsPresenter.cpp | 2 +-
GUI/View/Mask/PolygonView.cpp | 4 ++--
GUI/View/Projection/ProjectionsPlot.cpp | 2 +-
GUI/View/SampleDesigner/ConnectableView.cpp | 2 +-
GUI/View/SampleDesigner/DesignerScene.cpp | 18 +++++++--------
GUI/View/SampleDesigner/DesignerView.cpp | 2 +-
GUI/View/SampleDesigner/ILayerView.cpp | 10 ++++-----
GUI/View/SampleDesigner/LayerView.cpp | 2 +-
GUI/View/SampleDesigner/MultiLayerView.cpp | 4 ++--
GUI/View/SampleDesigner/NodeEditor.cpp | 2 +-
.../SampleDesigner/NodeEditorConnection.cpp | 4 ++--
GUI/View/SpecularData/SpecularDataCanvas.cpp | 2 +-
GUI/View/Toplevel/TestView.cpp | 2 +-
Sample/Scattering/ISampleNode.cpp | 2 +-
Tests/Unit/GUI/TestComponentUtils.cpp | 4 ++--
Tests/Unit/GUI/TestFTDistributionItems.cpp | 2 +-
Tests/Unit/GUI/TestFormFactorItems.cpp | 2 +-
Tests/Unit/GUI/TestProxyModelStrategy.cpp | 4 ++--
Tests/Unit/Sample/MultiLayerTest.cpp | 4 ++--
41 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/Core/Export/PyFmt2.cpp b/Core/Export/PyFmt2.cpp
index 86e08c7730b..9f6e5e3b9e2 100644
--- a/Core/Export/PyFmt2.cpp
+++ b/Core/Export/PyFmt2.cpp
@@ -41,7 +41,7 @@ std::string representShape2D(const std::string& indent, const IShape2D* ishape,
std::ostringstream result;
result << std::setprecision(12);
- if (const Polygon* shape = dynamic_cast<const Polygon*>(ishape)) {
+ if (const auto* shape = dynamic_cast<const Polygon*>(ishape)) {
std::vector<double> xpos, ypos;
shape->getPoints(xpos, ypos);
result << indent << "points = [";
@@ -57,7 +57,7 @@ std::string representShape2D(const std::string& indent, const IShape2D* ishape,
} else if (dynamic_cast<const InfinitePlane*>(ishape)) {
result << indent << "simulation.maskAll()\n";
- } else if (const Ellipse* shape = dynamic_cast<const Ellipse*>(ishape)) {
+ } else if (const auto* shape = dynamic_cast<const Ellipse*>(ishape)) {
result << indent << "simulation.addMask(";
result << "ba.Ellipse(" << printValueFunc(shape->getCenterX()) << ", "
<< printValueFunc(shape->getCenterY()) << ", " << printValueFunc(shape->getRadiusX())
@@ -67,7 +67,7 @@ std::string representShape2D(const std::string& indent, const IShape2D* ishape,
result << "), " << Py::Fmt::printBool(mask_value) << ")\n";
}
- else if (const Rectangle* shape = dynamic_cast<const Rectangle*>(ishape)) {
+ else if (const auto* shape = dynamic_cast<const Rectangle*>(ishape)) {
result << indent << "simulation.addMask(";
result << "ba.Rectangle(" << printValueFunc(shape->getXlow()) << ", "
<< printValueFunc(shape->getYlow()) << ", " << printValueFunc(shape->getXup())
@@ -75,13 +75,13 @@ std::string representShape2D(const std::string& indent, const IShape2D* ishape,
<< ")\n";
}
- else if (const VerticalLine* shape = dynamic_cast<const VerticalLine*>(ishape)) {
+ else if (const auto* shape = dynamic_cast<const VerticalLine*>(ishape)) {
result << indent << "simulation.addMask(";
result << "ba.VerticalLine(" << printValueFunc(shape->getXpos()) << "), "
<< Py::Fmt::printBool(mask_value) << ")\n";
}
- else if (const HorizontalLine* shape = dynamic_cast<const HorizontalLine*>(ishape)) {
+ else if (const auto* shape = dynamic_cast<const HorizontalLine*>(ishape)) {
result << indent << "simulation.addMask(";
result << "ba.HorizontalLine(" << printValueFunc(shape->getYpos()) << "), "
<< Py::Fmt::printBool(mask_value) << ")\n";
diff --git a/Core/Simulation/ISimulation2D.cpp b/Core/Simulation/ISimulation2D.cpp
index d38240ce414..9ad508bc2f0 100644
--- a/Core/Simulation/ISimulation2D.cpp
+++ b/Core/Simulation/ISimulation2D.cpp
@@ -32,14 +32,14 @@ ISimulation2D::~ISimulation2D() = default;
IDetector2D& ISimulation2D::detector2D()
{
- IDetector2D* p = dynamic_cast<IDetector2D*>(&detector());
+ auto* p = dynamic_cast<IDetector2D*>(&detector());
ASSERT(p);
return *p;
}
const IDetector2D& ISimulation2D::detector2D() const
{
- const IDetector2D* p = dynamic_cast<const IDetector2D*>(&detector());
+ const auto* p = dynamic_cast<const IDetector2D*>(&detector());
ASSERT(p);
return *p;
}
diff --git a/GUI/Model/Fit/FitParameterHelper.cpp b/GUI/Model/Fit/FitParameterHelper.cpp
index 5ea5a277cbe..77d8fde858d 100644
--- a/GUI/Model/Fit/FitParameterHelper.cpp
+++ b/GUI/Model/Fit/FitParameterHelper.cpp
@@ -118,7 +118,7 @@ ParameterItem* FitParameterHelper::getParameterItem(FitParameterContainerItem* c
cur = cur->parent();
}
ASSERT(cur && cur->modelType() == JobItem::M_TYPE);
- JobItem* jobItem = dynamic_cast<JobItem*>(cur);
+ auto* jobItem = dynamic_cast<JobItem*>(cur);
ASSERT(jobItem);
return dynamic_cast<ParameterItem*>(
GUI::Model::Path::getItemFromPath(link, jobItem->parameterContainerItem()));
diff --git a/GUI/Model/Fit/ParameterTuningModel.cpp b/GUI/Model/Fit/ParameterTuningModel.cpp
index a8401538a59..fc856c93e1f 100644
--- a/GUI/Model/Fit/ParameterTuningModel.cpp
+++ b/GUI/Model/Fit/ParameterTuningModel.cpp
@@ -54,7 +54,7 @@ QMimeData* ParameterTuningModel::mimeData(const QModelIndexList& proxyIndexes) c
ParameterItem* ParameterTuningModel::getParameterItem(const QModelIndex& proxyIndex) const
{
- SessionModel* sessionModel = dynamic_cast<SessionModel*>(sourceModel());
+ auto* sessionModel = dynamic_cast<SessionModel*>(sourceModel());
ASSERT(sessionModel);
QModelIndex sourceIndex = toSourceIndex(proxyIndex);
diff --git a/GUI/Model/From/FromDomain.cpp b/GUI/Model/From/FromDomain.cpp
index 194461e2a9b..141a3a7a593 100644
--- a/GUI/Model/From/FromDomain.cpp
+++ b/GUI/Model/From/FromDomain.cpp
@@ -64,14 +64,14 @@ namespace {
void setPDF1D(InterferenceRadialParaCrystalItem* item, const IFTDistribution1D* ipdf)
{
- if (const FTDistribution1DCauchy* pdf = dynamic_cast<const FTDistribution1DCauchy*>(ipdf)) {
+ if (const auto* pdf = dynamic_cast<const FTDistribution1DCauchy*>(ipdf)) {
FTDistribution1DCauchyItem* pdfItem = item->setPDFType<FTDistribution1DCauchyItem>();
pdfItem->omega().set(pdf->omega());
} else if (const FTDistribution1DGauss* pdf =
dynamic_cast<const FTDistribution1DGauss*>(ipdf)) {
FTDistribution1DGaussItem* pdfItem = item->setPDFType<FTDistribution1DGaussItem>();
pdfItem->omega().set(pdf->omega());
- } else if (const FTDistribution1DGate* pdf = dynamic_cast<const FTDistribution1DGate*>(ipdf)) {
+ } else if (const auto* pdf = dynamic_cast<const FTDistribution1DGate*>(ipdf)) {
FTDistribution1DGateItem* pdfItem = item->setPDFType<FTDistribution1DGateItem>();
pdfItem->omega().set(pdf->omega());
} else if (const FTDistribution1DTriangle* pdf =
@@ -141,7 +141,7 @@ void setPDF2D(Interference2DParaCrystalItem* item, const IFTDistribution2D* pdf)
void setDecayFunction1D(Interference1DLatticeItem* item, const IFTDecayFunction1D* ipdf)
{
- if (const FTDecayFunction1DCauchy* pdf = dynamic_cast<const FTDecayFunction1DCauchy*>(ipdf)) {
+ if (const auto* pdf = dynamic_cast<const FTDecayFunction1DCauchy*>(ipdf)) {
FTDecayFunction1DCauchyItem* pdfItem =
item->setDecayFunctionType<FTDecayFunction1DCauchyItem>();
pdfItem->decayLength().set(pdf->decayLength());
@@ -226,7 +226,7 @@ void setDistribution(BeamDistributionItem* part_distr_item, ParameterDistributio
const IDistribution1D* p_distribution = par_distr.getDistribution();
DistributionItem* distItem = nullptr;
- if (const DistributionGate* distr = dynamic_cast<const DistributionGate*>(p_distribution)) {
+ if (const auto* distr = dynamic_cast<const DistributionGate*>(p_distribution)) {
DistributionGateItem* distr_gate_item =
part_distr_item->setDistributionType<DistributionGateItem>();
distr_gate_item->setRange(factor * distr->lowerBound(), factor * distr->upperBound());
@@ -472,7 +472,7 @@ void GUI::Transform::FromDomain::setSpecularBeamItem(SpecularBeamItem* beam_item
setFootprintFactor(simulation.footprintFactor(), beam_item);
- const AlphaScan* scan = dynamic_cast<const AlphaScan*>(simulation.dataHandler());
+ const auto* scan = dynamic_cast<const AlphaScan*>(simulation.dataHandler());
if (!scan)
return;
@@ -665,7 +665,7 @@ void GUI::Transform::FromDomain::setMaskContainer(MaskContainerItem* container_i
bool mask_value(false);
const IShape2D* shape = detectorMask->getMaskShape(i_mask, mask_value);
- if (const Ellipse* ellipse = dynamic_cast<const Ellipse*>(shape)) {
+ if (const auto* ellipse = dynamic_cast<const Ellipse*>(shape)) {
auto* ellipseItem = new EllipseItem();
ellipseItem->setXCenter(scale * ellipse->getCenterX());
ellipseItem->setYCenter(scale * ellipse->getCenterY());
@@ -676,7 +676,7 @@ void GUI::Transform::FromDomain::setMaskContainer(MaskContainerItem* container_i
container_item->insertItem(0, ellipseItem);
}
- else if (const Rectangle* rectangle = dynamic_cast<const Rectangle*>(shape)) {
+ else if (const auto* rectangle = dynamic_cast<const Rectangle*>(shape)) {
auto* rectangleItem = new RectangleItem();
rectangleItem->setXLow(scale * rectangle->getXlow());
rectangleItem->setYLow(scale * rectangle->getYlow());
@@ -687,7 +687,7 @@ void GUI::Transform::FromDomain::setMaskContainer(MaskContainerItem* container_i
}
- else if (const Polygon* polygon = dynamic_cast<const Polygon*>(shape)) {
+ else if (const auto* polygon = dynamic_cast<const Polygon*>(shape)) {
auto* polygonItem = new PolygonItem();
std::vector<double> xpos, ypos;
polygon->getPoints(xpos, ypos);
@@ -704,21 +704,21 @@ void GUI::Transform::FromDomain::setMaskContainer(MaskContainerItem* container_i
container_item->insertItem(0, polygonItem);
}
- else if (const VerticalLine* vline = dynamic_cast<const VerticalLine*>(shape)) {
+ else if (const auto* vline = dynamic_cast<const VerticalLine*>(shape)) {
auto* lineItem = new VerticalLineItem();
lineItem->setPosX(scale * vline->getXpos());
lineItem->setMaskValue(mask_value);
container_item->insertItem(0, lineItem);
}
- else if (const HorizontalLine* hline = dynamic_cast<const HorizontalLine*>(shape)) {
+ else if (const auto* hline = dynamic_cast<const HorizontalLine*>(shape)) {
auto* lineItem = new HorizontalLineItem();
lineItem->setPosY(scale * hline->getYpos());
lineItem->setMaskValue(mask_value);
container_item->insertItem(0, lineItem);
}
- else if (const InfinitePlane* plane = dynamic_cast<const InfinitePlane*>(shape)) {
+ else if (const auto* plane = dynamic_cast<const InfinitePlane*>(shape)) {
Q_UNUSED(plane);
auto* planeItem = new MaskAllItem();
planeItem->setMaskValue(mask_value);
diff --git a/GUI/Model/Instrument/BeamDistributionItem.cpp b/GUI/Model/Instrument/BeamDistributionItem.cpp
index c6296758dfa..dbd1bc0a3f9 100644
--- a/GUI/Model/Instrument/BeamDistributionItem.cpp
+++ b/GUI/Model/Instrument/BeamDistributionItem.cpp
@@ -104,7 +104,7 @@ void BeamDistributionItem::initDistributionItem(bool show_mean)
const QString editor_type = distributionNone->meanItem()->editorType();
for (auto item : groupItem->groupItems()) {
- DistributionItem* distrItem = dynamic_cast<DistributionItem*>(item);
+ auto* distrItem = dynamic_cast<DistributionItem*>(item);
distrItem->showMean(show_mean);
if (item == distributionNone)
@@ -132,7 +132,7 @@ double BeamDistributionItem::meanValue() const
void BeamDistributionItem::resetToValue(double value)
{
- DistributionNoneItem* distributionItem = dynamic_cast<DistributionNoneItem*>(
+ auto* distributionItem = dynamic_cast<DistributionNoneItem*>(
setGroupProperty(P_DISTRIBUTION, DistributionNoneItem::M_TYPE));
ASSERT(distributionItem);
distributionItem->setMean(value);
diff --git a/GUI/Model/Job/JobModel.cpp b/GUI/Model/Job/JobModel.cpp
index 5a024052f63..8593e5bc1de 100644
--- a/GUI/Model/Job/JobModel.cpp
+++ b/GUI/Model/Job/JobModel.cpp
@@ -42,14 +42,14 @@ JobModel::~JobModel()
const JobItem* JobModel::getJobItemForIndex(const QModelIndex& index) const
{
- const JobItem* result = dynamic_cast<const JobItem*>(itemForIndex(index));
+ const auto* result = dynamic_cast<const JobItem*>(itemForIndex(index));
ASSERT(result);
return result;
}
JobItem* JobModel::getJobItemForIndex(const QModelIndex& index)
{
- JobItem* result = dynamic_cast<JobItem*>(itemForIndex(index));
+ auto* result = dynamic_cast<JobItem*>(itemForIndex(index));
ASSERT(result);
return result;
}
@@ -217,7 +217,7 @@ QString JobModel::generateJobName()
void JobModel::restoreItem(SessionItem* item)
{
ASSERT(item);
- if (ParameterItem* parameter = dynamic_cast<ParameterItem*>(item))
+ if (auto* parameter = dynamic_cast<ParameterItem*>(item))
parameter->restoreFromBackup();
for (auto child : item->children())
diff --git a/GUI/Model/Sample/GUIDomainSampleVisitor.cpp b/GUI/Model/Sample/GUIDomainSampleVisitor.cpp
index 3f7fc32d616..4a9e617e648 100644
--- a/GUI/Model/Sample/GUIDomainSampleVisitor.cpp
+++ b/GUI/Model/Sample/GUIDomainSampleVisitor.cpp
@@ -506,7 +506,7 @@ void GUIDomainSampleVisitor::visit(const InterferenceRadialParaCrystal* node)
void GUIDomainSampleVisitor::visit(const RotationX* node)
{
- ItemWithParticles* parent = dynamic_cast<ItemWithParticles*>(m_levelToParentItem[depth() - 1]);
+ auto* parent = dynamic_cast<ItemWithParticles*>(m_levelToParentItem[depth() - 1]);
ASSERT(parent);
TransformationItem* transformation_item = parent->createTransformationItem();
@@ -517,7 +517,7 @@ void GUIDomainSampleVisitor::visit(const RotationX* node)
void GUIDomainSampleVisitor::visit(const RotationY* node)
{
- ItemWithParticles* parent = dynamic_cast<ItemWithParticles*>(m_levelToParentItem[depth() - 1]);
+ auto* parent = dynamic_cast<ItemWithParticles*>(m_levelToParentItem[depth() - 1]);
ASSERT(parent);
TransformationItem* transformation_item = parent->createTransformationItem();
@@ -528,7 +528,7 @@ void GUIDomainSampleVisitor::visit(const RotationY* node)
void GUIDomainSampleVisitor::visit(const RotationZ* node)
{
- ItemWithParticles* parent = dynamic_cast<ItemWithParticles*>(m_levelToParentItem[depth() - 1]);
+ auto* parent = dynamic_cast<ItemWithParticles*>(m_levelToParentItem[depth() - 1]);
ASSERT(parent);
TransformationItem* transformation_item = parent->createTransformationItem();
@@ -539,7 +539,7 @@ void GUIDomainSampleVisitor::visit(const RotationZ* node)
void GUIDomainSampleVisitor::visit(const RotationEuler* node)
{
- ItemWithParticles* parent = dynamic_cast<ItemWithParticles*>(m_levelToParentItem[depth() - 1]);
+ auto* parent = dynamic_cast<ItemWithParticles*>(m_levelToParentItem[depth() - 1]);
ASSERT(parent);
TransformationItem* transformation_item = parent->createTransformationItem();
diff --git a/GUI/Model/Sample/InterferenceItems.cpp b/GUI/Model/Sample/InterferenceItems.cpp
index 71ffc0633d2..531604cb194 100644
--- a/GUI/Model/Sample/InterferenceItems.cpp
+++ b/GUI/Model/Sample/InterferenceItems.cpp
@@ -276,8 +276,8 @@ FTDistribution2DItem* Interference2DParaCrystalItem::pdf2() const
void Interference2DParaCrystalItem::update_distribution_displaynames()
{
- GroupItem* group1 = dynamic_cast<GroupItem*>(getItem(P_PDF1));
- GroupItem* group2 = dynamic_cast<GroupItem*>(getItem(P_PDF2));
+ auto* group1 = dynamic_cast<GroupItem*>(getItem(P_PDF1));
+ auto* group2 = dynamic_cast<GroupItem*>(getItem(P_PDF2));
if (!group1 || !group2)
return;
diff --git a/GUI/Model/Session/SessionItem.h b/GUI/Model/Session/SessionItem.h
index 73231652911..911b901166d 100644
--- a/GUI/Model/Session/SessionItem.h
+++ b/GUI/Model/Session/SessionItem.h
@@ -352,7 +352,7 @@ private:
template <typename T> T* SessionItem::item(const QString& tag) const
{
- T* t = dynamic_cast<T*>(getItem(tag));
+ auto* t = dynamic_cast<T*>(getItem(tag));
ASSERT(t);
return t;
}
@@ -362,7 +362,7 @@ template <typename T> QVector<T*> SessionItem::items(const QString& tag) const
QVector<T*> result;
for (SessionItem* item : getItems(tag))
- if (T* titem = dynamic_cast<T*>(item))
+ if (auto* titem = dynamic_cast<T*>(item))
result.push_back(titem);
return result;
}
@@ -408,7 +408,7 @@ template <typename T> T* SessionItem::setGroupPropertyType(const QString& groupT
template <typename T> T& SessionItem::groupItem(const QString& groupName) const
{
- T* t = dynamic_cast<T*>(getGroupItem(groupName));
+ auto* t = dynamic_cast<T*>(getGroupItem(groupName));
ASSERT(t);
return *t;
}
diff --git a/GUI/View/Common/ItemComboToolBar.cpp b/GUI/View/Common/ItemComboToolBar.cpp
index 4163bdd1477..cf9ea681488 100644
--- a/GUI/View/Common/ItemComboToolBar.cpp
+++ b/GUI/View/Common/ItemComboToolBar.cpp
@@ -91,7 +91,7 @@ void ItemComboToolBar::setComboConnected(bool value)
void ItemComboToolBar::makeItemsEnabled(const QStringList& activePresentations)
{
- const QStandardItemModel* model = dynamic_cast<const QStandardItemModel*>(m_comboBox->model());
+ const auto* model = dynamic_cast<const QStandardItemModel*>(m_comboBox->model());
ASSERT(model);
for (int row = 0; row < m_comboBox->count(); ++row) {
diff --git a/GUI/View/Compare/FitComparisonWidget.cpp b/GUI/View/Compare/FitComparisonWidget.cpp
index c62447071a6..4a0f00b436f 100644
--- a/GUI/View/Compare/FitComparisonWidget.cpp
+++ b/GUI/View/Compare/FitComparisonWidget.cpp
@@ -119,7 +119,7 @@ void FitComparisonWidget::onResetViewAction()
JobItem* FitComparisonWidget::jobItem()
{
- JobItem* jobItem = dynamic_cast<JobItem*>(currentItem());
+ auto* jobItem = dynamic_cast<JobItem*>(currentItem());
return jobItem;
}
diff --git a/GUI/View/Compare/FitComparisonWidget1D.cpp b/GUI/View/Compare/FitComparisonWidget1D.cpp
index bd5111fda23..7ad9602c045 100644
--- a/GUI/View/Compare/FitComparisonWidget1D.cpp
+++ b/GUI/View/Compare/FitComparisonWidget1D.cpp
@@ -116,7 +116,7 @@ void FitComparisonWidget1D::onResetViewAction()
JobItem* FitComparisonWidget1D::jobItem()
{
- JobItem* jobItem = dynamic_cast<JobItem*>(currentItem());
+ auto* jobItem = dynamic_cast<JobItem*>(currentItem());
return jobItem;
}
diff --git a/GUI/View/Fit/FitParameterWidget.cpp b/GUI/View/Fit/FitParameterWidget.cpp
index e7c365f99eb..f08e8967305 100644
--- a/GUI/View/Fit/FitParameterWidget.cpp
+++ b/GUI/View/Fit/FitParameterWidget.cpp
@@ -351,7 +351,7 @@ QVector<FitParameterItem*> FitParameterWidget::selectedFitParameters()
for (auto index : indexes) {
if (SessionItem* item = m_fitParameterModel->itemForIndex(index)) {
if (item->hasModelType<FitParameterItem>()) {
- FitParameterItem* fitParItem = dynamic_cast<FitParameterItem*>(item);
+ auto* fitParItem = dynamic_cast<FitParameterItem*>(item);
ASSERT(fitParItem);
result.push_back(fitParItem);
}
diff --git a/GUI/View/Info/CautionSign.cpp b/GUI/View/Info/CautionSign.cpp
index 691fa6968c1..190ca55965e 100644
--- a/GUI/View/Info/CautionSign.cpp
+++ b/GUI/View/Info/CautionSign.cpp
@@ -110,7 +110,7 @@ QPoint CautionSign::positionForCautionSign() const
int x = m_area->width() - xpos_offset;
int y = m_area->height() - ypos_offset;
- if (QAbstractScrollArea* scrollArea = dynamic_cast<QAbstractScrollArea*>(m_area)) {
+ if (auto* scrollArea = dynamic_cast<QAbstractScrollArea*>(m_area)) {
if (QScrollBar* horizontal = scrollArea->horizontalScrollBar()) {
if (horizontal->isVisible())
diff --git a/GUI/View/Intensity/IntensityDataCanvas.cpp b/GUI/View/Intensity/IntensityDataCanvas.cpp
index ed4db46203e..69a53752842 100644
--- a/GUI/View/Intensity/IntensityDataCanvas.cpp
+++ b/GUI/View/Intensity/IntensityDataCanvas.cpp
@@ -130,7 +130,7 @@ void IntensityDataCanvas::rotateData()
IntensityDataItem* IntensityDataCanvas::intensityDataItem()
{
- IntensityDataItem* result = dynamic_cast<IntensityDataItem*>(currentItem());
+ auto* result = dynamic_cast<IntensityDataItem*>(currentItem());
ASSERT(result);
return result;
}
diff --git a/GUI/View/Job/JobListViewDelegate.cpp b/GUI/View/Job/JobListViewDelegate.cpp
index e8ad13c4074..1648110cace 100644
--- a/GUI/View/Job/JobListViewDelegate.cpp
+++ b/GUI/View/Job/JobListViewDelegate.cpp
@@ -38,7 +38,7 @@ void JobListViewDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
if (option.state & QStyle::State_Selected)
painter->fillRect(option.rect, option.palette.highlight());
- const JobListModel* model = dynamic_cast<const JobListModel*>(index.model());
+ const auto* model = dynamic_cast<const JobListModel*>(index.model());
ASSERT(model);
const JobItem* item = model->jobForIndex(index);
@@ -76,7 +76,7 @@ bool JobListViewDelegate::editorEvent(QEvent* event, QAbstractItemModel* model,
return QItemDelegate::editorEvent(event, model, option, index);
}
- const JobListModel* jqmodel = dynamic_cast<const JobListModel*>(index.model());
+ const auto* jqmodel = dynamic_cast<const JobListModel*>(index.model());
ASSERT(model);
const JobItem* item = jqmodel->jobForIndex(index);
diff --git a/GUI/View/Job/JobResultsPresenter.cpp b/GUI/View/Job/JobResultsPresenter.cpp
index adb1cd53394..a6c0efe23ec 100644
--- a/GUI/View/Job/JobResultsPresenter.cpp
+++ b/GUI/View/Job/JobResultsPresenter.cpp
@@ -59,7 +59,7 @@ void JobResultsPresenter::setItem(SessionItem* item)
void JobResultsPresenter::setPresentation(const QString& presentationType)
{
ItemComboWidget::setPresentation(presentationType);
- JobItem* item = dynamic_cast<JobItem*>(currentItem());
+ auto* item = dynamic_cast<JobItem*>(currentItem());
if (item && !presentationType.isEmpty())
item->setPresentationType(presentationType);
}
@@ -68,7 +68,7 @@ void JobResultsPresenter::setPresentation(JobViewActivity activity)
{
m_activity = activity;
QString presentation;
- JobItem* jobItem = dynamic_cast<JobItem*>(currentItem());
+ auto* jobItem = dynamic_cast<JobItem*>(currentItem());
if (jobItem && !jobItem->isRunning()) {
switch (activity) {
case JobViewActivity::Fitting:
@@ -90,7 +90,7 @@ void JobResultsPresenter::setPresentation(JobViewActivity activity)
QStringList JobResultsPresenter::activePresentationList(SessionItem* item)
{
- JobItem* jobItem = dynamic_cast<JobItem*>(item);
+ auto* jobItem = dynamic_cast<JobItem*>(item);
if (!jobItem || jobItem->isRunning())
return {};
@@ -106,7 +106,7 @@ QStringList JobResultsPresenter::activePresentationList(SessionItem* item)
QStringList JobResultsPresenter::presentationList(SessionItem* item)
{
- JobItem* jobItem = dynamic_cast<JobItem*>(item);
+ auto* jobItem = dynamic_cast<JobItem*>(item);
if (!jobItem || jobItem->isRunning())
return {};
diff --git a/GUI/View/Mask/IShape2DView.cpp b/GUI/View/Mask/IShape2DView.cpp
index 0fa53d88147..0788cb38458 100644
--- a/GUI/View/Mask/IShape2DView.cpp
+++ b/GUI/View/Mask/IShape2DView.cpp
@@ -24,7 +24,7 @@
namespace {
bool itemMaskValue(const SessionItem* item)
{
- if (const MaskItem* maskItem = dynamic_cast<const MaskItem*>(item))
+ if (const auto* maskItem = dynamic_cast<const MaskItem*>(item))
return maskItem->maskValue();
return false;
}
@@ -157,7 +157,7 @@ void IShape2DView::onItemPropertyChange(const QString& propertyName)
schedule_update = true;
} else if (MaskItem::isIsVisiblePropertyName(propertyName)) {
bool visible = false;
- if (MaskItem* maskItem = dynamic_cast<MaskItem*>(parameterizedItem()))
+ if (auto* maskItem = dynamic_cast<MaskItem*>(parameterizedItem()))
visible = maskItem->isVisibleValue();
this->setVisible(visible);
schedule_update = true;
diff --git a/GUI/View/Mask/MaskEditorActions.cpp b/GUI/View/Mask/MaskEditorActions.cpp
index 05ad04c5cc6..ca0eb4bba35 100644
--- a/GUI/View/Mask/MaskEditorActions.cpp
+++ b/GUI/View/Mask/MaskEditorActions.cpp
@@ -123,7 +123,7 @@ void MaskEditorActions::onToggleMaskValueAction()
ASSERT(m_maskModel);
ASSERT(m_selectionModel);
for (auto itemIndex : m_selectionModel->selectedIndexes()) {
- if (MaskItem* item = dynamic_cast<MaskItem*>(m_maskModel->itemForIndex(itemIndex))) {
+ if (auto* item = dynamic_cast<MaskItem*>(m_maskModel->itemForIndex(itemIndex))) {
item->setMaskValue(!item->maskValue());
}
}
diff --git a/GUI/View/Mask/MaskGraphicsScene.cpp b/GUI/View/Mask/MaskGraphicsScene.cpp
index 47a0400644b..e3c6617fe05 100644
--- a/GUI/View/Mask/MaskGraphicsScene.cpp
+++ b/GUI/View/Mask/MaskGraphicsScene.cpp
@@ -243,7 +243,7 @@ void MaskGraphicsScene::onSceneSelectionChanged()
m_selectionModel->clearSelection();
for (QGraphicsItem* graphicsItem : selectedItems()) {
- if (IShape2DView* view = dynamic_cast<IShape2DView*>(graphicsItem)) {
+ if (auto* view = dynamic_cast<IShape2DView*>(graphicsItem)) {
QModelIndex itemIndex = m_maskModel->indexOfItem(view->parameterizedItem());
ASSERT(itemIndex.isValid());
if (!m_selectionModel->isSelected(itemIndex))
diff --git a/GUI/View/Mask/MaskGraphicsView.cpp b/GUI/View/Mask/MaskGraphicsView.cpp
index 52cffc2c9ed..635393f4cb7 100644
--- a/GUI/View/Mask/MaskGraphicsView.cpp
+++ b/GUI/View/Mask/MaskGraphicsView.cpp
@@ -119,7 +119,7 @@ bool MaskGraphicsView::isControlButtonIsPressed(QWheelEvent* event)
void MaskGraphicsView::cancelCurrentDrawing()
{
- MaskGraphicsScene* maskScene = dynamic_cast<MaskGraphicsScene*>(scene());
+ auto* maskScene = dynamic_cast<MaskGraphicsScene*>(scene());
maskScene->cancelCurrentDrawing();
}
@@ -153,7 +153,7 @@ void MaskGraphicsView::increazeZoomValue()
void MaskGraphicsView::updateSize(const QSize& newSize)
{
for (QGraphicsItem* graphicsItem : scene()->items()) {
- if (MaskGraphicsProxy* proxy = dynamic_cast<MaskGraphicsProxy*>(graphicsItem)) {
+ if (auto* proxy = dynamic_cast<MaskGraphicsProxy*>(graphicsItem)) {
proxy->resize(newSize);
scene()->setSceneRect(0, 0, newSize.width(), newSize.height());
proxy->setPos(0, 0);
diff --git a/GUI/View/Mask/MaskResultsPresenter.cpp b/GUI/View/Mask/MaskResultsPresenter.cpp
index 4f0d341a454..95443f3d3ee 100644
--- a/GUI/View/Mask/MaskResultsPresenter.cpp
+++ b/GUI/View/Mask/MaskResultsPresenter.cpp
@@ -90,7 +90,7 @@ OutputData<double>* MaskResultsPresenter::createMaskPresentation() const
const double scale = 1.0;
for (int i_row = m_maskModel->rowCount(m_maskContainerIndex); i_row > 0; --i_row) {
QModelIndex itemIndex = m_maskModel->index(i_row - 1, 0, m_maskContainerIndex);
- if (MaskItem* maskItem = dynamic_cast<MaskItem*>(m_maskModel->itemForIndex(itemIndex))) {
+ if (auto* maskItem = dynamic_cast<MaskItem*>(m_maskModel->itemForIndex(itemIndex))) {
if (maskItem->modelType() == RegionOfInterestItem::M_TYPE) {
roi = maskItem->createShape(scale);
} else {
diff --git a/GUI/View/Mask/PolygonView.cpp b/GUI/View/Mask/PolygonView.cpp
index d8e51f687c1..bac3edb6a10 100644
--- a/GUI/View/Mask/PolygonView.cpp
+++ b/GUI/View/Mask/PolygonView.cpp
@@ -50,7 +50,7 @@ void PolygonView::addView(IShape2DView* childView, int row)
if (childItems().contains(childView))
return;
- PolygonPointView* pointView = dynamic_cast<PolygonPointView*>(childView);
+ auto* pointView = dynamic_cast<PolygonPointView*>(childView);
ASSERT(pointView);
pointView->setParentItem(this);
@@ -191,7 +191,7 @@ void PolygonView::update_points()
return;
for (QGraphicsItem* childItem : childItems()) {
- PolygonPointView* view = dynamic_cast<PolygonPointView*>(childItem);
+ auto* view = dynamic_cast<PolygonPointView*>(childItem);
QPointF pos = view->scenePos();
disconnect(view, &PolygonPointView::propertyChanged, this, &PolygonView::update_view);
view->updateParameterizedItem(pos);
diff --git a/GUI/View/Projection/ProjectionsPlot.cpp b/GUI/View/Projection/ProjectionsPlot.cpp
index cbd782d4deb..6aa4ffa65e5 100644
--- a/GUI/View/Projection/ProjectionsPlot.cpp
+++ b/GUI/View/Projection/ProjectionsPlot.cpp
@@ -128,7 +128,7 @@ void ProjectionsPlot::onProjectionPropertyChanged(SessionItem* item, const QStri
IntensityDataItem* ProjectionsPlot::intensityItem()
{
- IntensityDataItem* result = dynamic_cast<IntensityDataItem*>(currentItem());
+ auto* result = dynamic_cast<IntensityDataItem*>(currentItem());
ASSERT(result);
return result;
}
diff --git a/GUI/View/SampleDesigner/ConnectableView.cpp b/GUI/View/SampleDesigner/ConnectableView.cpp
index 2c20fba43dc..1ce6d193458 100644
--- a/GUI/View/SampleDesigner/ConnectableView.cpp
+++ b/GUI/View/SampleDesigner/ConnectableView.cpp
@@ -135,7 +135,7 @@ void ConnectableView::setPortCoordinates()
int nOutPorts = getNumberOfOutputPorts();
int nport(0);
for (QGraphicsItem* item : childItems()) {
- NodeEditorPort* port = dynamic_cast<NodeEditorPort*>(item);
+ auto* port = dynamic_cast<NodeEditorPort*>(item);
if (!port)
continue;
if (port->isOutput()) {
diff --git a/GUI/View/SampleDesigner/DesignerScene.cpp b/GUI/View/SampleDesigner/DesignerScene.cpp
index 1eb97b2a88f..2f7bddafc33 100644
--- a/GUI/View/SampleDesigner/DesignerScene.cpp
+++ b/GUI/View/SampleDesigner/DesignerScene.cpp
@@ -182,7 +182,7 @@ void DesignerScene::onSceneSelectionChanged()
m_selectionModel->clearSelection();
QList<QGraphicsItem*> selected = selectedItems();
for (int i = 0; i < selected.size(); ++i) {
- IView* view = dynamic_cast<IView*>(selected[i]);
+ auto* view = dynamic_cast<IView*>(selected[i]);
if (view) {
SessionItem* sampleItem = view->getItem();
QModelIndex itemIndex = m_sampleModel->indexOfItem(sampleItem);
@@ -282,22 +282,22 @@ void DesignerScene::deleteSelectedItems()
{
QList<SessionItem*> itemsToDelete;
for (auto graphicsItem : selectedItems())
- if (IView* view = dynamic_cast<IView*>(graphicsItem))
+ if (auto* view = dynamic_cast<IView*>(graphicsItem))
itemsToDelete << view->getItem();
// Remove all selected connections and all connections on selected view.
// By this, the deletion works only on the really selected items, not on elements
// in the item hierarchy (connections are represented by hierarchy)
for (auto graphicsItem : selectedItems()) {
- if (NodeEditorConnection* connection = dynamic_cast<NodeEditorConnection*>(graphicsItem))
+ if (auto* connection = dynamic_cast<NodeEditorConnection*>(graphicsItem))
removeConnection(connection);
- if (IView* view = dynamic_cast<IView*>(graphicsItem))
+ if (auto* view = dynamic_cast<IView*>(graphicsItem))
removeConnections(view);
// connections to layers in MultiLayers are not detected by the above - make it explicit
// here
- if (MultiLayerView* mv = dynamic_cast<MultiLayerView*>(graphicsItem)) {
+ if (auto* mv = dynamic_cast<MultiLayerView*>(graphicsItem)) {
auto item = mv->getItem();
for (auto child : item->children()) {
if (auto childView = getViewForItem(dynamic_cast<SessionGraphicsItem*>(child));
@@ -355,7 +355,7 @@ void DesignerScene::onEstablishedConnection(NodeEditorConnection* connection_ptr
return;
} else if (parentItem->hasModelType<ParticleCoreShellItem>()) {
ParticleCoreShellItem* parent = polymorphic_cast<ParticleCoreShellItem*>(parentItem);
- ParticleItem* child = dynamic_cast<ParticleItem*>(childItem);
+ auto* child = dynamic_cast<ParticleItem*>(childItem);
if (parentView->getInputPortIndex(connection->inputPort()) == 0) {
parent->setCore(child);
return;
@@ -371,7 +371,7 @@ void DesignerScene::onEstablishedConnection(NodeEditorConnection* connection_ptr
//! propagates break of connection between views on scene to the model
void DesignerScene::removeConnection(NodeEditorConnection* connection)
{
- IView* viewConnectedOnOutput = dynamic_cast<IView*>(connection->outputPort()->parentItem());
+ auto* viewConnectedOnOutput = dynamic_cast<IView*>(connection->outputPort()->parentItem());
auto itemConnectedOnOutput = viewConnectedOnOutput->getItem();
if (itemConnectedOnOutput)
m_sampleModel->moveItem(itemConnectedOnOutput, nullptr);
@@ -380,7 +380,7 @@ void DesignerScene::removeConnection(NodeEditorConnection* connection)
void DesignerScene::removeConnections(IView* view)
{
for (auto graphicsItem : items()) {
- if (NodeEditorConnection* connection = dynamic_cast<NodeEditorConnection*>(graphicsItem)) {
+ if (auto* connection = dynamic_cast<NodeEditorConnection*>(graphicsItem)) {
if (connection->getParentView() == view || connection->getChildView() == view)
removeConnection(connection);
}
@@ -509,7 +509,7 @@ bool DesignerScene::isAcceptedByMultiLayer(const DesignerMimeData* mimeData,
bool DesignerScene::isLayerDragged() const
{
- ILayerView* layer = dynamic_cast<ILayerView*>(mouseGrabberItem());
+ auto* layer = dynamic_cast<ILayerView*>(mouseGrabberItem());
return layer && !m_layer_interface_line.isNull();
}
diff --git a/GUI/View/SampleDesigner/DesignerView.cpp b/GUI/View/SampleDesigner/DesignerView.cpp
index 8810ea20fe8..6dfc96e6c3b 100644
--- a/GUI/View/SampleDesigner/DesignerView.cpp
+++ b/GUI/View/SampleDesigner/DesignerView.cpp
@@ -81,7 +81,7 @@ void DesignerView::onChangeScale(double new_scale)
void DesignerView::deleteSelectedItems()
{
- DesignerScene* designerScene = dynamic_cast<DesignerScene*>(scene());
+ auto* designerScene = dynamic_cast<DesignerScene*>(scene());
ASSERT(designerScene);
designerScene->deleteSelectedItems();
}
diff --git a/GUI/View/SampleDesigner/ILayerView.cpp b/GUI/View/SampleDesigner/ILayerView.cpp
index a5d5ebb408d..82bcad4faa3 100644
--- a/GUI/View/SampleDesigner/ILayerView.cpp
+++ b/GUI/View/SampleDesigner/ILayerView.cpp
@@ -62,7 +62,7 @@ void ILayerView::onPropertyChange(const QString& propertyName)
void ILayerView::updateHeight()
{
- if (LayerItem* item = dynamic_cast<LayerItem*>(m_item)) {
+ if (auto* item = dynamic_cast<LayerItem*>(m_item)) {
m_rect.setHeight(DesignerHelper::nanometerToScreen(item->thickness()));
setPortCoordinates();
update();
@@ -72,7 +72,7 @@ void ILayerView::updateHeight()
void ILayerView::updateColor()
{
- if (LayerItem* item = dynamic_cast<LayerItem*>(m_item)) {
+ if (auto* item = dynamic_cast<LayerItem*>(m_item)) {
setColor(item->materialColor());
update();
}
@@ -86,7 +86,7 @@ void ILayerView::updateLabel()
NodeEditorPort* port = getInputPorts()[0];
QString material = "";
- if (LayerItem* item = dynamic_cast<LayerItem*>(m_item))
+ if (auto* item = dynamic_cast<LayerItem*>(m_item))
material = item->materialName();
/* Thickness and roughness can be added, but the length of the string
@@ -113,7 +113,7 @@ QVariant ILayerView::itemChange(GraphicsItemChange change, const QVariant& value
MultiLayerCandidate multilayerCandidate = getMultiLayerCandidate();
if (multilayerCandidate) {
- DesignerScene* designerScene = dynamic_cast<DesignerScene*>(scene());
+ auto* designerScene = dynamic_cast<DesignerScene*>(scene());
designerScene->setLayerInterfaceLine(multilayerCandidate.getInterfaceToScene());
}
}
@@ -132,7 +132,7 @@ void ILayerView::mousePressEvent(QGraphicsSceneMouseEvent* event)
//! request to SessionModel.
void ILayerView::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
{
- DesignerScene* designerScene = dynamic_cast<DesignerScene*>(scene());
+ auto* designerScene = dynamic_cast<DesignerScene*>(scene());
ASSERT(designerScene);
designerScene->setLayerInterfaceLine(); // removing drop area hint from the scene
diff --git a/GUI/View/SampleDesigner/LayerView.cpp b/GUI/View/SampleDesigner/LayerView.cpp
index abda5606898..8afaeb2f85d 100644
--- a/GUI/View/SampleDesigner/LayerView.cpp
+++ b/GUI/View/SampleDesigner/LayerView.cpp
@@ -42,7 +42,7 @@ void LayerView::paint(QPainter* painter, const QStyleOptionGraphicsItem* option,
void LayerView::addView(IView* childView, int /* row */)
{
- ParticleLayoutView* layout = dynamic_cast<ParticleLayoutView*>(childView);
+ auto* layout = dynamic_cast<ParticleLayoutView*>(childView);
ASSERT(layout);
connectInputPort(layout, 0);
}
diff --git a/GUI/View/SampleDesigner/MultiLayerView.cpp b/GUI/View/SampleDesigner/MultiLayerView.cpp
index a68664bc145..5ad0c1df64a 100644
--- a/GUI/View/SampleDesigner/MultiLayerView.cpp
+++ b/GUI/View/SampleDesigner/MultiLayerView.cpp
@@ -66,7 +66,7 @@ void MultiLayerView::paint(QPainter* painter, const QStyleOptionGraphicsItem* op
void MultiLayerView::addView(IView* childView, int row)
{
- ILayerView* layer = dynamic_cast<ILayerView*>(childView);
+ auto* layer = dynamic_cast<ILayerView*>(childView);
ASSERT(layer);
if (!childItems().contains(layer)) {
@@ -217,7 +217,7 @@ void MultiLayerView::dropEvent(QGraphicsSceneDragDropEvent* event)
{
const DesignerMimeData* mimeData = checkDragEvent(event);
if (mimeData) {
- DesignerScene* designerScene = dynamic_cast<DesignerScene*>(scene());
+ auto* designerScene = dynamic_cast<DesignerScene*>(scene());
if (designerScene) {
SampleModel* sampleModel = designerScene->getSampleModel();
diff --git a/GUI/View/SampleDesigner/NodeEditor.cpp b/GUI/View/SampleDesigner/NodeEditor.cpp
index 13fa76d30d9..fdc009e4b27 100644
--- a/GUI/View/SampleDesigner/NodeEditor.cpp
+++ b/GUI/View/SampleDesigner/NodeEditor.cpp
@@ -41,7 +41,7 @@ QGraphicsItem* NodeEditor::itemAt(const QPointF& pos)
bool NodeEditor::eventFilter(QObject* object, QEvent* event)
{
- QGraphicsSceneMouseEvent* mouseEvent = dynamic_cast<QGraphicsSceneMouseEvent*>(event);
+ auto* mouseEvent = dynamic_cast<QGraphicsSceneMouseEvent*>(event);
if (!mouseEvent)
return QObject::eventFilter(object, event);
diff --git a/GUI/View/SampleDesigner/NodeEditorConnection.cpp b/GUI/View/SampleDesigner/NodeEditorConnection.cpp
index b649f3bc0df..b35a6065a2c 100644
--- a/GUI/View/SampleDesigner/NodeEditorConnection.cpp
+++ b/GUI/View/SampleDesigner/NodeEditorConnection.cpp
@@ -123,7 +123,7 @@ void NodeEditorConnection::paint(QPainter* painter, const QStyleOptionGraphicsIt
ConnectableView* NodeEditorConnection::getParentView()
{
ASSERT(inputPort() != outputPort());
- ConnectableView* result = dynamic_cast<ConnectableView*>(inputPort()->parentItem());
+ auto* result = dynamic_cast<ConnectableView*>(inputPort()->parentItem());
ASSERT(result);
return result;
}
@@ -131,7 +131,7 @@ ConnectableView* NodeEditorConnection::getParentView()
ConnectableView* NodeEditorConnection::getChildView()
{
ASSERT(inputPort() != outputPort());
- ConnectableView* result = dynamic_cast<ConnectableView*>(outputPort()->parentItem());
+ auto* result = dynamic_cast<ConnectableView*>(outputPort()->parentItem());
ASSERT(result);
return result;
}
diff --git a/GUI/View/SpecularData/SpecularDataCanvas.cpp b/GUI/View/SpecularData/SpecularDataCanvas.cpp
index 405d1d3fa97..891354d37a3 100644
--- a/GUI/View/SpecularData/SpecularDataCanvas.cpp
+++ b/GUI/View/SpecularData/SpecularDataCanvas.cpp
@@ -95,7 +95,7 @@ void SpecularDataCanvas::onMousePress(QMouseEvent* event)
SpecularDataItem* SpecularDataCanvas::specularDataItem()
{
- SpecularDataItem* result = dynamic_cast<SpecularDataItem*>(currentItem());
+ auto* result = dynamic_cast<SpecularDataItem*>(currentItem());
ASSERT(result);
return result;
}
diff --git a/GUI/View/Toplevel/TestView.cpp b/GUI/View/Toplevel/TestView.cpp
index 96f3f78f018..fb9dc6feb2a 100644
--- a/GUI/View/Toplevel/TestView.cpp
+++ b/GUI/View/Toplevel/TestView.cpp
@@ -191,7 +191,7 @@ double getTestValue(size_t bin, double factor)
SpecularDataItem* fillTestItem(SessionItem* item, double factor)
{
- SpecularDataItem* result = dynamic_cast<SpecularDataItem*>(item);
+ auto* result = dynamic_cast<SpecularDataItem*>(item);
ASSERT(result);
auto outputData = std::make_unique<OutputData<double>>();
outputData->addAxis(FixedBinAxis("Angle [deg]", 1000, 0.0, 10.0));
diff --git a/Sample/Scattering/ISampleNode.cpp b/Sample/Scattering/ISampleNode.cpp
index fcc7aabebbb..c89269919f1 100644
--- a/Sample/Scattering/ISampleNode.cpp
+++ b/Sample/Scattering/ISampleNode.cpp
@@ -28,7 +28,7 @@ std::vector<const Material*> ISampleNode::containedMaterials() const
if (const Material* p_material = material())
result.push_back(p_material);
for (const auto* child : getChildren()) {
- if (const ISampleNode* sample = dynamic_cast<const ISampleNode*>(child)) {
+ if (const auto* sample = dynamic_cast<const ISampleNode*>(child)) {
for (const Material* p_material : sample->containedMaterials())
result.push_back(p_material);
}
diff --git a/Tests/Unit/GUI/TestComponentUtils.cpp b/Tests/Unit/GUI/TestComponentUtils.cpp
index 24e64376f09..d2695ac8666 100644
--- a/Tests/Unit/GUI/TestComponentUtils.cpp
+++ b/Tests/Unit/GUI/TestComponentUtils.cpp
@@ -17,7 +17,7 @@ TEST_F(TestComponentUtils, test_componentItems)
auto particle = model.insertItem<ParticleItem>();
SessionItem* group = particle->formFactorItem();
SessionItem* ffItem = particle->formFactor();
- CylinderItem* ffCylinder = dynamic_cast<CylinderItem*>(ffItem);
+ auto* ffCylinder = dynamic_cast<CylinderItem*>(ffItem);
EXPECT_NE(ffCylinder, nullptr);
auto itemList = GUI::Model::ComponentUtils::componentItems(*particle);
@@ -38,7 +38,7 @@ TEST_F(TestComponentUtils, test_componentItemsFFChange)
SessionItem* group = particle->formFactorItem();
particle->setFormFactorType<FullSphereItem>();
- FullSphereItem* sphereItem = dynamic_cast<FullSphereItem*>(particle->formFactor());
+ auto* sphereItem = dynamic_cast<FullSphereItem*>(particle->formFactor());
auto itemList = GUI::Model::ComponentUtils::componentItems(*particle);
EXPECT_EQ(itemList.size(), 5);
diff --git a/Tests/Unit/GUI/TestFTDistributionItems.cpp b/Tests/Unit/GUI/TestFTDistributionItems.cpp
index cfeb6b2d4ee..dcb202c2e67 100644
--- a/Tests/Unit/GUI/TestFTDistributionItems.cpp
+++ b/Tests/Unit/GUI/TestFTDistributionItems.cpp
@@ -10,7 +10,7 @@ TEST_F(TestFTDistributionItems, test_FTDistribution1DCauchy)
FTDistribution1DCauchyItem item;
item.omega().set(2.0);
auto pdf = item.createFTDistribution();
- const FTDistribution1DCauchy* cauchy = dynamic_cast<FTDistribution1DCauchy*>(pdf.get());
+ const auto* cauchy = dynamic_cast<FTDistribution1DCauchy*>(pdf.get());
EXPECT_EQ(cauchy->omega(), 2.0);
// from domain
diff --git a/Tests/Unit/GUI/TestFormFactorItems.cpp b/Tests/Unit/GUI/TestFormFactorItems.cpp
index 032c4d44d58..39ecb73ac62 100644
--- a/Tests/Unit/GUI/TestFormFactorItems.cpp
+++ b/Tests/Unit/GUI/TestFormFactorItems.cpp
@@ -16,7 +16,7 @@ TEST_F(TestFormFactorItems, test_AnisoPyramidItem)
item.setHeight(13.0);
item.setAlpha(60.0);
auto P_ff = item.createFormFactor();
- FormFactorAnisoPyramid* p_ff = dynamic_cast<FormFactorAnisoPyramid*>(P_ff.get());
+ auto* p_ff = dynamic_cast<FormFactorAnisoPyramid*>(P_ff.get());
EXPECT_TRUE(p_ff);
EXPECT_EQ(p_ff->getLength(), 20.0);
EXPECT_EQ(p_ff->getWidth(), 16.0);
diff --git a/Tests/Unit/GUI/TestProxyModelStrategy.cpp b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
index 2f7244022cd..d403cdcfbdd 100644
--- a/Tests/Unit/GUI/TestProxyModelStrategy.cpp
+++ b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
@@ -85,7 +85,7 @@ TEST_F(TestProxyModelStrategy, test_identityStrategyParticle)
EXPECT_TRUE(parentOfProxy == model.indexOfItem(group));
// Checking "real" parent of Cylinders radius. It has to be CylinderItem
- CylinderItem* ffCylinder = dynamic_cast<CylinderItem*>(ffItem);
+ auto* ffCylinder = dynamic_cast<CylinderItem*>(ffItem);
EXPECT_NE(ffCylinder, nullptr);
SessionItem* radiusItem = ffCylinder->radiusItem();
auto radiusProxyIndex = strategy.sourceToProxy().value(model.indexOfItem(radiusItem));
@@ -146,7 +146,7 @@ TEST_F(TestProxyModelStrategy, test_setRootIndex)
auto item = model.insertItem<ParticleItem>();
SessionItem* group = item->formFactorItem();
SessionItem* ffItem = item->formFactor();
- CylinderItem* ffCylinder = dynamic_cast<CylinderItem*>(ffItem);
+ auto* ffCylinder = dynamic_cast<CylinderItem*>(ffItem);
EXPECT_NE(ffCylinder, nullptr);
QModelIndex particleIndex = model.indexOfItem(item);
diff --git a/Tests/Unit/Sample/MultiLayerTest.cpp b/Tests/Unit/Sample/MultiLayerTest.cpp
index c84939f904f..50128f20fe3 100644
--- a/Tests/Unit/Sample/MultiLayerTest.cpp
+++ b/Tests/Unit/Sample/MultiLayerTest.cpp
@@ -216,11 +216,11 @@ TEST_F(MultiLayerTest, MultiLayerCompositeTest)
for (size_t index = 0; index < children.size(); ++index) {
const INode* sample = children[index];
if (counter % 2 == 1) {
- const LayerInterface* interface = dynamic_cast<const LayerInterface*>(sample);
+ const auto* interface = dynamic_cast<const LayerInterface*>(sample);
EXPECT_TRUE(nullptr != interface);
interface_buffer.push_back(interface);
} else {
- const Layer* layer = dynamic_cast<const Layer*>(sample);
+ const auto* layer = dynamic_cast<const Layer*>(sample);
EXPECT_TRUE(nullptr != layer);
layer_buffer.push_back(layer);
}
--
GitLab