Commit 04cda2e2 authored by Mathieu Westphal's avatar Mathieu Westphal Committed by Kitware Robot

Merge topic 'correctingWarnings'

c85c60dc Correcting a #if related warning in pqSILWidget
8ad0f935 Correcting a missing VTK_FALLTHROUGH in NiftiReaderPlugin
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Nicolas Vuaille's avatarNicolas Vuaille <nicolas.vuaille@kitware.com>
Acked-by: Michael Migliore's avatarMichael Migliore <michael.migliore@kitware.com>
Merge-request: !2876
parents bad75d7d c85c60dc
Pipeline #123499 failed with stage
in 0 seconds
......@@ -229,16 +229,22 @@ void vtkNIfTIReader::ExecuteInformation()
{
case 7:
numElts *= m_NiftiImage->nw;
VTK_FALLTHROUGH;
case 6:
numElts *= m_NiftiImage->nv;
VTK_FALLTHROUGH;
case 5:
numElts *= m_NiftiImage->nu;
VTK_FALLTHROUGH;
case 4:
numElts *= m_NiftiImage->nt;
VTK_FALLTHROUGH;
case 3:
numElts *= m_NiftiImage->nz;
VTK_FALLTHROUGH;
case 2:
numElts *= m_NiftiImage->ny;
VTK_FALLTHROUGH;
case 1:
numElts *= m_NiftiImage->nx;
break;
......
......@@ -167,10 +167,12 @@ void pqSILWidget::onModelReset()
tree->setModel(sortModel);
tree->expandAll();
auto helper = new pqTreeViewSelectionHelper(tree);
#if (QT_VERSION < QT_VERSION_CHECK(5, 10, 0))
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
new pqTreeViewSelectionHelper(tree);
#else
// disable filtering for older Qt version where recursive filtering
// on a tree is not supported.
auto helper = new pqTreeViewSelectionHelper(tree);
helper->setFilterable(false);
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment