summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-07-10 14:41:03 +0200
committerLars Knoll <lars.knoll@qt.io>2020-08-24 00:17:04 +0200
commit47b5821c4e71bfffe8f7434cad078b1b86508e15 (patch)
treeda6fb86ad4016be0afe26ab760b1920b18d71130
parent68c4449d2fc9bd18499b885e3a04d0464ba51d6c (diff)
Get rid of the unused meta type switcher
Change-Id: I8771feb68227bf69643b66314284c645cccdec6f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/CMakeLists.txt1
-rw-r--r--src/corelib/kernel/kernel.pri1
-rw-r--r--src/corelib/kernel/qmetatype.cpp1
-rw-r--r--src/corelib/kernel/qmetatypeswitcher_p.h89
-rw-r--r--src/corelib/kernel/qvariant_p.h2
5 files changed, 0 insertions, 94 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 663e501516..26364f4660 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -107,7 +107,6 @@ qt_add_module(Core
kernel/qmetaobject_moc_p.h
kernel/qmetaobjectbuilder.cpp kernel/qmetaobjectbuilder_p.h
kernel/qmetatype.cpp kernel/qmetatype.h kernel/qmetatype_p.h
- kernel/qmetatypeswitcher_p.h
kernel/qmimedata.cpp kernel/qmimedata.h
# kernel/qobject.cpp kernel/qobject.h kernel/qobject_p.h # special case
kernel/qobject_impl.h
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
index a493260c50..036230e11f 100644
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@@ -42,7 +42,6 @@ HEADERS += \
kernel/qmath.h \
kernel/qsystemerror_p.h \
kernel/qmetatype_p.h \
- kernel/qmetatypeswitcher_p.h \
kernel/qtestsupport_core.h \
kernel/qproperty.h \
kernel/qpropertyprivate.h \
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index ce6971e177..24f095a66d 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -54,7 +54,6 @@
#include "quuid.h"
#include "qvariant.h"
#include "qdatastream.h"
-#include "qmetatypeswitcher_p.h"
#if QT_CONFIG(regularexpression)
# include "qregularexpression.h"
diff --git a/src/corelib/kernel/qmetatypeswitcher_p.h b/src/corelib/kernel/qmetatypeswitcher_p.h
deleted file mode 100644
index dabc70f4b0..0000000000
--- a/src/corelib/kernel/qmetatypeswitcher_p.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore 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 QMETATYPESWITCHER_P_H
-#define QMETATYPESWITCHER_P_H
-
-#include "qmetatype.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.
-//
-
-QT_BEGIN_NAMESPACE
-
-class QMetaTypeSwitcher {
-public:
- class NotBuiltinType; // type is not a built-in type, but it may be a custom type or an unknown type
- class UnknownType; // type not known to QMetaType system
- template<class ReturnType, class DelegateObject>
- static ReturnType switcher(DelegateObject &logic, int type, const void *data = nullptr);
-};
-
-
-#define QT_METATYPE_SWICHER_CASE(TypeName, TypeId, Name)\
- case QMetaType::TypeName: return logic.delegate(static_cast<Name const *>(data));
-
-template<class ReturnType, class DelegateObject>
-ReturnType QMetaTypeSwitcher::switcher(DelegateObject &logic, int type, const void *data)
-{
- switch (QMetaType::Type(type)) {
- QT_FOR_EACH_STATIC_TYPE(QT_METATYPE_SWICHER_CASE)
-
- case QMetaType::UnknownType:
- return logic.delegate(static_cast<UnknownType const *>(data));
- default:
- if (type < QMetaType::User)
- return logic.delegate(static_cast<UnknownType const *>(data));
- return logic.delegate(static_cast<NotBuiltinType const *>(data));
- }
-}
-
-#undef QT_METATYPE_SWICHER_CASE
-
-QT_END_NAMESPACE
-
-#endif // QMETATYPESWITCHER_P_H
diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h
index 1094ee6c2b..18fc0fbf80 100644
--- a/src/corelib/kernel/qvariant_p.h
+++ b/src/corelib/kernel/qvariant_p.h
@@ -56,8 +56,6 @@
#include <QtCore/qvariant.h>
#include <QtCore/private/qmetatype_p.h>
-#include "qmetatypeswitcher_p.h"
-
QT_BEGIN_NAMESPACE
template<typename T>