summaryrefslogtreecommitdiffstats
path: root/src/render/renderstates/qpointsize.cpp
diff options
context:
space:
mode:
authorRobert Brock <robert.brock@kdab.com>2016-02-29 11:58:58 +0000
committerSean Harmer <sean.harmer@kdab.com>2016-03-05 01:07:30 +0000
commitc3ad40d587dd6a1c2d287b2e55b6334beff0817c (patch)
treee2135734f4ce2d6e767c67fa158c3c26a2887835 /src/render/renderstates/qpointsize.cpp
parent598d6a50981314170bf4da289b5d5070fc8709c7 (diff)
QPointSize renaming
enum renamed from Specification to SizeMode removed isProgrammable specification became sizeMode staticValue became Fixed Task-number: QTBUG-51428 Change-Id: I5932bf4c0622243e032593ba72da70159eeb3304 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/renderstates/qpointsize.cpp')
-rw-r--r--src/render/renderstates/qpointsize.cpp25
1 files changed, 10 insertions, 15 deletions
diff --git a/src/render/renderstates/qpointsize.cpp b/src/render/renderstates/qpointsize.cpp
index 986148b54..819d1c8ca 100644
--- a/src/render/renderstates/qpointsize.cpp
+++ b/src/render/renderstates/qpointsize.cpp
@@ -46,13 +46,13 @@ namespace Qt3DRender {
class QPointSizePrivate : public QRenderStatePrivate
{
public:
- QPointSizePrivate(QPointSize::Specification spec, float value)
+ QPointSizePrivate(QPointSize::SizeMode sizeMode, float value)
: QRenderStatePrivate(QRenderState::PointSize)
- , m_specification(spec)
+ , m_sizeMode(sizeMode)
, m_value(value)
{}
- QPointSize::Specification m_specification;
+ QPointSize::SizeMode m_sizeMode;
float m_value;
Q_DECLARE_PUBLIC(QPointSize)
@@ -70,7 +70,7 @@ public:
*/
QPointSize::QPointSize(Qt3DCore::QNode *parent)
- : QRenderState(*new QPointSizePrivate(Specification::Programmable, 0.f), parent)
+ : QRenderState(*new QPointSizePrivate(SizeMode::Programmable, 0.f), parent)
{
}
@@ -79,10 +79,10 @@ QPointSize::~QPointSize()
QNode::cleanup();
}
-QPointSize::Specification QPointSize::specification() const
+QPointSize::SizeMode QPointSize::sizeMode() const
{
Q_D(const QPointSize);
- return d->m_specification;
+ return d->m_sizeMode;
}
float QPointSize::value() const
@@ -91,16 +91,11 @@ float QPointSize::value() const
return d->m_value;
}
-bool QPointSize::isProgrammable() const
-{
- return (specification() == QPointSize::Specification::Programmable);
-}
-
-void QPointSize::setSpecification(Specification spec)
+void QPointSize::setSizeMode(SizeMode sizeMode)
{
Q_D(QPointSize);
- d->m_specification = spec;
- emit specificationChanged(spec);
+ d->m_sizeMode = sizeMode;
+ emit sizeModeChanged(sizeMode);
}
void QPointSize::setValue(float size)
@@ -118,7 +113,7 @@ void QPointSize::copy(const Qt3DCore::QNode *ref)
Q_D(QPointSize);
d->m_value = refState->d_func()->m_value;
- d->m_specification = refState->d_func()->m_specification;
+ d->m_sizeMode = refState->d_func()->m_sizeMode;
}
} // namespace Qt3DRender