Skip to content

Commit 19d7218

Browse files
hjmjohnsonhjmjohnson
committed
COMP: Use modern macro for name of class
When preparing for the future with ITK by setting ITK_FUTURE_LEGACY_REMOVE:BOOL=ON ITK_LEGACY_REMOVEBOOL=ON The future preferred macro should be used │ - itkTypeMacro │ + itkOverrideGetNameOfClassMacro
1 parent 380e811 commit 19d7218

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

‎Modules/Video/BridgeVXL/include/vidl_itk_istream.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class ITK_TEMPLATE_EXPORT vidl_itk_istream : public vidl_istream
6060
virtual ~vidl_itk_istream() {}
6161

6262
/** Runtime information support. */
63-
// Cannot use as we do not derive from ITK Object with GetNameOfClass itkTypeMacro(vidl_itk_istream, vidl_istream);
63+
// Cannot use as we do not derive from ITK Object with GetNameOfClass itkOverrideGetNameOfClassMacro(vidl_itk_istream);
6464
const char *
6565
GetNameOfClass() const
6666
{

‎Utilities/Doxygen/DoxygenConfig.cmake‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -89,52 +89,52 @@ set(DOXYGEN_PREDEFINED
8989
"itkNotUsed(x)=x"
9090
"itkLegacyMacro(x)=[[deprecated]] x"
9191
"itkStaticConstMacro(name,type,value)=static constexpr type name = value"
92-
"itkSetInputMacro(name, type, number)= virtual void Set##name##Input(const type *_arg)\; virtual void SetInput##number(const type *_arg)\;"
93-
"itkGetInputMacro(name, type, number)= virtual const type * Get##name##Input() const\; virtual const type * GetInput##number() const\;"
94-
"itkSetMacro(name,type)= virtual void Set##name (type _arg)\;"
95-
"itkGetMacro(name,type)= virtual type Get##name ()\;"
96-
"itkGetConstMacro(name,type)= virtual type Get##name () const\;"
97-
"itkSetStringMacro(name)= virtual void Set##name (const char* _arg)\;"
98-
"itkGetStringMacro(name)= virtual const char* Get##name () const\;"
99-
"itkSetClampMacro(name,type,min,max)= virtual void Set##name (type _arg)\;"
100-
"itkSetObjectMacro(name,type)= virtual void Set##name (type* _arg)\;"
101-
"itkSetConstObjectMacro(name,type)= virtual void Set##name ( const type* _arg)\;"
102-
"itkGetConstObjectMacro(name,type)= virtual const type* Get##name () const\;"
103-
"itkGetModifiableObjectMacro(name,type)= virtual type* GetModifiable##name ()\; virtual const type* Get##name () const\;"
104-
"itkGetConstReferenceMacro(name,type)= virtual const type& Get##name () const\;"
105-
"itkSetEnumMacro(name,type)= virtual void Set##name (const type _arg)\;"
106-
"itkGetEnumMacro(name,type)= virtual type Get##name () const\;"
107-
"itkGetConstReferenceObjectMacro(name,type)= virtual const type::Pointer& Get##name () const\;"
108-
"itkSetDecoratedInputMacro(name, type)= virtual void Set##name##Input(const SimpleDataObjectDecorator<type> *_arg)\; virtual void Set##name(const type &_arg)\; void Set##name(const SimpleDataObjectDecorator< type > *_arg)"
109-
"itkGetDecoratedInputMacro(name, type)= virtual const SimpleDataObjectDecorator< type > * Get##name##Input() const\; virtual const type & Get##name() const\;"
110-
"itkSetGetDecoratedInputMacro(name, type)= virtual void Set##name##Input(const SimpleDataObjectDecorator< type > *_arg)\; virtual void Set##name(const type &_arg)\; virtual void Set##name(const SimpleDataObjectDecorator< type > *_arg)\; virtual const SimpleDataObjectDecorator< type > * Get##name##Input() const\; virtual const type & Get##name() const\;"
111-
"itkSetDecoratedObjectInputMacro(name, type, number)= virtual void Set##name##Input(const DataObjectDecorator<type> *_arg)\; virtual void SetInput##number(const DataObjectDecorator<type> *_arg)\; virtual const DataObjectDecorator<type> * Get##name##Input() const\; virtual const DataObjectDecorator<type> * GetInput##number() const\; virtual void Set##name(const type *_arg)\;"
112-
"itkGetDecoratedObjectInputMacro(name, type)= virtual const DataObjectDecorator< type > * Get##name##Input() const\; virtual const type * Get##name() const\;"
113-
"itkSetGetDecoratedObjectInputMacro(name, type)= virtual void Set##name##Input(const DataObjectDecorator<type> *_arg)\; virtual void SetInput##number(const DataObjectDecorator<type> *_arg)\; virtual const DataObjectDecorator<type> * Get##name##Input() const\; virtual const DataObjectDecorator<type> * GetInput##number() const\; virtual void Set##name(const type *_arg)\; virtual const DataObjectDecorator< type > * Get##name##Input() const\; virtual const type * Get##name() const\;"
114-
"itkSetDecoratedOutputMacro(name, type)= virtual void Set##name##Output(const SimpleDataObjectDecorator<type> *_arg)\; virtual void Set##name(const type &_arg)\; void Set##name(const SimpleDataObjectDecorator< type > *_arg)"
115-
"itkGetDecoratedOutputMacro(name, type)= virtual const SimpleDataObjectDecorator< type > * Get##name##Output() const\; virtual const type & Get##name() const\;"
116-
"itkBooleanMacro(name)= virtual void name##On ()\; virtual void name##Off ()\;"
117-
"itkSetVector2Macro(name,type)= virtual void Set##name (type _arg1, type _arg2) virtual void Set##name (type _arg[2])\;"
118-
"itkGetVector2Macro(name,type)= virtual type* Get##name () const\; virtual void Get##name (type& _arg1, type& _arg2) const\; virtual void Get##name (type _arg[2]) const\;"
119-
"itkSetVector3Macro(name,type)= virtual void Set##name (type _arg1, type _arg2, type _arg3) virtual void Set##name (type _arg[3])\;"
120-
"itkGetVector3Macro(name,type)= virtual type* Get##name () const\; virtual void Get##name (type& _arg1, type& _arg2, type& _arg3) const\; virtual void Get##name (type _arg[3]) const\;"
121-
"itkSetVector4Macro(name,type)= virtual void Set##name (type _arg1, type _arg2, type _arg3, type _arg4) virtual void Set##name (type _arg[4])\;"
122-
"itkGetVector4Macro(name,type)= virtual type* Get##name () const\; virtual void Get##name (type& _arg1, type& _arg2, type& _arg3, type& _arg4) const\; virtual void Get##name (type _arg[4]) const\;"
123-
"itkSetVector6Macro(name,type)= virtual void Set##name (type _arg1, type _arg2, type _arg3, type _arg4, type _arg5, type _arg6) virtual void Set##name (type _arg[6])\;"
124-
"itkGetVector6Macro(name,type)= virtual type* Get##name () const\; virtual void Get##name (type& _arg1, type& _arg2, type& _arg3, type& _arg4, type& _arg5, type& _arg6) const\; virtual void Get##name (type _arg[6]) const\;"
125-
"itkSetVectorMacro(name,type,count)= virtual void Set##name(type data[])\;"
126-
"itkGetVectorMacro(name,type,count)= virtual type* Get##name () const\;"
127-
"itkSetInputMacro(name,type)= virtual void Set##name(const type *input)\;"
128-
"itkGetInputMacro(name,type)= virtual const type * Get##name() const\;"
129-
"itkNewMacro(type)= static Pointer New()\; virtual::itk::LightObject::Pointer CreateAnother() const\;"
130-
"itkSimpleNewMacro(type)= static Pointer New()\;"
131-
"itkCreateAnotherMacro(type)= virtual::itk::LightObject::Pointer CreateAnother() const\;"
132-
"itkFactorylessNewMacro(x)= static Pointer New()\; virtual ::itk::LightObject::Pointer CreateAnother() const\;"
133-
"itkTypeMacro(thisClass,superclass)= virtual const char *GetNameOfClass() const\;"
134-
"itkVirtualGetNameOfClassMacro(thisClass)= virtual const char * GetNameOfClass() const\;"
135-
"itkOverrideGetNameOfClassMacro(thisClass)= const char * GetNameOfClass() const override\;"
136-
"itkEventMacro(thisClass,superclass)= class thisClass : public superclass {}\;"
137-
"itkDeclareExceptionMacro(newexcp,parentexcp,whatmessage)= namespace itk { class newexcp : public parentexcp { public: newexcp(const char *file, unsigned int lineNumber) : parentexcp(file, lineNumber) { this->SetDescription(whatmessage)\; } newexcp(const std::string & file, unsigned int lineNumber) : parentexcp(file, lineNumber) { this->SetDescription(whatmessage)\; } itkTypeMacro(newexcp, , parentexcp)\; }\; }"
92+
"itkSetInputMacro(name, type, number)= virtual void Set##name##Input(const type *_arg); virtual void SetInput##number(const type *_arg);"
93+
"itkGetInputMacro(name, type, number)= virtual const type * Get##name##Input() const; virtual const type * GetInput##number() const;"
94+
"itkSetMacro(name,type)= virtual void Set##name (type _arg);"
95+
"itkGetMacro(name,type)= virtual type Get##name ();"
96+
"itkGetConstMacro(name,type)= virtual type Get##name () const;"
97+
"itkSetStringMacro(name)= virtual void Set##name (const char* _arg);"
98+
"itkGetStringMacro(name)= virtual const char* Get##name () const;"
99+
"itkSetClampMacro(name,type,min,max)= virtual void Set##name (type _arg);"
100+
"itkSetObjectMacro(name,type)= virtual void Set##name (type* _arg);"
101+
"itkSetConstObjectMacro(name,type)= virtual void Set##name ( const type* _arg);"
102+
"itkGetConstObjectMacro(name,type)= virtual const type* Get##name () const;"
103+
"itkGetModifiableObjectMacro(name,type)= virtual type* GetModifiable##name (); virtual const type* Get##name () const;"
104+
"itkGetConstReferenceMacro(name,type)= virtual const type& Get##name () const;"
105+
"itkSetEnumMacro(name,type)= virtual void Set##name (const type _arg);"
106+
"itkGetEnumMacro(name,type)= virtual type Get##name () const;"
107+
"itkGetConstReferenceObjectMacro(name,type)= virtual const type::Pointer& Get##name () const;"
108+
"itkSetDecoratedInputMacro(name, type)= virtual void Set##name##Input(const SimpleDataObjectDecorator<type> *_arg); virtual void Set##name(const type &_arg); void Set##name(const SimpleDataObjectDecorator< type > *_arg)"
109+
"itkGetDecoratedInputMacro(name, type)= virtual const SimpleDataObjectDecorator< type > * Get##name##Input() const; virtual const type & Get##name() const;"
110+
"itkSetGetDecoratedInputMacro(name, type)= virtual void Set##name##Input(const SimpleDataObjectDecorator< type > *_arg); virtual void Set##name(const type &_arg); virtual void Set##name(const SimpleDataObjectDecorator< type > *_arg); virtual const SimpleDataObjectDecorator< type > * Get##name##Input() const; virtual const type & Get##name() const;"
111+
"itkSetDecoratedObjectInputMacro(name, type, number)= virtual void Set##name##Input(const DataObjectDecorator<type> *_arg); virtual void SetInput##number(const DataObjectDecorator<type> *_arg); virtual const DataObjectDecorator<type> * Get##name##Input() const; virtual const DataObjectDecorator<type> * GetInput##number() const; virtual void Set##name(const type *_arg);"
112+
"itkGetDecoratedObjectInputMacro(name, type)= virtual const DataObjectDecorator< type > * Get##name##Input() const; virtual const type * Get##name() const;"
113+
"itkSetGetDecoratedObjectInputMacro(name, type)= virtual void Set##name##Input(const DataObjectDecorator<type> *_arg); virtual void SetInput##number(const DataObjectDecorator<type> *_arg); virtual const DataObjectDecorator<type> * Get##name##Input() const; virtual const DataObjectDecorator<type> * GetInput##number() const; virtual void Set##name(const type *_arg); virtual const DataObjectDecorator< type > * Get##name##Input() const; virtual const type * Get##name() const;"
114+
"itkSetDecoratedOutputMacro(name, type)= virtual void Set##name##Output(const SimpleDataObjectDecorator<type> *_arg); virtual void Set##name(const type &_arg); void Set##name(const SimpleDataObjectDecorator< type > *_arg)"
115+
"itkGetDecoratedOutputMacro(name, type)= virtual const SimpleDataObjectDecorator< type > * Get##name##Output() const; virtual const type & Get##name() const;"
116+
"itkBooleanMacro(name)= virtual void name##On (); virtual void name##Off ();"
117+
"itkSetVector2Macro(name,type)= virtual void Set##name (type _arg1, type _arg2) virtual void Set##name (type _arg[2]);"
118+
"itkGetVector2Macro(name,type)= virtual type* Get##name () const; virtual void Get##name (type& _arg1, type& _arg2) const; virtual void Get##name (type _arg[2]) const;"
119+
"itkSetVector3Macro(name,type)= virtual void Set##name (type _arg1, type _arg2, type _arg3) virtual void Set##name (type _arg[3]);"
120+
"itkGetVector3Macro(name,type)= virtual type* Get##name () const; virtual void Get##name (type& _arg1, type& _arg2, type& _arg3) const; virtual void Get##name (type _arg[3]) const;"
121+
"itkSetVector4Macro(name,type)= virtual void Set##name (type _arg1, type _arg2, type _arg3, type _arg4) virtual void Set##name (type _arg[4]);"
122+
"itkGetVector4Macro(name,type)= virtual type* Get##name () const; virtual void Get##name (type& _arg1, type& _arg2, type& _arg3, type& _arg4) const; virtual void Get##name (type _arg[4]) const;"
123+
"itkSetVector6Macro(name,type)= virtual void Set##name (type _arg1, type _arg2, type _arg3, type _arg4, type _arg5, type _arg6) virtual void Set##name (type _arg[6]);"
124+
"itkGetVector6Macro(name,type)= virtual type* Get##name () const; virtual void Get##name (type& _arg1, type& _arg2, type& _arg3, type& _arg4, type& _arg5, type& _arg6) const; virtual void Get##name (type _arg[6]) const;"
125+
"itkSetVectorMacro(name,type,count)= virtual void Set##name(type data[]);"
126+
"itkGetVectorMacro(name,type,count)= virtual type* Get##name () const;"
127+
"itkSetInputMacro(name,type)= virtual void Set##name(const type *input);"
128+
"itkGetInputMacro(name,type)= virtual const type * Get##name() const;"
129+
"itkNewMacro(type)= static Pointer New(); virtual::itk::LightObject::Pointer CreateAnother() const;"
130+
"itkSimpleNewMacro(type)= static Pointer New();"
131+
"itkCreateAnotherMacro(type)= virtual::itk::LightObject::Pointer CreateAnother() const;"
132+
"itkFactorylessNewMacro(x)= static Pointer New(); virtual ::itk::LightObject::Pointer CreateAnother() const;"
133+
"itkTypeMacro(thisClass,superclass)= virtual const char *GetNameOfClass() const;"
134+
"itkVirtualGetNameOfClassMacro(thisClass)= virtual const char * GetNameOfClass() const;"
135+
"itkOverrideGetNameOfClassMacro(thisClass)= const char * GetNameOfClass() const override;"
136+
"itkEventMacro(thisClass,superclass)= class thisClass : public superclass {};"
137+
"itkDeclareExceptionMacro(newexcp,parentexcp,whatmessage)= namespace itk { class newexcp : public parentexcp { public: newexcp(const char *file, unsigned int lineNumber) : parentexcp(file, lineNumber) { this->SetDescription(whatmessage); } newexcp(const std::string & file, unsigned int lineNumber) : parentexcp(file, lineNumber) { this->SetDescription(whatmessage); } itkOverrideGetNameOfClassMacro(newexcp, ); }; }"
138138
"itkConceptMacro(thisName,thisConcept)= /* This class requires thisName in the form of thisConcept */"
139139
"std::numeric_limits= std::numeric_limits"
140140
"ITK_TYPENAME= typename"

0 commit comments

Comments
 (0)