From f222206e8d20649cf349d541dc90c37b6a00c780 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 30 Apr 2015 12:23:34 +0200 Subject: Remove unused NativeImage Only the static method systemFormat of NativeImage was used, and only from raster pixmaps for default formats. This patch moves the method to qpixmap_raster.cpp. Change-Id: Ic3cb673775693ea0595bad5e5f267a8dd1e8b0ec Reviewed-by: Shawn Rutledge Reviewed-by: Robin Burchell Reviewed-by: Laszlo Agocs --- src/gui/image/image.pri | 2 - src/gui/image/qnativeimage.cpp | 72 ---------------------------- src/gui/image/qnativeimage_p.h | 85 --------------------------------- src/gui/image/qpixmap_raster.cpp | 17 +++++-- src/gui/image/qpixmap_raster_p.h | 1 + src/gui/painting/qtextureglyphcache.cpp | 1 - 6 files changed, 14 insertions(+), 164 deletions(-) delete mode 100644 src/gui/image/qnativeimage.cpp delete mode 100644 src/gui/image/qnativeimage_p.h (limited to 'src') diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index 657b57c0cd..378256516c 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -11,7 +11,6 @@ HEADERS += \ image/qimagereader.h \ image/qimagewriter.h \ image/qmovie.h \ - image/qnativeimage_p.h \ image/qpaintengine_pic_p.h \ image/qpicture.h \ image/qpicture_p.h \ @@ -45,7 +44,6 @@ SOURCES += \ image/qmovie.cpp \ image/qpixmap_raster.cpp \ image/qpixmap_blitter.cpp \ - image/qnativeimage.cpp \ image/qimagepixmapcleanuphooks.cpp \ image/qicon.cpp \ image/qiconloader.cpp \ diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp deleted file mode 100644 index 38e67761b1..0000000000 --- a/src/gui/image/qnativeimage.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include "qnativeimage_p.h" -#include -#include "private/qguiapplication_p.h" -#include "qscreen.h" - -#include "private/qpaintengine_raster_p.h" - - -QT_BEGIN_NAMESPACE - - -QNativeImage::QNativeImage(int width, int height, QImage::Format format, bool /* isTextBuffer */, QWindow *) - : image(width, height, format) -{ - -} - - -QNativeImage::~QNativeImage() -{ -} - -QImage::Format QNativeImage::systemFormat() -{ - if (!QGuiApplication::primaryScreen()) - return QImage::Format_Invalid; - return QGuiApplication::primaryScreen()->handle()->format(); -} - - -QT_END_NAMESPACE - diff --git a/src/gui/image/qnativeimage_p.h b/src/gui/image/qnativeimage_p.h deleted file mode 100644 index 3824fa6465..0000000000 --- a/src/gui/image/qnativeimage_p.h +++ /dev/null @@ -1,85 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QNATIVEIMAGE_P_H -#define QNATIVEIMAGE_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 -#include "qimage.h" - - -QT_BEGIN_NAMESPACE - -class QWindow; - -class QNativeImage -{ -public: - QNativeImage(int width, int height, QImage::Format format, bool isTextBuffer = false, QWindow *window = 0); - ~QNativeImage(); - - inline int width() const; - inline int height() const; - - QImage image; - - static QImage::Format systemFormat(); - - -private: - Q_DISABLE_COPY(QNativeImage) -}; - -inline int QNativeImage::width() const { return image.width(); } -inline int QNativeImage::height() const { return image.height(); } - -QT_END_NAMESPACE - -#endif // QNATIVEIMAGE_P_H diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp index 45047f556c..741f7713da 100644 --- a/src/gui/image/qpixmap_raster.cpp +++ b/src/gui/image/qpixmap_raster.cpp @@ -42,7 +42,6 @@ #include #include "qpixmap_raster_p.h" -#include "qnativeimage_p.h" #include "qimage_p.h" #include "qpaintengine.h" @@ -50,9 +49,12 @@ #include "qimage.h" #include #include +#include +#include #include #include #include +#include QT_BEGIN_NAMESPACE @@ -88,6 +90,13 @@ QRasterPlatformPixmap::~QRasterPlatformPixmap() { } +QImage::Format QRasterPlatformPixmap::systemOpaqueFormat() +{ + if (!QGuiApplication::primaryScreen()) + return QImage::Format_RGB32; + return QGuiApplication::primaryScreen()->handle()->format(); +} + QPlatformPixmap *QRasterPlatformPixmap::createCompatiblePlatformPixmap() const { return new QRasterPlatformPixmap(pixelType()); @@ -99,7 +108,7 @@ void QRasterPlatformPixmap::resize(int width, int height) if (pixelType() == BitmapType) format = QImage::Format_MonoLSB; else - format = QNativeImage::systemFormat(); + format = systemOpaqueFormat(); image = QImage(width, height, format); w = width; @@ -306,13 +315,13 @@ void QRasterPlatformPixmap::createPixmapForImage(QImage &sourceImage, Qt::ImageC ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32; } else { - QImage::Format opaqueFormat = QNativeImage::systemFormat(); + QImage::Format opaqueFormat = systemOpaqueFormat(); QImage::Format alphaFormat = qt_alphaVersionForPainting(opaqueFormat); if (!sourceImage.hasAlphaChannel()) { format = opaqueFormat; } else if ((flags & Qt::NoOpaqueDetection) == 0 - && !const_cast(sourceImage).data_ptr()->checkForAlphaPixels()) + && !sourceImage.data_ptr()->checkForAlphaPixels()) { format = opaqueFormat; } else { diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h index fde82bcbe9..95e018eb35 100644 --- a/src/gui/image/qpixmap_raster_p.h +++ b/src/gui/image/qpixmap_raster_p.h @@ -88,6 +88,7 @@ protected: void createPixmapForImage(QImage &sourceImage, Qt::ImageConversionFlags flags, bool inPlace); void setImage(const QImage &image); QImage image; + static QImage::Format systemOpaqueFormat(); private: friend class QPixmap; diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index bfc8551a9b..86a53c21a3 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -42,7 +42,6 @@ #include "qtextureglyphcache_p.h" #include "private/qfontengine_p.h" #include "private/qnumeric_p.h" -#include "private/qnativeimage_p.h" QT_BEGIN_NAMESPACE -- cgit v1.2.3