merge qpaintdevice and qpaintdevice_x11 sources

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 0e532ae..436b8a6 100644 (file)
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -814,7 +814,6 @@ set(GUI_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/painting/qprinterinfo_unix.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/painting/qgrayraster.c
     ${CMAKE_CURRENT_SOURCE_DIR}/painting/qcolormap_x11.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/painting/qpaintdevice_x11.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/painting/qpaintengine_x11.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/painting/qwindowsurface_x11.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/styles/qstyle.cpp
@@ -1089,7 +1088,6 @@ katie_allinone_exclude(
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qx11info_x11.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/painting/qcolor.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/painting/qcolormap_x11.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/painting/qpaintdevice_x11.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/painting/qpaintengine_x11.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/painting/qregion_x11.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/painting/qwindowsurface_raster.cpp

diff --git a/src/gui/painting/qpaintdevice.cpp b/src/gui/painting/qpaintdevice.cpp
index 7d21935..95c20cd 100644 (file)
--- a/src/gui/painting/qpaintdevice.cpp
+++ b/src/gui/painting/qpaintdevice.cpp
@@ -32,9 +32,45 @@
 ****************************************************************************/
 
 #include "qpaintdevice.h"
+#include "qpainter.h"
+#include "qwidget.h"
+#include "qbitmap.h"
+#include "qx11info_x11.h"
 
 QT_BEGIN_NAMESPACE
 
+/*! \internal
+
+    Returns the X11 handle of the paint device. 0 is returned if it
+    can't be obtained.
+*/
+
+Qt::HANDLE Q_GUI_EXPORT qt_x11Handle(const QPaintDevice *pd)
+{
+    if (!pd) return 0;
+    if (pd->devType() == QInternal::Widget)
+        return static_cast<const QWidget *>(pd)->handle();
+    else if (pd->devType() == QInternal::Pixmap)
+        return static_cast<const QPixmap *>(pd)->handle();
+    return 0;
+}
+
+/*!
+    \relates QPaintDevice
+
+    Returns the QX11Info structure for the \a pd paint device. 0 is
+    returned if it can't be obtained.
+*/
+const Q_GUI_EXPORT QX11Info *qt_x11Info(const QPaintDevice *pd)
+{
+    if (!pd) return Q_NULLPTR;
+    if (pd->devType() == QInternal::Widget)
+        return &static_cast<const QWidget *>(pd)->x11Info();
+    else if (pd->devType() == QInternal::Pixmap)
+        return &static_cast<const QPixmap *>(pd)->x11Info();
+    return Q_NULLPTR;
+}
+
 QPaintDevice::QPaintDevice()
 {
     painters = 0;

diff --git a/src/gui/painting/qpaintdevice_x11.cpp b/src/gui/painting/qpaintdevice_x11.cpp
deleted file mode 100644 (file)
index 500b0b5..0000000
--- a/src/gui/painting/qpaintdevice_x11.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2016-2020 Ivailo Monev
-**
-** This file is part of the QtGui module of the Katie 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.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company 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.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qpaintdevice.h"
-#include "qpainter.h"
-#include "qwidget.h"
-#include "qbitmap.h"
-#include "qapplication.h"
-#include "qt_x11_p.h"
-#include "qx11info_x11.h"
-
-QT_BEGIN_NAMESPACE
-
-/*! \internal
-
-    Returns the X11 handle of the paint device. 0 is returned if it
-    can't be obtained.
-*/
-
-Qt::HANDLE Q_GUI_EXPORT qt_x11Handle(const QPaintDevice *pd)
-{
-    if (!pd) return 0;
-    if (pd->devType() == QInternal::Widget)
-        return static_cast<const QWidget *>(pd)->handle();
-    else if (pd->devType() == QInternal::Pixmap)
-        return static_cast<const QPixmap *>(pd)->handle();
-    return 0;
-}
-
-/*!
-    \relates QPaintDevice
-
-    Returns the QX11Info structure for the \a pd paint device. 0 is
-    returned if it can't be obtained.
-*/
-const Q_GUI_EXPORT QX11Info *qt_x11Info(const QPaintDevice *pd)
-{
-    if (!pd) return Q_NULLPTR;
-    if (pd->devType() == QInternal::Widget)
-        return &static_cast<const QWidget *>(pd)->x11Info();
-    else if (pd->devType() == QInternal::Pixmap)
-        return &static_cast<const QPixmap *>(pd)->x11Info();
-    return Q_NULLPTR;
-}
-
-QT_END_NAMESPACE