From 594640f8b4c558ee41c852d0c7eeea7f0c344b1c Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Thu, 8 Sep 2016 11:53:23 -0700 Subject: [PATCH] coding standard fixes --- .../src/RenderableWebEntityItem.cpp | 16 ++++++++-------- .../src/RenderableWebEntityItem.h | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp index cb6906534f..cc022d9df2 100644 --- a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp @@ -39,8 +39,8 @@ static int MAX_WINDOW_SIZE = 4096; static float OPAQUE_ALPHA_THRESHOLD = 0.99f; void WebEntityAPIHelper::synthesizeKeyPress(QString key) { - if (_ptr) { - _ptr->synthesizeKeyPress(key); + if (_renderableWebEntityItem) { + _renderableWebEntityItem->synthesizeKeyPress(key); } } @@ -57,10 +57,10 @@ void WebEntityAPIHelper::emitWebEvent(const QVariant& message) { QMetaObject::invokeMethod(this, "emitWebEvent", Qt::QueuedConnection, Q_ARG(QVariant, message)); } else { // special case to handle raising and lowering the virtual keyboard - if (message.type() == QVariant::String && message.toString() == "_RAISE_KEYBOARD" && _ptr) { - _ptr->setKeyboardRaised(true); - } else if (message.type() == QVariant::String && message.toString() == "_LOWER_KEYBOARD" && _ptr) { - _ptr->setKeyboardRaised(false); + if (message.type() == QVariant::String && message.toString() == "_RAISE_KEYBOARD" && _renderableWebEntityItem) { + _renderableWebEntityItem->setKeyboardRaised(true); + } else if (message.type() == QVariant::String && message.toString() == "_LOWER_KEYBOARD" && _renderableWebEntityItem) { + _renderableWebEntityItem->setKeyboardRaised(false); } else { emit webEventReceived(message); } @@ -83,7 +83,7 @@ RenderableWebEntityItem::RenderableWebEntityItem(const EntityItemID& entityItemI _touchDevice.setMaximumTouchPoints(4); _webEntityAPIHelper = new WebEntityAPIHelper; - _webEntityAPIHelper->setPtr(this); + _webEntityAPIHelper->setRenderableWebEntityItem(this); _webEntityAPIHelper->moveToThread(qApp->thread()); // forward web events to EntityScriptingInterface @@ -94,7 +94,7 @@ RenderableWebEntityItem::RenderableWebEntityItem(const EntityItemID& entityItemI } RenderableWebEntityItem::~RenderableWebEntityItem() { - _webEntityAPIHelper->setPtr(nullptr); + _webEntityAPIHelper->setRenderableWebEntityItem(nullptr); _webEntityAPIHelper->deleteLater(); destroyWebSurface(); qDebug() << "Destroyed web entity " << getID(); diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.h b/libraries/entities-renderer/src/RenderableWebEntityItem.h index ec14d2d662..47808c4262 100644 --- a/libraries/entities-renderer/src/RenderableWebEntityItem.h +++ b/libraries/entities-renderer/src/RenderableWebEntityItem.h @@ -27,8 +27,8 @@ class RenderableWebEntityItem; class WebEntityAPIHelper : public QObject { Q_OBJECT public: - void setPtr(RenderableWebEntityItem* ptr) { - _ptr = ptr; + void setRenderableWebEntityItem(RenderableWebEntityItem* renderableWebEntityItem) { + _renderableWebEntityItem = renderableWebEntityItem; } Q_INVOKABLE void synthesizeKeyPress(QString key); @@ -41,7 +41,7 @@ signals: void webEventReceived(const QVariant& message); protected: - RenderableWebEntityItem* _ptr{ nullptr }; + RenderableWebEntityItem* _renderableWebEntityItem{ nullptr }; }; class RenderableWebEntityItem : public WebEntityItem {