summaryrefslogtreecommitdiffstats
path: root/src/render/frontend/qmaterial.h
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2014-07-08 10:10:43 +0200
committerSean Harmer <sean.harmer@kdab.com>2014-07-09 12:43:20 +0200
commit7977ff592528fc8fe2e3af5dc0285becd2455314 (patch)
treef9098ea957ea9d9d3d48a14aecc4e4c530c5801d /src/render/frontend/qmaterial.h
parent64fc67331c933461beb68368147d3832d9e39655 (diff)
Renamed Parameter to QParameter
Change-Id: I1377b93ca06a838a625d38db8b77ebcee438b203 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qmaterial.h')
-rw-r--r--src/render/frontend/qmaterial.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/frontend/qmaterial.h b/src/render/frontend/qmaterial.h
index 18f7fb746..cdf25cd73 100644
--- a/src/render/frontend/qmaterial.h
+++ b/src/render/frontend/qmaterial.h
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
namespace Qt3D {
class Texture;
-class Parameter;
+class QParameter;
class QMaterialPrivate;
typedef QMap<QString, Texture*> TextureDict;
@@ -69,9 +69,9 @@ public:
void setEffect(QAbstractEffect *effect) Q_DECL_OVERRIDE;
- void addParameter(Parameter *parameter);
- void removeParameter(Parameter *parameter);
- QList<Parameter *> parameters() const;
+ void addParameter(QParameter *parameter);
+ void removeParameter(QParameter *parameter);
+ QList<QParameter *> parameters() const;
TextureDict textureValues() const;