From d80b00f3206291dc90433a95bd6c6aadc17be0bb Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Date: Fri, 13 Apr 2012 09:39:15 -0700
Subject: Fix header inclusion guards
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

_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>
---
 src/gui/kernel/qguiapplication.h | 6 +++---
 src/gui/kernel/qwindow.h         | 6 +++---
 src/gui/kernel/qwindow_p.h       | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h
index aad540d203..8ae0e6dfc5 100644
--- 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 315c403d20..71ae9686b3 100644
--- 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 eb4fab9013..b665298ce0 100644
--- 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
-- 
cgit v1.2.3