diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2014-07-08 10:10:43 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2014-07-09 12:43:20 +0200 |
commit | 7977ff592528fc8fe2e3af5dc0285becd2455314 (patch) | |
tree | f9098ea957ea9d9d3d48a14aecc4e4c530c5801d /src/quick3d/quick3drenderer/items/quick3dmaterial.cpp | |
parent | 64fc67331c933461beb68368147d3832d9e39655 (diff) |
Renamed Parameter to QParameter
Change-Id: I1377b93ca06a838a625d38db8b77ebcee438b203
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drenderer/items/quick3dmaterial.cpp')
-rw-r--r-- | src/quick3d/quick3drenderer/items/quick3dmaterial.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp b/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp index 0d340a958..9308efeb7 100644 --- a/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp +++ b/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp @@ -56,16 +56,16 @@ Quick3DMaterial::Quick3DMaterial(QObject *parent) { } -QQmlListProperty<Parameter> Quick3DMaterial::qmlParameters() +QQmlListProperty<QParameter> Quick3DMaterial::qmlParameters() { - return QQmlListProperty<Parameter>(this, 0, + return QQmlListProperty<QParameter>(this, 0, &Quick3DMaterial::appendParameter, &Quick3DMaterial::parameterCount, &Quick3DMaterial::parameterAt, &Quick3DMaterial::clearParameters); } -void Quick3DMaterial::appendParameter(QQmlListProperty<Parameter> *list, Parameter *param) +void Quick3DMaterial::appendParameter(QQmlListProperty<QParameter> *list, QParameter *param) { Quick3DMaterial *mat = qobject_cast<Quick3DMaterial *>(list->object); if (mat) { @@ -74,7 +74,7 @@ void Quick3DMaterial::appendParameter(QQmlListProperty<Parameter> *list, Paramet } } -Parameter *Quick3DMaterial::parameterAt(QQmlListProperty<Parameter> *list, int index) +QParameter *Quick3DMaterial::parameterAt(QQmlListProperty<QParameter> *list, int index) { Quick3DMaterial *mat = qobject_cast<Quick3DMaterial *>(list->object); if (mat) @@ -82,7 +82,7 @@ Parameter *Quick3DMaterial::parameterAt(QQmlListProperty<Parameter> *list, int i return 0; } -int Quick3DMaterial::parameterCount(QQmlListProperty<Parameter> *list) +int Quick3DMaterial::parameterCount(QQmlListProperty<QParameter> *list) { Quick3DMaterial *mat = qobject_cast<Quick3DMaterial *>(list->object); if (mat) @@ -90,11 +90,11 @@ int Quick3DMaterial::parameterCount(QQmlListProperty<Parameter> *list) return 0; } -void Quick3DMaterial::clearParameters(QQmlListProperty<Parameter> *list) +void Quick3DMaterial::clearParameters(QQmlListProperty<QParameter> *list) { Quick3DMaterial *mat = qobject_cast<Quick3DMaterial *>(list->object); if (mat) { - Q_FOREACH (Parameter *p, mat->parentMaterial()->parameters()) { + Q_FOREACH (QParameter *p, mat->parentMaterial()->parameters()) { mat->parentMaterial()->removeParameter(p); } } |