gui/opengl: Fix missing or improper include guard in headers

Use an include guard in headers to ensure the header is not included
more than once. Make the header guard match its file name.

Change-Id: I29b41e9d33e4ea17165f44c49de0a963574dd809
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>

diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h
index bd990d0..328ded6 100644 (file)
--- a/src/gui/image/qiconloader_p.h
+++ b/src/gui/image/qiconloader_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QDESKTOPICON_P_H
-#define QDESKTOPICON_P_H
+#ifndef QICONLOADER_P_H
+#define QICONLOADER_P_H
 
 #ifndef QT_NO_ICON
 //
@@ -187,6 +187,6 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QDESKTOPICON_P_H
+#endif // QT_NO_ICON
 
-#endif //QT_NO_ICON
+#endif // QICONLOADER_P_H

diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h
index 8e1a8cc..cfc6a9b 100644 (file)
--- a/src/gui/image/qpixmap_raster_p.h
+++ b/src/gui/image/qpixmap_raster_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QPIXMAPDATA_RASTER_P_H
-#define QPIXMAPDATA_RASTER_P_H
+#ifndef QPIXMAP_RASTER_P_H
+#define QPIXMAP_RASTER_P_H
 
 //
 //  W A R N I N G
@@ -95,6 +95,6 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QPIXMAPDATA_RASTER_P_H
+#endif // QPIXMAP_RASTER_P_H
 
 

diff --git a/src/gui/image/qplatformpixmap.h b/src/gui/image/qplatformpixmap.h
index 21bcfcd..c7396bb 100644 (file)
--- a/src/gui/image/qplatformpixmap.h
+++ b/src/gui/image/qplatformpixmap.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QPIXMAPDATA_P_H
-#define QPIXMAPDATA_P_H
+#ifndef QPLATFORMPIXMAP_H
+#define QPLATFORMPIXMAP_H
 
 //
 //  W A R N I N G
@@ -157,4 +157,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QPIXMAPDATA_P_H
+#endif // QPLATFORMPIXMAP_H

diff --git a/src/gui/kernel/qopenglcontext_p.h b/src/gui/kernel/qopenglcontext_p.h
index ac72b76..b07ac0a 100644 (file)
--- a/src/gui/kernel/qopenglcontext_p.h
+++ b/src/gui/kernel/qopenglcontext_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QGUIGLCONTEXT_P_H
-#define QGUIGLCONTEXT_P_H
+#ifndef QOPENGLCONTEXT_P_H
+#define QOPENGLCONTEXT_P_H
 
 #ifndef QT_NO_OPENGL
 
@@ -251,4 +251,4 @@ QT_END_NAMESPACE
 QT_END_HEADER
 
 #endif // QT_NO_OPENGL
-#endif // QGUIGLCONTEXT_P_H
+#endif // QOPENGLCONTEXT_P_H

diff --git a/src/gui/kernel/qplatformopenglcontext.h b/src/gui/kernel/qplatformopenglcontext.h
index 466c81d..e505e2e 100644 (file)
--- a/src/gui/kernel/qplatformopenglcontext.h
+++ b/src/gui/kernel/qplatformopenglcontext.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QPLATFORMGLCONTEXT_H
-#define QPLATFORMGLCONTEXT_H
+#ifndef QPLATFORMOPENGLCONTEXT_H
+#define QPLATFORMOPENGLCONTEXT_H
 
 //
 //  W A R N I N G
@@ -104,4 +104,4 @@ QT_END_HEADER
 
 #endif // QT_NO_OPENGL
 
-#endif // QPLATFORMGLCONTEXT_H
+#endif // QPLATFORMOPENGLCONTEXT_H

diff --git a/src/gui/kernel/qplatformscreen_p.h b/src/gui/kernel/qplatformscreen_p.h
index ced66be..812c10f 100644 (file)
--- a/src/gui/kernel/qplatformscreen_p.h
+++ b/src/gui/kernel/qplatformscreen_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QPLATFORMSCREEN_QPA_P_H
-#define QPLATFORMSCREEN_QPA_P_H
+#ifndef QPLATFORMSCREEN_P_H
+#define QPLATFORMSCREEN_P_H
 
 //
 //  W A R N I N G
@@ -71,4 +71,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QPLATFORMSCREEN_QPA_P_H
+#endif // QPLATFORMSCREEN_P_H

diff --git a/src/gui/kernel/qplatformwindow_p.h b/src/gui/kernel/qplatformwindow_p.h
index 84a4a88..12e2e60 100644 (file)
--- a/src/gui/kernel/qplatformwindow_p.h
+++ b/src/gui/kernel/qplatformwindow_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QPLATFORMWINDOW_QPA_P_H
-#define QPLATFORMWINDOW_QPA_P_H
+#ifndef QPLATFORMWINDOW_P_H
+#define QPLATFORMWINDOW_P_H
 
 //
 //  W A R N I N G
@@ -71,4 +71,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QPLATFORMWINDOW_QPA_P_H
+#endif // QPLATFORMWINDOW_P_H

diff --git a/src/gui/opengl/qopenglgradientcache_p.h b/src/gui/opengl/qopenglgradientcache_p.h
index 7acc8c1..47837e5 100644 (file)
--- a/src/gui/opengl/qopenglgradientcache_p.h
+++ b/src/gui/opengl/qopenglgradientcache_p.h
@@ -39,6 +39,9 @@
 **
 ****************************************************************************/
 
+#ifndef QOPENGLGRADIENTCACHE_P_H
+#define QOPENGLGRADIENTCACHE_P_H
+
 //
 //  W A R N I N G
 //  -------------
@@ -99,3 +102,4 @@ private:
 
 QT_END_NAMESPACE
 
+#endif // QOPENGLGRADIENTCACHE_P_H

diff --git a/src/gui/opengl/qopengltextureglyphcache_p.h b/src/gui/opengl/qopengltextureglyphcache_p.h
index 4b6101e..4ccac0e 100644 (file)
--- a/src/gui/opengl/qopengltextureglyphcache_p.h
+++ b/src/gui/opengl/qopengltextureglyphcache_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QOPENTEXTUREGLYPHCACHE_P_H
-#define QOPENTEXTUREGLYPHCACHE_P_H
+#ifndef QOPENGLTEXTUREGLYPHCACHE_P_H
+#define QOPENGLTEXTUREGLYPHCACHE_P_H
 
 //
 //  W A R N I N G
@@ -166,5 +166,5 @@ private:
 
 QT_END_NAMESPACE
 
-#endif
+#endif // QOPENGLTEXTUREGLYPHCACHE_P_H
 

diff --git a/src/gui/painting/qdrawhelper_mips_dsp_p.h b/src/gui/painting/qdrawhelper_mips_dsp_p.h
index 818b27c..7988471 100644 (file)
--- a/src/gui/painting/qdrawhelper_mips_dsp_p.h
+++ b/src/gui/painting/qdrawhelper_mips_dsp_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QDRAWHELPER_MIPS_P_H
-#define QDRAWHELPER_MIPS_P_H
+#ifndef QDRAWHELPER_MIPS_DSP_P_H
+#define QDRAWHELPER_MIPS_DSP_P_H
 
 #include <private/qdrawhelper_p.h>
 
@@ -164,4 +164,4 @@ extern "C" void  qConvertRgb16To32_asm_mips_dspr2(quint32 *dest, const quint16 *
 
 QT_END_NAMESPACE
 
-#endif // QDRAWHELPER_MIPS_P_H
+#endif // QDRAWHELPER_MIPS_DSP_P_H

diff --git a/src/gui/painting/qt_mips_asm_dsp.h b/src/gui/painting/qt_mips_asm_dsp.h
index 088831f..fb5dc4f 100644 (file)
--- a/src/gui/painting/qt_mips_asm_dsp.h
+++ b/src/gui/painting/qt_mips_asm_dsp.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT_MIPS_DSP_H__
-#define QT_MIPS_DSP_H__
+#ifndef QT_MIPS_ASM_DSP_H
+#define QT_MIPS_ASM_DSP_H
 
 #define zero $0
 #define AT   $1
@@ -246,4 +246,4 @@ LEAF_MIPS32R2(symbol)                                   \
     or                \out_1,    \scratch1, \scratch3
 .endm
 
-#endif //QT_MIPS_DSP_H__
+#endif // QT_MIPS_ASM_DSP_H

diff --git a/src/gui/text/qglyphrun.h b/src/gui/text/qglyphrun.h
index 37e9a72..80c796f 100644 (file)
--- a/src/gui/text/qglyphrun.h
+++ b/src/gui/text/qglyphrun.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QOpenGLYPHRUN_H
-#define QOpenGLYPHRUN_H
+#ifndef QGLYPHRUN_H
+#define QGLYPHRUN_H
 
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qvector.h>
@@ -134,4 +134,4 @@ QT_END_HEADER
 
 #endif // QT_NO_RAWFONT
 
-#endif // QOpenGLYPHS_H
+#endif // QGLYPHRUN_H

diff --git a/src/gui/text/qglyphrun_p.h b/src/gui/text/qglyphrun_p.h
index b75862b..6926934 100644 (file)
--- a/src/gui/text/qglyphrun_p.h
+++ b/src/gui/text/qglyphrun_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QOpenGLYPHRUN_P_H
-#define QOpenGLYPHRUN_P_H
+#ifndef QGLYPHRUN_P_H
+#define QGLYPHRUN_P_H
 
 //
 //  W A R N I N G
@@ -113,6 +113,6 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QOpenGLYPHS_P_H
-
 #endif // QT_NO_RAWFONT
+
+#endif // QGLYPHRUN_P_H

diff --git a/src/opengl/gl2paintengineex/qglgradientcache_p.h b/src/opengl/gl2paintengineex/qglgradientcache_p.h
index 1628572..5654c9b 100644 (file)
--- a/src/opengl/gl2paintengineex/qglgradientcache_p.h
+++ b/src/opengl/gl2paintengineex/qglgradientcache_p.h
@@ -39,6 +39,9 @@
 **
 ****************************************************************************/
 
+#ifndef QGLGRADIENTCACHE_P_H
+#define QGLGRADIENTCACHE_P_H
+
 //
 //  W A R N I N G
 //  -------------
@@ -99,3 +102,4 @@ private:
 
 QT_END_NAMESPACE
 
+#endif // QGLGRADIENTCACHE_P_H

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index 8eeee33..3ade720 100644 (file)
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QGRAPHICSCONTEXT_OPENGL2_P_H
-#define QGRAPHICSCONTEXT_OPENGL2_P_H
+#ifndef QPAINTENGINEEX_OPENGL2_P_H
+#define QPAINTENGINEEX_OPENGL2_P_H
 
 //
 //  W A R N I N G
@@ -322,4 +322,4 @@ void QGL2PaintEngineExPrivate::setVertexAttributePointer(unsigned int arrayIndex
 
 QT_END_NAMESPACE
 
-#endif
+#endif // QPAINTENGINEEX_OPENGL2_P_H