From 50bc20bca483bc3dbd5655bf1e9417fc572c21cd Mon Sep 17 00:00:00 2001 From: ouv Date: Mon, 4 Dec 2017 14:28:20 +0300 Subject: [PATCH] Removed dependency on boost. --- src/SVTK/SVTK_InteractorStyle.cxx | 4 ++-- src/SVTK/SVTK_InteractorStyle.h | 6 +----- src/SVTK/SVTK_SelectionEvent.h | 4 +++- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/SVTK/SVTK_InteractorStyle.cxx b/src/SVTK/SVTK_InteractorStyle.cxx index 05cae30d0..f988c50e6 100644 --- a/src/SVTK/SVTK_InteractorStyle.cxx +++ b/src/SVTK/SVTK_InteractorStyle.cxx @@ -176,7 +176,7 @@ SVTK_SelectionEvent* SVTK_InteractorStyle::GetSelectionEvent() GetEventPosition( this->Interactor, mySelectionEvent->myX, mySelectionEvent->myY ); - return mySelectionEvent.get(); + return mySelectionEvent.GetPointer(); } /*! @@ -195,7 +195,7 @@ SVTK_SelectionEvent* SVTK_InteractorStyle::GetSelectionEventFlipY() this->Interactor->GetEventPosition(mySelectionEvent->myX, mySelectionEvent->myY); - return mySelectionEvent.get(); + return mySelectionEvent.GetPointer(); } void SVTK_InteractorStyle::RotateXY(int dx, int dy) diff --git a/src/SVTK/SVTK_InteractorStyle.h b/src/SVTK/SVTK_InteractorStyle.h index b4a9616db..5c8211305 100644 --- a/src/SVTK/SVTK_InteractorStyle.h +++ b/src/SVTK/SVTK_InteractorStyle.h @@ -33,8 +33,6 @@ #include "SVTK_SelectionEvent.h" -#include - #include #include @@ -157,9 +155,7 @@ class SVTK_EXPORT SVTK_InteractorStyle: public vtkInteractorStyle static SVTK_InteractorStyle *New(); vtkTypeMacro(SVTK_InteractorStyle, vtkInteractorStyle); - typedef boost::shared_ptr PSelectionEvent; - - + typedef vtkSmartPointer PSelectionEvent; //! Generate special #SVTK_SelectionEvent virtual SVTK_SelectionEvent* GetSelectionEvent(); diff --git a/src/SVTK/SVTK_SelectionEvent.h b/src/SVTK/SVTK_SelectionEvent.h index 75d01316f..69bc0b489 100644 --- a/src/SVTK/SVTK_SelectionEvent.h +++ b/src/SVTK/SVTK_SelectionEvent.h @@ -31,13 +31,15 @@ #include "SVTK_Selection.h" +#include + //! The structure is used for passing all infromation necessary for claculation of the selection. /*! The SVTK_SelectionEvent is generated by #SVTK_InteractorStyle. In its turn the #SVTK_InteractorStyle uses for it generation #vtkRenderWindowInteractor and #SVTK_Selector instances. */ -struct SVTK_SelectionEvent +struct SVTK_SelectionEvent: public vtkObjectBase { //! Through usage of the parameter any new type of selection can be introduced Selection_Mode mySelectionMode; -- 2.39.2