Mercurial > hg > orthanc-stone

comparison Framework/Scene2DViewport/ViewportController.h @ 1299:c38c89684d83 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replacing std::auto_ptr by std::unique_ptr
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 02 Mar 2020 17:21:24 +0100
parents 7ec8fea061b9
children adf234ecaa00
comparison
equal deleted inserted replaced
1297:6ab03e429f06 1299:c38c89684d83
24 24
25 #include "../Messages/IObservable.h" 25 #include "../Messages/IObservable.h"
26 #include "../Scene2D/Scene2D.h" 26 #include "../Scene2D/Scene2D.h"
27 #include "../Scene2DViewport/IFlexiblePointerTracker.h" 27 #include "../Scene2DViewport/IFlexiblePointerTracker.h"
28 28
29 #include <Core/Compatibility.h>
30
29 #include <boost/enable_shared_from_this.hpp> 31 #include <boost/enable_shared_from_this.hpp>
30 #include <stack> 32 #include <stack>
31 33
32 namespace OrthancStone 34 namespace OrthancStone
33 { 35 {
229 private: 231 private:
230 double GetCanvasToSceneFactor() const; 232 double GetCanvasToSceneFactor() const;
231 233
232 boost::weak_ptr<UndoStack> undoStackW_; // Global stack, possibly shared by all viewports 234 boost::weak_ptr<UndoStack> undoStackW_; // Global stack, possibly shared by all viewports
233 std::vector<boost::shared_ptr<MeasureTool> > measureTools_; 235 std::vector<boost::shared_ptr<MeasureTool> > measureTools_;
234 boost::shared_ptr<IFlexiblePointerTracker> activeTracker_; // TODO - Couldn't this be a "std::auto_ptr"? 236 boost::shared_ptr<IFlexiblePointerTracker> activeTracker_; // TODO - Couldn't this be a "std::unique_ptr"?
235 237
236 std::auto_ptr<Scene2D> scene_; 238 std::unique_ptr<Scene2D> scene_;
237 239
238 // this is cached 240 // this is cached
239 double canvasToSceneFactor_; 241 double canvasToSceneFactor_;
240 }; 242 };
241 } 243 }