STYLE: Remove redundant itk:: qualifiers at namespace scope

hjmjohnson · claude · hjmjohnson · commit b6fc556513e2 · 2026-04-08T00:58:44.000Z
Add Utilities/Maintenance/fix-redundant-namespace-qualifiers.py that
detects and auto-fixes itk::Symbol references inside namespace itk { }
blocks where the itk:: prefix is redundant.

The script is conservative to avoid false positives:
- Only fixes at namespace scope (not inside class/struct bodies)
- Skips sub-namespaces (namespace itk::v3, itk::detail, etc.)
- Preserves itk:: on macros (itkNewMacro, itkTypeMacro, etc.)
- Skips using declarations and namespace aliases
- Skips strings, comments, and preprocessor directives

Apply the script across the codebase, removing 26 redundant qualifiers.

Usage:
  python fix-redundant-namespace-qualifiers.py --fix file1.cxx file2.h

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/Modules/Core/Common/include/itkEventObject.h b/Modules/Core/Common/include/itkEventObject.h
@@ -142,17 +142,14 @@ operator<<(std::ostream & os, const EventObject & e)
   };                                                       \
   ITK_MACROEND_NOOP_STATEMENT
 
-#define itkEventMacroDefinition(classname, super)                            \
-  classname::classname(const classname & s)                                  \
-    : super(s)                                                               \
-  {}                                                                         \
-  classname::~classname() {}                                                 \
-  const char * classname::GetEventName() const { return #classname; }        \
-  bool         classname::CheckEvent(const itk::EventObject * e) const       \
-  {                                                                          \
-    return dynamic_cast<const classname *>(e) != nullptr;                    \
-  }                                                                          \
-  itk::EventObject * classname::MakeObject() const { return new classname; } \
+#define itkEventMacroDefinition(classname, super)                                                                   \
+  classname::classname(const classname & s)                                                                         \
+    : super(s)                                                                                                      \
+  {}                                                                                                                \
+  classname::~classname() {}                                                                                        \
+  const char * classname::GetEventName() const { return #classname; }                                               \
+  bool classname::CheckEvent(const EventObject * e) const { return dynamic_cast<const classname *>(e) != nullptr; } \
+  EventObject * classname::MakeObject() const { return new classname; }                                             \
   ITK_MACROEND_NOOP_STATEMENT
 
 #if !defined(ITK_LEGACY_REMOVE)
diff --git a/Modules/Core/Common/include/itkThreadSupport.h b/Modules/Core/Common/include/itkThreadSupport.h
@@ -48,7 +48,7 @@ using ITK_THREAD_RETURN_TYPE = void *;
 /** @ITKEndGrouping */
 constexpr ITK_THREAD_RETURN_TYPE ITK_THREAD_RETURN_DEFAULT_VALUE{ nullptr };
 using itk::ITK_THREAD_RETURN_DEFAULT_VALUE; // We need this out of the itk namespace for #define to work below
-using ITK_THREAD_RETURN_FUNCTION_CALL_CONVENTION = itk::ITK_THREAD_RETURN_TYPE;
+using ITK_THREAD_RETURN_FUNCTION_CALL_CONVENTION = ITK_THREAD_RETURN_TYPE;
 #elif defined(ITK_USE_WIN32_THREADS)
 
 constexpr size_t ITK_MAX_THREADS{ ITK_DEFAULT_MAX_THREADS };
@@ -76,7 +76,7 @@ constexpr ThreadProcessIdType ITK_DEFAULT_THREAD_ID{ 0 };
 #  endif
 using ITK_THREAD_RETURN_TYPE = void;
 #  define ITK_THREAD_RETURN_DEFAULT_VALUE
-using ITK_THREAD_RETURN_FUNCTION_CALL_CONVENTION = itk::ITK_THREAD_RETURN_TYPE;
+using ITK_THREAD_RETURN_FUNCTION_CALL_CONVENTION = ITK_THREAD_RETURN_TYPE;
 #endif
 
 
diff --git a/Modules/Core/Common/src/itkFloatingPointExceptions.cxx b/Modules/Core/Common/src/itkFloatingPointExceptions.cxx
@@ -80,7 +80,7 @@ ExceptionGlobals * FloatingPointExceptions::m_PimplGlobals;
 
 /** Print enum values */
 std::ostream &
-operator<<(std::ostream & out, const itk::FloatingPointExceptionsEnums::ExceptionAction value)
+operator<<(std::ostream & out, const FloatingPointExceptionsEnums::ExceptionAction value)
 {
   return out << [value] {
     switch (value)
diff --git a/Modules/Core/Common/src/itkRealTimeClock.cxx b/Modules/Core/Common/src/itkRealTimeClock.cxx
@@ -126,7 +126,7 @@ RealTimeClock::GetRealTimeStamp() const
 }
 
 void
-RealTimeClock::PrintSelf(std::ostream & os, itk::Indent indent) const
+RealTimeClock::PrintSelf(std::ostream & os, Indent indent) const
 {
   Superclass::PrintSelf(os, indent);
 
diff --git a/Modules/Core/GPUCommon/include/itkGPUImage.h b/Modules/Core/GPUCommon/include/itkGPUImage.h
@@ -216,7 +216,7 @@ class ITK_TEMPLATE_EXPORT GPUImage : public Image<TPixel, VImageDimension>
   typename GPUImageDataManager<GPUImage>::Pointer m_DataManager{};
 };
 
-class ITK_TEMPLATE_EXPORT GPUImageFactory : public itk::ObjectFactoryBase
+class ITK_TEMPLATE_EXPORT GPUImageFactory : public ObjectFactoryBase
 {
 public:
   ITK_DISALLOW_COPY_AND_MOVE(GPUImageFactory);
diff --git a/Modules/Core/GPUCommon/include/itkGPUImageToImageFilter.hxx b/Modules/Core/GPUCommon/include/itkGPUImageToImageFilter.hxx
@@ -59,7 +59,7 @@ GPUImageToImageFilter<TInputImage, TOutputImage, TParentImageFilter>::GenerateDa
 template <typename TInputImage, typename TOutputImage, typename TParentImageFilter>
 void
 GPUImageToImageFilter<TInputImage, TOutputImage, TParentImageFilter>::GraftOutput(
-  typename itk::GPUTraits<TOutputImage>::Type * output)
+  typename GPUTraits<TOutputImage>::Type * output)
 {
   using GPUOutputImage = typename itk::GPUTraits<TOutputImage>::Type;
   typename GPUOutputImage::Pointer gpuImage = dynamic_cast<GPUOutputImage *>(this->GetOutput());
@@ -87,8 +87,8 @@ GPUImageToImageFilter<TInputImage, TOutputImage, TParentImageFilter>::GraftOutpu
 template <typename TInputImage, typename TOutputImage, typename TParentImageFilter>
 void
 GPUImageToImageFilter<TInputImage, TOutputImage, TParentImageFilter>::GraftOutput(
-  const DataObjectIdentifierType &              key,
-  typename itk::GPUTraits<TOutputImage>::Type * output)
+  const DataObjectIdentifierType &         key,
+  typename GPUTraits<TOutputImage>::Type * output)
 {
   using GPUOutputImage = typename itk::GPUTraits<TOutputImage>::Type;
   typename GPUOutputImage::Pointer gpuImage = dynamic_cast<GPUOutputImage *>(this->ProcessObject::GetOutput(key));
diff --git a/Modules/Core/GPUCommon/include/itkOpenCLUtil.h b/Modules/Core/GPUCommon/include/itkOpenCLUtil.h
@@ -96,7 +96,7 @@ void
 GetTypenameInString(const std::type_info & intype, std::ostringstream & ret);
 
 /** Get pixel dimension (number of channels).
- * For high-dimensional pixel format, only itk::Vector< type, 2/3 > is acceptable. */
+ * For high-dimensional pixel format, only Vector< type, 2/3 > is acceptable. */
 int
 GetPixelDimension(const std::type_info & intype);
 
diff --git a/Modules/Core/ImageAdaptors/include/itkNthElementPixelAccessor.h b/Modules/Core/ImageAdaptors/include/itkNthElementPixelAccessor.h
@@ -111,7 +111,7 @@ class NthElementPixelAccessor
 
 
 template <typename TOutputPixelType, typename TPixelType>
-class NthElementPixelAccessor<TOutputPixelType, itk::VariableLengthVector<TPixelType>>
+class NthElementPixelAccessor<TOutputPixelType, VariableLengthVector<TPixelType>>
   : private DefaultVectorPixelAccessor<TPixelType>
 {
 public:
diff --git a/Modules/Core/ImageFunction/include/itkLabelImageGaussianInterpolateImageFunction.h b/Modules/Core/ImageFunction/include/itkLabelImageGaussianInterpolateImageFunction.h
@@ -66,7 +66,7 @@ namespace itk
  */
 template <typename TInputImage,
           typename TCoordinate = double,
-          typename TPixelCompare = std::less<typename itk::NumericTraits<typename TInputImage::PixelType>::RealType>>
+          typename TPixelCompare = std::less<typename NumericTraits<typename TInputImage::PixelType>::RealType>>
 class ITK_TEMPLATE_EXPORT LabelImageGaussianInterpolateImageFunction
   : public GaussianInterpolateImageFunction<TInputImage, TCoordinate>
 {
diff --git a/Modules/Core/TestKernel/include/itkTestVerifyMetaData.h b/Modules/Core/TestKernel/include/itkTestVerifyMetaData.h
@@ -26,9 +26,7 @@ namespace itk
 /* Used only to avoid duplicate code in itkMetaDictionaryGTest.cxx and itkHDF5ImageIOTest.cxx */
 template <typename T>
 int
-VerifyMetaDataPrivateTestingUtility(const itk::MetaDataDictionary & metaDict,
-                                    const std::string &             key,
-                                    const T &                       knownValue)
+VerifyMetaDataPrivateTestingUtility(const MetaDataDictionary & metaDict, const std::string & key, const T & knownValue)
 {
   int status = EXIT_SUCCESS;
   T   exposedValue{};
diff --git a/Modules/Filtering/FFT/include/itkFFTImageFilterFactory.h b/Modules/Filtering/FFT/include/itkFFTImageFilterFactory.h
@@ -86,7 +86,7 @@ struct FFTImageFilterTraits
 template <template <typename, typename> class TFFTImageFilter,
           template <typename, unsigned int> class TInput = Image,
           template <typename, unsigned int> class TOutput = Image>
-class FFTImageFilterFactory : public itk::ObjectFactoryBase
+class FFTImageFilterFactory : public ObjectFactoryBase
 {
 public:
   ITK_DISALLOW_COPY_AND_MOVE(FFTImageFilterFactory);
diff --git a/Modules/Filtering/ImageGrid/include/itkOrientImageFilter.hxx b/Modules/Filtering/ImageGrid/include/itkOrientImageFilter.hxx
@@ -238,7 +238,7 @@ OrientImageFilter<TInputImage, TOutputImage>::NeedToFlip()
 #if defined(DefinedDebugOrient)
 #  define DEBUG_EXECUTE(X) X
 
-using SO_OrientationType = itk::SpatialOrientationEnums::ValidCoordinateOrientations;
+using SO_OrientationType = SpatialOrientationEnums::ValidCoordinateOrientations;
 
 std::string
 SO_OrientationToString(SO_OrientationType in)
diff --git a/Modules/Filtering/ImageIntensity/include/itkMagnitudeAndPhaseToComplexImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkMagnitudeAndPhaseToComplexImageFilter.h
@@ -76,8 +76,7 @@ class MagnitudeAndPhaseToComplex
 
 template <typename TInputImage1,
           typename TInputImage2 = TInputImage1,
-          typename TOutputImage =
-            itk::Image<std::complex<typename TInputImage1::PixelType>, TInputImage1::ImageDimension>>
+          typename TOutputImage = Image<std::complex<typename TInputImage1::PixelType>, TInputImage1::ImageDimension>>
 class MagnitudeAndPhaseToComplexImageFilter
   : public BinaryGeneratorImageFilter<TInputImage1, TInputImage2, TOutputImage>
 {
diff --git a/Modules/Filtering/LabelMap/include/itkObjectByObjectLabelMapFilter.hxx b/Modules/Filtering/LabelMap/include/itkObjectByObjectLabelMapFilter.hxx
@@ -46,7 +46,7 @@ ObjectByObjectLabelMapFilter<TInputImage,
                              TInternalOutputImageType>::ObjectByObjectLabelMapFilter()
   : m_ConstrainPaddingToImage(true)
   , m_KeepLabels(true)
-  , m_InternalForegroundValue(itk::NumericTraits<InternalOutputPixelType>::max())
+  , m_InternalForegroundValue(NumericTraits<InternalOutputPixelType>::max())
   , m_Select(SelectType::New())
   , m_Crop(CropType::New())
   , m_Pad(PadType::New())
diff --git a/Modules/Filtering/MathematicalMorphology/include/itkFlatStructuringElement.hxx b/Modules/Filtering/MathematicalMorphology/include/itkFlatStructuringElement.hxx
@@ -56,9 +56,7 @@ FlatStructuringElement<VDimension>::GeneratePolygon(TStructuringElement &, TRadi
 
 template <unsigned int VDimension>
 void
-FlatStructuringElement<VDimension>::GeneratePolygon(itk::FlatStructuringElement<2> & res,
-                                                    itk::Size<2>                     radius,
-                                                    unsigned int                     lines)
+FlatStructuringElement<VDimension>::GeneratePolygon(FlatStructuringElement<2> & res, Size<2> radius, unsigned int lines)
 {
   // radial decomposition method from "Radial Decomposition of Discs
   // and Spheres" - CVGIP: Graphical Models and Image Processing
@@ -128,9 +126,7 @@ FlatStructuringElement<VDimension>::GeneratePolygon(itk::FlatStructuringElement<
 
 template <unsigned int VDimension>
 void
-FlatStructuringElement<VDimension>::GeneratePolygon(itk::FlatStructuringElement<3> & res,
-                                                    itk::Size<3>                     radius,
-                                                    unsigned int                     lines)
+FlatStructuringElement<VDimension>::GeneratePolygon(FlatStructuringElement<3> & res, Size<3> radius, unsigned int lines)
 {
   res.SetRadius(radius);
   res.SetDecomposable(true);
diff --git a/Modules/Filtering/Smoothing/include/itkFFTDiscreteGaussianImageFilterFactory.h b/Modules/Filtering/Smoothing/include/itkFFTDiscreteGaussianImageFilterFactory.h
@@ -40,7 +40,7 @@ namespace itk
  * \ingroup FourierTransform
  * \ingroup ITKFFT
  */
-class FFTDiscreteGaussianImageFilterFactory : public itk::ObjectFactoryBase
+class FFTDiscreteGaussianImageFilterFactory : public ObjectFactoryBase
 {
 public:
   ITK_DISALLOW_COPY_AND_MOVE(FFTDiscreteGaussianImageFilterFactory);
diff --git a/Modules/IO/DCMTK/src/itkDCMTKFileReader.cxx b/Modules/IO/DCMTK/src/itkDCMTKFileReader.cxx
@@ -750,7 +750,7 @@ DCMTKFileReader::GetElementPN(const unsigned short group,
 int
 DCMTKFileReader::GetElementIS(const unsigned short group,
                               const unsigned short element,
-                              itk::int32_t &       target,
+                              int32_t &            target,
                               const bool           throwException) const
 {
   DcmTagKey    tagkey(group, element);
@@ -779,7 +779,7 @@ DCMTKFileReader::GetElementIS(const unsigned short group,
 int
 DCMTKFileReader::GetElementSL(const unsigned short group,
                               const unsigned short element,
-                              itk::int32_t &       target,
+                              int32_t &            target,
                               const bool           throwException) const
 {
   DcmTagKey    tagkey(group, element);
@@ -808,7 +808,7 @@ DCMTKFileReader::GetElementSL(const unsigned short group,
 int
 DCMTKFileReader::GetElementISorOB(const unsigned short group,
                                   const unsigned short element,
-                                  itk::int32_t &       target,
+                                  int32_t &            target,
                                   const bool           throwException) const
 {
   if (this->GetElementIS(group, element, target, false) == EXIT_SUCCESS)
diff --git a/Modules/IO/SpatialObjects/src/itkPolygonGroupSpatialObjectXMLFile.cxx b/Modules/IO/SpatialObjects/src/itkPolygonGroupSpatialObjectXMLFile.cxx
@@ -173,7 +173,7 @@ class NumericTraits<std::string>
 template <typename T>
 void
 WriteMetaDataAttribute(PolygonGroupSpatialObjectXMLFileWriter * This,
-                       itk::MetaDataDictionary &                thisDic,
+                       MetaDataDictionary &                     thisDic,
                        const char * const                       MetaName,
                        const char * const                       attName,
                        std::ofstream &                          output)
diff --git a/Modules/IO/TransformBase/include/itkTransformFileReader.h b/Modules/IO/TransformBase/include/itkTransformFileReader.h
@@ -112,7 +112,7 @@ class ITK_TEMPLATE_EXPORT TransformFileReaderTemplate : public LightProcessObjec
 };
 
 /** This helps to meet backward compatibility */
-using TransformFileReader = itk::TransformFileReaderTemplate<double>;
+using TransformFileReader = TransformFileReaderTemplate<double>;
 
 } // namespace itk
 
diff --git a/Modules/IO/TransformBase/include/itkTransformFileWriter.h b/Modules/IO/TransformBase/include/itkTransformFileWriter.h
@@ -132,7 +132,7 @@ class ITKIOTransformBase_TEMPLATE_EXPORT TransformFileWriterTemplate : public Li
 };
 
 /** This helps to meet backward compatibility */
-using TransformFileWriter = itk::TransformFileWriterTemplate<double>;
+using TransformFileWriter = TransformFileWriterTemplate<double>;
 
 ITK_GCC_PRAGMA_DIAG_PUSH()
 ITK_GCC_PRAGMA_DIAG(ignored "-Wattributes")
diff --git a/Modules/IO/TransformBase/include/itkTransformIOBase.h b/Modules/IO/TransformBase/include/itkTransformIOBase.h
@@ -221,7 +221,7 @@ TransformIOBaseTemplate<double>::GetTypeNameString()
 }
 
 /** This helps to meet backward compatibility */
-using TransformIOBase = itk::TransformIOBaseTemplate<double>;
+using TransformIOBase = TransformIOBaseTemplate<double>;
 
 } // end namespace itk
 
diff --git a/Modules/Numerics/Optimizersv4/include/itkRegistrationParameterScalesEstimator.hxx b/Modules/Numerics/Optimizersv4/include/itkRegistrationParameterScalesEstimator.hxx
@@ -97,7 +97,7 @@ RegistrationParameterScalesEstimator<TMetric>::GetTransform()
 }
 
 template <typename TMetric>
-itk::SizeValueType
+SizeValueType
 RegistrationParameterScalesEstimator<TMetric>::GetDimension()
 {
   if (m_TransformForward)
diff --git a/Modules/Numerics/Statistics/include/itkImageToNeighborhoodSampleAdaptor.h b/Modules/Numerics/Statistics/include/itkImageToNeighborhoodSampleAdaptor.h
@@ -325,7 +325,7 @@ class ITK_TEMPLATE_EXPORT ImageToNeighborhoodSampleAdaptor
 
 template <typename TImage, typename TBoundaryCondition>
 std::ostream &
-operator<<(std::ostream & os, const std::vector<itk::ConstNeighborhoodIterator<TImage, TBoundaryCondition>> & mv);
+operator<<(std::ostream & os, const std::vector<ConstNeighborhoodIterator<TImage, TBoundaryCondition>> & mv);
 
 } // end of namespace itk
 
diff --git a/Modules/Numerics/Statistics/include/itkImageToNeighborhoodSampleAdaptor.hxx b/Modules/Numerics/Statistics/include/itkImageToNeighborhoodSampleAdaptor.hxx
@@ -234,7 +234,7 @@ ImageToNeighborhoodSampleAdaptor<TImage, TBoundaryCondition>::GetTotalFrequency(
 
 template <typename TImage, typename TBoundaryCondition>
 std::ostream &
-operator<<(std::ostream & os, const std::vector<itk::ConstNeighborhoodIterator<TImage, TBoundaryCondition>> & mv)
+operator<<(std::ostream & os, const std::vector<ConstNeighborhoodIterator<TImage, TBoundaryCondition>> & mv)
 {
   const itk::ConstNeighborhoodIterator<TImage, TBoundaryCondition> nbhd = mv[0];
   os << "Neighborhood: " << std::endl;
diff --git a/Modules/Registration/Common/include/itkEuclideanDistancePointMetric.h b/Modules/Registration/Common/include/itkEuclideanDistancePointMetric.h
@@ -42,7 +42,7 @@ namespace itk
  */
 template <typename TFixedPointSet,
           typename TMovingPointSet,
-          typename TDistanceMap = itk::Image<unsigned short, TMovingPointSet::PointDimension>>
+          typename TDistanceMap = Image<unsigned short, TMovingPointSet::PointDimension>>
 class ITK_TEMPLATE_EXPORT EuclideanDistancePointMetric
   : public PointSetToPointSetMetric<TFixedPointSet, TMovingPointSet>
 {
diff --git a/Modules/Registration/Common/include/itkLandmarkBasedTransformInitializer.h b/Modules/Registration/Common/include/itkLandmarkBasedTransformInitializer.h
@@ -81,8 +81,8 @@ namespace itk
  * \endsphinx
  */
 template <typename TTransform,
-          typename TFixedImage = itk::ImageBase<TTransform::InputSpaceDimension>,
-          typename TMovingImage = itk::ImageBase<TTransform::OutputSpaceDimension>>
+          typename TFixedImage = ImageBase<TTransform::InputSpaceDimension>,
+          typename TMovingImage = ImageBase<TTransform::OutputSpaceDimension>>
 class ITK_TEMPLATE_EXPORT LandmarkBasedTransformInitializer : public Object
 {
 public:
diff --git a/Modules/Registration/Common/include/itkLandmarkBasedTransformInitializer.hxx b/Modules/Registration/Common/include/itkLandmarkBasedTransformInitializer.hxx
@@ -781,8 +781,8 @@ LandmarkBasedTransformInitializer<TTransform, TFixedImage, TMovingImage>::Comput
 template <typename TTransform, typename TFixedImage, typename TMovingImage>
 void
 LandmarkBasedTransformInitializer<TTransform, TFixedImage, TMovingImage>::CreateMatrix(
-  itk::Matrix<ParametersValueType, 4, 4> &                               N,
-  const itk::Matrix<ParametersValueType, ImageDimension, ImageDimension> M)
+  Matrix<ParametersValueType, 4, 4> &                               N,
+  const Matrix<ParametersValueType, ImageDimension, ImageDimension> M)
 {
   // On-diagonal elements.
   N[0][0] = M[0][0] + M[1][1] + M[2][2];
diff --git a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFilter.h b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFilter.h
@@ -67,7 +67,7 @@ namespace itk
 template <typename TFixedImage,
           typename TMovingImage,
           typename TDisplacementField,
-          typename TParentImageFilter = itk::DemonsRegistrationFilter<TFixedImage, TMovingImage, TDisplacementField>>
+          typename TParentImageFilter = DemonsRegistrationFilter<TFixedImage, TMovingImage, TDisplacementField>>
 class ITK_TEMPLATE_EXPORT GPUDemonsRegistrationFilter
   : public GPUPDEDeformableRegistrationFilter<TFixedImage, TMovingImage, TDisplacementField, TParentImageFilter>
 {
@@ -152,7 +152,7 @@ class ITK_TEMPLATE_EXPORT GPUDemonsRegistrationFilter
  * \brief Object Factory implementation for GPUDemonsRegistrationFilter
  * \ingroup ITKGPUPDEDeformableRegistration
  */
-class GPUDemonsRegistrationFilterFactory : public itk::ObjectFactoryBase
+class GPUDemonsRegistrationFilterFactory : public ObjectFactoryBase
 {
 public:
   ITK_DISALLOW_COPY_AND_MOVE(GPUDemonsRegistrationFilterFactory);
diff --git a/Modules/Registration/Metricsv4/include/itkObjectToObjectMultiMetricv4.hxx b/Modules/Registration/Metricsv4/include/itkObjectToObjectMultiMetricv4.hxx
@@ -60,7 +60,7 @@ template <unsigned int TFixedDimension,
           unsigned int TMovingDimension,
           typename TVirtualImage,
           typename TInternalComputationValueType>
-itk::SizeValueType
+SizeValueType
 ObjectToObjectMultiMetricv4<TFixedDimension, TMovingDimension, TVirtualImage, TInternalComputationValueType>::
   GetNumberOfMetrics() const
 {
diff --git a/Modules/Video/BridgeOpenCV/include/itkOpenCVBasicTypeBridge.h b/Modules/Video/BridgeOpenCV/include/itkOpenCVBasicTypeBridge.h
@@ -92,7 +92,7 @@ struct OpenCVBasicTypeBridge<TPoint, cv::Point3_<typename TPoint::CoordinateType
 };
 
 template <>
-struct OpenCVBasicTypeBridge<itk::Index<2>, cv::Point>
+struct OpenCVBasicTypeBridge<Index<2>, cv::Point>
 {
   using ITKDataType = itk::Index<2>;
   using OpenCVDataType = cv::Point;
@@ -115,7 +115,7 @@ struct OpenCVBasicTypeBridge<itk::Index<2>, cv::Point>
 };
 
 template <>
-struct OpenCVBasicTypeBridge<itk::Index<3>, cv::Point3i>
+struct OpenCVBasicTypeBridge<Index<3>, cv::Point3i>
 {
   using ITKDataType = itk::Index<3>;
   using OpenCVDataType = cv::Point3i;
@@ -139,7 +139,7 @@ struct OpenCVBasicTypeBridge<itk::Index<3>, cv::Point3i>
 };
 
 template <>
-struct OpenCVBasicTypeBridge<itk::Size<2>, cv::Size>
+struct OpenCVBasicTypeBridge<Size<2>, cv::Size>
 {
   using ITKDataType = itk::Size<2>;
   using OpenCVDataType = cv::Size;
@@ -165,7 +165,7 @@ struct OpenCVBasicTypeBridge<itk::Size<2>, cv::Size>
 // Using int for VRows/VColumns (matching OpenCV) with a cast in the ITK
 // pattern allows the compiler to deduce both sides correctly.
 template <typename T, int VRows, int VColumns>
-struct OpenCVBasicTypeBridge<itk::Matrix<T, static_cast<unsigned int>(VRows), static_cast<unsigned int>(VColumns)>,
+struct OpenCVBasicTypeBridge<Matrix<T, static_cast<unsigned int>(VRows), static_cast<unsigned int>(VColumns)>,
                              cv::Matx<T, VRows, VColumns>>
 {
   using ITKDataType = itk::Matrix<T, static_cast<unsigned int>(VRows), static_cast<unsigned int>(VColumns)>;
diff --git a/Modules/Video/Filtering/include/itkImageFilterToVideoFilterWrapper.h b/Modules/Video/Filtering/include/itkImageFilterToVideoFilterWrapper.h
@@ -38,8 +38,8 @@ namespace itk
  */
 template <typename TImageToImageFilter>
 class ITK_TEMPLATE_EXPORT ImageFilterToVideoFilterWrapper
-  : public VideoToVideoFilter<itk::VideoStream<typename TImageToImageFilter::InputImageType>,
-                              itk::VideoStream<typename TImageToImageFilter::OutputImageType>>
+  : public VideoToVideoFilter<VideoStream<typename TImageToImageFilter::InputImageType>,
+                              VideoStream<typename TImageToImageFilter::OutputImageType>>
 {
 public:
   ITK_DISALLOW_COPY_AND_MOVE(ImageFilterToVideoFilterWrapper);
diff --git a/Modules/Video/IO/src/itkFileListVideoIO.cxx b/Modules/Video/IO/src/itkFileListVideoIO.cxx
diff --git a/Utilities/Maintenance/fix-redundant-namespace-qualifiers.py b/Utilities/Maintenance/fix-redundant-namespace-qualifiers.py

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ ExceptionGlobals * FloatingPointExceptions::m_PimplGlobals;`
`80`	`80`
`81`	`81`	`/** Print enum values */`
`82`	`82`	`std::ostream &`
`83`		`-operator<<(std::ostream & out, const itk::FloatingPointExceptionsEnums::ExceptionAction value)`
	`83`	`+operator<<(std::ostream & out, const FloatingPointExceptionsEnums::ExceptionAction value)`
`84`	`84`	`{`
`85`	`85`	`return out << [value] {`
`86`	`86`	`switch (value)`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ RealTimeClock::GetRealTimeStamp() const`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`void`
`129`		`-RealTimeClock::PrintSelf(std::ostream & os, itk::Indent indent) const`
	`129`	`+RealTimeClock::PrintSelf(std::ostream & os, Indent indent) const`
`130`	`130`	`{`
`131`	`131`	`Superclass::PrintSelf(os, indent);`
`132`	`132`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ class ITK_TEMPLATE_EXPORT GPUImage : public Image<TPixel, VImageDimension>`
`216`	`216`	`typename GPUImageDataManager<GPUImage>::Pointer m_DataManager{};`
`217`	`217`	`};`
`218`	`218`
`219`		`-class ITK_TEMPLATE_EXPORT GPUImageFactory : public itk::ObjectFactoryBase`
	`219`	`+class ITK_TEMPLATE_EXPORT GPUImageFactory : public ObjectFactoryBase`
`220`	`220`	`{`
`221`	`221`	`public:`
`222`	`222`	`ITK_DISALLOW_COPY_AND_MOVE(GPUImageFactory);`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ class NthElementPixelAccessor`
`111`	`111`
`112`	`112`
`113`	`113`	`template <typename TOutputPixelType, typename TPixelType>`
`114`		`-class NthElementPixelAccessor<TOutputPixelType, itk::VariableLengthVector<TPixelType>>`
	`114`	`+class NthElementPixelAccessor<TOutputPixelType, VariableLengthVector<TPixelType>>`
`115`	`115`	`: private DefaultVectorPixelAccessor<TPixelType>`
`116`	`116`	`{`
`117`	`117`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ namespace itk`
`66`	`66`	`*/`
`67`	`67`	`template <typename TInputImage,`
`68`	`68`	`typename TCoordinate = double,`
`69`		`- typename TPixelCompare = std::less<typename itk::NumericTraits<typename TInputImage::PixelType>::RealType>>`
	`69`	`+ typename TPixelCompare = std::less<typename NumericTraits<typename TInputImage::PixelType>::RealType>>`
`70`	`70`	`class ITK_TEMPLATE_EXPORT LabelImageGaussianInterpolateImageFunction`
`71`	`71`	`: public GaussianInterpolateImageFunction<TInputImage, TCoordinate>`
`72`	`72`	`{`