From ca31cbf2ad5dc43d74a2220d929f45bfe10c806b Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar.sletta@nokia.com>
Date: Wed, 15 Jun 2011 11:51:15 +0200
Subject: Renamed QMLRenderer -> QSGDefaultRenderer

Change-Id: Ib1f00d45cecd3b438148adce2f7cf247030b2dfb
---
 src/declarative/items/qsgshadereffectmesh.cpp             |  5 -----
 src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp | 14 +++++++-------
 src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h |  4 ++--
 src/declarative/scenegraph/qsgcontext.cpp                 |  2 +-
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/declarative/items/qsgshadereffectmesh.cpp b/src/declarative/items/qsgshadereffectmesh.cpp
index 4900755e46..f4d8b468af 100644
--- a/src/declarative/items/qsgshadereffectmesh.cpp
+++ b/src/declarative/items/qsgshadereffectmesh.cpp
@@ -135,11 +135,6 @@ QSGGeometry *QSGGridMesh::updateGeometry(QSGGeometry *geometry, const QVector<QB
             break;
         }
 
-        if (error) {
-            delete geometry;
-            return 0;
-        }
-
         geometry = new QSGGeometry(attrCount == 1
                                    ? QSGGeometry::defaultAttributes_Point2D()
                                    : QSGGeometry::defaultAttributes_TexturedPoint2D(),
diff --git a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp
index e2bd8f6134..3c0a618991 100644
--- a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp
+++ b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp
@@ -159,7 +159,7 @@ T Heap<T, prealloc>::pop()
 }
 
 
-QMLRenderer::QMLRenderer(QSGContext *context)
+QSGDefaultRenderer::QSGDefaultRenderer(QSGContext *context)
     : QSGRenderer(context)
     , m_opaqueNodes(64)
     , m_transparentNodes(64)
@@ -176,7 +176,7 @@ QMLRenderer::QMLRenderer(QSGContext *context)
 #endif
 }
 
-void QMLRenderer::nodeChanged(QSGNode *node, QSGNode::DirtyFlags flags)
+void QSGDefaultRenderer::nodeChanged(QSGNode *node, QSGNode::DirtyFlags flags)
 {
     QSGRenderer::nodeChanged(node, flags);
 
@@ -191,7 +191,7 @@ void QMLRenderer::nodeChanged(QSGNode *node, QSGNode::DirtyFlags flags)
         m_needs_sorting = true;
 }
 
-void QMLRenderer::render()
+void QSGDefaultRenderer::render()
 {
 #if defined (QML_RUNTIME_TESTING)
     static bool dumpTree = qApp->arguments().contains(QLatin1String("--dump-tree"));
@@ -348,18 +348,18 @@ public:
     bool operator < (const Foo &other) const { return nodeLessThan(second, other.second); }
 };
 
-void QMLRenderer::setSortFrontToBackEnabled(bool sort)
+void QSGDefaultRenderer::setSortFrontToBackEnabled(bool sort)
 {
     printf("setting sorting to... %d\n", sort);
     m_sort_front_to_back = sort;
 }
 
-bool QMLRenderer::isSortFrontToBackEnabled() const
+bool QSGDefaultRenderer::isSortFrontToBackEnabled() const
 {
     return m_sort_front_to_back;
 }
 
-void QMLRenderer::buildLists(QSGNode *node)
+void QSGDefaultRenderer::buildLists(QSGNode *node)
 {
     if (node->isSubtreeBlocked())
         return;
@@ -432,7 +432,7 @@ void QMLRenderer::buildLists(QSGNode *node)
     }
 }
 
-void QMLRenderer::renderNodes(const QDataBuffer<QSGGeometryNode *> &list)
+void QSGDefaultRenderer::renderNodes(const QDataBuffer<QSGGeometryNode *> &list)
 {
     const float scale = 1.0f / m_currentRenderOrder;
     int count = list.size();
diff --git a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
index ca1f5592cf..c855ed606a 100644
--- a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
+++ b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
@@ -52,11 +52,11 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QMLRenderer : public QSGRenderer
+class QSGDefaultRenderer : public QSGRenderer
 {
     Q_OBJECT
 public:
-    QMLRenderer(QSGContext *context);
+    QSGDefaultRenderer(QSGContext *context);
 
     void render();
 
diff --git a/src/declarative/scenegraph/qsgcontext.cpp b/src/declarative/scenegraph/qsgcontext.cpp
index 55942bebe4..635b0ad091 100644
--- a/src/declarative/scenegraph/qsgcontext.cpp
+++ b/src/declarative/scenegraph/qsgcontext.cpp
@@ -308,7 +308,7 @@ QSGRenderer *QSGContext::createRenderer()
 {
     // ### Do something with this before release...
     static bool doFrontToBack = qApp->arguments().contains(QLatin1String("--opaque-front-to-back"));
-    QMLRenderer *renderer = new QMLRenderer(this);
+    QSGDefaultRenderer *renderer = new QSGDefaultRenderer(this);
     if (doFrontToBack) {
         printf("QSGContext: Sorting opaque nodes front to back...\n");
         renderer->setSortFrontToBackEnabled(true);
-- 
cgit v1.2.3