Skip to content

Commit 0bc61e0

Browse files
authored
Merge pull request #6023 from hjmjohnson/style-redundant-namespace-qualifier
STYLE: Remove redundant itk:: qualifiers at namespace scope
2 parents 35158b6 + 6e61376 commit 0bc61e0

29 files changed

+416
-41
lines changed

Modules/Core/Common/include/itkThreadSupport.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ using ITK_THREAD_RETURN_TYPE = void *;
4848
/** @ITKEndGrouping */
4949
constexpr ITK_THREAD_RETURN_TYPE ITK_THREAD_RETURN_DEFAULT_VALUE{ nullptr };
5050
using itk::ITK_THREAD_RETURN_DEFAULT_VALUE; // We need this out of the itk namespace for #define to work below
51-
using ITK_THREAD_RETURN_FUNCTION_CALL_CONVENTION = itk::ITK_THREAD_RETURN_TYPE;
51+
using ITK_THREAD_RETURN_FUNCTION_CALL_CONVENTION = ITK_THREAD_RETURN_TYPE;
5252
#elif defined(ITK_USE_WIN32_THREADS)
5353

5454
constexpr size_t ITK_MAX_THREADS{ ITK_DEFAULT_MAX_THREADS };
@@ -76,7 +76,7 @@ constexpr ThreadProcessIdType ITK_DEFAULT_THREAD_ID{ 0 };
7676
# endif
7777
using ITK_THREAD_RETURN_TYPE = void;
7878
# define ITK_THREAD_RETURN_DEFAULT_VALUE
79-
using ITK_THREAD_RETURN_FUNCTION_CALL_CONVENTION = itk::ITK_THREAD_RETURN_TYPE;
79+
using ITK_THREAD_RETURN_FUNCTION_CALL_CONVENTION = ITK_THREAD_RETURN_TYPE;
8080
#endif
8181

8282

Modules/Core/Common/src/itkFloatingPointExceptions.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ ExceptionGlobals * FloatingPointExceptions::m_PimplGlobals;
8080

8181
/** Print enum values */
8282
std::ostream &
83-
operator<<(std::ostream & out, const itk::FloatingPointExceptionsEnums::ExceptionAction value)
83+
operator<<(std::ostream & out, const FloatingPointExceptionsEnums::ExceptionAction value)
8484
{
8585
return out << [value] {
8686
switch (value)

Modules/Core/Common/src/itkRealTimeClock.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ RealTimeClock::GetRealTimeStamp() const
126126
}
127127

128128
void
129-
RealTimeClock::PrintSelf(std::ostream & os, itk::Indent indent) const
129+
RealTimeClock::PrintSelf(std::ostream & os, Indent indent) const
130130
{
131131
Superclass::PrintSelf(os, indent);
132132

Modules/Core/GPUCommon/include/itkGPUImage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ class ITK_TEMPLATE_EXPORT GPUImage : public Image<TPixel, VImageDimension>
216216
typename GPUImageDataManager<GPUImage>::Pointer m_DataManager{};
217217
};
218218

219-
class ITK_TEMPLATE_EXPORT GPUImageFactory : public itk::ObjectFactoryBase
219+
class ITK_TEMPLATE_EXPORT GPUImageFactory : public ObjectFactoryBase
220220
{
221221
public:
222222
ITK_DISALLOW_COPY_AND_MOVE(GPUImageFactory);

Modules/Core/ImageAdaptors/include/itkNthElementPixelAccessor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class NthElementPixelAccessor
111111

112112

113113
template <typename TOutputPixelType, typename TPixelType>
114-
class NthElementPixelAccessor<TOutputPixelType, itk::VariableLengthVector<TPixelType>>
114+
class NthElementPixelAccessor<TOutputPixelType, VariableLengthVector<TPixelType>>
115115
: private DefaultVectorPixelAccessor<TPixelType>
116116
{
117117
public:

Modules/Core/ImageFunction/include/itkLabelImageGaussianInterpolateImageFunction.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ namespace itk
6666
*/
6767
template <typename TInputImage,
6868
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>>
7070
class ITK_TEMPLATE_EXPORT LabelImageGaussianInterpolateImageFunction
7171
: public GaussianInterpolateImageFunction<TInputImage, TCoordinate>
7272
{

Modules/Core/TestKernel/include/itkTestVerifyMetaData.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ namespace itk
2626
/* Used only to avoid duplicate code in itkMetaDictionaryGTest.cxx and itkHDF5ImageIOTest.cxx */
2727
template <typename T>
2828
int
29-
VerifyMetaDataPrivateTestingUtility(const itk::MetaDataDictionary & metaDict,
30-
const std::string & key,
31-
const T & knownValue)
29+
VerifyMetaDataPrivateTestingUtility(const MetaDataDictionary & metaDict, const std::string & key, const T & knownValue)
3230
{
3331
int status = EXIT_SUCCESS;
3432
T exposedValue{};

Modules/Filtering/FFT/include/itkFFTImageFilterFactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ struct FFTImageFilterTraits
8686
template <template <typename, typename> class TFFTImageFilter,
8787
template <typename, unsigned int> class TInput = Image,
8888
template <typename, unsigned int> class TOutput = Image>
89-
class FFTImageFilterFactory : public itk::ObjectFactoryBase
89+
class FFTImageFilterFactory : public ObjectFactoryBase
9090
{
9191
public:
9292
ITK_DISALLOW_COPY_AND_MOVE(FFTImageFilterFactory);

Modules/Filtering/ImageGrid/include/itkOrientImageFilter.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ OrientImageFilter<TInputImage, TOutputImage>::NeedToFlip()
238238
#if defined(DefinedDebugOrient)
239239
# define DEBUG_EXECUTE(X) X
240240

241-
using SO_OrientationType = itk::SpatialOrientationEnums::ValidCoordinateOrientations;
241+
using SO_OrientationType = SpatialOrientationEnums::ValidCoordinateOrientations;
242242

243243
std::string
244244
SO_OrientationToString(SO_OrientationType in)

Modules/Filtering/ImageIntensity/include/itkMagnitudeAndPhaseToComplexImageFilter.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ class MagnitudeAndPhaseToComplex
7676

7777
template <typename TInputImage1,
7878
typename TInputImage2 = TInputImage1,
79-
typename TOutputImage =
80-
itk::Image<std::complex<typename TInputImage1::PixelType>, TInputImage1::ImageDimension>>
79+
typename TOutputImage = Image<std::complex<typename TInputImage1::PixelType>, TInputImage1::ImageDimension>>
8180
class MagnitudeAndPhaseToComplexImageFilter
8281
: public BinaryGeneratorImageFilter<TInputImage1, TInputImage2, TOutputImage>
8382
{

0 commit comments

Comments
 (0)