Fix header inclusion guards

_QPA_ should only be used for qpa (plugin specific api) files.

Change-Id: I1fb6cd5973fcabec4c7e87eb6ccb048f825e2aad
Reviewed-by: Holger Freyther <holger+qt@freyther.de>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h
index aad540d..8ae0e6d 100644 (file)
--- a/src/gui/kernel/qguiapplication.h
+++ b/src/gui/kernel/qguiapplication.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QGUIAPPLICATION_QPA_H
-#define QGUIAPPLICATION_QPA_H
+#ifndef QGUIAPPLICATION_H
+#define QGUIAPPLICATION_H
 
 #include <QtCore/qcoreapplication.h>
 #include <QtGui/qwindowdefs.h>
@@ -170,4 +170,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QGUIAPPLICATION_QPA_H
+#endif // QGUIAPPLICATION_H

diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index 315c403..71ae968 100644 (file)
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QWINDOW_QPA_H
-#define QWINDOW_QPA_H
+#ifndef QWINDOW_H
+#define QWINDOW_H
 
 #include <QtCore/QObject>
 #include <QtCore/QEvent>
@@ -310,4 +310,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QWINDOW_QPA_H
+#endif // QWINDOW_H

diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h
index eb4fab9..b665298 100644 (file)
--- a/src/gui/kernel/qwindow_p.h
+++ b/src/gui/kernel/qwindow_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QWINDOW_QPA_P_H
-#define QWINDOW_QPA_P_H
+#ifndef QWINDOW_P_H
+#define QWINDOW_P_H
 
 #include <QtGui/qwindow.h>
 #include <QtGui/qplatformwindow_qpa.h>
@@ -132,4 +132,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QWINDOW_QPA_P_H
+#endif // QWINDOW_P_H