diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-09-15 16:51:51 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-15 23:54:23 +0200 |
| commit | 9bedada232fb821f1fba2c1bdbd24702947dcaed (patch) | |
| tree | 70c4847bc269eb4551a05afc6b0de16d168b7575 /src/gui/image | |
| parent | 7329ad3ee59fedc68758289677f3ece617858708 (diff) | |
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>
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qiconloader_p.h | 8 | ||||
| -rw-r--r-- | src/gui/image/qpixmap_raster_p.h | 6 | ||||
| -rw-r--r-- | src/gui/image/qplatformpixmap.h | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h index bd990d0d53..328ded606b 100644 --- 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 8e1a8ccc03..cfc6a9b323 100644 --- 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 21bcfcd5d5..c7396bbef3 100644 --- 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 |