From 0448b57eeda7f2c79cddd7d9d43a772737183dc1 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 11 Jun 2013 16:17:34 +0200 Subject: [PATCH] Remove unused stuff from qv8objectresource. Change-Id: Idb24297ff2b518cc3d928c0cf01ee9feb8223eee Reviewed-by: Simon Hausmann --- src/qml/qml/v8/qv8engine.cpp | 1 - src/qml/qml/v8/qv8objectresource_p.h | 3 +-- src/quick/items/context2d/qquickcontext2d.cpp | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index c24f36d..1a70352 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -142,7 +142,6 @@ QVariant QV8Engine::toVariant(const QV4::Value &value, int typeHint) QV8ObjectResource *r = (QV8ObjectResource *)v8::Handle(value)->ToObject()->GetExternalResource(); if (r) { switch (r->resourceType()) { - case QV8ObjectResource::Context2DStyleType: case QV8ObjectResource::XMLHttpRequestType: case QV8ObjectResource::DOMNodeType: case QV8ObjectResource::ParticleDataType: diff --git a/src/qml/qml/v8/qv8objectresource_p.h b/src/qml/qml/v8/qv8objectresource_p.h index 5afecb2..aa876ae 100644 --- a/src/qml/qml/v8/qv8objectresource_p.h +++ b/src/qml/qml/v8/qv8objectresource_p.h @@ -70,8 +70,7 @@ class QV8ObjectResource : public v8::Object::ExternalResource public: QV8ObjectResource(QV8Engine *engine) : engine(engine) { Q_ASSERT(engine); } enum ResourceType { XMLHttpRequestType, DOMNodeType, - Context2DStyleType, - ParticleDataType, VisualDataItemType }; + ParticleDataType }; virtual ResourceType resourceType() const = 0; QV8Engine *engine; diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index 9b0e1ad..6b43266 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -69,8 +69,6 @@ #include #include -#include - #if defined(Q_OS_QNX) || defined(Q_OS_ANDROID) #include #endif -- 2.7.4