1 files changed, 5 insertions, 112 deletions

diff --git a/src/widgets/kernel/qwidgetsvariant.cpp b/src/widgets/kernel/qwidgetsvariant.cpp
index 15a48bf683..17a19aa780 100644
--- a/src/widgets/kernel/qwidgetsvariant.cpp
+++ b/src/widgets/kernel/qwidgetsvariant.cpp
@@ -1,129 +1,26 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWidgets 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
 
 #include "qvariant.h"
 
 #include "qsizepolicy.h"
 #include "qwidget.h"
 
-#include "private/qvariant_p.h"
 #include <private/qmetatype_p.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace {
 
-static bool isNull(const QVariant::Private *)
+// NOLINTNEXTLINE(cppcoreguidelines-virtual-class-destructor): this is not a base class
+static constexpr struct : QMetaTypeModuleHelper
 {
-    return false;
-}
-
-static bool compare(const QVariant::Private *a, const QVariant::Private *b)
-{
-    Q_ASSERT(a->type() == b->type());
-    switch (a->type().id()) {
-    case QMetaType::QSizePolicy:
-        return *v_cast<QSizePolicy>(a) == *v_cast<QSizePolicy>(b);
-    default:
-        Q_ASSERT(false);
-    }
-    return false;
-}
-
-static bool convert(const QVariant::Private *d, int type, void *result, bool *ok)
-{
-    Q_UNUSED(d);
-    Q_UNUSED(type);
-    Q_UNUSED(result);
-    if (ok)
-        *ok = false;
-    return false;
-}
-
-#if !defined(QT_NO_DEBUG_STREAM)
-static void streamDebug(QDebug dbg, const QVariant &v)
-{
-    QVariant::Private *d = const_cast<QVariant::Private *>(&v.data_ptr());
-    switch (d->type().id()) {
-    case QMetaType::QSizePolicy:
-        dbg.nospace() << *v_cast<QSizePolicy>(d);
-        break;
-    default:
-        dbg.nospace() << "QMetaType::Type(" << d->type().id() << ')';
-    }
-}
-#endif
-
-static const QVariant::Handler widgets_handler = {
-    isNull,
-    compare,
-    convert,
-#if !defined(QT_NO_DEBUG_STREAM)
-    streamDebug
-#else
-    nullptr
-#endif
-};
-
-static const struct : QMetaTypeModuleHelper
-{
-    QtPrivate::QMetaTypeInterface *interfaceForType(int type) const override {
+    const QtPrivate::QMetaTypeInterface *interfaceForType(int type) const override {
         switch (type) {
             QT_FOR_EACH_STATIC_WIDGETS_CLASS(QT_METATYPE_CONVERT_ID_TO_TYPE)
             default: return nullptr;
         }
     }
-#ifndef QT_NO_DATASTREAM
-    bool save(QDataStream &stream, int type, const void *data) const override {
-        switch (type) {
-            QT_FOR_EACH_STATIC_WIDGETS_CLASS(QT_METATYPE_DATASTREAM_SAVE)
-            default: return false;
-        }
-    }
-    bool load(QDataStream &stream, int type, void *data) const override {
-        switch (type) {
-            QT_FOR_EACH_STATIC_WIDGETS_CLASS(QT_METATYPE_DATASTREAM_LOAD)
-            default: return false;
-        }
-    }
-#endif
-
 }  qVariantWidgetsHelper;
 
 
@@ -131,13 +28,9 @@ static const struct : QMetaTypeModuleHelper
 
 }  // namespace
 
-extern Q_CORE_EXPORT const QMetaTypeModuleHelper *qMetaTypeWidgetsHelper;
-
 void qRegisterWidgetsVariant()
 {
-    qRegisterMetaType<QWidget*>();
     qMetaTypeWidgetsHelper = &qVariantWidgetsHelper;
-    QVariantPrivate::registerHandler(QModulesPrivate::Widgets, &widgets_handler);
 }
 Q_CONSTRUCTOR_FUNCTION(qRegisterWidgetsVariant)