Commit 5629eba7 authored by Dave DeMarle's avatar Dave DeMarle Committed by Code Review
Browse files

Merge topic 'doc-macros' into master

cadd4a07 STYLE: Update documentation generation of vtkTypeMacro
f142e3f3 STYLE: Remove duplicate macro definition in doc generation script
parents 431f3477 cadd4a07
...@@ -51,6 +51,10 @@ class vtkWeakPointerBaseToObjectBaseFriendship; ...@@ -51,6 +51,10 @@ class vtkWeakPointerBaseToObjectBaseFriendship;
class VTKCOMMONCORE_EXPORT vtkObjectBase class VTKCOMMONCORE_EXPORT vtkObjectBase
{ {
// Description:
// Return the class name as a string. This method is overridden
// in all subclasses of vtkObjectBase with the vtkTypeMacro found
// in vtkSetGet.h.
virtual const char* GetClassNameInternal() const { return "vtkObjectBase"; } virtual const char* GetClassNameInternal() const { return "vtkObjectBase"; }
public: public:
...@@ -61,9 +65,7 @@ public: ...@@ -61,9 +65,7 @@ public:
#endif #endif
// Description: // Description:
// Return the class name as a string. This method is defined // Return the class name as a string.
// in all subclasses of vtkObjectBase with the vtkTypeMacro found
// in vtkSetGet.h.
const char* GetClassName() const; const char* GetClassName() const;
#ifdef VTK_WORKAROUND_WINDOWS_MANGLE #ifdef VTK_WORKAROUND_WINDOWS_MANGLE
......
...@@ -173,14 +173,14 @@ PREDEFINED = "vtkSetMacro(name,type)= \ ...@@ -173,14 +173,14 @@ PREDEFINED = "vtkSetMacro(name,type)= \
virtual float *Get##name();" \ virtual float *Get##name();" \
"vtkTypeMacro(thisClass,superclass)= \ "vtkTypeMacro(thisClass,superclass)= \
typedef superclass Superclass; \ typedef superclass Superclass; \
virtual const char *GetClassName(); \ private: \
virtual const char* GetClassNameInternal() const; \
public: \
static int IsTypeOf(const char *type); \ static int IsTypeOf(const char *type); \
virtual int IsA(const char *type); \ virtual int IsA(const char *type); \
static thisClass* SafeDownCast(vtkObject *o);" \ static thisClass* SafeDownCast(vtkObjectBase *o); \
"vtkTypeMacro(thisClass,superclass)= \ protected: \
typedef superclass Superclass; \ virtual vtkObjectBase *NewInstanceInternal() const; \
virtual const char *GetClassName(); \ public: \
static int IsTypeOf(const char *type); \ thisClass *NewInstance() const;" \
virtual int IsA(const char *type); \
static thisClass* SafeDownCast(vtkObject *o);" \
"VTK_LEGACY(x)= x" "VTK_LEGACY(x)= x"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment