From 121b5777ffb0f692310973fbe858356894c52998 Mon Sep 17 00:00:00 2001 From: Kim Motoyoshi Kalland Date: Fri, 25 Nov 2011 10:01:32 +0100 Subject: [PATCH] Removed ShaderEffectItem and qt_ModelViewProjectionMatrix. ShaderEffectItem was replaced by ShaderEffect, and qt_ModelViewProjectionMatrix with qt_Matrix a while ago. The old names were kept working for a transition period, but it's now time to remove them completely. Change-Id: Ife030d2122250784fe2ec80b1f8645301b0165d0 Reviewed-by: Gunnar Sletta --- src/declarative/items/qquickitemsmodule.cpp | 1 - src/declarative/items/qquickshadereffect.cpp | 15 --------------- src/declarative/items/qquickshadereffect_p.h | 7 ------- src/declarative/items/qquickshadereffectnode.cpp | 3 --- 4 files changed, 0 insertions(+), 26 deletions(-) diff --git a/src/declarative/items/qquickitemsmodule.cpp b/src/declarative/items/qquickitemsmodule.cpp index fd9f4f8..060d51e 100644 --- a/src/declarative/items/qquickitemsmodule.cpp +++ b/src/declarative/items/qquickitemsmodule.cpp @@ -186,7 +186,6 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) qmlRegisterType(uri,major,minor,"Pinch"); qmlRegisterType(); - qmlRegisterType("QtQuick", 2, 0, "ShaderEffectItem"); // TODO: Remove after grace period. qmlRegisterType("QtQuick", 2, 0, "ShaderEffect"); qmlRegisterType("QtQuick", 2, 0, "ShaderEffectSource"); qmlRegisterUncreatableType("QtQuick", 2, 0, "ShaderEffectMesh", QQuickShaderEffectMesh::tr("Cannot create instance of abstract class ShaderEffectMesh.")); diff --git a/src/declarative/items/qquickshadereffect.cpp b/src/declarative/items/qquickshadereffect.cpp index 78c23d4..bdef980 100644 --- a/src/declarative/items/qquickshadereffect.cpp +++ b/src/declarative/items/qquickshadereffect.cpp @@ -88,14 +88,6 @@ const char *qtTexCoordAttributeName() return qt_texcoord_attribute_name; } -// TODO: Remove after grace period. -QQuickShaderEffectItem::QQuickShaderEffectItem(QQuickItem *parent) - : QQuickShaderEffect(parent) -{ - qWarning("ShaderEffectItem has been deprecated. Use ShaderEffect instead."); -} - - /*! \qmlclass ShaderEffect QQuickShaderEffect \inqmlmodule QtQuick 2 @@ -643,17 +635,10 @@ void QQuickShaderEffect::lookThroughShaderCode(const QByteArray &code) const int matLen = sizeof("qt_Matrix") - 1; const int opLen = sizeof("qt_Opacity") - 1; - const int mvpMatLen = sizeof("qt_ModelViewProjectionMatrix") - 1; const int sampLen = sizeof("sampler2D") - 1; if (nameLength == matLen && qstrncmp("qt_Matrix", s + nameIndex, matLen) == 0) { m_source.respectsMatrix = true; - } else if (nameLength == mvpMatLen && qstrncmp("qt_ModelViewProjectionMatrix", - s + nameIndex, mvpMatLen) == 0) - { - // TODO: Remove after grace period. - qWarning("ShaderEffect: qt_ModelViewProjectionMatrix is deprecated. Use qt_Matrix instead."); - m_source.respectsMatrix = true; } else if (nameLength == opLen && qstrncmp("qt_Opacity", s + nameIndex, opLen) == 0) { m_source.respectsOpacity = true; } else { diff --git a/src/declarative/items/qquickshadereffect_p.h b/src/declarative/items/qquickshadereffect_p.h index ee38c31..1910f43 100644 --- a/src/declarative/items/qquickshadereffect_p.h +++ b/src/declarative/items/qquickshadereffect_p.h @@ -151,13 +151,6 @@ private: uint m_dirtyGeometry : 1; }; -// TODO: Remove after grace period. -class QQuickShaderEffectItem : public QQuickShaderEffect -{ -public: - QQuickShaderEffectItem(QQuickItem *parent = 0); -}; - QT_END_NAMESPACE QT_END_HEADER diff --git a/src/declarative/items/qquickshadereffectnode.cpp b/src/declarative/items/qquickshadereffectnode.cpp index 30066ab..43c891e 100644 --- a/src/declarative/items/qquickshadereffectnode.cpp +++ b/src/declarative/items/qquickshadereffectnode.cpp @@ -196,9 +196,6 @@ void QQuickCustomMaterialShader::initialize() { m_opacityLoc = program()->uniformLocation("qt_Opacity"); m_matrixLoc = program()->uniformLocation("qt_Matrix"); - // TODO: Remove after grace period. - if (m_matrixLoc == -1) - m_matrixLoc = program()->uniformLocation("qt_ModelViewProjectionMatrix"); } const char *QQuickCustomMaterialShader::vertexShader() const -- 1.7.2.5