diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-03 16:56:48 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-08 13:36:24 +0200 |
commit | 7ed5f3b867db5eb5b0bd6dc49828e0e6931b60f9 (patch) | |
tree | 895e46ec3c1ef83070843500cc3a791761727d20 /src/opengl | |
parent | 6a3a234742e4f186dd065e48cb013036d5f7a621 (diff) |
don't use QT_{BEGIN,END}_INCLUDE_NAMESPACE needlessly
these macros behave counter-intuitively, so don't use them unless the code
structure really suggests their use.
Change-Id: I58213b39f8a98e4368901217fac14ca49c28b8cf
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/opengl')
-rw-r--r-- | src/opengl/qgl_p.h | 5 | ||||
-rw-r--r-- | src/opengl/qglframebufferobject_p.h | 6 | ||||
-rw-r--r-- | src/opengl/qglpixelbuffer_p.h | 6 |
3 files changed, 4 insertions, 13 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index c2b16f91e0..b03214aed8 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -66,6 +66,7 @@ #include "qglpaintdevice_p.h" #include <QtGui/QOpenGLContext> +#include <QtOpenGL/private/qglextensions_p.h> QT_BEGIN_NAMESPACE @@ -73,10 +74,6 @@ class QGLContext; class QGLOverlayWidget; class QPixmap; -QT_BEGIN_INCLUDE_NAMESPACE -#include <QtOpenGL/private/qglextensions_p.h> -QT_END_INCLUDE_NAMESPACE - class QGLFormatPrivate { public: diff --git a/src/opengl/qglframebufferobject_p.h b/src/opengl/qglframebufferobject_p.h index 37d786cf60..bab84916ea 100644 --- a/src/opengl/qglframebufferobject_p.h +++ b/src/opengl/qglframebufferobject_p.h @@ -53,15 +53,11 @@ // We mean it. // -QT_BEGIN_NAMESPACE - -QT_BEGIN_INCLUDE_NAMESPACE - #include <qglframebufferobject.h> #include <private/qglpaintdevice_p.h> #include <private/qgl_p.h> -QT_END_INCLUDE_NAMESPACE +QT_BEGIN_NAMESPACE #ifndef QT_OPENGL_ES #define DEFAULT_FORMAT GL_RGBA8 diff --git a/src/opengl/qglpixelbuffer_p.h b/src/opengl/qglpixelbuffer_p.h index 227d35aabc..105fc5f957 100644 --- a/src/opengl/qglpixelbuffer_p.h +++ b/src/opengl/qglpixelbuffer_p.h @@ -53,13 +53,11 @@ // We mean it. // -QT_BEGIN_NAMESPACE - -QT_BEGIN_INCLUDE_NAMESPACE #include "QtOpenGL/qglpixelbuffer.h" #include <private/qgl_p.h> #include <private/qglpaintdevice_p.h> -QT_END_INCLUDE_NAMESPACE + +QT_BEGIN_NAMESPACE class QEglContext; |