From b3ea9d0de7cc0f6b72e8d1159d3efb6a8958ff94 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Mon, 29 Jul 2019 09:40:58 -0700 Subject: [PATCH] addressing commetn --- interface/src/ui/InteractiveWindow.cpp | 4 ++-- interface/src/ui/InteractiveWindow.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/interface/src/ui/InteractiveWindow.cpp b/interface/src/ui/InteractiveWindow.cpp index 8ad006006c..992c6abefc 100644 --- a/interface/src/ui/InteractiveWindow.cpp +++ b/interface/src/ui/InteractiveWindow.cpp @@ -142,9 +142,9 @@ InteractiveWindow::InteractiveWindow(const QString& sourceUrl, const QVariantMap p->deleteLater(); }); - QObject::connect(_interactiveWindowProxy.get(), &InteractiveWindowProxy::webEventReceived, + connect(_interactiveWindowProxy.get(), &InteractiveWindowProxy::webEventReceived, this, &InteractiveWindow::emitWebEvent, Qt::QueuedConnection); - QObject::connect(this, &InteractiveWindow::scriptEventReceived, _interactiveWindowProxy.get(), + connect(this, &InteractiveWindow::scriptEventReceived, _interactiveWindowProxy.get(), &InteractiveWindowProxy::emitScriptEvent, Qt::QueuedConnection); if (properties.contains(DOCKED_PROPERTY) && presentationMode == InteractiveWindowPresentationMode::Native) { diff --git a/interface/src/ui/InteractiveWindow.h b/interface/src/ui/InteractiveWindow.h index 357db3744a..67f0a9ea2e 100644 --- a/interface/src/ui/InteractiveWindow.h +++ b/interface/src/ui/InteractiveWindow.h @@ -41,7 +41,6 @@ class InteractiveWindowProxy : public QObject { Q_OBJECT public: InteractiveWindowProxy(){} - public slots: void emitScriptEvent(const QVariant& scriptMessage);