From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Thu, 9 Jun 2016 08:02:22 +0000 (+0200)
Subject: Ensure headers compatibility for static compilation
X-Git-Tag: v1.4.0~21^2~8
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f9343f9b5c39e55d8c92c8432944fbafc593aafb;p=clitk.git

Ensure headers compatibility for static compilation
---

diff --git a/vv/vvIntensityValueSlider.h b/vv/vvIntensityValueSlider.h
index 25fdc57..722e534 100644
--- 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 0477ca6..eadf342 100644
--- 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 7dca49e..a3af4a3 100644
--- 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 f6a440f..88a75a6 100644
--- 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 a99bd55..89e001e 100644
--- 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 e544a8b..014fe3d 100644
--- 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 23b73d5..9fe70ce 100644
--- 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 c713767..07dbd48 100644
--- 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 af7e1f7..e3904a6 100644
--- 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 dea76c3..9152712 100644
--- 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 28cf41f..2f64bb3 100644
--- 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 aa84273..9cb993a 100644
--- 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 7d3c452..ec56fda 100644
--- 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 4801403..25bf6d0 100644
--- 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 7a06c27..dfc83b1 100644
--- 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 d02ba78..8e5405a 100644
--- 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"