diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-06-20 13:37:37 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-06-20 13:37:37 +0200 |
| commit | f332786abc6817fefaa683fb22caa40184c1316e (patch) | |
| tree | f604af4c61007eee49d39d715b300c3622c52753 /src/opengl | |
| parent | 9a3f592966b9227f099e752f578a157500989146 (diff) | |
| parent | 61aae4e9a033bfb59664105e5377fd086bacb517 (diff) | |
| download | qt4-tools-f332786abc6817fefaa683fb22caa40184c1316e.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/gl2paintengineex/qtriangulator.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/opengl/gl2paintengineex/qtriangulator.cpp b/src/opengl/gl2paintengineex/qtriangulator.cpp index 7c3be2b318..5293eff6a5 100644 --- a/src/opengl/gl2paintengineex/qtriangulator.cpp +++ b/src/opengl/gl2paintengineex/qtriangulator.cpp @@ -1309,6 +1309,9 @@ inline void QRingBuffer<T>::enqueue(const T &x) //============================================================================// // QTriangulator // //============================================================================// + +typedef QRBTree<int>::Node *QRBTreeIntNodePointer; + template<typename T> class QTriangulator { @@ -1775,7 +1778,7 @@ bool QTriangulator<T>::ComplexToSimple::edgeIsLeftOfEdge(int leftEdgeIndex, int } template <typename T> -QRBTree<int>::Node *QTriangulator<T>::ComplexToSimple::searchEdgeLeftOf(int edgeIndex) const +QRBTreeIntNodePointer QTriangulator<T>::ComplexToSimple::searchEdgeLeftOf(int edgeIndex) const { QRBTree<int>::Node *current = m_edgeList.root; QRBTree<int>::Node *result = 0; @@ -1791,7 +1794,7 @@ QRBTree<int>::Node *QTriangulator<T>::ComplexToSimple::searchEdgeLeftOf(int edge } template <typename T> -QRBTree<int>::Node *QTriangulator<T>::ComplexToSimple::searchEdgeLeftOf(int edgeIndex, QRBTree<int>::Node *after) const +QRBTreeIntNodePointer QTriangulator<T>::ComplexToSimple::searchEdgeLeftOf(int edgeIndex, QRBTree<int>::Node *after) const { if (!m_edgeList.root) return after; |