Skip to content

Commit

Permalink
STYLE: Remove space between class and member names (follow-up)
Browse files Browse the repository at this point in the history
Removed spaces between class and member names, that were
accidentally introduced with pull request #1191
commit 2074c2f "STYLE: Enforce ITK style
defined by .clang-format".

Using bash commands like:

  find . \( -iname *.cxx \) -exec perl -pi -w -e 's/([A-Z]\w+) \:\:(\w)/$1::$2/g;' {} \;

Follow-up to pull request #2096
commit 734d6f8 "STYLE: Remove space between
class and member names in C++ source files"
  • Loading branch information
N-Dekker authored and dzenanz committed Sep 27, 2022
1 parent c97a715 commit 2b1b531
Show file tree
Hide file tree
Showing 54 changed files with 316 additions and 323 deletions.
8 changes: 4 additions & 4 deletions Modules/Core/Common/src/itkHexahedronCellTopology.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ namespace itk
/**
* The hexahedron's topology data: Edges.
*/
const int HexahedronCellTopology ::m_Edges[12][2] = { { 0, 1 }, { 1, 2 }, { 3, 2 }, { 0, 3 }, { 4, 5 }, { 5, 6 },
{ 7, 6 }, { 4, 7 }, { 0, 4 }, { 1, 5 }, { 3, 7 }, { 2, 6 } };
const int HexahedronCellTopology::m_Edges[12][2] = { { 0, 1 }, { 1, 2 }, { 3, 2 }, { 0, 3 }, { 4, 5 }, { 5, 6 },
{ 7, 6 }, { 4, 7 }, { 0, 4 }, { 1, 5 }, { 3, 7 }, { 2, 6 } };

/**
* The hexahedron's topology data: Faces.
*/
const int HexahedronCellTopology ::m_Faces[6][4] = { { 0, 4, 7, 3 }, { 1, 2, 6, 5 }, { 0, 1, 5, 4 },
{ 3, 7, 6, 2 }, { 0, 3, 2, 1 }, { 4, 5, 6, 7 } };
const int HexahedronCellTopology::m_Faces[6][4] = { { 0, 4, 7, 3 }, { 1, 2, 6, 5 }, { 0, 1, 5, 4 },
{ 3, 7, 6, 2 }, { 0, 3, 2, 1 }, { 4, 5, 6, 7 } };

HexahedronCellTopology::HexahedronCellTopology() = default;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace itk
/**
* The triangle's topology data: Edges
*/
const int QuadraticTriangleCellTopology ::m_Edges[3][3] = { { 0, 4, 1 }, { 1, 5, 2 }, { 2, 3, 0 } };
const int QuadraticTriangleCellTopology::m_Edges[3][3] = { { 0, 4, 1 }, { 1, 5, 2 }, { 2, 3, 0 } };

QuadraticTriangleCellTopology::QuadraticTriangleCellTopology() = default;

Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/src/itkQuadrilateralCellTopology.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace itk
/**
* The quadrilateral's topology data: Edges.
*/
const int QuadrilateralCellTopology ::m_Edges[4][2] = { { 0, 1 }, { 1, 2 }, { 2, 3 }, { 3, 0 } };
const int QuadrilateralCellTopology::m_Edges[4][2] = { { 0, 1 }, { 1, 2 }, { 2, 3 }, { 3, 0 } };

QuadrilateralCellTopology::QuadrilateralCellTopology() = default;

Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/src/itkSmapsFileParser.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ SmapsData_2_6::GetStackUsage()

/** --- VMMapData --- **/

VMMapData_10_2 ::VMMapData_10_2() = default;
VMMapData_10_2::VMMapData_10_2() = default;

VMMapData_10_2::~VMMapData_10_2() = default;

Expand Down
4 changes: 2 additions & 2 deletions Modules/Core/Common/src/itkTetrahedronCellTopology.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ namespace itk
/**
* The tetrahedron's topology data: Faces
*/
const int TetrahedronCellTopology ::m_Faces[4][3] = { { 0, 1, 3 }, { 1, 2, 3 }, { 2, 0, 3 }, { 0, 2, 1 } };
const int TetrahedronCellTopology::m_Faces[4][3] = { { 0, 1, 3 }, { 1, 2, 3 }, { 2, 0, 3 }, { 0, 2, 1 } };

/**
* The tetrahedron's topology data: Faces
*/
const int TetrahedronCellTopology ::m_Edges[6][2] = { { 0, 1 }, { 1, 2 }, { 2, 0 }, { 0, 3 }, { 1, 3 }, { 2, 3 } };
const int TetrahedronCellTopology::m_Edges[6][2] = { { 0, 1 }, { 1, 2 }, { 2, 0 }, { 0, 3 }, { 1, 3 }, { 2, 3 } };

TetrahedronCellTopology::TetrahedronCellTopology() = default;

Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/src/itkTriangleCellTopology.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace itk
/**
* The triangle's topology data: Edges
*/
const int TriangleCellTopology ::m_Edges[3][2] = { { 0, 1 }, { 1, 2 }, { 2, 0 } };
const int TriangleCellTopology::m_Edges[3][2] = { { 0, 1 }, { 1, 2 }, { 2, 0 } };

TriangleCellTopology::TriangleCellTopology() = default;

Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/src/itkXMLFileOutputWindow.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace itk
/**
* Prompting off by default
*/
XMLFileOutputWindow ::XMLFileOutputWindow() = default;
XMLFileOutputWindow::XMLFileOutputWindow() = default;

XMLFileOutputWindow::~XMLFileOutputWindow() = default;

Expand Down
2 changes: 1 addition & 1 deletion Modules/Filtering/FFT/src/itkFFTWGlobalConfiguration.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ HardwareWisdomFilenameGenerator::GetUseSteppingCode() const
}


FFTWGlobalConfiguration ::FFTWGlobalConfiguration()
FFTWGlobalConfiguration::FFTWGlobalConfiguration()
: m_WisdomCacheBase("")
{
{ // Configure default method for creating WISDOM_CACHE files
Expand Down
12 changes: 6 additions & 6 deletions Modules/Filtering/Path/src/itkChainCodePath2D.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
namespace itk
{
ChainCodePath2D::OutputType
ChainCodePath2D ::Evaluate(const InputType & input) const
ChainCodePath2D::Evaluate(const InputType & input) const
{
return DecodeOffset(m_Chain2D[input]);
}

ChainCodePath2D::IndexType
ChainCodePath2D ::EvaluateToIndex(const InputType & input) const
ChainCodePath2D::EvaluateToIndex(const InputType & input) const
{
IndexType index = GetStart();

Expand All @@ -41,7 +41,7 @@ ChainCodePath2D ::EvaluateToIndex(const InputType & input) const
}

ChainCodePath2D::OffsetType
ChainCodePath2D ::IncrementInput(InputType & input) const
ChainCodePath2D::IncrementInput(InputType & input) const
{
if (input < NumberOfSteps())
{
Expand All @@ -54,7 +54,7 @@ ChainCodePath2D ::IncrementInput(InputType & input) const
}

std::string
ChainCodePath2D ::GetChainCodeAsString() const
ChainCodePath2D::GetChainCodeAsString() const
{
std::string printableChain;

Expand All @@ -72,7 +72,7 @@ ChainCodePath2D ::GetChainCodeAsString() const
}

/** Constructor */
ChainCodePath2D ::ChainCodePath2D()
ChainCodePath2D::ChainCodePath2D()
{
// Most of the work is done in the parent constructor.

Expand Down Expand Up @@ -129,7 +129,7 @@ ChainCodePath2D::~ChainCodePath2D() = default;

/** Standard "PrintSelf" method */
void
ChainCodePath2D ::PrintSelf(std::ostream & os, Indent indent) const
ChainCodePath2D::PrintSelf(std::ostream & os, Indent indent) const
{
Superclass::PrintSelf(os, indent);
os << indent << "Chain code 2D: " << GetChainCodeAsString() << std::endl;
Expand Down
2 changes: 1 addition & 1 deletion Modules/IO/DCMTK/src/itkDCMTKFileReader.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ DCMTKSequence::SetDcmSequenceOfItems(DcmSequenceOfItems * seq)
}

int
DCMTKSequence ::card() const
DCMTKSequence::card() const
{
return this->m_DcmSequenceOfItems->card();
}
Expand Down
14 changes: 7 additions & 7 deletions Modules/IO/DCMTK/src/itkDCMTKImageIO.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ DCMTKImageIO::DCMTKImageIO()
}

void
DCMTKImageIO ::SetLogLevel(LogLevelEnum level)
DCMTKImageIO::SetLogLevel(LogLevelEnum level)
{
switch (level)
{
Expand Down Expand Up @@ -96,7 +96,7 @@ DCMTKImageIO ::SetLogLevel(LogLevelEnum level)
}

DCMTKImageIO::LogLevelEnum
DCMTKImageIO ::GetLogLevel() const
DCMTKImageIO::GetLogLevel() const
{
dcmtk::log4cplus::Logger rootLogger = dcmtk::log4cplus::Logger::getRoot();
switch (rootLogger.getLogLevel())
Expand Down Expand Up @@ -247,7 +247,7 @@ DCMTKImageIO::CanWriteFile(const char * itkNotUsed(name))
}

void
DCMTKImageIO ::OpenDicomImage()
DCMTKImageIO::OpenDicomImage()
{
if (this->m_DImage != nullptr)
{
Expand All @@ -271,7 +271,7 @@ DCMTKImageIO ::OpenDicomImage()

//------------------------------------------------------------------------------
void
DCMTKImageIO ::Read(void * buffer)
DCMTKImageIO::Read(void * buffer)
{
this->OpenDicomImage();
if (m_DImage->getStatus() != EIS_Normal)
Expand Down Expand Up @@ -307,7 +307,7 @@ DCMTKImageIO ::Read(void * buffer)
}

void
DCMTKImageIO ::ReorderRGBValues(void * buffer, const void * data, size_t count, unsigned int voxel_size)
DCMTKImageIO::ReorderRGBValues(void * buffer, const void * data, size_t count, unsigned int voxel_size)
{
switch (this->m_ComponentType)
{
Expand Down Expand Up @@ -510,12 +510,12 @@ DCMTKImageIO::ReadImageInformation()
}

void
DCMTKImageIO ::WriteImageInformation()
DCMTKImageIO::WriteImageInformation()
{}

/** */
void
DCMTKImageIO ::Write(const void * buffer)
DCMTKImageIO::Write(const void * buffer)
{
(void)(buffer);
}
Expand Down
2 changes: 1 addition & 1 deletion Modules/IO/DCMTK/src/itkDCMTKSeriesFileNames.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

namespace itk
{
DCMTKSeriesFileNames ::DCMTKSeriesFileNames()
DCMTKSeriesFileNames::DCMTKSeriesFileNames()
{
m_InputDirectory = "";
m_OutputDirectory = "";
Expand Down
2 changes: 1 addition & 1 deletion Modules/IO/GE/src/itkGE4ImageIO.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ GE4ImageIO::ReadHeader(const char * FileNameToRead)
}

float
GE4ImageIO ::MvtSunf(int numb)
GE4ImageIO::MvtSunf(int numb)
{
constexpr auto signbit = 020000000000U;
constexpr auto dmantissa = 077777777U;
Expand Down
2 changes: 1 addition & 1 deletion Modules/IO/GE/src/itkGE5ImageIO.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ GE5ImageIO::~GE5ImageIO()
}

int
GE5ImageIO ::CheckGE5xImages(char const * const imageFileTemplate, std::string & reason)
GE5ImageIO::CheckGE5xImages(char const * const imageFileTemplate, std::string & reason)
{
//
// Does it exist?
Expand Down
6 changes: 3 additions & 3 deletions Modules/IO/GIPL/src/itkGiplImageIO.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ GiplImageIO::ReadImageInformation()
}

void
GiplImageIO ::SwapBytesIfNecessary(void * buffer, SizeValueType numberOfPixels)
GiplImageIO::SwapBytesIfNecessary(void * buffer, SizeValueType numberOfPixels)
{
switch (m_ComponentType)
{
Expand Down Expand Up @@ -696,14 +696,14 @@ GiplImageIO ::SwapBytesIfNecessary(void * buffer, SizeValueType numberOfPixels)
}

void
GiplImageIO ::WriteImageInformation()
GiplImageIO::WriteImageInformation()
{
// not possible to write a Gipl file
}

/** The write function is not implemented */
void
GiplImageIO ::Write(const void * buffer)
GiplImageIO::Write(const void * buffer)
{
CheckExtension(m_FileName.c_str());

Expand Down
Loading

0 comments on commit 2b1b531

Please sign in to comment.