Ensure headers compatibility for static compilation

diff --git a/vv/vvIntensityValueSlider.h b/vv/vvIntensityValueSlider.h
index 25fdc5753e75941262d1f7e7a8df0d64abdaa986..722e5343c91f54803abe4f1ceb874c9a6bfa2133 100644 (file)
--- a/vv/vvIntensityValueSlider.h
+++ b/vv/vvIntensityValueSlider.h
@@ -20,11 +20,7 @@
 
 // qt
 #include <QtGlobal>
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
 #include <QDialog>
 
 // clitk 

diff --git a/vv/vvLabelImageLoaderWidget.h b/vv/vvLabelImageLoaderWidget.h
index 0477ca606a4c5497fab91b5985c6b5b0100a08e3..eadf342cb14812b8edb9554e7e360bb06d299918 100644 (file)
--- a/vv/vvLabelImageLoaderWidget.h
+++ b/vv/vvLabelImageLoaderWidget.h
@@ -24,11 +24,7 @@
 
 // qt
 #include <QtGlobal>
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
 #include <QDialog>
 #include "ui_vvLabelImageLoaderWidget.h"
 

diff --git a/vv/vvSegmentationDialog.h b/vv/vvSegmentationDialog.h
index 7dca49e9b570ceeac67b783aea84df40a02a538e..a3af4a39575b6be2efc1034649a8108b43099ae0 100644 (file)
--- a/vv/vvSegmentationDialog.h
+++ b/vv/vvSegmentationDialog.h
@@ -32,11 +32,7 @@
 #include "vtkPolyData.h"
 #include <vtkPolyDataMapper.h>
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
 #include <QTreeWidget>
 
 //====================================================================

diff --git a/vv/vvSurfaceViewerDialog.h b/vv/vvSurfaceViewerDialog.h
index f6a440fbcfd5e6f5b565c5068e42a77ef903adb5..88a75a6924081fd4eca777d21dbed1c311dffac6 100644 (file)
--- a/vv/vvSurfaceViewerDialog.h
+++ b/vv/vvSurfaceViewerDialog.h
@@ -23,11 +23,7 @@ class vtkPolyDataMapper;
 class vtkActor;
 class vtkOBJReader;
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
 #include <QTreeWidget>
 
 //====================================================================

diff --git a/vv/vvToolBinarize.h b/vv/vvToolBinarize.h
index a99bd55f58c6cbb9de112bafb7a1cc6c51ff5516..89e001e5469f3cd0da592ebdcec598ad9910018b 100644 (file)
--- a/vv/vvToolBinarize.h
+++ b/vv/vvToolBinarize.h
@@ -19,11 +19,7 @@
 #define VVTOOLBINARIZE_H
 
 #include <QtGlobal>
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
 
 #include "vvToolBase.h"
 #include "vvToolWidgetBase.h"

diff --git a/vv/vvToolCropImage.h b/vv/vvToolCropImage.h
index e544a8ba4a2d53f0cacee1ed99f609cdfc148b26..014fe3d03789e21a027c240b189a4b764a918c96 100644 (file)
--- a/vv/vvToolCropImage.h
+++ b/vv/vvToolCropImage.h
@@ -20,11 +20,7 @@
 
 //qt
 #include <QtGlobal>
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
 #include <QDialog>
 #include <QSlider>
 // vv

diff --git a/vv/vvToolImageArithm.h b/vv/vvToolImageArithm.h
index 23b73d54e40b26fd8362bf44247db14cc9b889fd..9fe70ce15b2062791ee1f001a8301b375ad2afd9 100644 (file)
--- a/vv/vvToolImageArithm.h
+++ b/vv/vvToolImageArithm.h
@@ -19,11 +19,7 @@
 #define VVTOOLImageArithm_H
 
 #include <QtGlobal>
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
 
 #include "vvToolBase.h"
 #include "vvToolWidgetBase.h"

diff --git a/vv/vvToolInputSelectorWidget.h b/vv/vvToolInputSelectorWidget.h
index c71376706b46cccdfa3dd77d6349d7e7a2ec41cf..07dbd483735d503f19565be897b260357574375c 100644 (file)
--- a/vv/vvToolInputSelectorWidget.h
+++ b/vv/vvToolInputSelectorWidget.h
@@ -20,11 +20,7 @@
 
 // qt
 #include <QObject>
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
 #include <QDialog>
 
 // vv

diff --git a/vv/vvToolMIP.h b/vv/vvToolMIP.h
index af7e1f7792488eb369457c12f7a48e2827393629..e3904a68702f1b7011475fc26531c26b01231703 100644 (file)
--- a/vv/vvToolMIP.h
+++ b/vv/vvToolMIP.h
@@ -48,11 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <vvImage.h>
 
 #include <QtGlobal>
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
 #include "vvToolBase.h"
 #include "QWidget"
 #include "vvToolWidgetBase.h"

diff --git a/vv/vvToolMedianFilter.h b/vv/vvToolMedianFilter.h
index dea76c371ab867e18adfbad16f57e1c338543d1b..915271275f706279a0f2348d200096fd1abe164e 100644 (file)
--- a/vv/vvToolMedianFilter.h
+++ b/vv/vvToolMedianFilter.h
@@ -45,18 +45,14 @@
   #ifndef VVTOOLMedianFilter_H
   #define VVTOOLMedianFilter_H
 
-#include <QtGlobal>
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
+  #include <QtGlobal>
   #include <QtDesigner/QDesignerExportWidget>
-#else
-  #include <QtUiPlugin/QDesignerExportWidget>
-#endif
   #include "vvToolBase.h"
   #include "QWidget"
   #include "vvToolWidgetBase.h"
   #include "ui_vvToolMedianFilter.h"
   #include "clitkMedianImageFilter_ggo.h"
-   #include <clitkMedianImageGenericFilter.h>
+  #include <clitkMedianImageGenericFilter.h>
 
 
   //------------------------------------------------------------------------------

diff --git a/vv/vvToolProfile.h b/vv/vvToolProfile.h
index 28cf41f7c6bff23f8cf7f3f71dd36757bcce2f65..2f64bb3a656e28f10b93cf0107f35abe430714fb 100644 (file)
--- a/vv/vvToolProfile.h
+++ b/vv/vvToolProfile.h
@@ -19,11 +19,7 @@
 #define VVTOOLPROFILE_H
 
 #include <QtGlobal>
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
 
 #include "vvToolBase.h"
 #include "vvToolWidgetBase.h"

diff --git a/vv/vvToolROIManager.h b/vv/vvToolROIManager.h
index aa84273fe97a186bbf929b616da1d657f38ab5c5..9cb993ad6f57dac5ab5b6185c54e64189bf487b9 100644 (file)
--- a/vv/vvToolROIManager.h
+++ b/vv/vvToolROIManager.h
@@ -20,11 +20,7 @@
 #define VVTOOLROIMANAGER_H
 
 #include <QtGlobal>
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
 #include <QSharedPointer>
 
 #include "vvToolBase.h"

diff --git a/vv/vvToolResample.h b/vv/vvToolResample.h
index 7d3c4522b7981026a569289042c2db1a10c682aa..ec56fda68cfbd40d410ae0b2f1b78c0e76c7a35f 100644 (file)
--- a/vv/vvToolResample.h
+++ b/vv/vvToolResample.h
@@ -31,11 +31,7 @@
 #include "vvToolBase.h"
 
 // qt
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
 #include <QTreeWidget>
 
 //------------------------------------------------------------------------------

diff --git a/vv/vvToolSegmentation.h b/vv/vvToolSegmentation.h
index 4801403541d1aca2539637b18729b223ac8a3791..25bf6d018ba19ae57c943ed0c6564c7034671021 100644 (file)
--- a/vv/vvToolSegmentation.h
+++ b/vv/vvToolSegmentation.h
@@ -19,11 +19,7 @@
 #define VVTOOLSEGMENTATION_H
 
 #include <QtGlobal>
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
 
 #include "vvToolBase.h"
 #include "vvToolWidgetBase.h"

diff --git a/vv/vvToolSimpleInputSelectorWidget.h b/vv/vvToolSimpleInputSelectorWidget.h
index 7a06c27bcf0136e6b4ed1624fc64fd7fad6d9395..dfc83b14b5806453486bed7712419d7e863a7af3 100644 (file)
--- a/vv/vvToolSimpleInputSelectorWidget.h
+++ b/vv/vvToolSimpleInputSelectorWidget.h
@@ -19,11 +19,7 @@
 #define VVTOOLSIMPLEINPUTSELECTORWIDGET_H
 
 #include <QtGlobal>
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
 #include <QDialog>
 #include "ui_vvToolSimpleInputSelectorWidget.h"
 

diff --git a/vv/vvToolWidgetBase.h b/vv/vvToolWidgetBase.h
index d02ba78ba4be3a1ba51edbf7bc917fd1617ec906..8e5405a674e69111748a5a6fe1697b3a81f02249 100644 (file)
--- a/vv/vvToolWidgetBase.h
+++ b/vv/vvToolWidgetBase.h
@@ -20,11 +20,7 @@
 #define VVTOOLWIDGETBASE_H
 
 #include <QtGlobal>
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
 #include "ui_vvToolWidgetBase.h"
 #include "clitkImageToImageGenericFilter.h"