diff options
Diffstat (limited to 'src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp | 46 |
1 files changed, 5 insertions, 41 deletions
diff --git a/src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp index b4a9d64eb8..fffb154040 100644 --- a/src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp +++ b/src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins 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) 2018 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 #include <QVarLengthArray> @@ -320,7 +284,7 @@ static void init_direct(QXcbColormapPrivate *d, bool ownColormap) XStoreColors(X11->display, d->colormap, colorTable.data(), colorTable.count()); } -static QXcbColormap **cmaps = 0; +static QXcbColormap **cmaps = nullptr; void QXcbColormap::initialize() { @@ -343,7 +307,7 @@ void QXcbColormap::initialize() d->visual = DefaultVisual(display, i); d->defaultVisual = true; - Visual *argbVisual = 0; + Visual *argbVisual = nullptr; if (X11->visual && i == DefaultScreen(display)) { // only use the outside colormap on the default screen @@ -356,7 +320,7 @@ void QXcbColormap::initialize() d->visual = find_visual(display, i, X11->visual_class, X11->visual_id, &d->depth, &d->defaultVisual); } else if (!X11->custom_cmap) { - XStandardColormap *stdcmap = 0; + XStandardColormap *stdcmap = nullptr; int ncmaps = 0; #if QT_CONFIG(xrender) |