diff options
Diffstat (limited to 'src/gui/image/qpixmap_blitter_p.h')
| -rw-r--r-- | src/gui/image/qpixmap_blitter_p.h | 58 |
1 files changed, 11 insertions, 47 deletions
diff --git a/src/gui/image/qpixmap_blitter_p.h b/src/gui/image/qpixmap_blitter_p.h index d70cbcdcc3..89928026a2 100644 --- a/src/gui/image/qpixmap_blitter_p.h +++ b/src/gui/image/qpixmap_blitter_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QPIXMAP_BLITTER_P_H #define QPIXMAP_BLITTER_P_H @@ -120,7 +84,7 @@ inline void QBlittablePlatformPixmap::markRasterOverlay(const QRectF &rect) #ifdef QT_BLITTER_RASTEROVERLAY markRasterOverlayImpl(rect); #else - Q_UNUSED(rect) + Q_UNUSED(rect); #endif } @@ -129,7 +93,7 @@ inline void QBlittablePlatformPixmap::markRasterOverlay(const QVectorPath &path) #ifdef QT_BLITTER_RASTEROVERLAY markRasterOverlayImpl(path.convertToPainterPath().boundingRect()); #else - Q_UNUSED(path) + Q_UNUSED(path); #endif } @@ -141,8 +105,8 @@ inline void QBlittablePlatformPixmap::markRasterOverlay(const QPointF &pos, cons rect.moveBottomLeft(pos); markRasterOverlay(rect); #else - Q_UNUSED(pos) - Q_UNUSED(ti) + Q_UNUSED(pos); + Q_UNUSED(ti); #endif } @@ -153,8 +117,8 @@ inline void QBlittablePlatformPixmap::markRasterOverlay(const QRect *rects, int markRasterOverlay(rects[i]); } #else - Q_UNUSED(rects) - Q_UNUSED(rectCount) + Q_UNUSED(rects); + Q_UNUSED(rectCount); #endif } inline void QBlittablePlatformPixmap::markRasterOverlay(const QRectF *rects, int rectCount) @@ -164,8 +128,8 @@ inline void QBlittablePlatformPixmap::markRasterOverlay(const QRectF *rects, int markRasterOverlay(rects[i]); } #else - Q_UNUSED(rects) - Q_UNUSED(rectCount) + Q_UNUSED(rects); + Q_UNUSED(rectCount); #endif } @@ -203,7 +167,7 @@ inline void QBlittablePlatformPixmap::unmarkRasterOverlay(const QRectF &rect) #ifdef QT_BLITTER_RASTEROVERLAY unmarkRasterOverlayImpl(rect); #else - Q_UNUSED(rect) + Q_UNUSED(rect); #endif } |