Mercurial > hg > orthanc-stone
diff Samples/WebAssembly/dev.h @ 1298:8a0a62189f46
replacing std::auto_ptr by std::unique_ptr
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 02 Mar 2020 16:31:30 +0100 |
| parents | 2d8ab34c8c91 |
| children |
line wrap: on
line diff
--- a/Samples/WebAssembly/dev.h Sun Feb 23 15:25:49 2020 +0100 +++ b/Samples/WebAssembly/dev.h Mon Mar 02 16:31:30 2020 +0100 @@ -79,7 +79,7 @@ const EmscriptenMouseEvent& source, OrthancStone::IViewport& viewport) { - std::auto_ptr<OrthancStone::PointerEvent> target( + std::unique_ptr<OrthancStone::PointerEvent> target( new OrthancStone::PointerEvent); target->AddPosition(viewport.GetPixelCenterCoordinates( @@ -91,7 +91,7 @@ return target.release(); } -std::auto_ptr<OrthancStone::ActiveTracker> tracker_; +std::unique_ptr<OrthancStone::ActiveTracker> tracker_; EM_BOOL OnMouseEvent(int eventType, const EmscriptenMouseEvent *mouseEvent, @@ -111,7 +111,7 @@ char buf[64]; sprintf(buf, "click %d", count++); - std::auto_ptr<OrthancStone::TextSceneLayer> layer(new OrthancStone::TextSceneLayer); + std::unique_ptr<OrthancStone::TextSceneLayer> layer(new OrthancStone::TextSceneLayer); layer->SetText(buf); controller->GetViewport().GetScene().SetLayer(100, layer.release()); controller->GetViewport().Refresh(); @@ -123,7 +123,7 @@ boost::shared_ptr<OrthancStone::IFlexiblePointerTracker> t; { - std::auto_ptr<OrthancStone::PointerEvent> event( + std::unique_ptr<OrthancStone::PointerEvent> event( ConvertMouseEvent(*mouseEvent, controller->GetViewport())); switch (mouseEvent->button) @@ -165,7 +165,7 @@ case EMSCRIPTEN_EVENT_MOUSEMOVE: if (tracker_.get() != NULL) { - std::auto_ptr<OrthancStone::PointerEvent> event( + std::unique_ptr<OrthancStone::PointerEvent> event( ConvertMouseEvent(*mouseEvent, controller->GetViewport())); tracker_->PointerMove(*event); controller->GetViewport().Refresh(); @@ -175,7 +175,7 @@ case EMSCRIPTEN_EVENT_MOUSEUP: if (tracker_.get() != NULL) { - std::auto_ptr<OrthancStone::PointerEvent> event( + std::unique_ptr<OrthancStone::PointerEvent> event( ConvertMouseEvent(*mouseEvent, controller->GetViewport())); tracker_->PointerUp(*event); controller->GetViewport().Refresh();