Commit 40f458e9 authored by Sean McBride's avatar Sean McBride Committed by Code Review

Merge topic 'more-header-guards' into master

18f40505 Fix more include guards to not start with __vtk
parents e8b56036 18f40505
......@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#ifndef __vtkADIOSUtilities_h
#define __vtkADIOSUtilities_h
#ifndef vtkADIOSUtilities_h
#define vtkADIOSUtilities_h
#include <vtkType.h>
......
......@@ -16,8 +16,8 @@
// .SECTION Description
// .SECTION See Also
#ifndef __vtkGDAL_h
#define __vtkGDAL_h
#ifndef vtkGDAL_h
#define vtkGDAL_h
#include "vtkObject.h"
#include <vtkIOGDALModule.h> // For export macro
......@@ -40,5 +40,5 @@ class VTKIOGDAL_EXPORT vtkGDAL : public vtkObject
void operator=(const vtkGDAL&); // Not implemented
};
#endif // __vtkGDAL_h
#endif // vtkGDAL_h
// VTK-HeaderTest-Exclude: vtkGDAL.h
......@@ -23,8 +23,8 @@
// render window (it is disabled by default). Otherwise the lines will be
// drawn through the labels.
#ifndef __vtkLabeledContourMapper_h
#define __vtkLabeledContourMapper_h
#ifndef vtkLabeledContourMapper_h
#define vtkLabeledContourMapper_h
#include "vtkRenderingCoreModule.h" // For export macro
......
......@@ -16,8 +16,8 @@
// An mapper that uses imposters to draw PointGaussians. Supports
// transparency and picking as well.
#ifndef __vtkPointGaussianMapper_h
#define __vtkPointGaussianMapper_h
#ifndef vtkPointGaussianMapper_h
#define vtkPointGaussianMapper_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkPolyDataMapper.h"
......
......@@ -20,8 +20,8 @@
// .SECTION see also
// vtkTextProperty vtkCollection
#ifndef __vtkTextPropertyCollection_h
#define __vtkTextPropertyCollection_h
#ifndef vtkTextPropertyCollection_h
#define vtkTextPropertyCollection_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkCollection.h"
......
......@@ -19,8 +19,8 @@
// This class extends vtkOpenGLCamera by introducing API wherein the camera
// matrices can be set explicitly by the application.
#ifndef __vtkExternalOpenGLCamera_h
#define __vtkExternalOpenGLCamera_h
#ifndef vtkExternalOpenGLCamera_h
#define vtkExternalOpenGLCamera_h
#include "vtkRenderingExternalModule.h" // For export macro
#include "vtkOpenGLCamera.h"
......
......@@ -35,8 +35,8 @@
// WindowIsCurrentEvent and WindowFrameEvent.
// \sa vtkGenericOpenGLRenderWindow
#ifndef __vtkExternalOpenGLRenderWindow_h
#define __vtkExternalOpenGLRenderWindow_h
#ifndef vtkExternalOpenGLRenderWindow_h
#define vtkExternalOpenGLRenderWindow_h
#include "vtkRenderingExternalModule.h" // For export macro
#include "vtkGenericOpenGLRenderWindow.h"
......@@ -66,4 +66,4 @@ private:
vtkExternalOpenGLRenderWindow(const vtkExternalOpenGLRenderWindow&); // Not implemented
void operator=(const vtkExternalOpenGLRenderWindow&); // Not implemented
};
#endif //__vtkExternalOpenGLRenderWindow_h
#endif //vtkExternalOpenGLRenderWindow_h
......@@ -27,8 +27,8 @@
//
// \sa vtkExternalOpenGLCamera
#ifndef __vtkExternalOpenGLRenderer_h
#define __vtkExternalOpenGLRenderer_h
#ifndef vtkExternalOpenGLRenderer_h
#define vtkExternalOpenGLRenderer_h
#include "vtkRenderingExternalModule.h" // For export macro
#include "vtkOpenGLRenderer.h"
......@@ -74,4 +74,4 @@ private:
void operator=(const vtkExternalOpenGLRenderer&); // Not implemented.
};
#endif //__vtkExternalOpenGLRenderer_h
#endif //vtkExternalOpenGLRenderer_h
......@@ -17,8 +17,8 @@
// vtkOpenGLLabeledContourMapper is an override for vtkLabeledContourMapper
// that implements stenciling using the OpenGL API.
#ifndef __vtkOpenGLLabelContourMapper_h
#define __vtkOpenGLLabelContourMapper_h
#ifndef vtkOpenGLLabelContourMapper_h
#define vtkOpenGLLabelContourMapper_h
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkLabeledContourMapper.h"
......
......@@ -16,8 +16,8 @@
// An OpenGL mapper that uses imposters to draw PointGaussians. Supports
// transparency and picking as well.
#ifndef __vtkOpenGLPointGaussianMapper_h
#define __vtkOpenGLPointGaussianMapper_h
#ifndef vtkOpenGLPointGaussianMapper_h
#define vtkOpenGLPointGaussianMapper_h
#include "vtkRenderingOpenGL2Module.h" // For export macro
#include "vtkPointGaussianMapper.h"
......
Markdown is supported
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