diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-02-18 20:20:09 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-02-20 13:36:19 +0000 |
| commit | a425b5f19c20f357acf92950dda7b395c1ee4c72 (patch) | |
| tree | 4db0ed2aab2a884466c7033989cc5fe85932cf90 /src/plugins/platforms/windows/qwindowsglcontext.h | |
| parent | 611942f2d737cc75c7492dffc183174e432aa155 (diff) | |
QWindowsGLContext: replace homebrew Array with std::vector
std::vector is all that the Array original author dreamed about,
and more: never shrinks capacity, non CoWed, ...
Appart from append(), the Array API was modeled after std::vector
(size_t size_type, etc) already, so the port to std::vector is
minimal. The only change besides append() -> push_back() was not
assuming const_iterator being const T*.
Remove now-unused Array.
Change-Id: I02bc71441d01e554e320746d82dbc00f74c5466d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsglcontext.h')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsglcontext.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.h b/src/plugins/platforms/windows/qwindowsglcontext.h index 791a17301e..3acfed1ccf 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.h +++ b/src/plugins/platforms/windows/qwindowsglcontext.h @@ -40,12 +40,13 @@ #ifndef QWINDOWSGLCONTEXT_H #define QWINDOWSGLCONTEXT_H -#include "array.h" #include "qtwindows_additional.h" #include "qwindowsopenglcontext.h" #include <QtGui/QOpenGLContext> +#include <vector> + QT_BEGIN_NAMESPACE class QDebug; @@ -264,7 +265,7 @@ private: QOpenGLContext *m_context; QSurfaceFormat m_obtainedFormat; HGLRC m_renderingContext; - Array<QOpenGLContextData> m_windowContexts; + std::vector<QOpenGLContextData> m_windowContexts; PIXELFORMATDESCRIPTOR m_obtainedPixelFormatDescriptor; int m_pixelFormat; bool m_extensionsUsed; |