Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STYLE: Remove space between class and member names in C++ source files #2096

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Examples/RegistrationITKv4/DeformableRegistration13.cxx
Expand Up @@ -118,7 +118,7 @@ main(int argc, char * argv[])
}

// For consistent results when regression testing.
itk::Statistics::MersenneTwisterRandomVariateGenerator ::GetInstance()
itk::Statistics::MersenneTwisterRandomVariateGenerator::GetInstance()
->SetSeed(121212);

constexpr unsigned int ImageDimension = 2;
Expand Down
4 changes: 2 additions & 2 deletions Examples/SpatialObjects/SpatialObjectHierarchy.cxx
Expand Up @@ -43,10 +43,10 @@ main(int, char *[])
// Software Guide : BeginCodeSnippet
using SpatialObjectType = itk::SpatialObject<3>;

SpatialObjectType::Pointer object1 = SpatialObjectType ::New();
SpatialObjectType::Pointer object1 = SpatialObjectType::New();
object1->GetProperty().SetName("First Object");

SpatialObjectType::Pointer object2 = SpatialObjectType ::New();
SpatialObjectType::Pointer object2 = SpatialObjectType::New();
object2->GetProperty().SetName("Second Object");
// Software Guide : EndCodeSnippet

Expand Down
4 changes: 2 additions & 2 deletions Examples/SpatialObjects/SpatialObjectTransforms.cxx
Expand Up @@ -104,10 +104,10 @@ main(int, char *[])
using SpatialObjectType = itk::SpatialObject<2>;
using TransformType = SpatialObjectType::TransformType;

SpatialObjectType::Pointer object1 = SpatialObjectType ::New();
SpatialObjectType::Pointer object1 = SpatialObjectType::New();
object1->GetProperty().SetName("First Object");

SpatialObjectType::Pointer object2 = SpatialObjectType ::New();
SpatialObjectType::Pointer object2 = SpatialObjectType::New();
object2->GetProperty().SetName("Second Object");
object1->AddChild(object2);
// Software Guide : EndCodeSnippet
Expand Down
Expand Up @@ -47,7 +47,7 @@ class VectorImageNeighborhoodAccessorFunctor
using VectorLengthType = unsigned int;
using OffsetType = typename ImageType::OffsetType;

using NeighborhoodType = Neighborhood<InternalPixelType *, TImage ::ImageDimension>;
using NeighborhoodType = Neighborhood<InternalPixelType *, TImage::ImageDimension>;

template <typename TOutput = ImageType>
using ImageBoundaryConditionType = ImageBoundaryCondition<ImageType, TOutput>;
Expand Down
72 changes: 36 additions & 36 deletions Modules/Core/Common/src/itkDataObject.cxx
Expand Up @@ -35,50 +35,50 @@ itkGetGlobalValueMacro(DataObject, bool, GlobalReleaseDataFlag, false);
// after use by filter
bool * DataObject::m_GlobalReleaseDataFlag;

DataObjectError ::DataObjectError() noexcept
DataObjectError::DataObjectError() noexcept
: ExceptionObject()
{}

DataObjectError ::DataObjectError(const char * file, unsigned int lineNumber)
DataObjectError::DataObjectError(const char * file, unsigned int lineNumber)
: ExceptionObject(file, lineNumber)
{}

DataObjectError ::DataObjectError(const std::string & file, unsigned int lineNumber)
DataObjectError::DataObjectError(const std::string & file, unsigned int lineNumber)
: ExceptionObject(file, lineNumber)
{}

DataObjectError ::DataObjectError(const DataObjectError & orig) noexcept
DataObjectError::DataObjectError(const DataObjectError & orig) noexcept
: ExceptionObject(orig)
{
m_DataObject = orig.m_DataObject;
}

DataObjectError &
DataObjectError ::operator=(const DataObjectError &) noexcept = default;
DataObjectError::operator=(const DataObjectError &) noexcept = default;

void
DataObjectError ::SetDataObject(DataObject * dobj) noexcept
DataObjectError::SetDataObject(DataObject * dobj) noexcept
{
m_DataObject = dobj;
}

#if !defined(ITK_LEGACY_REMOVE)
DataObject *
DataObjectError ::GetDataObject() noexcept
DataObjectError::GetDataObject() noexcept
{
return m_DataObject;
}
#endif

const DataObject *
DataObjectError ::GetDataObject() const noexcept
DataObjectError::GetDataObject() const noexcept
{
return m_DataObject;
}


void
DataObjectError ::PrintSelf(std::ostream & os, Indent indent) const
DataObjectError::PrintSelf(std::ostream & os, Indent indent) const
{
ExceptionObject::Print(os);

Expand All @@ -94,25 +94,25 @@ DataObjectError ::PrintSelf(std::ostream & os, Indent indent) const
}
}

InvalidRequestedRegionError ::InvalidRequestedRegionError() noexcept
InvalidRequestedRegionError::InvalidRequestedRegionError() noexcept
: DataObjectError()
{}

InvalidRequestedRegionError ::InvalidRequestedRegionError(const char * file, unsigned int lineNumber)
InvalidRequestedRegionError::InvalidRequestedRegionError(const char * file, unsigned int lineNumber)
: DataObjectError(file, lineNumber)
{}

InvalidRequestedRegionError ::InvalidRequestedRegionError(const std::string & file, unsigned int lineNumber)
InvalidRequestedRegionError::InvalidRequestedRegionError(const std::string & file, unsigned int lineNumber)
: DataObjectError(file, lineNumber)
{}

InvalidRequestedRegionError ::InvalidRequestedRegionError(const InvalidRequestedRegionError &) noexcept = default;
InvalidRequestedRegionError::InvalidRequestedRegionError(const InvalidRequestedRegionError &) noexcept = default;

InvalidRequestedRegionError &
InvalidRequestedRegionError ::operator=(const InvalidRequestedRegionError &) noexcept = default;
InvalidRequestedRegionError::operator=(const InvalidRequestedRegionError &) noexcept = default;

void
InvalidRequestedRegionError ::PrintSelf(std::ostream & os, Indent indent) const
InvalidRequestedRegionError::PrintSelf(std::ostream & os, Indent indent) const
{
DataObjectError::PrintSelf(os, indent);
}
Expand All @@ -133,11 +133,11 @@ DataObject::DataObject()
}

//----------------------------------------------------------------------------
DataObject ::~DataObject() = default;
DataObject::~DataObject() = default;

//----------------------------------------------------------------------------
void
DataObject ::Initialize()
DataObject::Initialize()
{
// We don't modify ourselves because the "ReleaseData" methods depend upon
// no modification when initialized.
Expand All @@ -146,7 +146,7 @@ DataObject ::Initialize()

//----------------------------------------------------------------------------
void
DataObject ::SetGlobalReleaseDataFlag(bool val)
DataObject::SetGlobalReleaseDataFlag(bool val)
{
itkInitGlobalsMacro(GlobalReleaseDataFlag);
if (val == *m_GlobalReleaseDataFlag)
Expand All @@ -158,22 +158,22 @@ DataObject ::SetGlobalReleaseDataFlag(bool val)

//----------------------------------------------------------------------------
bool
DataObject ::GetGlobalReleaseDataFlag()
DataObject::GetGlobalReleaseDataFlag()
{
return *DataObject::GetGlobalReleaseDataFlagPointer();
}

//----------------------------------------------------------------------------
void
DataObject ::ReleaseData()
DataObject::ReleaseData()
{
this->Initialize();
m_DataReleased = true;
}

//----------------------------------------------------------------------------
bool
DataObject ::ShouldIReleaseData() const
DataObject::ShouldIReleaseData() const
{
return (GetGlobalReleaseDataFlag() || m_ReleaseDataFlag);
}
Expand All @@ -182,7 +182,7 @@ DataObject ::ShouldIReleaseData() const
// Set the process object that generates this data object.
//
void
DataObject ::DisconnectPipeline()
DataObject::DisconnectPipeline()
{
itkDebugMacro("disconnecting from the pipeline.");

Expand All @@ -204,7 +204,7 @@ DataObject ::DisconnectPipeline()
}

bool
DataObject ::DisconnectSource(ProcessObject * arg, const DataObjectIdentifierType & name)
DataObject::DisconnectSource(ProcessObject * arg, const DataObjectIdentifierType & name)
{
if (m_Source == arg && m_SourceOutputName == name)
{
Expand All @@ -223,7 +223,7 @@ DataObject ::DisconnectSource(ProcessObject * arg, const DataObjectIdentifierTyp
}

bool
DataObject ::ConnectSource(ProcessObject * arg, const DataObjectIdentifierType & name)
DataObject::ConnectSource(ProcessObject * arg, const DataObjectIdentifierType & name)
{
if (m_Source != arg || m_SourceOutputName != name)
{
Expand All @@ -245,21 +245,21 @@ DataObject ::ConnectSource(ProcessObject * arg, const DataObjectIdentifierType &
//----------------------------------------------------------------------------

SmartPointer<ProcessObject>
DataObject ::GetSource() const
DataObject::GetSource() const
{
itkDebugMacro("returning Source address " << m_Source.GetPointer());
return m_Source.GetPointer();
}

const DataObject::DataObjectIdentifierType &
DataObject ::GetSourceOutputName() const
DataObject::GetSourceOutputName() const
{
itkDebugMacro("returning Source name " << m_SourceOutputName);
return m_SourceOutputName;
}

DataObject::DataObjectPointerArraySizeType
DataObject ::GetSourceOutputIndex() const
DataObject::GetSourceOutputIndex() const
{
if (!m_Source)
{
Expand All @@ -270,7 +270,7 @@ DataObject ::GetSourceOutputIndex() const

//----------------------------------------------------------------------------
void
DataObject ::PrintSelf(std::ostream & os, Indent indent) const
DataObject::PrintSelf(std::ostream & os, Indent indent) const
{
Object::PrintSelf(os, indent);

Expand Down Expand Up @@ -301,15 +301,15 @@ DataObject ::PrintSelf(std::ostream & os, Indent indent) const

//----------------------------------------------------------------------------
void
DataObject ::Update()
DataObject::Update()
{
this->UpdateOutputInformation();
this->PropagateRequestedRegion();
this->UpdateOutputData();
}

void
DataObject ::UpdateOutputInformation()
DataObject::UpdateOutputInformation()
{

if (this->GetSource())
Expand All @@ -319,13 +319,13 @@ DataObject ::UpdateOutputInformation()
}

void
DataObject ::ResetPipeline()
DataObject::ResetPipeline()
{
this->PropagateResetPipeline();
}

void
DataObject ::PropagateResetPipeline()
DataObject::PropagateResetPipeline()
{
if (m_Source)
{
Expand All @@ -335,7 +335,7 @@ DataObject ::PropagateResetPipeline()

//----------------------------------------------------------------------------
void
DataObject ::PropagateRequestedRegion()
DataObject::PropagateRequestedRegion()
{
// If we need to update due to PipelineMTime, or the fact that our
// data was released, then propagate the update region to the source
Expand Down Expand Up @@ -364,7 +364,7 @@ DataObject ::PropagateRequestedRegion()

//----------------------------------------------------------------------------
void
DataObject ::UpdateOutputData()
DataObject::UpdateOutputData()
{
// If we need to update due to PipelineMTime, or the fact that our
// data was released, then propagate the UpdateOutputData to the source
Expand All @@ -380,7 +380,7 @@ DataObject ::UpdateOutputData()

//----------------------------------------------------------------------------
void
DataObject ::DataHasBeenGenerated()
DataObject::DataHasBeenGenerated()
{
this->m_DataReleased = false;
this->Modified();
Expand All @@ -389,7 +389,7 @@ DataObject ::DataHasBeenGenerated()

//----------------------------------------------------------------------------
ModifiedTimeType
DataObject ::GetUpdateMTime() const
DataObject::GetUpdateMTime() const
{
return m_UpdateMTime.GetMTime();
}
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/src/itkEquivalencyTable.cxx
Expand Up @@ -139,7 +139,7 @@ EquivalencyTable::RecursiveLookup(const unsigned long a) const
}

void
EquivalencyTable ::PrintSelf(std::ostream & os, Indent indent) const
EquivalencyTable::PrintSelf(std::ostream & os, Indent indent) const
{
Superclass::PrintSelf(os, indent);
}
Expand Down
8 changes: 4 additions & 4 deletions Modules/Core/Common/src/itkEventObject.cxx
Expand Up @@ -20,7 +20,7 @@
namespace itk
{
void
EventObject ::Print(std::ostream & os) const
EventObject::Print(std::ostream & os) const
{
Indent indent;

Expand All @@ -33,7 +33,7 @@ EventObject ::Print(std::ostream & os) const
* Define a default print header for all objects.
*/
void
EventObject ::PrintHeader(std::ostream & os, Indent indent) const
EventObject::PrintHeader(std::ostream & os, Indent indent) const
{
os << std::endl;
os << indent << "itk::" << this->GetEventName() << " (" << this << ")\n";
Expand All @@ -43,13 +43,13 @@ EventObject ::PrintHeader(std::ostream & os, Indent indent) const
* Define a default print trailer for all objects.
*/
void
EventObject ::PrintTrailer(std::ostream & os, Indent indent) const
EventObject::PrintTrailer(std::ostream & os, Indent indent) const
{
os << indent << std::endl;
}

void
EventObject ::PrintSelf(std::ostream &, Indent) const
EventObject::PrintSelf(std::ostream &, Indent) const
{}

/**
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/src/itkExceptionObject.cxx
Expand Up @@ -297,7 +297,7 @@ ExceptionObject::what() const noexcept
}

void
ExceptionObject ::Print(std::ostream & os) const
ExceptionObject::Print(std::ostream & os) const
{
Indent indent;

Expand Down