printsupport: 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: Iefc02181fe235ede51c567fb54997531e5cd08a3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/printsupport/dialogs/qpagesetupdialog_unix_p.h b/src/printsupport/dialogs/qpagesetupdialog_unix_p.h
index e5c8718..1da05bb 100644 (file)
--- a/src/printsupport/dialogs/qpagesetupdialog_unix_p.h
+++ b/src/printsupport/dialogs/qpagesetupdialog_unix_p.h
@@ -38,8 +38,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef QPAGESETUPWIDGET_H
-#define QPAGESETUPWIDGET_H
+#ifndef QPAGESETUPDIALOG_UNIX_P_H
+#define QPAGESETUPDIALOG_UNIX_P_H
 
 //
 //  W A R N I N G

diff --git a/src/printsupport/kernel/qpaintengine_preview_p.h b/src/printsupport/kernel/qpaintengine_preview_p.h
index 98fdf25..6e8bfac 100644 (file)
--- a/src/printsupport/kernel/qpaintengine_preview_p.h
+++ b/src/printsupport/kernel/qpaintengine_preview_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QPREVIEWPAINTENGINE_P_H
-#define QPREVIEWPAINTENGINE_P_H
+#ifndef QPAINTENGINE_PREVIEW_P_H
+#define QPAINTENGINE_PREVIEW_P_H
 
 //
 //  W A R N I N G

diff --git a/src/printsupport/kernel/qplatformprintersupport.h b/src/printsupport/kernel/qplatformprintersupport.h
index 018ec05..ae583d5 100644 (file)
--- a/src/printsupport/kernel/qplatformprintersupport.h
+++ b/src/printsupport/kernel/qplatformprintersupport.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QPLATFORMPRINTINGSUPPORT_H
-#define QPLATFORMPRINTINGSUPPORT_H
+#ifndef QPLATFORMPRINTERSUPPORT_H
+#define QPLATFORMPRINTERSUPPORT_H
 //
 //  W A R N I N G
 //  -------------
@@ -100,4 +100,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QPLATFORMPRINTINGSUPPORT_H
+#endif // QPLATFORMPRINTERSUPPORT_H

diff --git a/src/printsupport/kernel/qplatformprintplugin.h b/src/printsupport/kernel/qplatformprintplugin.h
index 1fa0f52..4394d14 100644 (file)
--- a/src/printsupport/kernel/qplatformprintplugin.h
+++ b/src/printsupport/kernel/qplatformprintplugin.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QPLATFORMPRINTERSUPPORTPLUGIN_H
-#define QPLATFORMPRINTERSUPPORTPLUGIN_H
+#ifndef QPLATFORMPRINTPLUGIN_H
+#define QPLATFORMPRINTPLUGIN_H
 
 //
 //  W A R N I N G
@@ -80,4 +80,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QPLATFORMPRINTERSUPPORTPLUGIN_H
+#endif // QPLATFORMPRINTPLUGIN_H