From 1fd85093a400bd9a3f69de7512451a33e257d669 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Date: Thu, 2 Aug 2012 11:37:34 +0300
Subject: Move QPlatformWindowPrivate into its own header

Most other qplatform* classes have the same setup and more
importantly this allows QPlatformWindow subclasses to utilize
the d-pointer.

Change-Id: I52afeaaf35bba8ef42d59ff3107f7d7bcf931e5e
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
---
 src/gui/kernel/kernel.pri          |  1 +
 src/gui/kernel/qplatformwindow.cpp |  7 +---
 src/gui/kernel/qplatformwindow_p.h | 74 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 6 deletions(-)
 create mode 100644 src/gui/kernel/qplatformwindow_p.h

diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index 9ceb0ee082..b8a86ad2a7 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -24,6 +24,7 @@ HEADERS += \
         kernel/qplatformthemefactory_p.h \
         kernel/qplatformthemeplugin.h \
         kernel/qplatformwindow.h \
+        kernel/qplatformwindow_p.h \
         kernel/qplatformcursor.h \
         kernel/qplatformclipboard.h \
         kernel/qplatformnativeinterface.h \
diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp
index fe674705af..c579a6ec57 100644
--- a/src/gui/kernel/qplatformwindow.cpp
+++ b/src/gui/kernel/qplatformwindow.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qplatformwindow.h"
+#include "qplatformwindow_p.h"
 
 #include <QtGui/qwindowsysteminterface.h>
 #include <QtGui/qwindow.h>
@@ -47,12 +48,6 @@
 
 QT_BEGIN_NAMESPACE
 
-class QPlatformWindowPrivate
-{
-    QRect rect;
-    friend class QPlatformWindow;
-};
-
 /*!
     Constructs a platform window with the given top level window.
 */
diff --git a/src/gui/kernel/qplatformwindow_p.h b/src/gui/kernel/qplatformwindow_p.h
new file mode 100644
index 0000000000..84a4a88059
--- /dev/null
+++ b/src/gui/kernel/qplatformwindow_p.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QPLATFORMWINDOW_QPA_P_H
+#define QPLATFORMWINDOW_QPA_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qrect.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Gui)
+
+class QPlatformWindowPrivate
+{
+public:
+    QRect rect;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QPLATFORMWINDOW_QPA_P_H
-- 
cgit v1.2.3