Mercurial > hg > orthanc-stone

comparison Framework/Deprecated/Widgets/WorldSceneWidget.cpp @ 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 2d8ab34c8c91
children 30deba7bc8e2
comparison
equal deleted inserted replaced
1297:6ab03e429f06 1299:c38c89684d83
40 // in screen coordinates/pixels. 40 // in screen coordinates/pixels.
41 class WorldSceneWidget::SceneMouseTracker : public IMouseTracker 41 class WorldSceneWidget::SceneMouseTracker : public IMouseTracker
42 { 42 {
43 private: 43 private:
44 ViewportGeometry view_; 44 ViewportGeometry view_;
45 std::auto_ptr<IWorldSceneMouseTracker> tracker_; 45 std::unique_ptr<IWorldSceneMouseTracker> tracker_;
46 46
47 public: 47 public:
48 SceneMouseTracker(const ViewportGeometry& view, 48 SceneMouseTracker(const ViewportGeometry& view,
49 IWorldSceneMouseTracker* tracker) : 49 IWorldSceneMouseTracker* tracker) :
50 view_(view), 50 view_(view),
164 { 164 {
165 double sceneX, sceneY; 165 double sceneX, sceneY;
166 view_.MapPixelCenterToScene(sceneX, sceneY, x, y); 166 view_.MapPixelCenterToScene(sceneX, sceneY, x, y);
167 167
168 // asks the Widget Interactor to provide a mouse tracker 168 // asks the Widget Interactor to provide a mouse tracker
169 std::auto_ptr<IWorldSceneMouseTracker> tracker; 169 std::unique_ptr<IWorldSceneMouseTracker> tracker;
170 170
171 if (interactor_) 171 if (interactor_)
172 { 172 {
173 tracker.reset(interactor_->CreateMouseTracker(*this, view_, button, modifiers, x, y, sceneX, sceneY, GetStatusBar(), touches)); 173 tracker.reset(interactor_->CreateMouseTracker(*this, view_, button, modifiers, x, y, sceneX, sceneY, GetStatusBar(), touches));
174 } 174 }