From 4938e1aef35045554074a4340aed25f9796f65ea Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar.sletta@nokia.com>
Date: Thu, 22 Sep 2011 21:23:07 +0200
Subject: [PATCH] do not pollute the global namespace
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: I6a6bd1b9ff89535c7af0f11dd9c501945ee0718b
Reviewed-on: http://codereview.qt-project.org/5428
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 .../scenegraph/coreapi/qsgdefaultrenderer.cpp      |   10 ++--
 .../scenegraph/coreapi/qsgdefaultrenderer_p.h      |   47 ++++++++++----------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp
index a215968..93d8ca0 100644
--- a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp
+++ b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp
@@ -112,23 +112,23 @@ static bool nodeLessThanWithRenderOrder(QSGGeometryNode *a, QSGGeometryNode *b)
 }
 
 
-IndexGeometryNodePair::IndexGeometryNodePair(int i, QSGGeometryNode *node)
+QSGDefaultRenderer::IndexGeometryNodePair::IndexGeometryNodePair(int i, QSGGeometryNode *node)
     : QPair<int, QSGGeometryNode *>(i, node)
 {
 }
 
-bool IndexGeometryNodePair::operator < (const IndexGeometryNodePair &other) const
+bool QSGDefaultRenderer::IndexGeometryNodePair::operator < (const QSGDefaultRenderer::IndexGeometryNodePair &other) const
 {
     return nodeLessThan(second, other.second);
 }
 
 
-IndexGeometryNodePairHeap::IndexGeometryNodePairHeap()
+QSGDefaultRenderer::IndexGeometryNodePairHeap::IndexGeometryNodePairHeap()
     : v(64)
 {
 }
 
-void IndexGeometryNodePairHeap::insert(const IndexGeometryNodePair &x)
+void QSGDefaultRenderer::IndexGeometryNodePairHeap::insert(const QSGDefaultRenderer::IndexGeometryNodePair &x)
 {
     int i = v.size();
     v.add(x);
@@ -138,7 +138,7 @@ void IndexGeometryNodePairHeap::insert(const IndexGeometryNodePair &x)
     }
 }
 
-IndexGeometryNodePair IndexGeometryNodePairHeap::pop()
+QSGDefaultRenderer::IndexGeometryNodePair QSGDefaultRenderer::IndexGeometryNodePairHeap::pop()
 {
     IndexGeometryNodePair x = top();
     if (v.size() > 1)
diff --git a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
index 64480f0..45cebdd 100644
--- a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
+++ b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
@@ -52,35 +52,36 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class IndexGeometryNodePair : public QPair<int, QSGGeometryNode *>
-{
-public:
-    IndexGeometryNodePair(int i, QSGGeometryNode *n);
-    bool operator < (const IndexGeometryNodePair &other) const;
-};
-
-
-// Minimum heap.
-class IndexGeometryNodePairHeap
-{
-public:
-    IndexGeometryNodePairHeap();
-    void insert(const IndexGeometryNodePair &x);
-    const IndexGeometryNodePair &top() const { return v.first(); }
-    IndexGeometryNodePair pop();
-    bool isEmpty() const { return v.isEmpty(); }
-private:
-    static int parent(int i) { return (i - 1) >> 1; }
-    static int left(int i) { return (i << 1) | 1; }
-    static int right(int i) { return (i + 1) << 1; }
-    QDataBuffer<IndexGeometryNodePair> v;
-};
 
 
 class QSGDefaultRenderer : public QSGRenderer
 {
     Q_OBJECT
 public:
+    class IndexGeometryNodePair : public QPair<int, QSGGeometryNode *>
+    {
+    public:
+        IndexGeometryNodePair(int i, QSGGeometryNode *n);
+        bool operator < (const IndexGeometryNodePair &other) const;
+    };
+
+
+    // Minimum heap.
+    class IndexGeometryNodePairHeap
+    {
+    public:
+        IndexGeometryNodePairHeap();
+        void insert(const IndexGeometryNodePair &x);
+        const IndexGeometryNodePair &top() const { return v.first(); }
+        IndexGeometryNodePair pop();
+        bool isEmpty() const { return v.isEmpty(); }
+    private:
+        static int parent(int i) { return (i - 1) >> 1; }
+        static int left(int i) { return (i << 1) | 1; }
+        static int right(int i) { return (i + 1) << 1; }
+        QDataBuffer<IndexGeometryNodePair> v;
+    };
+
     QSGDefaultRenderer(QSGContext *context);
 
     void render();
-- 
1.7.2.5