Merge pull request #759 from jcfr/fix-remaining-cpp98-gcc-build-errors

Fix remaining cpp98 gcc build errors

Libs/Visualization/VTK/Core/ctkVTKScalarsToColorsUtils.cpp

@@ -18,7 +18,6 @@
 
 =========================================================================*/
 // CTK includes
-#include "ctkCompilerDetections_p.h" // For CTK_NULLPTR
 #include "ctkLogger.h"
 #include "ctkVTKScalarsToColorsUtils.h"
 

Libs/Visualization/VTK/Core/vtkDiscretizableColorTransferChart.cpp

@@ -130,6 +130,8 @@ vtkDiscretizableColorTransferChart::vtkDiscretizableColorTransferChart()
 
   this->CompositeHiddenItem = CTK_NULLPTR;
   this->ControlPoints = CTK_NULLPTR;
+
+  this->rangeMoving = RangeMoving_NONE;
 }
 
 // ----------------------------------------------------------------------------

Libs/Visualization/VTK/Core/vtkDiscretizableColorTransferChart.h

@@ -94,7 +94,7 @@ protected:
   enum RangeMoving {
     RangeMoving_NONE, RangeMoving_MIN, RangeMoving_MAX
   };
-  RangeMoving rangeMoving = RangeMoving_NONE;
+  RangeMoving rangeMoving;
 
   double DataRange[2];
   double CurrentRange[2];

Libs/Visualization/VTK/Core/vtkDiscretizableColorTransferControlPointsItem.h

@@ -38,9 +38,9 @@ public:
     vtkCompositeControlPointsItem)
   static vtkDiscretizableColorTransferControlPointsItem* New();
 
-  bool MouseMoveEvent(const vtkContextMouseEvent &mouse) override;
-  bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse) override;
-  bool MouseButtonPressEvent(const vtkContextMouseEvent& mouse) override;
+  bool MouseMoveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+  bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+  bool MouseButtonPressEvent(const vtkContextMouseEvent& mouse) VTK_OVERRIDE;
 
   bool IsProcessing();
   void StartProcessing();

Libs/Visualization/VTK/Core/vtkScalarsToColorsContextItem.cpp

@@ -21,7 +21,6 @@
 
 // CTK includes
 #include "ctkVTKScalarsToColorsUtils.h"
-#include "ctkCompilerDetections_p.h" // For CTK_NULLPTR
 #include "vtkDiscretizableColorTransferChart.h"
 #include "vtkScalarsToColorsHistogramChart.h"
 #include "vtkScalarsToColorsPreviewChart.h"

Libs/Visualization/VTK/Core/vtkScalarsToColorsContextItem.h

@@ -61,7 +61,7 @@ public:
     const char* xAxisColumn, const char* yAxisColumn);
 
   /// Paint event.
-  bool Paint(vtkContext2D* painter) override;
+  bool Paint(vtkContext2D* painter) VTK_OVERRIDE;
 
   /// Get/Set the color of the current control point.
   void SetCurrentControlPointColor(const double rgb[3]);
@@ -98,7 +98,7 @@ protected:
 
 private:
   vtkScalarsToColorsContextItem();
-  ~vtkScalarsToColorsContextItem() override;
+  ~vtkScalarsToColorsContextItem() VTK_OVERRIDE;
 
   /// Cached geometry of the scene
   vtkVector2i LastSceneSize;

Libs/Visualization/VTK/Core/vtkScalarsToColorsPreviewChart.cpp

@@ -20,8 +20,6 @@
 
 #include "vtkScalarsToColorsPreviewChart.h"
 
-#include "ctkCompilerDetections_p.h" // For CTK_NULLPTR
-
 // VTK includes
 #include <vtkAxis.h>
 #include <vtkColorTransferFunctionItem.h>

Libs/Visualization/VTK/Widgets/Testing/Cpp/ctkVTKScalarsToColorsComboBoxTest1.cpp

@@ -24,7 +24,6 @@
 #include <QTimer>
 
 // CTK includes
-#include "ctkCompilerDetections_p.h" // For CTK_NULLPTR
 #include "ctkVTKScalarsToColorsComboBox.h"
 
 // VTK includes

Libs/Visualization/VTK/Widgets/ctkVTKDiscretizableColorTransferWidget.cpp

@@ -22,7 +22,6 @@
 
 // CTK includes
 #include "ctkColorPickerButton.h"
-#include "ctkCompilerDetections_p.h" // For CTK_NULLPTR
 #include "ctkDoubleSlider.h"
 #include "ctkVTKScalarsToColorsComboBox.h"
 #include "ctkVTKScalarsToColorsUtils.h"

Libs/Visualization/VTK/Widgets/ctkVTKDiscretizableColorTransferWidget.h

@@ -22,7 +22,6 @@
 #define __ctkVTKDiscretizableColorTransferWidget_h
 
 // CTK includes
-#include "ctkCompilerDetections_p.h" // For CTK_NULLPTR
 #include "ctkVisualizationVTKWidgetsExport.h"
 class ctkVTKDiscretizableColorTransferWidgetPrivate;
 class ctkVTKScalarsToColorsComboBox;

Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsComboBox.cpp

@@ -22,7 +22,6 @@
 #include <QPainter>
 
 // CTK includes
-#include "ctkCompilerDetections_p.h" // For CTK_NULLPTR
 #include "ctkVTKScalarsToColorsComboBox.h"
 #include "ctkVTKWidgetsUtils.h"
 

Libs/ctkExport.h.in

@@ -8,6 +8,8 @@
 #ifndef __@MY_EXPORT_HEADER_PREFIX@Export_h
 #define __@MY_EXPORT_HEADER_PREFIX@Export_h
 
+#include "ctkCompilerDetections_p.h"
+
 #include <QtGlobal>
 
 #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)