Merge branch 'VTK6_Qt5' of git.creatis.insa-lyon.fr:clitk into VTK6_Qt5

[clitk.git] / vv / vvSurfaceViewerDialog.h

diff --git a/vv/vvSurfaceViewerDialog.h b/vv/vvSurfaceViewerDialog.h
index 797b8c2bc9fe6fe75f0018bc1eec3af89c8aba97..ff9f0be7a056f92aea349387c7fe0d982709261c 100644 (file)
--- a/vv/vvSurfaceViewerDialog.h
+++ b/vv/vvSurfaceViewerDialog.h
@@ -3,7 +3,7 @@
 
   Authors belong to: 
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef _vvSurfaceViewerDialog_H
 #define _vvSurfaceViewerDialog_H
 #include "ui_vvSurfaceViewerDialog.h"
@@ -23,7 +23,11 @@ class vtkPolyDataMapper;
 class vtkActor;
 class vtkOBJReader;
 
+#if QT_VERSION < 0x050000
 #include <QtDesigner/QDesignerExportWidget>
+#else
+#include <QtUiPlugin/QDesignerExportWidget>
+#endif
 #include <QTreeWidget>
 
 //====================================================================
@@ -46,7 +50,7 @@ private :
     vtkPolyDataMapper* mMapper;
     vtkActor* mActor;
     vtkRenderer * mRenderer;
-    unsigned int mCurrentTime;
+    int mCurrentTime;
 
 }; // end class vvSurfaceViewerDialog
 //====================================================================