Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 20:57:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

coding standard fixes

Browse source
This commit is contained in:
Anthony J. Thibault 2016-09-08 11:53:23 -07:00
parent ebb4c0990b
commit 594640f8b4
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
View file

@ -39,8 +39,8 @@ static int MAX_WINDOW_SIZE = 4096;
static float OPAQUE_ALPHA_THRESHOLD = 0.99f; static float OPAQUE_ALPHA_THRESHOLD = 0.99f;
void WebEntityAPIHelper::synthesizeKeyPress(QString key) { void WebEntityAPIHelper::synthesizeKeyPress(QString key) {
if (_ptr) { if (_renderableWebEntityItem) {
_ptr->synthesizeKeyPress(key); _renderableWebEntityItem->synthesizeKeyPress(key);
} }
} }
@ -57,10 +57,10 @@ void WebEntityAPIHelper::emitWebEvent(const QVariant& message) {
QMetaObject::invokeMethod(this, "emitWebEvent", Qt::QueuedConnection, Q_ARG(QVariant, message)); QMetaObject::invokeMethod(this, "emitWebEvent", Qt::QueuedConnection, Q_ARG(QVariant, message));
} else { } else {
// special case to handle raising and lowering the virtual keyboard // special case to handle raising and lowering the virtual keyboard
if (message.type() == QVariant::String && message.toString() == "_RAISE_KEYBOARD" && _ptr) { if (message.type() == QVariant::String && message.toString() == "_RAISE_KEYBOARD" && _renderableWebEntityItem) {
_ptr->setKeyboardRaised(true); _renderableWebEntityItem->setKeyboardRaised(true);
} else if (message.type() == QVariant::String && message.toString() == "_LOWER_KEYBOARD" && _ptr) { } else if (message.type() == QVariant::String && message.toString() == "_LOWER_KEYBOARD" && _renderableWebEntityItem) {
_ptr->setKeyboardRaised(false); _renderableWebEntityItem->setKeyboardRaised(false);
} else { } else {
emit webEventReceived(message); emit webEventReceived(message);
} }
@ -83,7 +83,7 @@ RenderableWebEntityItem::RenderableWebEntityItem(const EntityItemID& entityItemI
_touchDevice.setMaximumTouchPoints(4); _touchDevice.setMaximumTouchPoints(4);
_webEntityAPIHelper = new WebEntityAPIHelper; _webEntityAPIHelper = new WebEntityAPIHelper;
_webEntityAPIHelper->setPtr(this); _webEntityAPIHelper->setRenderableWebEntityItem(this);
_webEntityAPIHelper->moveToThread(qApp->thread()); _webEntityAPIHelper->moveToThread(qApp->thread());
// forward web events to EntityScriptingInterface // forward web events to EntityScriptingInterface
@ -94,7 +94,7 @@ RenderableWebEntityItem::RenderableWebEntityItem(const EntityItemID& entityItemI
} }
RenderableWebEntityItem::~RenderableWebEntityItem() { RenderableWebEntityItem::~RenderableWebEntityItem() {
_webEntityAPIHelper->setPtr(nullptr); _webEntityAPIHelper->setRenderableWebEntityItem(nullptr);
_webEntityAPIHelper->deleteLater(); _webEntityAPIHelper->deleteLater();
destroyWebSurface(); destroyWebSurface();
qDebug() << "Destroyed web entity " << getID(); qDebug() << "Destroyed web entity " << getID();

6
libraries/entities-renderer/src/RenderableWebEntityItem.h
View file

@ -27,8 +27,8 @@ class RenderableWebEntityItem;
class WebEntityAPIHelper : public QObject { class WebEntityAPIHelper : public QObject {
Q_OBJECT Q_OBJECT
public: public:
void setPtr(RenderableWebEntityItem* ptr) { void setRenderableWebEntityItem(RenderableWebEntityItem* renderableWebEntityItem) {
_ptr = ptr; _renderableWebEntityItem = renderableWebEntityItem;
} }
Q_INVOKABLE void synthesizeKeyPress(QString key); Q_INVOKABLE void synthesizeKeyPress(QString key);
@ -41,7 +41,7 @@ signals:
void webEventReceived(const QVariant& message); void webEventReceived(const QVariant& message);
protected: protected:
RenderableWebEntityItem* _ptr{ nullptr }; RenderableWebEntityItem* _renderableWebEntityItem{ nullptr };
}; };
class RenderableWebEntityItem : public WebEntityItem { class RenderableWebEntityItem : public WebEntityItem {