瀏覽代碼

STYLE: Simplify use of CTK_NULLPTR including compiler header in Export header

Jean-Christophe Fillion-Robin 7 年之前
父節點
當前提交
1b975dbe58

+ 0 - 1
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"
 

+ 0 - 1
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"

+ 0 - 2
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>

+ 0 - 1
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

+ 0 - 1
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"

+ 0 - 1
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;

+ 0 - 1
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"
 

+ 2 - 0
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)