Merge remote-tracking branch 'gerrit/master' into containers

Change-Id: I2d358b912f1055ee6021d13de2f66fd459aaa355

1 files changed, 1 insertions, 74 deletions

diff --git a/src/gui/opengl/qtriangulator.cpp b/src/gui/opengl/qtriangulator.cpp
index 67c2a6494e..c4b8aba9a7 100644
--- a/src/gui/opengl/qtriangulator.cpp
+++ b/src/gui/opengl/qtriangulator.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -41,7 +41,6 @@
 
 #include "qtriangulator_p.h"
 
-#include <QtWidgets/qdialog.h>
 #include <QtGui/qevent.h>
 #include <QtGui/qpainter.h>
 #include <QtGui/qpainterpath.h>
@@ -721,78 +720,6 @@ inline void QInt64Set::clear()
 }
 
 //============================================================================//
-//                                QRingBuffer                                 //
-//============================================================================//
-
-// T must be POD.
-template <class T>
-class QRingBuffer
-{
-public:
-    inline QRingBuffer() : m_array(0), m_head(0), m_size(0), m_capacity(0) { }
-    inline ~QRingBuffer() {if (m_array) delete[] m_array;}
-    bool reallocate(int capacity);
-    inline const T &head() const {Q_ASSERT(m_size > 0); return m_array[m_head];}
-    inline const T &dequeue();
-    inline void enqueue(const T &x);
-    inline bool isEmpty() const {return m_size == 0;}
-private:
-    T *m_array;
-    int m_head;
-    int m_size;
-    int m_capacity;
-};
-
-template <class T>
-bool QRingBuffer<T>::reallocate(int capacity)
-{
-    T *oldArray = m_array;
-    m_array = new T[capacity];
-    if (m_array) {
-        if (oldArray) {
-            if (m_head + m_size > m_capacity) {
-                memcpy(m_array, oldArray + m_head, (m_capacity - m_head) * sizeof(T));
-                memcpy(m_array + (m_capacity - m_head), oldArray, (m_head + m_size - m_capacity) * sizeof(T));
-            } else {
-                memcpy(m_array, oldArray + m_head, m_size * sizeof(T));
-            }
-            delete[] oldArray;
-        }
-        m_capacity = capacity;
-        m_head = 0;
-        return true;
-    } else {
-        m_array = oldArray;
-        return false;
-    }
-}
-
-template <class T>
-inline const T &QRingBuffer<T>::dequeue()
-{
-    Q_ASSERT(m_size > 0);
-    Q_ASSERT(m_array);
-    Q_ASSERT(m_capacity >= m_size);
-    int index = m_head;
-    if (++m_head >= m_capacity)
-        m_head -= m_capacity;
-    --m_size;
-    return m_array[index];
-}
-
-template <class T>
-inline void QRingBuffer<T>::enqueue(const T &x)
-{
-    if (m_size == m_capacity)
-        reallocate(qMax(2 * m_capacity, 64));
-    int index = m_head + m_size;
-    if (index >= m_capacity)
-        index -= m_capacity;
-    m_array[index] = x;
-    ++m_size;
-}
-
-//============================================================================//
 //                               QTriangulator                                //
 //============================================================================//
 template<typename T>