STYLE: Drop signed from signed short, signed int, signed long

cd ~/git/ITK find * -type f | egrep -i -e '\.[it]?(cc|hh|[ch](\+\+|pp?|xx)?)$' | fgrep -v ThirdParty | xargs sed -i -r -e \ 's#(^|[^"/A-Za-z_])signed (short|int|long)([^"/A-Za-z_]|$)#\1\2\3#g'
InsightSoftwareConsortium · Apr 6, 2022 · 8c2c654 · 8c2c654
1 parent e03a941
commit 8c2c654
Show file tree

Hide file tree

Showing 62 changed files with 252 additions and 254 deletions.
diff --git a/Examples/Filtering/SpatialObjectToImage1.cxx b/Examples/Filtering/SpatialObjectToImage1.cxx
@@ -97,7 +97,7 @@ main(int argc, char * argv[])
   //  Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  using PixelType = signed short;
+  using PixelType = short;
   constexpr unsigned int Dimension = 3;
 
   using ImageType = itk::Image<PixelType, Dimension>;

diff --git a/Examples/Filtering/SpatialObjectToImage2.cxx b/Examples/Filtering/SpatialObjectToImage2.cxx
@@ -95,7 +95,7 @@ main(int argc, char * argv[])
   //  Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  using PixelType = signed short;
+  using PixelType = short;
   constexpr unsigned int Dimension = 3;
 
   using ImageType = itk::Image<PixelType, Dimension>;

diff --git a/Examples/IO/CovariantVectorImageWrite.cxx b/Examples/IO/CovariantVectorImageWrite.cxx
@@ -74,14 +74,14 @@ main(int argc, char ** argv)
 
   //  Software Guide : BeginLatex
   //
-  //  We read an image of \code{signed short} pixels and compute the
+  //  We read an image of \code{short} pixels and compute the
   //  gradient to produce an image of CovariantVectors where each
   //  component is of type \code{float}.
   //
   //  Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  using InputPixelType = signed short;
+  using InputPixelType = short;
   using ComponentType = float;
   constexpr unsigned int Dimension = 2;
 

diff --git a/Examples/IO/DicomImageReadChangeHeaderWrite.cxx b/Examples/IO/DicomImageReadChangeHeaderWrite.cxx
@@ -77,7 +77,7 @@ main(int argc, char * argv[])
   // Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  using InputPixelType = signed short;
+  using InputPixelType = short;
   constexpr unsigned int Dimension = 2;
   using InputImageType = itk::Image<InputPixelType, Dimension>;
   // Software Guide : EndCodeSnippet

diff --git a/Examples/IO/DicomImageReadPrintTags.cxx b/Examples/IO/DicomImageReadPrintTags.cxx
@@ -74,7 +74,7 @@ main(int argc, char * argv[])
   // Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  using PixelType = signed short;
+  using PixelType = short;
   constexpr unsigned int Dimension = 2;
 
   using ImageType = itk::Image<PixelType, Dimension>;

diff --git a/Examples/IO/DicomImageReadWrite.cxx b/Examples/IO/DicomImageReadWrite.cxx
@@ -63,7 +63,7 @@ main(int argc, char * argv[])
   // Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  using InputPixelType = signed short;
+  using InputPixelType = short;
   constexpr unsigned int InputDimension = 2;
 
   using InputImageType = itk::Image<InputPixelType, InputDimension>;
@@ -187,7 +187,7 @@ main(int argc, char * argv[])
   //
   //  We will now rescale the image using the RescaleIntensityImageFilter. For
   //  this purpose we use a better suited pixel type: \code{unsigned char}
-  //  instead of \code{signed short}.  The minimum and maximum values of the
+  //  instead of \code{short}.  The minimum and maximum values of the
   //  output image are explicitly defined in the rescaling filter.
   //
   // Software Guide : EndLatex

diff --git a/Examples/IO/DicomPrintPatientInformation.cxx b/Examples/IO/DicomPrintPatientInformation.cxx
@@ -50,7 +50,7 @@ main(int argc, char * argv[])
     return EXIT_FAILURE;
   }
 
-  using PixelType = signed short;
+  using PixelType = short;
   constexpr unsigned int Dimension = 2;
 
   using ImageType = itk::Image<PixelType, Dimension>;

diff --git a/Examples/IO/DicomSeriesReadGaussianImageWrite.cxx b/Examples/IO/DicomSeriesReadGaussianImageWrite.cxx
@@ -36,7 +36,7 @@ main(int argc, char * argv[])
   }
 
 
-  using PixelType = signed short;
+  using PixelType = short;
   constexpr unsigned int Dimension = 3;
 
   using ImageType = itk::Image<PixelType, Dimension>;

diff --git a/Examples/IO/DicomSeriesReadImageWrite2.cxx b/Examples/IO/DicomSeriesReadImageWrite2.cxx
@@ -66,7 +66,7 @@ main(int argc, char * argv[])
   //
   // We define the pixel type and dimension of the image to be read. In this
   // particular case, the dimensionality of the image is 3, and we assume a
-  // \code{signed short} pixel type that is commonly used for X-Rays CT
+  // \code{short} pixel type that is commonly used for X-Rays CT
   // scanners.
   //
   // The image orientation information contained in the direction cosines
@@ -76,7 +76,7 @@ main(int argc, char * argv[])
   // Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  using PixelType = signed short;
+  using PixelType = short;
   constexpr unsigned int Dimension = 3;
 
   using ImageType = itk::Image<PixelType, Dimension>;

diff --git a/Examples/IO/DicomSeriesReadPrintTags.cxx b/Examples/IO/DicomSeriesReadPrintTags.cxx
@@ -57,7 +57,7 @@ main(int argc, char * argv[])
   // Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  using PixelType = signed short;
+  using PixelType = short;
   constexpr unsigned int Dimension = 3;
 
   using ImageType = itk::Image<PixelType, Dimension>;

diff --git a/Examples/IO/DicomSeriesReadSeriesWrite.cxx b/Examples/IO/DicomSeriesReadSeriesWrite.cxx
@@ -99,7 +99,7 @@ main(int argc, char * argv[])
   //  Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  using PixelType = signed short;
+  using PixelType = short;
   constexpr unsigned int Dimension = 3;
 
   using ImageType = itk::Image<PixelType, Dimension>;
@@ -232,7 +232,7 @@ main(int argc, char * argv[])
   // Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  using OutputPixelType = signed short;
+  using OutputPixelType = short;
   constexpr unsigned int OutputDimension = 2;
 
   using Image2DType = itk::Image<OutputPixelType, OutputDimension>;

diff --git a/Examples/IO/ImageReadDicomSeriesWrite.cxx b/Examples/IO/ImageReadDicomSeriesWrite.cxx
@@ -56,7 +56,7 @@ main(int argc, char * argv[])
   }
 
 
-  using PixelType = signed short;
+  using PixelType = short;
   constexpr unsigned int Dimension = 3;
 
   using ImageType = itk::Image<PixelType, Dimension>;
@@ -87,7 +87,7 @@ main(int argc, char * argv[])
   itksys::SystemTools::MakeDirectory(outputDirectory);
 
 
-  using OutputPixelType = signed short;
+  using OutputPixelType = short;
   constexpr unsigned int OutputDimension = 2;
 
   using Image2DType = itk::Image<OutputPixelType, OutputDimension>;

diff --git a/Examples/IO/ImageReadExtractWrite.cxx b/Examples/IO/ImageReadExtractWrite.cxx
@@ -77,8 +77,8 @@ main(int argc, char ** argv)
   //  Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  using InputPixelType = signed short;
-  using OutputPixelType = signed short;
+  using InputPixelType = short;
+  using OutputPixelType = short;
 
   using InputImageType = itk::Image<InputPixelType, 3>;
   using OutputImageType = itk::Image<OutputPixelType, 2>;

diff --git a/Examples/IO/ImageReadRegionOfInterestWrite.cxx b/Examples/IO/ImageReadRegionOfInterestWrite.cxx
@@ -71,8 +71,8 @@ main(int argc, char ** argv)
   //  Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  using InputPixelType = signed short;
-  using OutputPixelType = signed short;
+  using InputPixelType = short;
+  using OutputPixelType = short;
   constexpr unsigned int Dimension = 2;
 
   using InputImageType = itk::Image<InputPixelType, Dimension>;

diff --git a/Examples/RegistrationITKv4/DeformableRegistration14.cxx b/Examples/RegistrationITKv4/DeformableRegistration14.cxx
@@ -116,7 +116,7 @@ main(int argc, char * argv[])
   }
 
   constexpr unsigned int ImageDimension = 3;
-  using PixelType = signed short;
+  using PixelType = short;
 
   using FixedImageType = itk::Image<PixelType, ImageDimension>;
   using MovingImageType = itk::Image<PixelType, ImageDimension>;
@@ -329,7 +329,7 @@ main(int argc, char * argv[])
   // such as 100 or 128.
   resample->SetDefaultPixelValue(0);
 
-  using OutputPixelType = signed short;
+  using OutputPixelType = short;
 
   using OutputImageType = itk::Image<OutputPixelType, ImageDimension>;
 

diff --git a/Examples/RegistrationITKv4/DeformableRegistration15.cxx b/Examples/RegistrationITKv4/DeformableRegistration15.cxx
@@ -127,7 +127,7 @@ main(int argc, char * argv[])
   }
 
   constexpr unsigned int ImageDimension = 3;
-  using PixelType = signed short;
+  using PixelType = short;
 
   using FixedImageType = itk::Image<PixelType, ImageDimension>;
   using MovingImageType = itk::Image<PixelType, ImageDimension>;
@@ -703,7 +703,7 @@ main(int argc, char * argv[])
   // such as 100 or 128.
   resample->SetDefaultPixelValue(0);
 
-  using OutputPixelType = signed short;
+  using OutputPixelType = short;
 
   using OutputImageType = itk::Image<OutputPixelType, ImageDimension>;
 

diff --git a/Examples/RegistrationITKv4/DeformableRegistration8.cxx b/Examples/RegistrationITKv4/DeformableRegistration8.cxx
@@ -340,7 +340,7 @@ main(int argc, char * argv[])
   // such as 100 or 128.
   resample->SetDefaultPixelValue(0);
 
-  using OutputPixelType = signed short;
+  using OutputPixelType = short;
 
   using OutputImageType = itk::Image<OutputPixelType, ImageDimension>;
 

diff --git a/Examples/RegistrationITKv4/ModelToImageRegistration2.cxx b/Examples/RegistrationITKv4/ModelToImageRegistration2.cxx
@@ -164,7 +164,7 @@ main(int argc, char * argv[])
     itk::BinaryMaskToNarrowBandPointSetFilter<MaskImageType,
                                               FixedPointSetType>;
 
-  using PixelType = signed short;
+  using PixelType = short;
 
   using ImageType = itk::Image<PixelType, Dimension>;
 

diff --git a/Examples/Statistics/ScalarImageKmeansClassifier.cxx b/Examples/Statistics/ScalarImageKmeansClassifier.cxx
@@ -68,7 +68,7 @@ main(int argc, char * argv[])
   // Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  using PixelType = signed short;
+  using PixelType = short;
   constexpr unsigned int Dimension = 2;
 
   using ImageType = itk::Image<PixelType, Dimension>;

diff --git a/Examples/Statistics/ScalarImageMarkovRandomField1.cxx b/Examples/Statistics/ScalarImageMarkovRandomField1.cxx
@@ -108,13 +108,13 @@ main(int argc, char * argv[])
   // to classify. With this image type we can also declare the
   // \doxygen{ImageFileReader} needed for reading the input image, create one
   // and set its input filename. In this particular case we choose to use
-  // \code{signed short} as pixel type, which is typical for MicroMRI and CT
+  // \code{short} as pixel type, which is typical for MicroMRI and CT
   // data sets.
   //
   // Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  using PixelType = signed short;
+  using PixelType = short;
   constexpr unsigned int Dimension = 2;
 
   using ImageType = itk::Image<PixelType, Dimension>;

diff --git a/Modules/Core/Common/include/itkIntTypes.h b/Modules/Core/Common/include/itkIntTypes.h
@@ -87,11 +87,11 @@ using SizeValueType = unsigned long;
 using IdentifierType = SizeValueType;
 
 /** The components of the Index array (they are signed) */
-using IndexValueType = signed long;
+using IndexValueType = long;
 
 /** Differences between components of indexes, distance from one pointer
  *  to the origin of a buffer (it is signed) */
-using OffsetValueType = signed long;
+using OffsetValueType = long;
 
 #endif
 

diff --git a/Modules/Core/Common/include/itkIsNumber.h b/Modules/Core/Common/include/itkIsNumber.h
@@ -48,22 +48,22 @@ template <>
 struct IsNumber<unsigned short> : TrueType
 {};
 template <>
-struct IsNumber<signed short> : TrueType
+struct IsNumber<short> : TrueType
 {};
 template <>
-struct IsNumber<signed int> : TrueType
+struct IsNumber<int> : TrueType
 {};
 template <>
 struct IsNumber<unsigned int> : TrueType
 {};
 template <>
-struct IsNumber<signed long> : TrueType
+struct IsNumber<long> : TrueType
 {};
 template <>
 struct IsNumber<unsigned long> : TrueType
 {};
 template <>
-struct IsNumber<signed long long> : TrueType
+struct IsNumber<long long> : TrueType
 {};
 template <>
 struct IsNumber<unsigned long long> : TrueType

diff --git a/Modules/Core/Common/include/itkMath.h b/Modules/Core/Common/include/itkMath.h
@@ -456,7 +456,7 @@ struct AlmostEqualsFunctionSelector<false, true, false, true>
 
 template <>
 struct AlmostEqualsFunctionSelector<false, true, true, true>
-// float vs signed int
+// float vs int
 {
   using SelectedVersion = AlmostEqualsFloatVsInteger;
 };
@@ -477,7 +477,7 @@ struct AlmostEqualsFunctionSelector<true, false, false, true>
 
 template <>
 struct AlmostEqualsFunctionSelector<true, true, false, true>
-// signed int vs float
+// int vs float
 {
   using SelectedVersion = AlmostEqualsIntegerVsFloat;
 };

diff --git a/Modules/Core/Common/include/itkVariableLengthVector.h b/Modules/Core/Common/include/itkVariableLengthVector.h
@@ -1375,10 +1375,10 @@ std::ostream &
 operator<<(std::ostream & os, const VariableLengthVector<TValue> & arr)
 {
   const unsigned int length = arr.Size();
-  const signed int   last = static_cast<unsigned int>(length) - 1;
+  const int          last = static_cast<unsigned int>(length) - 1;
 
   os << "[";
-  for (signed int i = 0; i < last; ++i)
+  for (int i = 0; i < last; ++i)
   {
     os << arr[i] << ", ";
   }

diff --git a/Modules/Core/Common/test/itkAtanRegularizedHeavisideStepFunctionTest1.cxx b/Modules/Core/Common/test/itkAtanRegularizedHeavisideStepFunctionTest1.cxx
@@ -43,12 +43,12 @@ itkAtanRegularizedHeavisideStepFunctionTest1(int, char *[])
   constexpr double epsilon2 = 0.5;
   functionBase0->SetEpsilon(epsilon2);
 
-  const signed int     minValue = -20;
-  constexpr signed int maxValue = 20;
+  const int     minValue = -20;
+  constexpr int maxValue = 20;
 
   constexpr InputType incValue = 0.1;
 
-  for (signed int x = minValue; x < maxValue; ++x)
+  for (int x = minValue; x < maxValue; ++x)
   {
     const InputType ix = x * incValue;
     OutputType      f = functionBase0->Evaluate(ix);

diff --git a/Modules/Core/Common/test/itkHeavisideStepFunctionTest1.cxx b/Modules/Core/Common/test/itkHeavisideStepFunctionTest1.cxx
@@ -31,12 +31,12 @@ itkHeavisideStepFunctionTest1(int, char *[])
   std::cout << "GetNameOfClass() = " << functionBase0->GetNameOfClass() << std::endl;
   functionBase0->Print(std::cout);
 
-  const signed int     minValue = -20;
-  constexpr signed int maxValue = 20;
+  const int     minValue = -20;
+  constexpr int maxValue = 20;
 
   constexpr InputType incValue = 0.1;
 
-  for (signed int x = minValue; x < maxValue; ++x)
+  for (int x = minValue; x < maxValue; ++x)
   {
     const InputType ix = x * incValue;
     OutputType      f = functionBase0->Evaluate(ix);

diff --git a/Modules/Core/Common/test/itkImageRandomIteratorTest2.cxx b/Modules/Core/Common/test/itkImageRandomIteratorTest2.cxx
@@ -87,7 +87,7 @@ itkImageRandomIteratorTest2(int argc, char * argv[])
 
   if (argc > 4)
   {
-    using DifferencePixelType = signed long;
+    using DifferencePixelType = long;
     using DifferenceImageType = itk::Image<DifferencePixelType, ImageDimension>;
 
     using DifferenceFilterType = itk::Testing::ComparisonImageFilter<ImageType, DifferenceImageType>;