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.

Sign up for GitHub

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

Jump to bottom

COMP: Move ITK_DISALLOW_COPY_AND_ASSIGN calls to public section. #12

Merged
merged 1 commit into from Apr 20, 2018
Merged

COMP: Move ITK_DISALLOW_COPY_AND_ASSIGN calls to public section. #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions include/itkConditionalSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Expand Up @@ -36,6 +36,8 @@ class ConditionalSubdivisionQuadEdgeMeshFilter:
public QuadEdgeMeshToQuadEdgeMeshFilter< TInputMesh, typename TSubdivisionFilter::OutputMeshType >
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(ConditionalSubdivisionQuadEdgeMeshFilter);

using Self = ConditionalSubdivisionQuadEdgeMeshFilter;
using Superclass = QuadEdgeMeshToQuadEdgeMeshFilter< TInputMesh, typename TSubdivisionFilter::OutputMeshType>;
using Pointer = SmartPointer< Self >;
Expand Down Expand Up @@ -82,9 +84,6 @@ class ConditionalSubdivisionQuadEdgeMeshFilter:
SubdivisionFilterPointer m_SubdivisionFilter;
SubdivisionCellContainer m_CellsToBeSubdivided;
CriterionPointer m_SubdivisionCriterion;

private:
ITK_DISALLOW_COPY_AND_ASSIGN(ConditionalSubdivisionQuadEdgeMeshFilter);
};
} // end namespace itk

Expand Down
5 changes: 2 additions & 3 deletions include/itkIterativeTriangleCellSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Expand Up @@ -35,6 +35,8 @@ class IterativeTriangleCellSubdivisionQuadEdgeMeshFilter:
public QuadEdgeMeshToQuadEdgeMeshFilter< TInputMesh, typename TCellSubdivisionFilter::OutputMeshType >
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(IterativeTriangleCellSubdivisionQuadEdgeMeshFilter);

using Self = IterativeTriangleCellSubdivisionQuadEdgeMeshFilter;
using Superclass = QuadEdgeMeshToQuadEdgeMeshFilter< TInputMesh, typename TCellSubdivisionFilter::OutputMeshType>;
using Pointer = SmartPointer< Self >;
Expand Down Expand Up @@ -81,9 +83,6 @@ class IterativeTriangleCellSubdivisionQuadEdgeMeshFilter:
CellSubdivisionFilterPointer m_CellSubdivisionFilter;
SubdivisionCellContainer m_CellsToBeSubdivided;
unsigned int m_ResolutionLevels;

private:
ITK_DISALLOW_COPY_AND_ASSIGN(IterativeTriangleCellSubdivisionQuadEdgeMeshFilter);
};
} // end namespace itk

Expand Down
5 changes: 2 additions & 3 deletions include/itkLinearTriangleCellSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Expand Up @@ -37,6 +37,8 @@ class LinearTriangleCellSubdivisionQuadEdgeMeshFilter:
public TriangleCellSubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(LinearTriangleCellSubdivisionQuadEdgeMeshFilter);

using Self = LinearTriangleCellSubdivisionQuadEdgeMeshFilter;
using Superclass = TriangleCellSubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >;
using Pointer = SmartPointer< Self >;
Expand Down Expand Up @@ -87,9 +89,6 @@ class LinearTriangleCellSubdivisionQuadEdgeMeshFilter:
~LinearTriangleCellSubdivisionQuadEdgeMeshFilter() override {}

void AddNewCellPoints( InputCellType * cell ) override;

private:
ITK_DISALLOW_COPY_AND_ASSIGN(LinearTriangleCellSubdivisionQuadEdgeMeshFilter);
};
}

Expand Down
5 changes: 2 additions & 3 deletions include/itkLinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Expand Up @@ -34,6 +34,8 @@ class LinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter:
public TriangleEdgeCellSubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(LinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter);

using Self = LinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter;
using Superclass = TriangleEdgeCellSubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >;
using Pointer = SmartPointer< Self >;
Expand Down Expand Up @@ -85,9 +87,6 @@ class LinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter:
~LinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter() override {}

void AddNewEdgePoints( InputQEType * edge ) override;

private:
ITK_DISALLOW_COPY_AND_ASSIGN(LinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter);
};
}

Expand Down
5 changes: 2 additions & 3 deletions include/itkLoopTriangleCellSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Expand Up @@ -55,6 +55,8 @@ class LoopTriangleCellSubdivisionQuadEdgeMeshFilter:
public TriangleCellSubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(LoopTriangleCellSubdivisionQuadEdgeMeshFilter);

using Self = LoopTriangleCellSubdivisionQuadEdgeMeshFilter;
using Superclass = TriangleCellSubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >;
using Pointer = SmartPointer< Self >;
Expand Down Expand Up @@ -114,9 +116,6 @@ class LoopTriangleCellSubdivisionQuadEdgeMeshFilter:
void AddNewCellPoints( InputCellType *cell ) override;

InputPointType SmoothingPoint( const InputPointType & ipt, const InputPointsContainer * points );

private:
ITK_DISALLOW_COPY_AND_ASSIGN(LoopTriangleCellSubdivisionQuadEdgeMeshFilter);
};
}
#ifndef ITK_MANUAL_INSTANTIATION
Expand Down
5 changes: 2 additions & 3 deletions include/itkLoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Expand Up @@ -34,6 +34,8 @@ class LoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter:
public TriangleEdgeCellSubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(LoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter);

using Self = LoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter;
using Superclass = TriangleEdgeCellSubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >;
using Pointer = SmartPointer< Self >;
Expand Down Expand Up @@ -89,9 +91,6 @@ class LoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter:
void CopyInputMeshToOutputMeshPoints() override;

virtual void AverageOriginOfEdge( InputQEType * edge, const InputPointsContainer * points );

private:
ITK_DISALLOW_COPY_AND_ASSIGN(LoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter);
};
}

Expand Down
5 changes: 2 additions & 3 deletions include/itkModifiedButterflyTriangleCellSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Expand Up @@ -39,6 +39,8 @@ class ModifiedButterflyTriangleCellSubdivisionQuadEdgeMeshFilter:
public TriangleCellSubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(ModifiedButterflyTriangleCellSubdivisionQuadEdgeMeshFilter);

using Self = ModifiedButterflyTriangleCellSubdivisionQuadEdgeMeshFilter;
using Superclass = TriangleCellSubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >;
using Pointer = SmartPointer< Self >;
Expand Down Expand Up @@ -88,9 +90,6 @@ class ModifiedButterflyTriangleCellSubdivisionQuadEdgeMeshFilter:
~ModifiedButterflyTriangleCellSubdivisionQuadEdgeMeshFilter() override {}

void AddNewCellPoints( InputCellType *cell ) override;

private:
ITK_DISALLOW_COPY_AND_ASSIGN(ModifiedButterflyTriangleCellSubdivisionQuadEdgeMeshFilter);
};
}
#ifndef ITK_MANUAL_INSTANTIATION
Expand Down
5 changes: 2 additions & 3 deletions include/itkModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Expand Up @@ -34,6 +34,8 @@ class ModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter:
public TriangleEdgeCellSubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(ModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter);

using Self = ModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter;
using Superclass = TriangleEdgeCellSubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >;
using Pointer = SmartPointer< Self >;
Expand Down Expand Up @@ -85,9 +87,6 @@ class ModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter:
~ModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter() override {}

void AddNewEdgePoints( InputQEType * edge ) override;

private:
ITK_DISALLOW_COPY_AND_ASSIGN(ModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter);
};
}

Expand Down
5 changes: 2 additions & 3 deletions include/itkSquareThreeTriangleCellSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Expand Up @@ -34,6 +34,8 @@ class SquareThreeTriangleCellSubdivisionQuadEdgeMeshFilter:
public TriangleCellSubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(SquareThreeTriangleCellSubdivisionQuadEdgeMeshFilter);

using Self = SquareThreeTriangleCellSubdivisionQuadEdgeMeshFilter;
using Superclass = TriangleCellSubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >;
using Pointer = SmartPointer< Self >;
Expand Down Expand Up @@ -92,9 +94,6 @@ class SquareThreeTriangleCellSubdivisionQuadEdgeMeshFilter:

void AddNewCellPoints( InputCellType *cell ) override;
void GenerateOutputCells() override;

private:
ITK_DISALLOW_COPY_AND_ASSIGN(SquareThreeTriangleCellSubdivisionQuadEdgeMeshFilter);
};
}

Expand Down
5 changes: 2 additions & 3 deletions include/itkSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Expand Up @@ -41,6 +41,8 @@ class SubdivisionQuadEdgeMeshFilter:
public QuadEdgeMeshToQuadEdgeMeshFilter< TInputMesh, TOutputMesh >
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(SubdivisionQuadEdgeMeshFilter);

using Self = SubdivisionQuadEdgeMeshFilter;
using Superclass = QuadEdgeMeshToQuadEdgeMeshFilter< TInputMesh, TOutputMesh >;
using Pointer = SmartPointer< Self >;
Expand Down Expand Up @@ -105,9 +107,6 @@ class SubdivisionQuadEdgeMeshFilter:
void PrintSelf( std::ostream & os, Indent indent ) const override;

EdgePointIdentifierContainerPointer m_EdgesPointIdentifier;

private:
ITK_DISALLOW_COPY_AND_ASSIGN(SubdivisionQuadEdgeMeshFilter);
};
} // end namespace itk

Expand Down
5 changes: 2 additions & 3 deletions include/itkTriangleCellSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Expand Up @@ -40,6 +40,8 @@ class TriangleCellSubdivisionQuadEdgeMeshFilter:
public SubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(TriangleCellSubdivisionQuadEdgeMeshFilter);

using Self = TriangleCellSubdivisionQuadEdgeMeshFilter;
using Superclass = SubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >;
using Pointer = SmartPointer< Self >;
Expand Down Expand Up @@ -116,9 +118,6 @@ class TriangleCellSubdivisionQuadEdgeMeshFilter:

SubdivisionCellContainer m_CellsToBeSubdivided;
bool m_Uniform;

private:
ITK_DISALLOW_COPY_AND_ASSIGN(TriangleCellSubdivisionQuadEdgeMeshFilter);
};
} // end namespace itk

Expand Down
5 changes: 2 additions & 3 deletions include/itkTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Expand Up @@ -34,6 +34,8 @@ class TriangleEdgeCellSubdivisionQuadEdgeMeshFilter:
public TriangleCellSubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(TriangleEdgeCellSubdivisionQuadEdgeMeshFilter);

using Self = TriangleEdgeCellSubdivisionQuadEdgeMeshFilter;
using Superclass = TriangleCellSubdivisionQuadEdgeMeshFilter< TInputMesh, TOutputMesh >;
using Pointer = SmartPointer< Self >;
Expand Down Expand Up @@ -97,9 +99,6 @@ class TriangleEdgeCellSubdivisionQuadEdgeMeshFilter:
void PrintSelf( std::ostream & os, Indent indent ) const override;

SubdivisionCellContainer m_EdgesToBeSubdivided;

private:
ITK_DISALLOW_COPY_AND_ASSIGN(TriangleEdgeCellSubdivisionQuadEdgeMeshFilter);
};
} // end namespace itk

Expand Down