Skip to content

Commit 99b8f4f

Browse files
committed
additional ccpcheck fixes from line numbers moving
1 parent a6326d7 commit 99b8f4f

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

buildconfig/CMake/CppCheck_Suppressions.txt.in

-5
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,6 @@ constParameterReference:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Crystal/Index
409409
unreadVariable:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Crystal/NiggliCell.cpp:233
410410
constParameterReference:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Crystal/OrientedLattice.cpp:381
411411
constVariableReference:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Crystal/ScalarUtils.cpp:389
412-
constVariableReference:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Crystal/SpaceGroupFactory.cpp:29
413412
constVariableReference:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Crystal/StructureFactorCalculatorSummation.cpp:55
414413
constParameterPointer:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/IObjComponent.cpp:20
415414
constParameterPointer:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/IObjComponent.cpp:31
@@ -685,11 +684,7 @@ constVariableReference:${CMAKE_SOURCE_DIR}/qt/widgets/common/src/ImageInfoModelM
685684
passedByValue:${CMAKE_SOURCE_DIR}/qt/widgets/common/src/ImageInfoPresenter.cpp:33
686685
constVariableReference:${CMAKE_SOURCE_DIR}/qt/widgets/common/src/InstrumentSelector.cpp:38
687686
constVariableReference:${CMAKE_SOURCE_DIR}/qt/widgets/common/src/ListPropertyWidget.cpp:46
688-
iterateByValue:${CMAKE_SOURCE_DIR}/qt/widgets/common/src/MantidTreeModel.cpp:35
689687
iterateByValue:${CMAKE_SOURCE_DIR}/qt/widgets/common/src/MantidTreeWidget.cpp:171
690-
iterateByValue:${CMAKE_SOURCE_DIR}/qt/widgets/common/src/MantidTreeWidget.cpp:191
691-
uninitvar:${CMAKE_SOURCE_DIR}/qt/widgets/common/src/MantidTreeWidget.cpp:248
692-
uninitStructMember:${CMAKE_SOURCE_DIR}/qt/widgets/common/src/MantidTreeWidget.cpp:248
693688
iterateByValue:${CMAKE_SOURCE_DIR}/qt/widgets/common/src/MantidWSIndexDialog.cpp:161
694689
constVariableReference:${CMAKE_SOURCE_DIR}/qt/widgets/common/src/MantidWSIndexDialog.cpp:629
695690
constVariableReference:${CMAKE_SOURCE_DIR}/qt/widgets/common/src/MessageDisplay.cpp:151

qt/widgets/common/src/MantidTreeWidget.cpp

+10-8
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ QList<MatrixWorkspace_const_sptr> MantidTreeWidget::getSelectedMatrixWorkspaces(
187187
// Get the names of, and pointers to, the MatrixWorkspaces only.
188188
QList<MatrixWorkspace_const_sptr> selectedMatrixWsList;
189189
QList<QString> selectedMatrixWsNameList;
190-
foreach (const auto selectedWsName, selectedWsNameList) {
190+
foreach (const auto &selectedWsName, selectedWsNameList) {
191191
const auto matrixWs =
192192
std::dynamic_pointer_cast<const MatrixWorkspace>(m_ads.retrieve(selectedWsName.toStdString()));
193193
if (matrixWs) {
@@ -237,13 +237,15 @@ MantidWSIndexWidget::UserInput MantidTreeWidget::chooseSpectrumFromSelected(bool
237237
spectrumToPlot.insert(QString::fromStdString(selectedMatrixWs->getName()), SINGLE_SPECTRUM);
238238
}
239239
// and get simple 1D plot done
240-
MantidWSIndexWidget::UserInput selections;
241-
selections.plots = spectrumToPlot;
242-
selections.simple = true;
243-
selections.waterfall = false;
244-
selections.tiled = false;
245-
selections.surface = false;
246-
selections.contour = false;
240+
MantidWSIndexWidget::UserInput selections = {.plots = spectrumToPlot,
241+
.simple = true,
242+
.waterfall = false,
243+
.tiled = false,
244+
.errors = false,
245+
.surface = false,
246+
.contour = false,
247+
.isAdvanced = false,
248+
.advanced = NULL};
247249
return selections;
248250
}
249251

0 commit comments

Comments
 (0)