Avoid naming classes DrawState

Since winuser.h contains a DrawState #define, this tends to wreck havoc on
Windows. This patch respectively renames QDrawState, Qt3D::Render::DrawState
and Qt3D::Render::DrawStateSet to QRenderState, Qt3D::Render::RenderState and
Qt3D::Render::RenderStateSet. While this is more invasive than just
undefining DrawState, it should be more foolproof too.

Change-Id: I9fa86e5bf1fe41fb4839bd146822cc43e26019e6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

2 files changed, 23 insertions, 21 deletions

diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp b/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
index a41f83ebe..815bceb0a 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -73,13 +74,13 @@ QQmlListProperty<QParameterMapper> Quick3DRenderPass::bindingList()
                                                     &Quick3DRenderPass::clearBindings);
 }
 
-QQmlListProperty<QDrawState> Quick3DRenderPass::drawStateList()
+QQmlListProperty<QRenderState> Quick3DRenderPass::renderStateList()
 {
-    return QQmlListProperty<Qt3D::QDrawState>(this, 0,
-                                              &Quick3DRenderPass::appendDrawState,
-                                              &Quick3DRenderPass::drawStateCount,
-                                              &Quick3DRenderPass::drawStateAt,
-                                              &Quick3DRenderPass::clearDrawStates);
+    return QQmlListProperty<Qt3D::QRenderState>(this, 0,
+                                              &Quick3DRenderPass::appendRenderState,
+                                              &Quick3DRenderPass::renderStateCount,
+                                              &Quick3DRenderPass::renderStateAt,
+                                              &Quick3DRenderPass::clearRenderStates);
 }
 
 void Quick3DRenderPass::appendCriteria(QQmlListProperty<QCriterion> *list, QCriterion *criterion)
@@ -132,29 +133,29 @@ void Quick3DRenderPass::clearBindings(QQmlListProperty<QParameterMapper> *list)
         rPass->parentRenderPass()->removeBinding(binding);
 }
 
-void Quick3DRenderPass::appendDrawState(QQmlListProperty<QDrawState> *list, QDrawState *state)
+void Quick3DRenderPass::appendRenderState(QQmlListProperty<QRenderState> *list, QRenderState *state)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    rPass->parentRenderPass()->addDrawState(state);
+    rPass->parentRenderPass()->addRenderState(state);
 }
 
-QDrawState *Quick3DRenderPass::drawStateAt(QQmlListProperty<QDrawState> *list, int index)
+QRenderState *Quick3DRenderPass::renderStateAt(QQmlListProperty<QRenderState> *list, int index)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    return rPass->parentRenderPass()->drawStates().at(index);
+    return rPass->parentRenderPass()->renderStates().at(index);
 }
 
-int Quick3DRenderPass::drawStateCount(QQmlListProperty<QDrawState> *list)
+int Quick3DRenderPass::renderStateCount(QQmlListProperty<QRenderState> *list)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    return rPass->parentRenderPass()->drawStates().count();
+    return rPass->parentRenderPass()->renderStates().count();
 }
 
-void Quick3DRenderPass::clearDrawStates(QQmlListProperty<QDrawState> *list)
+void Quick3DRenderPass::clearRenderStates(QQmlListProperty<QRenderState> *list)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    Q_FOREACH (QDrawState *s, rPass->parentRenderPass()->drawStates())
-        rPass->parentRenderPass()->removeDrawState(s);
+    Q_FOREACH (QRenderState *s, rPass->parentRenderPass()->renderStates())
+        rPass->parentRenderPass()->removeRenderState(s);
 }
 
 } // Quick
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.h b/src/quick3d/quick3drenderer/items/quick3drenderpass.h
index 6ac7e1dd1..5e30a4aa0 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpass.h
+++ b/src/quick3d/quick3drenderer/items/quick3drenderpass.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -59,13 +60,13 @@ class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderPass : public QObject
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3D::QCriterion> criteria READ criteriaList)
     Q_PROPERTY(QQmlListProperty<Qt3D::QParameterMapper> bindings READ bindingList)
-    Q_PROPERTY(QQmlListProperty<Qt3D::QDrawState> drawStates READ drawStateList)
+    Q_PROPERTY(QQmlListProperty<Qt3D::QRenderState> renderStates READ renderStateList)
 public:
     explicit Quick3DRenderPass(QObject *parent = 0);
 
     QQmlListProperty<Qt3D::QCriterion> criteriaList();
     QQmlListProperty<Qt3D::QParameterMapper> bindingList();
-    QQmlListProperty<Qt3D::QDrawState> drawStateList();
+    QQmlListProperty<Qt3D::QRenderState> renderStateList();
     inline QRenderPass *parentRenderPass() const { return qobject_cast<QRenderPass *>(parent()); }
 
 private:
@@ -79,10 +80,10 @@ private:
     static int bindingsCount(QQmlListProperty<Qt3D::QParameterMapper> *list);
     static void clearBindings(QQmlListProperty<Qt3D::QParameterMapper> *list);
 
-    static void appendDrawState(QQmlListProperty<Qt3D::QDrawState> *list, QDrawState *state);
-    static QDrawState *drawStateAt(QQmlListProperty<Qt3D::QDrawState> *list, int index);
-    static int drawStateCount(QQmlListProperty<Qt3D::QDrawState> *list);
-    static void clearDrawStates(QQmlListProperty<Qt3D::QDrawState> *list);
+    static void appendRenderState(QQmlListProperty<Qt3D::QRenderState> *list, QRenderState *state);
+    static QRenderState *renderStateAt(QQmlListProperty<Qt3D::QRenderState> *list, int index);
+    static int renderStateCount(QQmlListProperty<Qt3D::QRenderState> *list);
+    static void clearRenderStates(QQmlListProperty<Qt3D::QRenderState> *list);
 };
 
 } // Quick