]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
Removed dependency on boost.
authorouv <oleg.uvarov@opencascade.com>
Mon, 4 Dec 2017 11:28:20 +0000 (14:28 +0300)
committerouv <oleg.uvarov@opencascade.com>
Mon, 4 Dec 2017 11:28:20 +0000 (14:28 +0300)
src/SVTK/SVTK_InteractorStyle.cxx
src/SVTK/SVTK_InteractorStyle.h
src/SVTK/SVTK_SelectionEvent.h

index 05cae30d02ade39b2e34f592defbf6dcea5e81e5..f988c50e6f238f1a8840feae8720d39e970b586f 100644 (file)
@@ -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)
index b4a9616db303799a56ba8e5ca664d6fbb2653a91..5c8211305a69ba3291e9ee1207b4f1b81a0852fb 100644 (file)
@@ -33,8 +33,6 @@
 
 #include "SVTK_SelectionEvent.h"
 
-#include <boost/shared_ptr.hpp>
-
 #include <vtkInteractorStyle.h>
 #include <vtkSmartPointer.h>
 
@@ -157,9 +155,7 @@ class SVTK_EXPORT SVTK_InteractorStyle: public vtkInteractorStyle
   static SVTK_InteractorStyle *New();
   vtkTypeMacro(SVTK_InteractorStyle, vtkInteractorStyle);
 
-  typedef boost::shared_ptr<SVTK_SelectionEvent> PSelectionEvent;
-
-  
+  typedef vtkSmartPointer<SVTK_SelectionEvent> PSelectionEvent;
 
   //! Generate special #SVTK_SelectionEvent
   virtual SVTK_SelectionEvent* GetSelectionEvent();
index 75d01316f0ddbc9dd9b824c3725af908d3adaf7f..69bc0b489993f40c89cb50247b2276a77a976b65 100644 (file)
 
 #include "SVTK_Selection.h"
 
+#include <vtkObjectBase.h>
+
 //! 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;