diff --git a/Accelerators/Piston/vtkPistonContour.h b/Accelerators/Piston/vtkPistonContour.h
index 14eb505ba916d140c6ba1b867fc9350f925bf7b8..86923012a0284e82668036b8ae48284cdecc4c3c 100644
--- a/Accelerators/Piston/vtkPistonContour.h
+++ b/Accelerators/Piston/vtkPistonContour.h
@@ -37,10 +37,11 @@ public:
*/
vtkSetMacro(IsoValue, float);
vtkGetMacro(IsoValue, float);
+ //@}
+
protected:
vtkPistonContour();
~vtkPistonContour();
- //@}
/**
* Method that does the actual calculation. Funnels down to ExecuteData.
diff --git a/Accelerators/Piston/vtkPistonThreshold.h b/Accelerators/Piston/vtkPistonThreshold.h
index 6ce3a863ea4a995b84725ff7fa3b42b13ddf072b..57c31500246f840d92d539f21154a77643abe2ca 100644
--- a/Accelerators/Piston/vtkPistonThreshold.h
+++ b/Accelerators/Piston/vtkPistonThreshold.h
@@ -45,10 +45,11 @@ public:
*/
vtkSetMacro(MaxValue, float);
vtkGetMacro(MaxValue, float);
+ //@}
+
protected:
vtkPistonThreshold();
~vtkPistonThreshold();
- //@}
/**
* Method that does the actual calculation.
diff --git a/Charts/Core/vtkPlotArea.h b/Charts/Core/vtkPlotArea.h
index c11f087cee56af32086a47c1833e7383c71299b7..9e22edb0edb0123514099c342b743f796a9d3c82 100644
--- a/Charts/Core/vtkPlotArea.h
+++ b/Charts/Core/vtkPlotArea.h
@@ -102,7 +102,6 @@ public:
const vtkVector2f& tolerance,
vtkVector2f* location);
- //@{
/**
* Generate and return the tooltip label string for this plot
* The segmentIndex parameter is ignored, except for vtkPlotBar
@@ -110,10 +109,10 @@ public:
virtual vtkStdString GetTooltipLabel(const vtkVector2d &plotPos,
vtkIdType seriesIndex,
vtkIdType segmentIndex);
+
protected:
vtkPlotArea();
~vtkPlotArea();
- //@}
/**
* Name of the valid point mask array.
diff --git a/Charts/Core/vtkPlotFunctionalBag.h b/Charts/Core/vtkPlotFunctionalBag.h
index 6f6f32382e81833a4f35bd7f307ef641bed7ee93..851622af6ac13e197a9bc8686b27aea1ab0b498e 100644
--- a/Charts/Core/vtkPlotFunctionalBag.h
+++ b/Charts/Core/vtkPlotFunctionalBag.h
@@ -124,15 +124,14 @@ public:
*/
virtual bool SelectPoints(const vtkVector2f& min, const vtkVector2f& max);
- //@{
/**
* Select all points in the specified polygon.
*/
virtual bool SelectPointsInPolygon(const vtkContextPolygon &polygon);
+
protected:
vtkPlotFunctionalBag();
~vtkPlotFunctionalBag();
- //@}
/**
* Populate the data arrays ready to operate on input data.
diff --git a/Common/Core/vtkArrayIterator.h b/Common/Core/vtkArrayIterator.h
index f6d864d42d1fcd0cc361738d7c7947992e562808..39f0e2c31ec292a8167de9010290081ba0a4b97e 100644
--- a/Common/Core/vtkArrayIterator.h
+++ b/Common/Core/vtkArrayIterator.h
@@ -61,16 +61,15 @@ public:
*/
virtual void Initialize(vtkAbstractArray* array) = 0;
- //@{
/**
* Get the data type from the underlying array. Returns 0 if
* no underlying array is present.
*/
virtual int GetDataType()=0;
+
protected:
vtkArrayIterator();
~vtkArrayIterator() VTK_OVERRIDE;
- //@}
private:
vtkArrayIterator(const vtkArrayIterator&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkArrayIteratorTemplate.h b/Common/Core/vtkArrayIteratorTemplate.h
index 03cb62a44e88ad67afb8bdc5b50daf13044406af..72ace91c5283b390ad161811da560626c4b8e323 100644
--- a/Common/Core/vtkArrayIteratorTemplate.h
+++ b/Common/Core/vtkArrayIteratorTemplate.h
@@ -102,15 +102,14 @@ public:
*/
int GetDataTypeSize();
- //@{
/**
* This is the data type for the value.
*/
typedef T ValueType;
+
protected:
vtkArrayIteratorTemplate();
~vtkArrayIteratorTemplate() VTK_OVERRIDE;
- //@}
T* Pointer;
private:
diff --git a/Common/Core/vtkCollection.h b/Common/Core/vtkCollection.h
index 13cde7dd3e1655c3c6f48a37e61c5cfef70cc879..1b15c890e49a7b5f966f290983ce3bfe19624d84 100644
--- a/Common/Core/vtkCollection.h
+++ b/Common/Core/vtkCollection.h
@@ -147,10 +147,11 @@ public:
*/
void Register(vtkObjectBase* o) VTK_OVERRIDE;
void UnRegister(vtkObjectBase* o) VTK_OVERRIDE;
+ //@}
+
protected:
vtkCollection();
~vtkCollection() VTK_OVERRIDE;
- //@}
virtual void RemoveElement(vtkCollectionElement *element,
vtkCollectionElement *previous);
diff --git a/Common/Core/vtkDataArraySelection.h b/Common/Core/vtkDataArraySelection.h
index fffe42b781df587a39e6cd2efea7071ccb737812..a77049c8c5c8c009a55971b7015728f68634272a 100644
--- a/Common/Core/vtkDataArraySelection.h
+++ b/Common/Core/vtkDataArraySelection.h
@@ -148,15 +148,14 @@ public:
int defaultStatus);
//@}
- //@{
/**
* Copy the selections from the given vtkDataArraySelection instance.
*/
void CopySelections(vtkDataArraySelection* selections);
+
protected:
vtkDataArraySelection();
~vtkDataArraySelection() VTK_OVERRIDE;
- //@}
// Internal implementation details.
vtkDataArraySelectionInternals* Internal;
diff --git a/Common/Core/vtkOStrStreamWrapper.h b/Common/Core/vtkOStrStreamWrapper.h
index f0ad36500d6d6d7ab0be6d1e9b6c9f2f6bce4622..61251fba9f29d4afc40dbfaae639935b7ca64817 100644
--- a/Common/Core/vtkOStrStreamWrapper.h
+++ b/Common/Core/vtkOStrStreamWrapper.h
@@ -64,10 +64,11 @@ public:
*/
void freeze();
void freeze(int);
+ //@}
+
protected:
// The pointer returned by str().
char* Result;
- //@}
// Whether the caller of str() owns the memory.
int Frozen;
diff --git a/Common/Core/vtkOverrideInformation.h b/Common/Core/vtkOverrideInformation.h
index 42f3be42da9e548859f8eb97edf3b684f7135384..1067493feefdd028f5fac5fee6e1a4b0a51a7b47 100644
--- a/Common/Core/vtkOverrideInformation.h
+++ b/Common/Core/vtkOverrideInformation.h
@@ -75,18 +75,26 @@ public:
{
return this->ObjectFactory;
}
+
//@{
/**
* Set the class override name
*/
vtkSetStringMacro(ClassOverrideName);
- // Set the class override with name
+
+ /**
+ * Set the class override with name
+ */
vtkSetStringMacro(ClassOverrideWithName);
- // Set the description
+
+ /**
+ * Set the description
+ */
vtkSetStringMacro(Description);
+ //@}
+
protected:
virtual void SetObjectFactory(vtkObjectFactory*);
- //@}
private:
vtkOverrideInformation();
diff --git a/Common/DataModel/vtkMeanValueCoordinatesInterpolator.h b/Common/DataModel/vtkMeanValueCoordinatesInterpolator.h
index c17e9b0ed898a04d6c220b626249503c8c5c3588..7d9cd183e9ad0526ab151924e56e1c0f28a36903 100644
--- a/Common/DataModel/vtkMeanValueCoordinatesInterpolator.h
+++ b/Common/DataModel/vtkMeanValueCoordinatesInterpolator.h
@@ -77,7 +77,6 @@ public:
static void ComputeInterpolationWeights(double x[3], vtkPoints *pts,
vtkIdList *tris, double *weights);
- //@{
/**
* Method to generate interpolation weights for a point x[3] from a list of
* polygonal faces. In this version of the method, the faces are defined by
@@ -87,10 +86,10 @@ public:
*/
static void ComputeInterpolationWeights(double x[3], vtkPoints *pts,
vtkCellArray *tris, double *weights);
+
protected:
vtkMeanValueCoordinatesInterpolator();
~vtkMeanValueCoordinatesInterpolator() VTK_OVERRIDE;
- //@}
/**
* Internal method that sets up the processing of triangular meshes.
diff --git a/Common/System/vtkServerSocket.h b/Common/System/vtkServerSocket.h
index 18cd399ba8e7e6b729e0629154300dadd21e7f7a..646aa1443eb20c79d40cfd502966ede7a8dfc1b9 100644
--- a/Common/System/vtkServerSocket.h
+++ b/Common/System/vtkServerSocket.h
@@ -46,15 +46,14 @@ public:
*/
vtkClientSocket* WaitForConnection(unsigned long msec=0);
- //@{
/**
* Returns the port on which the server is running.
*/
int GetServerPort();
+
protected:
vtkServerSocket();
~vtkServerSocket() VTK_OVERRIDE;
- //@}
private:
vtkServerSocket(const vtkServerSocket&) VTK_DELETE_FUNCTION;
diff --git a/Common/System/vtkSocket.h b/Common/System/vtkSocket.h
index 6cf82f7e93d39824eaf3b57152019ceeb00dd31d..9fd1ef1ecc59c0596280e5e71f23331e709037f0 100644
--- a/Common/System/vtkSocket.h
+++ b/Common/System/vtkSocket.h
@@ -61,15 +61,12 @@ public:
*/
int Receive(void* data, int length, int readFully=1);
- //@{
/**
* Provides access to the internal socket descriptor. This is valid only when
* GetConnected() returns true.
*/
vtkGetMacro(SocketDescriptor, int);
- //@}
- //@{
/**
* Selects set of sockets. Returns 0 on timeout, -1 on error.
* 1 on success. Selected socket's index is returned thru
@@ -77,10 +74,10 @@ public:
*/
static int SelectSockets(const int* sockets_to_select, int size,
unsigned long msec, int* selected_index);
+
protected:
vtkSocket();
~vtkSocket() VTK_OVERRIDE;
- //@}
int SocketDescriptor;
diff --git a/Common/System/vtkSocketCollection.h b/Common/System/vtkSocketCollection.h
index 7a50dcc94c813ec548d922c855ae6c5d3f74fed9..d4923ed6f550b757664391f7ce2c84bf3a7fe571 100644
--- a/Common/System/vtkSocketCollection.h
+++ b/Common/System/vtkSocketCollection.h
@@ -61,10 +61,11 @@ public:
void RemoveItem(int i);
void RemoveItem(vtkObject *);
void RemoveAllItems();
+ //@}
+
protected:
vtkSocketCollection();
~vtkSocketCollection() VTK_OVERRIDE;
- //@}
vtkSocket* SelectedSocket;
private:
diff --git a/Deprecated/vtkGraphHierarchicalBundle.h b/Deprecated/vtkGraphHierarchicalBundle.h
index a2c7bd99c47bb21a9293e09473b2b740ffa7cf9a..1da2a468ac15d9a68ed101b3654e768b2e163477 100644
--- a/Deprecated/vtkGraphHierarchicalBundle.h
+++ b/Deprecated/vtkGraphHierarchicalBundle.h
@@ -100,15 +100,14 @@ protected:
double BundlingStrength;
bool DirectMapping;
- //@{
/**
* Convert the vtkGraph into vtkPolyData.
*/
int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
+
private:
vtkGraphHierarchicalBundle(const vtkGraphHierarchicalBundle&) VTK_DELETE_FUNCTION;
void operator=(const vtkGraphHierarchicalBundle&) VTK_DELETE_FUNCTION;
};
- //@}
#endif
diff --git a/Filters/General/vtkCurvatures.h b/Filters/General/vtkCurvatures.h
index d5de6df8e4619fa1bbb3873bafc24957dd8c89ee..28fa69d8c03b97069a6fa1ffe9e2ba586e97b572 100644
--- a/Filters/General/vtkCurvatures.h
+++ b/Filters/General/vtkCurvatures.h
@@ -110,9 +110,10 @@ public:
vtkSetMacro(InvertMeanCurvature,int);
vtkGetMacro(InvertMeanCurvature,int);
vtkBooleanMacro(InvertMeanCurvature,int);
+ //@}
+
protected:
vtkCurvatures();
- //@}
// Usual data generation method
int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
diff --git a/Filters/Imaging/vtkComputeHistogram2DOutliers.h b/Filters/Imaging/vtkComputeHistogram2DOutliers.h
index 983e152bdaba976ab058989ba302f8a13245899a..8297265bc8502552d96e0f2e447966be636a04c0 100644
--- a/Filters/Imaging/vtkComputeHistogram2DOutliers.h
+++ b/Filters/Imaging/vtkComputeHistogram2DOutliers.h
@@ -129,16 +129,15 @@ protected:
*/
virtual int ComputeOutlierThresholds(vtkImageData* histogram, vtkDoubleArray* thresholds, double threshold);
- //@{
/**
* Take a set of range thresholds (bin extents) and filter out rows from the input table data that
* fits inside those thresholds.
*/
virtual int FillOutlierIds(vtkTable* data, vtkCollection* thresholds, vtkIdTypeArray* rowIds, vtkTable* outTable);
+
private:
vtkComputeHistogram2DOutliers(const vtkComputeHistogram2DOutliers&) VTK_DELETE_FUNCTION;
void operator=(const vtkComputeHistogram2DOutliers&) VTK_DELETE_FUNCTION;
};
- //@}
#endif
diff --git a/Filters/Imaging/vtkExtractHistogram2D.h b/Filters/Imaging/vtkExtractHistogram2D.h
index f67720ddf78006ac14f560707a3c3a31d24cc410..775d2631260c0355a26b1e62ba7dd4ed66cd0433 100644
--- a/Filters/Imaging/vtkExtractHistogram2D.h
+++ b/Filters/Imaging/vtkExtractHistogram2D.h
@@ -240,15 +240,14 @@ protected:
vtkInformationVector **inputVector,
vtkInformationVector *outputVector);
- //@{
/**
* Get points to the arrays that live in the two input columns
*/
int GetInputArrays(vtkDataArray*& col1, vtkDataArray*& col2);
+
private:
vtkExtractHistogram2D(const vtkExtractHistogram2D&) VTK_DELETE_FUNCTION;
void operator=(const vtkExtractHistogram2D&) VTK_DELETE_FUNCTION;
};
- //@}
#endif
diff --git a/Filters/Parallel/vtkAngularPeriodicFilter.h b/Filters/Parallel/vtkAngularPeriodicFilter.h
index 70acded1f54c10276566ec535f4c70f85be6a72e..c20e01d2c7d7e134e20f97ccd14fcf0bf13e7d66 100644
--- a/Filters/Parallel/vtkAngularPeriodicFilter.h
+++ b/Filters/Parallel/vtkAngularPeriodicFilter.h
@@ -169,7 +169,6 @@ protected:
vtkCompositeDataSet* output,
vtkCompositeDataSet* input);
- //@{
/**
* Generate a name for a piece in the periodic dataset from the input dataset
*/
@@ -177,10 +176,10 @@ protected:
vtkCompositeDataIterator* inputLoc,
vtkMultiPieceDataSet* output,
vtkIdType outputId);
+
private:
vtkAngularPeriodicFilter(const vtkAngularPeriodicFilter&) VTK_DELETE_FUNCTION;
void operator=(const vtkAngularPeriodicFilter&) VTK_DELETE_FUNCTION;
- //@}
bool ComputeRotationsOnTheFly;
diff --git a/Filters/ParallelStatistics/vtkPBivariateLinearTableThreshold.h b/Filters/ParallelStatistics/vtkPBivariateLinearTableThreshold.h
index 13214e1800cbfd23e3de629b27a5865d4f198d6c..b0601502118052afb6b54d5312a33bb4f9fa085e 100644
--- a/Filters/ParallelStatistics/vtkPBivariateLinearTableThreshold.h
+++ b/Filters/ParallelStatistics/vtkPBivariateLinearTableThreshold.h
@@ -50,10 +50,11 @@ public:
*/
virtual void SetController(vtkMultiProcessController*);
vtkGetObjectMacro(Controller,vtkMultiProcessController);
+ //@}
+
protected:
vtkPBivariateLinearTableThreshold();
virtual ~vtkPBivariateLinearTableThreshold();
- //@}
virtual int RequestData(
vtkInformation*,
diff --git a/Filters/Statistics/vtkBivariateLinearTableThreshold.h b/Filters/Statistics/vtkBivariateLinearTableThreshold.h
index a427c86d14e367b22a7d7f15e3bf6df3a7d7a251..a46b60bba47fe14d8c07acea6496c0be75fd877b 100644
--- a/Filters/Statistics/vtkBivariateLinearTableThreshold.h
+++ b/Filters/Statistics/vtkBivariateLinearTableThreshold.h
@@ -212,6 +212,7 @@ protected:
*/
virtual int ApplyThreshold(vtkTable* tableToThreshold, vtkIdTypeArray* acceptedIds);
+ //@{
/**
* Determine if x,y is above all specified lines.
*/
@@ -227,15 +228,15 @@ protected:
*/
int ThresholdNear(double x, double y);
- //@{
/**
* Determine if x,y is between ANY TWO of the specified lines.
*/
int ThresholdBetween(double x, double y);
+ //@}
+
private:
vtkBivariateLinearTableThreshold(const vtkBivariateLinearTableThreshold&) VTK_DELETE_FUNCTION;
void operator=(const vtkBivariateLinearTableThreshold&) VTK_DELETE_FUNCTION;
};
- //@}
#endif
diff --git a/IO/Core/vtkBase64InputStream.h b/IO/Core/vtkBase64InputStream.h
index 24522c6e51e5f4c4567e7e8364bd8a1875e650a9..0ca4f739c894698703ebb20e30fc10c5fae8d4d5 100644
--- a/IO/Core/vtkBase64InputStream.h
+++ b/IO/Core/vtkBase64InputStream.h
@@ -52,7 +52,6 @@ public:
*/
size_t Read(void* data, size_t length);
- //@{
/**
* Called after all desired calls to Seek and Read have been made.
* After this call, the caller is free to change the position of the
@@ -60,10 +59,10 @@ public:
* call to StartReading.
*/
void EndReading();
+
protected:
vtkBase64InputStream();
~vtkBase64InputStream();
- //@}
// Number of decoded bytes left in Buffer from last call to Read.
int BufferLength;
diff --git a/IO/Core/vtkDataCompressor.h b/IO/Core/vtkDataCompressor.h
index 34b20f14c36b3b5466b4677585554a3f31f091ba..50847ed98a5c947796d36010c9c4812410397f4e 100644
--- a/IO/Core/vtkDataCompressor.h
+++ b/IO/Core/vtkDataCompressor.h
@@ -73,7 +73,6 @@ public:
vtkUnsignedCharArray* Compress(unsigned char const* uncompressedData,
size_t uncompressedSize);
- //@{
/**
* Uncompress the given data. A vtkUnsignedCharArray containing the
* compressed data is returned with a reference count of 1. The
@@ -84,10 +83,10 @@ public:
vtkUnsignedCharArray* Uncompress(unsigned char const* compressedData,
size_t compressedSize,
size_t uncompressedSize);
+
protected:
vtkDataCompressor();
~vtkDataCompressor();
- //@}
// Actual compression method. This must be provided by a subclass.
// Must return the size of the compressed data, or zero on error.
diff --git a/IO/Core/vtkDelimitedTextWriter.h b/IO/Core/vtkDelimitedTextWriter.h
index 0f89a0fb6c80236c8d79373f6b04d7f9f71ae931..c62624d3af0cb58dd3736de9e51d9bed5a4f7b33 100644
--- a/IO/Core/vtkDelimitedTextWriter.h
+++ b/IO/Core/vtkDelimitedTextWriter.h
@@ -89,16 +89,15 @@ public:
*/
char *RegisterAndGetOutputString();
- //@{
/**
* Internal method: Returns the "string" with the "StringDelimiter" if
* UseStringDelimiter is true.
*/
vtkStdString GetString(vtkStdString string);
+
protected:
vtkDelimitedTextWriter();
~vtkDelimitedTextWriter();
- //@}
bool WriteToOutputString;
char* OutputString;
diff --git a/IO/Export/vtkX3DExporterFIWriter.h b/IO/Export/vtkX3DExporterFIWriter.h
index df58bec8145b6c62c1ef7c47ac0a632efb28e8e5..332bdc09d5d560282d380dc2bf0950606f329aee 100644
--- a/IO/Export/vtkX3DExporterFIWriter.h
+++ b/IO/Export/vtkX3DExporterFIWriter.h
@@ -78,11 +78,11 @@ public:
vtkSetClampMacro(Fastest, int, 0, 1);
vtkBooleanMacro(Fastest, int);
vtkGetMacro(Fastest, int);
+ //@}
+
protected:
vtkX3DExporterFIWriter();
~vtkX3DExporterFIWriter();
- //@}
-
private:
void StartAttribute(int attributeID, bool literal, bool addToTable = false);
diff --git a/IO/Export/vtkX3DExporterWriter.h b/IO/Export/vtkX3DExporterWriter.h
index 1caa8ecbbad1916df58b4e2d59758110993edfdc..1d198ff53b9f414c98031d1539ab17e54dc4bbfb 100644
--- a/IO/Export/vtkX3DExporterWriter.h
+++ b/IO/Export/vtkX3DExporterWriter.h
@@ -169,28 +169,27 @@ public:
*/
virtual void SetField(int attributeID, const double* values, size_t size) = 0;
- /**
- * Sets the field specified with attributeID
- * of the active node to the given value.
- * The type of the field is specified with type
- * It is possible to specify that the field is an
- * image for optimized formating or compression
- * Supported types: MFINT32, SFIMAGE
- */
+ /**
+ * Sets the field specified with attributeID
+ * of the active node to the given value.
+ * The type of the field is specified with type
+ * It is possible to specify that the field is an
+ * image for optimized formating or compression
+ * Supported types: MFINT32, SFIMAGE
+ */
virtual void SetField(int attributeID, const int* values, size_t size, bool image = false) = 0;
- //@{
- /**
+ /*
* Sets the field specified with attributeID
* of the active node to the given value.
* The type of the field is specified with type
* Supported types: MFString
- * virtual void SetField(int attributeID, int type, std::string) = 0;
*/
+ // virtual void SetField(int attributeID, int type, std::string) = 0;
+
protected:
vtkX3DExporterWriter();
~vtkX3DExporterWriter();
- //@}
char *OutputString;
int OutputStringLength;
diff --git a/IO/Geometry/vtkWindBladeReader.h b/IO/Geometry/vtkWindBladeReader.h
index 4268eba562647a4d5e44423a85eca0a9ddc6c325..1fe3bef871e098d5c90104834cdb855754d35874 100644
--- a/IO/Geometry/vtkWindBladeReader.h
+++ b/IO/Geometry/vtkWindBladeReader.h
@@ -254,7 +254,7 @@ protected:
void* clientdata, void* calldata);
virtual int FillOutputPortInformation(int, vtkInformation*);
- //@{
+
/**
* We intercept the requests to check for which port
* information is being requested for and if there is
@@ -264,9 +264,9 @@ protected:
int ProcessRequest(vtkInformation *request,
vtkInformationVector **inInfo,
vtkInformationVector *outInfo);
+
private:
WindBladeReaderInternal * Internal;
- //@}
vtkWindBladeReader(const vtkWindBladeReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkWindBladeReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Image/vtkImageReader2Factory.h b/IO/Image/vtkImageReader2Factory.h
index 601fa630d85731e957c8d4ec7a5f2fcda7deb633..abfde20f2828294dafcb5d05660eb8f37796ab80 100644
--- a/IO/Image/vtkImageReader2Factory.h
+++ b/IO/Image/vtkImageReader2Factory.h
@@ -64,16 +64,15 @@ public:
VTK_NEWINSTANCE
static vtkImageReader2* CreateImageReader2(const char* path);
- //@{
/**
* The caller must allocate the vtkImageReader2Collection and pass in the
* pointer to this method.
*/
static void GetRegisteredReaders(vtkImageReader2Collection* );
+
protected:
vtkImageReader2Factory();
~vtkImageReader2Factory();
- //@}
static void InitializeReaders();
diff --git a/IO/Movie/vtkOggTheoraWriter.h b/IO/Movie/vtkOggTheoraWriter.h
index d41a6ed79a601a2550888067421f1824049d91b8..a6c204f87177f8736f818c25ceb00548e54a4f6c 100644
--- a/IO/Movie/vtkOggTheoraWriter.h
+++ b/IO/Movie/vtkOggTheoraWriter.h
@@ -76,10 +76,11 @@ public:
vtkSetMacro(Subsampling, int);
vtkGetMacro(Subsampling, int);
vtkBooleanMacro(Subsampling, int);
+ //@}
+
protected:
vtkOggTheoraWriter();
~vtkOggTheoraWriter();
- //@}
vtkOggTheoraWriterInternal *Internals;
diff --git a/IO/ParallelXML/vtkXMLPDataWriter.h b/IO/ParallelXML/vtkXMLPDataWriter.h
index 29bc82678a49fa52f6753a865334fac092b7a877..e26b3934d6f33740d61cda6e86180d4d60b6caa8 100644
--- a/IO/ParallelXML/vtkXMLPDataWriter.h
+++ b/IO/ParallelXML/vtkXMLPDataWriter.h
@@ -144,16 +144,15 @@ protected:
vtkMultiProcessController* Controller;
- //@{
/**
* Valid at end of WriteInternal to indicate if we're going to continue
* execution.
*/
vtkGetMacro(ContinuingExecution, bool);
+
private:
vtkXMLPDataWriter(const vtkXMLPDataWriter&) VTK_DELETE_FUNCTION;
void operator=(const vtkXMLPDataWriter&) VTK_DELETE_FUNCTION;
- //@}
/**
* Method used to delete all written files.
diff --git a/IO/XML/vtkXMLStructuredDataReader.h b/IO/XML/vtkXMLStructuredDataReader.h
index 85d824e108109405a6d5481887cfd7faaa66b454..0dc5f1af37d0e217d5e358a22c20a610b202b316 100644
--- a/IO/XML/vtkXMLStructuredDataReader.h
+++ b/IO/XML/vtkXMLStructuredDataReader.h
@@ -59,16 +59,15 @@ public:
vtkBooleanMacro(WholeSlices, int);
//@}
- //@{
/**
* For the specified port, copy the information this reader sets up in
* SetupOutputInformation to outInfo
*/
virtual void CopyOutputInformation(vtkInformation *outInfo, int port);
+
protected:
vtkXMLStructuredDataReader();
~vtkXMLStructuredDataReader();
- //@}
virtual void SetOutputExtent(int* extent)=0;
int ReadPrimaryElement(vtkXMLDataElement* ePrimary);
diff --git a/Imaging/Hybrid/vtkVoxelModeller.h b/Imaging/Hybrid/vtkVoxelModeller.h
index f47345c47e3610c8043f68d24ce40e188f8c1e14..5806e48990e4ecd6babe3b1f96bdd8d93abb33de 100644
--- a/Imaging/Hybrid/vtkVoxelModeller.h
+++ b/Imaging/Hybrid/vtkVoxelModeller.h
@@ -123,10 +123,11 @@ public:
vtkGetMacro(ForegroundValue, double);
vtkSetMacro(BackgroundValue, double);
vtkGetMacro(BackgroundValue, double);
+ //@}
+
protected:
vtkVoxelModeller();
~vtkVoxelModeller() {}
- //@}
virtual int RequestInformation (vtkInformation *,
vtkInformationVector **,
diff --git a/Imaging/Statistics/vtkImageHistogram.h b/Imaging/Statistics/vtkImageHistogram.h
index 6e6ad07f27171f955f1c4fe79a1e1fc502f02d96..678c5fda2905f89fc8d0bdd70726dd918b6ab676 100644
--- a/Imaging/Statistics/vtkImageHistogram.h
+++ b/Imaging/Statistics/vtkImageHistogram.h
@@ -185,7 +185,6 @@ public:
*/
vtkIdType GetTotal() { return this->Total; }
- //@{
/**
* This is part of the executive, but is public so that it can be accessed
* by non-member functions.
@@ -195,10 +194,10 @@ public:
vtkInformationVector *outputVector,
vtkImageData ***inData,
vtkImageData **outData, int ext[6], int id);
+
protected:
vtkImageHistogram();
~vtkImageHistogram();
- //@}
virtual int RequestUpdateExtent(vtkInformation *vtkNotUsed(request),
vtkInformationVector **inInfo,
diff --git a/Infovis/Core/vtkGraphHierarchicalBundleEdges.h b/Infovis/Core/vtkGraphHierarchicalBundleEdges.h
index 8e74f54a0dadafcfaeffb54c49067aba0ede1055..36a6b26214de16f49d243db331351b1b4acc2314 100644
--- a/Infovis/Core/vtkGraphHierarchicalBundleEdges.h
+++ b/Infovis/Core/vtkGraphHierarchicalBundleEdges.h
@@ -101,15 +101,14 @@ protected:
double BundlingStrength;
bool DirectMapping;
- //@{
/**
* Convert the vtkGraph into vtkPolyData.
*/
int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
+
private:
vtkGraphHierarchicalBundleEdges(const vtkGraphHierarchicalBundleEdges&) VTK_DELETE_FUNCTION;
void operator=(const vtkGraphHierarchicalBundleEdges&) VTK_DELETE_FUNCTION;
};
- //@}
#endif
diff --git a/Infovis/Core/vtkTransferAttributes.h b/Infovis/Core/vtkTransferAttributes.h
index 0da2fdd84b6bf812f7bfde6d891c138bd2a03621..32832a555759d261324707835e4b4b7d4e2d570b 100644
--- a/Infovis/Core/vtkTransferAttributes.h
+++ b/Infovis/Core/vtkTransferAttributes.h
@@ -128,15 +128,14 @@ protected:
vtkVariant DefaultValue;
- //@{
/**
* Convert the vtkGraph into vtkPolyData.
*/
int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
+
private:
vtkTransferAttributes(const vtkTransferAttributes&) VTK_DELETE_FUNCTION;
void operator=(const vtkTransferAttributes&) VTK_DELETE_FUNCTION;
};
- //@}
#endif
diff --git a/Infovis/Core/vtkTreeFieldAggregator.h b/Infovis/Core/vtkTreeFieldAggregator.h
index ab3c9580eac636e33a413b12366f29e987ed508f..28ac83147b57f0d39185274d0f06fbbd580fa907 100644
--- a/Infovis/Core/vtkTreeFieldAggregator.h
+++ b/Infovis/Core/vtkTreeFieldAggregator.h
@@ -82,10 +82,11 @@ public:
vtkSetMacro(LogScale, bool);
vtkGetMacro(LogScale, bool);
vtkBooleanMacro(LogScale, bool);
+ //@}
+
protected:
vtkTreeFieldAggregator();
~vtkTreeFieldAggregator();
- //@}
int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
diff --git a/Interaction/Style/vtkParallelCoordinatesInteractorStyle.h b/Interaction/Style/vtkParallelCoordinatesInteractorStyle.h
index 9cbbc89ca3f588eae8e566b7c2f6349037f84c71..0e910a8e33c2e31a6ab2f7a8b0649e729d222b25 100644
--- a/Interaction/Style/vtkParallelCoordinatesInteractorStyle.h
+++ b/Interaction/Style/vtkParallelCoordinatesInteractorStyle.h
@@ -97,27 +97,32 @@ public:
virtual void OnLeave();
//@}
+ //@{
virtual void StartInspect(int x, int y);
virtual void Inspect(int x, int y);
virtual void EndInspect();
+ //@}
+ //@{
virtual void StartZoom();
virtual void Zoom();
virtual void EndZoom();
+ //@}
+ //@{
virtual void StartPan();
virtual void Pan();
virtual void EndPan();
+ //@}
- //@{
/**
* Override the "fly-to" (f keypress) for images.
*/
virtual void OnChar();
+
protected:
vtkParallelCoordinatesInteractorStyle();
~vtkParallelCoordinatesInteractorStyle();
- //@}
int CursorStartPosition[2];
int CursorCurrentPosition[2];
diff --git a/Parallel/MPI/vtkMPICommunicator.h b/Parallel/MPI/vtkMPICommunicator.h
index cbb90883f43173d336582f558808311c3b6001bf..eeb8101e5b3f47651fb238f0c666a030d41c5611 100644
--- a/Parallel/MPI/vtkMPICommunicator.h
+++ b/Parallel/MPI/vtkMPICommunicator.h
@@ -284,7 +284,6 @@ public:
vtkBooleanMacro(UseSsend, int);
//@}
- //@{
/**
* Copies all the attributes of source, deleting previously
* stored data. The MPI communicator handle is also copied.
@@ -293,10 +292,10 @@ public:
* world communicator, keeping the same context.
*/
void CopyFrom(vtkMPICommunicator* source);
+
protected:
vtkMPICommunicator();
~vtkMPICommunicator();
- //@}
// Obtain size and rank setting NumberOfProcesses and LocalProcessId Should
// not be called if the current communicator does not include this process
diff --git a/Parallel/MPI/vtkMPIController.h b/Parallel/MPI/vtkMPIController.h
index ea05f74e56d7a5e2c807a9e8a32fdea6fb3e9224..4f4732d1b526a7ec5982c0d48d8455e4ca77616e 100644
--- a/Parallel/MPI/vtkMPIController.h
+++ b/Parallel/MPI/vtkMPIController.h
@@ -337,15 +337,14 @@ protected:
static char ProcessorName[];
- //@{
/**
* When set, TriggerRMI uses Ssend instead of Send.
*/
static int UseSsendForRMI;
+
private:
vtkMPIController(const vtkMPIController&) VTK_DELETE_FUNCTION;
void operator=(const vtkMPIController&) VTK_DELETE_FUNCTION;
- //@}
};
diff --git a/Rendering/OpenGL/vtkChooserPainter.h b/Rendering/OpenGL/vtkChooserPainter.h
index 5d476b73e185ac0e4d4d135cdc46f4113b29ba80..f14e986ea4a20c51d4a3ea6b06354d0055e7444f 100644
--- a/Rendering/OpenGL/vtkChooserPainter.h
+++ b/Rendering/OpenGL/vtkChooserPainter.h
@@ -43,17 +43,16 @@ public:
void SetPolyPainter(vtkPolyDataPainter*);
void SetStripPainter(vtkPolyDataPainter*);
- //@{
- /**
+ /*
* Release any graphics resources that are being consumed by this mapper.
* The parameter window could be used to determine which graphic
* resources to release. Merely propagates the call to the painter.
- * void ReleaseGraphicsResources(vtkWindow *);
*/
+ // void ReleaseGraphicsResources(vtkWindow *);
+
protected:
vtkChooserPainter();
~vtkChooserPainter();
- //@}
vtkPolyDataPainter *VertPainter;
vtkPolyDataPainter *LinePainter;
diff --git a/Rendering/OpenGL/vtkCoincidentTopologyResolutionPainter.h b/Rendering/OpenGL/vtkCoincidentTopologyResolutionPainter.h
index c3350cb41bd10530dc2354e018e334fb1b1e909c..b831991e10bfd8a093df5c3773ed5532d0061bbd 100644
--- a/Rendering/OpenGL/vtkCoincidentTopologyResolutionPainter.h
+++ b/Rendering/OpenGL/vtkCoincidentTopologyResolutionPainter.h
@@ -68,17 +68,16 @@ public:
*/
static vtkInformationDoubleVectorKey* POLYGON_OFFSET_PARAMETERS();
- //@{
/**
* When set and when RESOLVE_COINCIDENT_TOPOLOGY is set to use polygon offset,
* solid polygonal faces will be offsetted, otherwise lines/vertices will be
* offsetted.
*/
static vtkInformationIntegerKey* POLYGON_OFFSET_FACES();
+
protected:
vtkCoincidentTopologyResolutionPainter();
~vtkCoincidentTopologyResolutionPainter();
- //@}
/**
* Called before RenderInternal() if the Information has been changed
@@ -107,6 +106,7 @@ protected:
double PolygonOffsetUnits;
double ZShift;
int OffsetFaces;
+
private:
vtkCoincidentTopologyResolutionPainter(const vtkCoincidentTopologyResolutionPainter&) VTK_DELETE_FUNCTION;
void operator=(const vtkCoincidentTopologyResolutionPainter&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkLinesPainter.h b/Rendering/OpenGL/vtkLinesPainter.h
index b2c42208038ea9e398449c7cccb97a36efbbb308..275abf72c33d0864ee151cc1a6d00b96b574c5cd 100644
--- a/Rendering/OpenGL/vtkLinesPainter.h
+++ b/Rendering/OpenGL/vtkLinesPainter.h
@@ -51,18 +51,17 @@ protected:
virtual void RenderInternal(vtkRenderer* renderer, vtkActor* actor,
unsigned long typeflags, bool forceCompileOnly);
- //@{
/**
* The actual rendering happens here. This method is called only when
* SupportedPrimitive is present in typeflags when Render() is invoked.
*/
virtual int RenderPrimitive(unsigned long flags, vtkDataArray* n,
vtkUnsignedCharArray* c, vtkDataArray* t, vtkRenderer* ren);
+
private:
vtkLinesPainter(const vtkLinesPainter&) VTK_DELETE_FUNCTION;
void operator=(const vtkLinesPainter&) VTK_DELETE_FUNCTION;
};
- //@}
diff --git a/Rendering/OpenGL/vtkOpenGLClipPlanesPainter.h b/Rendering/OpenGL/vtkOpenGLClipPlanesPainter.h
index 8747f3392a55a12677a4c8d65bcebaa775e35ada..253afd47e839e83099dbb3ea73d04f56cb4df6e1 100644
--- a/Rendering/OpenGL/vtkOpenGLClipPlanesPainter.h
+++ b/Rendering/OpenGL/vtkOpenGLClipPlanesPainter.h
@@ -40,7 +40,6 @@ protected:
vtkOpenGLClipPlanesPainter();
~vtkOpenGLClipPlanesPainter();
- //@{
/**
* Generates rendering primitives of appropriate type(s).
* Uses the clipping planes to set up clipping regions.
@@ -48,10 +47,10 @@ protected:
*/
virtual void RenderInternal(vtkRenderer* renderer, vtkActor* actor,
unsigned long typeflags, bool forceCompileOnly);
+
private:
vtkOpenGLClipPlanesPainter(const vtkOpenGLClipPlanesPainter&) VTK_DELETE_FUNCTION;
void operator=(const vtkOpenGLClipPlanesPainter&) VTK_DELETE_FUNCTION;
};
- //@}
#endif
diff --git a/Rendering/OpenGL/vtkOpenGLRepresentationPainter.h b/Rendering/OpenGL/vtkOpenGLRepresentationPainter.h
index 1c15a404dc631649a22be9b0b2d5b33f02478695..fd971260f7b23a0a1348ea7f0a802f2877c53152 100644
--- a/Rendering/OpenGL/vtkOpenGLRepresentationPainter.h
+++ b/Rendering/OpenGL/vtkOpenGLRepresentationPainter.h
@@ -52,16 +52,15 @@ protected:
vtkOpenGLRepresentationPainter();
~vtkOpenGLRepresentationPainter();
- //@{
/**
* Changes the polygon mode according to the representation.
*/
void RenderInternal(vtkRenderer* renderer, vtkActor* actor,
unsigned long typeflags,bool forceCompileOnly);
+
private:
vtkOpenGLRepresentationPainter(const vtkOpenGLRepresentationPainter&) VTK_DELETE_FUNCTION;
void operator=(const vtkOpenGLRepresentationPainter&) VTK_DELETE_FUNCTION;
};
- //@}
#endif
diff --git a/Rendering/OpenGL/vtkPointsPainter.h b/Rendering/OpenGL/vtkPointsPainter.h
index bb4f7e1bb76685cf15f7254fe9942f6071e9c7a9..8ddab47b3462457f18007a77d0cf218becdb09d7 100644
--- a/Rendering/OpenGL/vtkPointsPainter.h
+++ b/Rendering/OpenGL/vtkPointsPainter.h
@@ -41,17 +41,16 @@ protected:
vtkPointsPainter();
~vtkPointsPainter();
- //@{
/**
* The actual rendering happens here. This method is called only when
* SupportedPrimitive is present in typeflags when Render() is invoked.
*/
virtual int RenderPrimitive(unsigned long flags, vtkDataArray* n,
vtkUnsignedCharArray* c, vtkDataArray* t, vtkRenderer* ren);
+
private:
vtkPointsPainter(const vtkPointsPainter&) VTK_DELETE_FUNCTION;
void operator=(const vtkPointsPainter&) VTK_DELETE_FUNCTION;
};
- //@}
#endif
diff --git a/Rendering/OpenGL/vtkTStripsPainter.h b/Rendering/OpenGL/vtkTStripsPainter.h
index 9aa72eb55fd2a57e1240d6bc3358582021b9455d..585efe4950936f321c429258a32438f58c3498f0 100644
--- a/Rendering/OpenGL/vtkTStripsPainter.h
+++ b/Rendering/OpenGL/vtkTStripsPainter.h
@@ -34,17 +34,16 @@ protected:
vtkTStripsPainter();
~vtkTStripsPainter();
- //@{
/**
* The actual rendering happens here. This method is called only when
* SupportedPrimitive is present in typeflags when Render() is invoked.
*/
virtual int RenderPrimitive(unsigned long flags, vtkDataArray* n,
vtkUnsignedCharArray* c, vtkDataArray* t, vtkRenderer* ren);
+
private:
vtkTStripsPainter(const vtkTStripsPainter&) VTK_DELETE_FUNCTION;
void operator=(const vtkTStripsPainter&) VTK_DELETE_FUNCTION;
};
- //@}
#endif
diff --git a/Rendering/Volume/vtkFiniteDifferenceGradientEstimator.h b/Rendering/Volume/vtkFiniteDifferenceGradientEstimator.h
index c8131a8320cb9f611471102dd880af56ac3165c4..52da322d1c6dd0750f30aee873dd49a43f3533a0 100644
--- a/Rendering/Volume/vtkFiniteDifferenceGradientEstimator.h
+++ b/Rendering/Volume/vtkFiniteDifferenceGradientEstimator.h
@@ -70,17 +70,15 @@ protected:
vtkFiniteDifferenceGradientEstimator();
~vtkFiniteDifferenceGradientEstimator();
-
- //@{
/**
* Recompute the encoded normals and gradient magnitudes.
*/
void UpdateNormals( void );
+
private:
vtkFiniteDifferenceGradientEstimator(const vtkFiniteDifferenceGradientEstimator&) VTK_DELETE_FUNCTION;
void operator=(const vtkFiniteDifferenceGradientEstimator&) VTK_DELETE_FUNCTION;
};
- //@}
#endif
diff --git a/Rendering/VolumeAMR/vtkAMRVolumeMapper.h b/Rendering/VolumeAMR/vtkAMRVolumeMapper.h
index 4b9ad1a0febd9f6d54c7f0b013f90cfa87dc299a..3e44ef52c89dc84afb433cadf3da4d3f4bcd79ab 100644
--- a/Rendering/VolumeAMR/vtkAMRVolumeMapper.h
+++ b/Rendering/VolumeAMR/vtkAMRVolumeMapper.h
@@ -301,7 +301,6 @@ public:
vtkGetMacro(UseDefaultThreading, bool);
//@}
- //@{
/**
* Utility method used by UpdateResamplerFrustrumMethod() to compute the
* bounds.
@@ -309,10 +308,10 @@ public:
static bool ComputeResamplerBoundsFrustumMethod(
vtkCamera* camera, vtkRenderer* renderer,
const double data_bounds[6], double out_bounds[6]);
+
protected:
vtkAMRVolumeMapper();
~vtkAMRVolumeMapper();
- //@}
// see algorithm for more info
virtual int FillInputPortInformation(int port, vtkInformation* info);
diff --git a/Views/Infovis/vtkParallelCoordinatesHistogramRepresentation.h b/Views/Infovis/vtkParallelCoordinatesHistogramRepresentation.h
index 29f27a6e89a314d374f9768a2177d70fca110306..346b0e69831344ffc70a9731eaeadb544367a4d6 100644
--- a/Views/Infovis/vtkParallelCoordinatesHistogramRepresentation.h
+++ b/Views/Infovis/vtkParallelCoordinatesHistogramRepresentation.h
@@ -220,15 +220,14 @@ protected:
*/
virtual vtkImageData* GetHistogramImage(int idx);
- //@{
/**
* get the table containing just the outlier rows from the input table.
*/
virtual vtkTable* GetOutlierData();
+
private:
vtkParallelCoordinatesHistogramRepresentation(const vtkParallelCoordinatesHistogramRepresentation&) VTK_DELETE_FUNCTION;
void operator=(const vtkParallelCoordinatesHistogramRepresentation&) VTK_DELETE_FUNCTION;
};
- //@}
#endif
diff --git a/Views/Infovis/vtkRenderView.h b/Views/Infovis/vtkRenderView.h
index dc67c55518f12a420f9b061ed75fc2b084bf7908..5319712ac21a46ffa653d52b099f6e4117163d98 100644
--- a/Views/Infovis/vtkRenderView.h
+++ b/Views/Infovis/vtkRenderView.h
@@ -241,10 +241,11 @@ public:
void SetRenderOnMouseMove(bool b);
vtkGetMacro(RenderOnMouseMove, bool);
vtkBooleanMacro(RenderOnMouseMove, bool);
+ //@}
+
protected:
vtkRenderView();
~vtkRenderView();
- //@}
/**
* Called to process events.
diff --git a/Wrapping/PythonCore/vtkSmartPyObject.h b/Wrapping/PythonCore/vtkSmartPyObject.h
index f75126a0407534d1838a5e8a19bf8da3c01840e9..69814152f0c9a16077bd6efac6c380f57e171cb7 100644
--- a/Wrapping/PythonCore/vtkSmartPyObject.h
+++ b/Wrapping/PythonCore/vtkSmartPyObject.h
@@ -89,15 +89,14 @@ public:
* reference count
*/
PyObject *GetPointer() const;
- //@{
/**
* Returns the internal pointer to a PyObject and incrments its reference
* count
*/
PyObject* GetAndIncreaseReferenceCount();
+
private:
PyObject *Object;
};
- //@}
#endif