Merge branch 'VTK6_Qt5' into VTK6_Qt5_Overlay4D

[clitk.git] / vv / vvToolWidgetBase.h

diff --git a/vv/vvToolWidgetBase.h b/vv/vvToolWidgetBase.h
index 0951fa1888b79fc7b6ac3a42b357a7e4cb5375fd..d9bd2f3322e992d202d7318ca39d6d97490bcb15 100644 (file)
--- a/vv/vvToolWidgetBase.h
+++ b/vv/vvToolWidgetBase.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,12 +14,12 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 
 #ifndef VVTOOLWIDGETBASE_H
 #define VVTOOLWIDGETBASE_H
 
-#include <QtDesigner/QDesignerExportWidget>
+#include <QtUiPlugin/QDesignerExportWidget>
 #include "ui_vvToolWidgetBase.h"
 #include "clitkImageToImageGenericFilter.h"
 
@@ -37,7 +37,7 @@ class vvToolWidgetBase:
   public:
 
   vvToolWidgetBase(vvMainWindowBase * parent=0, Qt::WindowFlags f=Qt::Dialog, bool initialize=true); // default is a dialog
-  ~vvToolWidgetBase();
+  virtual ~vvToolWidgetBase();
 
   virtual void InputIsSelected(vvSlicerManager *m);
   virtual void InputIsSelected(std::vector<vvSlicerManager*> & l);
@@ -60,7 +60,7 @@ protected:
   virtual void Initialization();
   void InitializeInputs();
   Ui::vvToolWidgetBase ui;
-  clitk::ImageToImageGenericFilterBase * mFilter;
+  clitk::ImageToImageGenericFilterBase::Pointer mFilter;
   vvMainWindowBase * mMainWindow;
   std::vector<vvSlicerManager*> mSlicerManagersCompatible;
   vvSlicerManager * mCurrentSlicerManager;