Mercurial > hg > orthanc-stone

diff Framework/Scene2DViewport/LayerHolder.h @ 818:e42b491f1fb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed typedefs to shared_ptr by making them explicit. Removed using namespace directives to make usage more explicit, too.
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 29 May 2019 10:51:28 +0200
parents 07adcffba38c
children 0aff28f15ea2
line wrap: on
line diff
--- a/Framework/Scene2DViewport/LayerHolder.h	Wed May 29 08:36:13 2019 +0200
+++ b/Framework/Scene2DViewport/LayerHolder.h	Wed May 29 10:51:28 2019 +0200
@@ -20,8 +20,11 @@
 
 #pragma once
 
-#include "PointerTypes.h"
+#include "PredeclaredTypes.h"
+
 #include "boost/noncopyable.hpp"
+#include "boost/weak_ptr.hpp"
+#include "boost/shared_ptr.hpp"
 
 namespace OrthancStone
 {
@@ -40,7 +43,7 @@
     performed at this time
     */
     LayerHolder(
-      ViewportControllerWPtr controllerW,
+      boost::weak_ptr<ViewportController> controllerW,
       int polylineLayerCount, int textLayerCount);
 
     /**
@@ -86,14 +89,12 @@
   private:
     int GetPolylineLayerIndex(int index = 0);
     int GetTextLayerIndex(int index = 0);
-    Scene2DPtr GetScene();
+    boost::shared_ptr<Scene2D> GetScene();
 
     int textLayerCount_;
     int polylineLayerCount_;
-    ViewportControllerWPtr controllerW_;
+    boost::weak_ptr<ViewportController> controllerW_;
     int baseLayerIndex_;
   };
-
-  typedef boost::shared_ptr<LayerHolder> LayerHolderPtr;
 }