Mercurial > hg > orthanc-stone

diff Framework/Scene2DViewport/OneGesturePointerTracker.cpp @ 860:238693c3bc51 am-dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default -> am-dev
author Alain Mazy <alain@mazy.be>
date Mon, 24 Jun 2019 14:35:00 +0200
parents e42b491f1fb2
children 6f3f1ef347a3 2d8ab34c8c91
line wrap: on
line diff
--- a/Framework/Scene2DViewport/OneGesturePointerTracker.cpp	Wed Jun 19 17:36:33 2019 +0200
+++ b/Framework/Scene2DViewport/OneGesturePointerTracker.cpp	Mon Jun 24 14:35:00 2019 +0200
@@ -23,14 +23,12 @@
 
 #include <Core/OrthancException.h>
 
-#include <Framework/StoneException.h>
-
-using namespace Orthanc;
+#include "../StoneException.h"
 
 namespace OrthancStone
 {
   OneGesturePointerTracker::OneGesturePointerTracker(
-    ViewportControllerWPtr controllerW)
+    boost::weak_ptr<ViewportController> controllerW)
     : controllerW_(controllerW)
     , alive_(true)
     , currentTouchCount_(1)
@@ -64,7 +62,7 @@
     return alive_;
   }
 
-  ViewportControllerPtr OneGesturePointerTracker::GetController()
+  boost::shared_ptr<ViewportController> OneGesturePointerTracker::GetController()
   {
     return controllerW_.lock();
   }