Mercurial > hg > orthanc-stone
diff Applications/Qt/QCairoWidget.cpp @ 731:ac4fe43551a1
merge am-dev -> default
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Tue, 21 May 2019 13:53:57 +0200 |
parents | fe938bddb932 |
children | 922d2e61aa5d |
line wrap: on
line diff
--- a/Applications/Qt/QCairoWidget.cpp Tue May 21 13:27:54 2019 +0200 +++ b/Applications/Qt/QCairoWidget.cpp Tue May 21 13:53:57 2019 +0200 @@ -27,14 +27,14 @@ QCairoWidget::StoneObserver::StoneObserver(QCairoWidget& that, - OrthancStone::IViewport& viewport, + Deprecated::IViewport& viewport, OrthancStone::MessageBroker& broker) : OrthancStone::IObserver(broker), that_(that) { // get notified each time the content of the central viewport changes viewport.RegisterObserverCallback( - new OrthancStone::Callable<StoneObserver, OrthancStone::IViewport::ViewportChangedMessage> + new OrthancStone::Callable<StoneObserver, Deprecated::IViewport::ViewportChangedMessage> (*this, &StoneObserver::OnViewportChanged)); } @@ -68,7 +68,7 @@ context_ != NULL) { OrthancStone::NativeStoneApplicationContext::GlobalMutexLocker locker(*context_); - OrthancStone::IViewport& viewport = locker.GetCentralViewport(); + Deprecated::IViewport& viewport = locker.GetCentralViewport(); Orthanc::ImageAccessor a; surface_.GetWriteableAccessor(a); viewport.Render(a); @@ -125,7 +125,7 @@ { OrthancStone::NativeStoneApplicationContext::GlobalMutexLocker locker(*context_); - locker.GetCentralViewport().MouseDown(button, event->pos().x(), event->pos().y(), stoneModifiers, std::vector<OrthancStone::Touch>()); + locker.GetCentralViewport().MouseDown(button, event->pos().x(), event->pos().y(), stoneModifiers, std::vector<Deprecated::Touch>()); } } @@ -140,7 +140,7 @@ void QCairoWidget::mouseMoveEvent(QMouseEvent* event) { OrthancStone::NativeStoneApplicationContext::GlobalMutexLocker locker(*context_); - locker.GetCentralViewport().MouseMove(event->pos().x(), event->pos().y(), std::vector<OrthancStone::Touch>()); + locker.GetCentralViewport().MouseMove(event->pos().x(), event->pos().y(), std::vector<Deprecated::Touch>()); }