From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Thu, 20 Apr 2017 13:37:38 +0000 (+0200)
Subject: Remove warnings
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=99b8973aa53da85bd951268f29495311a1e3471f;p=clitk.git

Remove warnings
Change QtDesigner/QDesignerExportWidget to QtUiPlugin/QDesignerExportWidget
---

diff --git a/vv/vvIntensityValueSlider.h b/vv/vvIntensityValueSlider.h
index 722e534..b123f40 100644
--- a/vv/vvIntensityValueSlider.h
+++ b/vv/vvIntensityValueSlider.h
@@ -20,7 +20,11 @@
 
 // qt
 #include <QtGlobal>
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 #include <QDialog>
 
 // clitk 
diff --git a/vv/vvLabelImageLoaderWidget.h b/vv/vvLabelImageLoaderWidget.h
index eadf342..178acb2 100644
--- a/vv/vvLabelImageLoaderWidget.h
+++ b/vv/vvLabelImageLoaderWidget.h
@@ -24,7 +24,11 @@
 
 // qt
 #include <QtGlobal>
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 #include <QDialog>
 #include "ui_vvLabelImageLoaderWidget.h"
 
diff --git a/vv/vvSegmentationDialog.h b/vv/vvSegmentationDialog.h
index a3af4a3..f457df5 100644
--- a/vv/vvSegmentationDialog.h
+++ b/vv/vvSegmentationDialog.h
@@ -32,7 +32,11 @@
 #include "vtkPolyData.h"
 #include <vtkPolyDataMapper.h>
 
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 #include <QTreeWidget>
 
 //====================================================================
diff --git a/vv/vvSurfaceViewerDialog.h b/vv/vvSurfaceViewerDialog.h
index 88a75a6..f53c9bb 100644
--- a/vv/vvSurfaceViewerDialog.h
+++ b/vv/vvSurfaceViewerDialog.h
@@ -23,7 +23,11 @@ class vtkPolyDataMapper;
 class vtkActor;
 class vtkOBJReader;
 
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 #include <QTreeWidget>
 
 //====================================================================
diff --git a/vv/vvToolBinarize.h b/vv/vvToolBinarize.h
index 89e001e..4cdaa85 100644
--- a/vv/vvToolBinarize.h
+++ b/vv/vvToolBinarize.h
@@ -19,7 +19,11 @@
 #define VVTOOLBINARIZE_H
 
 #include <QtGlobal>
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 
 #include "vvToolBase.h"
 #include "vvToolWidgetBase.h"
diff --git a/vv/vvToolCropImage.h b/vv/vvToolCropImage.h
index 014fe3d..c5d8ce1 100644
--- a/vv/vvToolCropImage.h
+++ b/vv/vvToolCropImage.h
@@ -20,7 +20,11 @@
 
 //qt
 #include <QtGlobal>
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 #include <QDialog>
 #include <QSlider>
 // vv
diff --git a/vv/vvToolFoo.h b/vv/vvToolFoo.h
index 91f7dfe..e3526d6 100644
--- a/vv/vvToolFoo.h
+++ b/vv/vvToolFoo.h
@@ -17,7 +17,11 @@
 ===========================================================================**/
 #ifndef VVTOOLFOO_H
 #define VVTOOLFOO_H
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 #include <QDialog>
 
 #include "vvToolBase.h"
diff --git a/vv/vvToolFooWithWidgetBase.h b/vv/vvToolFooWithWidgetBase.h
index 0d07efd..3458f92 100644
--- a/vv/vvToolFooWithWidgetBase.h
+++ b/vv/vvToolFooWithWidgetBase.h
@@ -17,7 +17,11 @@
 ===========================================================================**/
 #ifndef VVTOOLFOO_H
 #define VVTOOLFOO_H
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 
 #include "vvToolBase.h"
 #include "vvToolWidgetBase.h"
diff --git a/vv/vvToolHistogram.h b/vv/vvToolHistogram.h
index ce58d07..437e4e6 100644
--- a/vv/vvToolHistogram.h
+++ b/vv/vvToolHistogram.h
@@ -19,7 +19,11 @@
 #define VVTOOLHISTOGRAM_H
 
 #include <QtGlobal>
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 
 #include "vvToolBase.h"
 #include "vvToolWidgetBase.h"
diff --git a/vv/vvToolImageArithm.h b/vv/vvToolImageArithm.h
index 9fe70ce..964b9c8 100644
--- a/vv/vvToolImageArithm.h
+++ b/vv/vvToolImageArithm.h
@@ -19,7 +19,11 @@
 #define VVTOOLImageArithm_H
 
 #include <QtGlobal>
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 
 #include "vvToolBase.h"
 #include "vvToolWidgetBase.h"
diff --git a/vv/vvToolInputSelectorWidget.h b/vv/vvToolInputSelectorWidget.h
index 07dbd48..76e0c34 100644
--- a/vv/vvToolInputSelectorWidget.h
+++ b/vv/vvToolInputSelectorWidget.h
@@ -20,7 +20,11 @@
 
 // qt
 #include <QObject>
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 #include <QDialog>
 
 // vv
diff --git a/vv/vvToolMIP.h b/vv/vvToolMIP.h
index e3904a6..e915525 100644
--- a/vv/vvToolMIP.h
+++ b/vv/vvToolMIP.h
@@ -48,7 +48,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <vvImage.h>
 
 #include <QtGlobal>
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 #include "vvToolBase.h"
 #include "QWidget"
 #include "vvToolWidgetBase.h"
diff --git a/vv/vvToolMedianFilter.h b/vv/vvToolMedianFilter.h
index 9152712..b075ac1 100644
--- a/vv/vvToolMedianFilter.h
+++ b/vv/vvToolMedianFilter.h
@@ -46,7 +46,11 @@
   #define VVTOOLMedianFilter_H
 
   #include <QtGlobal>
+#if QT_VERSION >= 0x050000
+  #include <QtUiPlugin/QDesignerExportWidget>
+#else
   #include <QtDesigner/QDesignerExportWidget>
+#endif
   #include "vvToolBase.h"
   #include "QWidget"
   #include "vvToolWidgetBase.h"
diff --git a/vv/vvToolPlastimatch.h b/vv/vvToolPlastimatch.h
index d808abd..ff56b8a 100644
--- a/vv/vvToolPlastimatch.h
+++ b/vv/vvToolPlastimatch.h
@@ -18,7 +18,11 @@
 #ifndef VVTOOLPLASTIMATCH_H
 #define VVTOOLPLASTIMATCH_H
 
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 
 #include "vvToolBase.h"
 #include "vvToolWidgetBase.h"
diff --git a/vv/vvToolProfile.h b/vv/vvToolProfile.h
index 2f64bb3..0410637 100644
--- a/vv/vvToolProfile.h
+++ b/vv/vvToolProfile.h
@@ -19,7 +19,11 @@
 #define VVTOOLPROFILE_H
 
 #include <QtGlobal>
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 
 #include "vvToolBase.h"
 #include "vvToolWidgetBase.h"
diff --git a/vv/vvToolROIManager.h b/vv/vvToolROIManager.h
index 9cb993a..fdf68a6 100644
--- a/vv/vvToolROIManager.h
+++ b/vv/vvToolROIManager.h
@@ -20,7 +20,11 @@
 #define VVTOOLROIMANAGER_H
 
 #include <QtGlobal>
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 #include <QSharedPointer>
 
 #include "vvToolBase.h"
diff --git a/vv/vvToolResample.h b/vv/vvToolResample.h
index ec56fda..2a4c427 100644
--- a/vv/vvToolResample.h
+++ b/vv/vvToolResample.h
@@ -31,7 +31,11 @@
 #include "vvToolBase.h"
 
 // qt
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 #include <QTreeWidget>
 
 //------------------------------------------------------------------------------
diff --git a/vv/vvToolSegmentation.h b/vv/vvToolSegmentation.h
index 25bf6d0..7e49dc4 100644
--- a/vv/vvToolSegmentation.h
+++ b/vv/vvToolSegmentation.h
@@ -19,7 +19,11 @@
 #define VVTOOLSEGMENTATION_H
 
 #include <QtGlobal>
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 
 #include "vvToolBase.h"
 #include "vvToolWidgetBase.h"
diff --git a/vv/vvToolSimpleInputSelectorWidget.h b/vv/vvToolSimpleInputSelectorWidget.h
index dfc83b1..4b8028f 100644
--- a/vv/vvToolSimpleInputSelectorWidget.h
+++ b/vv/vvToolSimpleInputSelectorWidget.h
@@ -19,7 +19,11 @@
 #define VVTOOLSIMPLEINPUTSELECTORWIDGET_H
 
 #include <QtGlobal>
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 #include <QDialog>
 #include "ui_vvToolSimpleInputSelectorWidget.h"
 
diff --git a/vv/vvToolStructureSetManager.h b/vv/vvToolStructureSetManager.h
index 0f5ffec..5bc88c2 100644
--- a/vv/vvToolStructureSetManager.h
+++ b/vv/vvToolStructureSetManager.h
@@ -19,7 +19,11 @@
 #ifndef VVTOOLSTRUCTURESETMANAGER_H
 #define VVTOOLSTRUCTURESETMANAGER_H
 
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 #include "vvToolBase.h"
 #include "vvToolWidgetBase.h"
 #include "clitkDicomRT_StructureSet.h"
diff --git a/vv/vvToolWidgetBase.h b/vv/vvToolWidgetBase.h
index 8e5405a..7a3a5df 100644
--- a/vv/vvToolWidgetBase.h
+++ b/vv/vvToolWidgetBase.h
@@ -20,7 +20,11 @@
 #define VVTOOLWIDGETBASE_H
 
 #include <QtGlobal>
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 #include "ui_vvToolWidgetBase.h"
 #include "clitkImageToImageGenericFilter.h"