diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-22 21:23:07 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-23 10:21:37 +0200 |
commit | 4938e1aef35045554074a4340aed25f9796f65ea (patch) | |
tree | fb4a1b911d23eb9ee1355543060a3348e6419662 | |
parent | 9ec54f4c3a7ecb483a7687aec3de232914d0eca8 (diff) |
do not pollute the global namespace
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>
-rw-r--r-- | src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp | 10 | ||||
-rw-r--r-- | src/declarative/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 a215968e2b..93d8ca01f1 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 64480f02de..45cebdd7b9 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(); |