Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/QtVtkComponents/QtVtkMgx3DApplication.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <vtkOpenGLRenderWindow.h>
#include <vtkMapper.h>
#include <vtkTextProperty.h>
#include <vtkVersionMacros.h>

#include <mgx_config.h>
using namespace std;
Expand Down
4 changes: 2 additions & 2 deletions src/VtkComponents/protected/VtkComponents/vtkECMAreaPicker.h
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ class VTKRENDERINGCORE_EXPORT vtkECMAreaPicker : public vtkAbstractPropPicker
double Y1;

private:
vtkECMAreaPicker(const vtkECMAreaPicker&) VTK_DELETE_FUNCTION;
void operator=(const vtkECMAreaPicker&) VTK_DELETE_FUNCTION;
vtkECMAreaPicker(const vtkECMAreaPicker&);
void operator=(const vtkECMAreaPicker&);
};

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ class VTKFILTERSGENERAL_EXPORT vtkECMExtractSelectedFrustum : public vtkExtractS
public:
static vtkECMExtractSelectedFrustum *New();
vtkTypeMacro(vtkECMExtractSelectedFrustum, vtkExtractSelectionBase);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent);

/**
* Return the MTime taking into account changes to the Frustum
*/
vtkMTimeType GetMTime() VTK_OVERRIDE;
vtkMTimeType GetMTime();

//@{
/**
Expand Down Expand Up @@ -151,16 +151,16 @@ class VTKFILTERSGENERAL_EXPORT vtkECMExtractSelectedFrustum : public vtkExtractS

protected:
vtkECMExtractSelectedFrustum(vtkPlanes *f=NULL);
~vtkECMExtractSelectedFrustum() VTK_OVERRIDE;
~vtkECMExtractSelectedFrustum();

// sets up output dataset
int RequestDataObject(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector) VTK_OVERRIDE;
vtkInformationVector* outputVector);

//execution
int RequestData(vtkInformation *,
vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
vtkInformationVector **, vtkInformationVector *);
int ABoxFrustumIsect(double bounds[], vtkCell *cell);
int FrustumClipPolygon(int nverts,
double *ivlist, double *wvlist, double *ovlist);
Expand Down Expand Up @@ -193,8 +193,8 @@ class VTKFILTERSGENERAL_EXPORT vtkECMExtractSelectedFrustum : public vtkExtractS
int ShowBounds;

private:
vtkECMExtractSelectedFrustum(const vtkECMExtractSelectedFrustum&) VTK_DELETE_FUNCTION;
void operator=(const vtkECMExtractSelectedFrustum&) VTK_DELETE_FUNCTION;
vtkECMExtractSelectedFrustum(const vtkECMExtractSelectedFrustum&);
void operator=(const vtkECMExtractSelectedFrustum&);

};

Expand Down