move QSurface into its own file.

also move QPlatformSurface to its own file

Change-Id: I29fb6c70ede18a0ac5e0f6bfb97a33293633e668
Reviewed-on: http://codereview.qt.nokia.com/4309
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

8 files changed, 277 insertions, 39 deletions

diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index 36caa9ce83..2167510c4d 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -61,7 +61,9 @@ qpa {
                 kernel/qguiapplication.h \
                 kernel/qguiapplication_p.h \
                 kernel/qwindow_p.h \
-                kernel/qwindow.h
+                kernel/qwindow.h \
+                kernel/qplatformsurface_qpa.h \
+                kernel/qsurface.h
 
 	SOURCES += \
                 kernel/qclipboard_qpa.cpp \
@@ -83,7 +85,9 @@ qpa {
                 kernel/qsessionmanager_qpa.cpp \
                 kernel/qsurfaceformat.cpp \
                 kernel/qguiapplication.cpp \
-                kernel/qwindow.cpp
+                kernel/qwindow.cpp \
+                kernel/qplatformsurface_qpa.cpp \
+                kernel/qsurface.cpp
 }
 
 win32:HEADERS+=kernel/qwindowdefs_win.h
diff --git a/src/gui/kernel/qplatformopenglcontext_qpa.h b/src/gui/kernel/qplatformopenglcontext_qpa.h
index 902ccdec6d..6fb8da25c1 100644
--- a/src/gui/kernel/qplatformopenglcontext_qpa.h
+++ b/src/gui/kernel/qplatformopenglcontext_qpa.h
@@ -52,21 +52,6 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Gui)
 
-class Q_GUI_EXPORT QPlatformSurface
-{
-public:
-    virtual QSurfaceFormat format() const = 0;
-
-    QSurface::SurfaceType surfaceType() const { return m_type; }
-
-private:
-    QPlatformSurface(QSurface::SurfaceType type) : m_type(type) {}
-
-    QSurface::SurfaceType m_type;
-
-    friend class QPlatformWindow;
-};
-
 class QPlatformOpenGLContextPrivate;
 
 class Q_GUI_EXPORT QPlatformOpenGLContext
diff --git a/src/gui/kernel/qplatformsurface_qpa.cpp b/src/gui/kernel/qplatformsurface_qpa.cpp
new file mode 100644
index 0000000000..dcfd201ea3
--- /dev/null
+++ b/src/gui/kernel/qplatformsurface_qpa.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** 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$
+**
+****************************************************************************/
+
+#include "qplatformsurface_qpa.h"
+
+QT_BEGIN_NAMESPACE
+
+QSurface::SurfaceType QPlatformSurface::surfaceType() const
+{
+    return m_type;
+}
+
+QPlatformSurface::QPlatformSurface(QSurface::SurfaceType type) : m_type(type)
+{
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/gui/kernel/qplatformsurface_qpa.h b/src/gui/kernel/qplatformsurface_qpa.h
new file mode 100644
index 0000000000..76b564de25
--- /dev/null
+++ b/src/gui/kernel/qplatformsurface_qpa.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** 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 QPLATFORMSURFACE_H
+#define QPLATFORMSURFACE_H
+
+#include <QtCore/qnamespace.h>
+#include <QtGui/qsurface.h>
+#include <QtGui/qsurfaceformat.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Gui)
+
+class Q_GUI_EXPORT QPlatformSurface
+{
+public:
+    virtual QSurfaceFormat format() const = 0;
+
+    QSurface::SurfaceType surfaceType() const;
+
+private:
+    QPlatformSurface(QSurface::SurfaceType type);
+
+    QSurface::SurfaceType m_type;
+
+    friend class QPlatformWindow;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif //QPLATFORMSURFACE_H
diff --git a/src/gui/kernel/qplatformwindow_qpa.h b/src/gui/kernel/qplatformwindow_qpa.h
index ef2e07d774..ffc3b75c1b 100644
--- a/src/gui/kernel/qplatformwindow_qpa.h
+++ b/src/gui/kernel/qplatformwindow_qpa.h
@@ -48,6 +48,7 @@
 #include <QtGui/qwindowdefs.h>
 #include <QtGui/qwindow.h>
 #include <QtGui/qplatformopenglcontext_qpa.h>
+#include <QtGui/qplatformsurface_qpa.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/gui/kernel/qsurface.cpp b/src/gui/kernel/qsurface.cpp
new file mode 100644
index 0000000000..e192674f02
--- /dev/null
+++ b/src/gui/kernel/qsurface.cpp
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qsurface.h"
+
+QT_BEGIN_NAMESPACE
+
+QSurface::QSurface(SurfaceType type)
+    : m_type(type)
+{
+}
+
+QSurface::SurfaceType QSurface::surfaceType() const
+{
+    return m_type;
+}
+
+QT_BEGIN_NAMESPACE
+
diff --git a/src/gui/kernel/qsurface.h b/src/gui/kernel/qsurface.h
new file mode 100644
index 0000000000..a6c8745a7a
--- /dev/null
+++ b/src/gui/kernel/qsurface.h
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** 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 QSURFACE_H
+#define QSURFACE_H
+
+#include <QtCore/qnamespace.h>
+#include <QtGui/qsurfaceformat.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Gui)
+
+class QPlatformSurface;
+
+class Q_GUI_EXPORT QSurface
+{
+public:
+    enum SurfaceType {
+        Window
+    };
+
+    virtual ~QSurface();
+
+    SurfaceType surfaceType() const;
+
+    virtual QSurfaceFormat format() const = 0;
+    virtual QPlatformSurface *surfaceHandle() const = 0;
+
+private:
+    QSurface(SurfaceType type);
+
+    SurfaceType m_type;
+
+    friend class QWindow;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif //QSURFACE_H
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index 76e0efb6fb..a6604aa951 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -47,6 +47,7 @@
 #include <QtCore/QMargins>
 #include <QtCore/QRect>
 
+#include <QtGui/qsurface.h>
 #include <QtGui/qsurfaceformat.h>
 #include <QtGui/qwindowdefs.h>
 
@@ -74,28 +75,6 @@ class QPlatformWindow;
 class QBackingStore;
 class QScreen;
 
-class Q_GUI_EXPORT QSurface
-{
-public:
-    enum SurfaceType {
-        Window
-    };
-
-    virtual ~QSurface();
-
-    SurfaceType surfaceType() const { return m_type; }
-
-    virtual QSurfaceFormat format() const = 0;
-    virtual QPlatformSurface *surfaceHandle() const = 0;
-
-private:
-    QSurface(SurfaceType type) : m_type(type) {}
-
-    SurfaceType m_type;
-
-    friend class QWindow;
-};
-
 class Q_GUI_EXPORT QWindow : public QObject, public QSurface
 {
     Q_OBJECT