diff options
Diffstat (limited to 'src/gui/kernel/qguivariant.cpp')
| -rw-r--r-- | src/gui/kernel/qguivariant.cpp | 56 |
1 files changed, 8 insertions, 48 deletions
diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp index c8200aedf1..fe72e7782f 100644 --- a/src/gui/kernel/qguivariant.cpp +++ b/src/gui/kernel/qguivariant.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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) 2020 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 // Gui types #include "qbitmap.h" @@ -86,20 +50,14 @@ #include <float.h> -#include "private/qvariant_p.h" #include <private/qmetatype_p.h> QT_BEGIN_NAMESPACE namespace { -struct GuiTypesFilter { - template<typename T> - struct Acceptor { - static const bool IsAccepted = QModulesPrivate::QTypeModuleInfo<T>::IsGui && QtMetaTypePrivate::TypeDefinition<T>::IsAvailable; - }; -}; -static const struct : QMetaTypeModuleHelper +// NOLINTNEXTLINE(cppcoreguidelines-virtual-class-destructor): this is not a base class +static constexpr struct : QMetaTypeModuleHelper { #define QT_IMPL_METATYPEINTERFACE_GUI_TYPES(MetaTypeName, MetaTypeId, RealName) \ QT_METATYPE_INTERFACE_INIT(RealName), @@ -117,6 +75,8 @@ static const struct : QMetaTypeModuleHelper Q_ASSERT(fromTypeId != toTypeId); bool onlyCheck = (from == nullptr && to == nullptr); + // either two nullptrs from canConvert, or two valid pointers + Q_ASSERT(onlyCheck || (bool(from) && bool(to))); using Int = int; switch (makePair(toTypeId, fromTypeId)) { @@ -126,7 +86,7 @@ static const struct : QMetaTypeModuleHelper return true; ); QMETATYPE_CONVERTER(QColor, QByteArray, - result.setNamedColor(QLatin1String(source)); + result = QColor::fromString(QLatin1StringView(source)); return result.isValid(); ); QMETATYPE_CONVERTER(QString, QColor, @@ -135,7 +95,7 @@ static const struct : QMetaTypeModuleHelper return true; ); QMETATYPE_CONVERTER(QColor, QString, - result.setNamedColor(source); + result = QColor::fromString(source); return result.isValid(); ); #if QT_CONFIG(shortcut) |