diff options
Diffstat (limited to 'src/dbus/qdbusmetatype_p.h')
-rw-r--r-- | src/dbus/qdbusmetatype_p.h | 101 |
1 files changed, 28 insertions, 73 deletions
diff --git a/src/dbus/qdbusmetatype_p.h b/src/dbus/qdbusmetatype_p.h index 1aa11552df..86a59f587d 100644 --- a/src/dbus/qdbusmetatype_p.h +++ b/src/dbus/qdbusmetatype_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 QtDBus 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 QDBUSMETATYPE_P_H #define QDBUSMETATYPE_P_H @@ -64,47 +28,38 @@ QT_BEGIN_NAMESPACE -struct QDBusMetaTypeId -{ - static int message(); // QDBusMessage - static int argument(); // QDBusArgument - static int variant(); // QDBusVariant - static int objectpath(); // QDBusObjectPath - static int signature(); // QDBusSignature - static int error(); // QDBusError - static int unixfd(); // QDBusUnixFileDescriptor - - static void init(); -}; - -inline int QDBusMetaTypeId::message() -#ifdef QT_BOOTSTRAPPED -{ return qDBusRegisterMetaType<QList<QDBusUnixFileDescriptor> >() + 1; } -#else -{ return qMetaTypeId<QDBusMessage>(); } -#endif +namespace QDBusMetaTypeId { +QMetaType message(); // QDBusMessage +QMetaType argument(); // QDBusArgument +QMetaType variant(); // QDBusVariant +QMetaType objectpath(); // QDBusObjectPath +QMetaType signature(); // QDBusSignature +QMetaType error(); // QDBusError +QMetaType unixfd(); // QDBusUnixFileDescriptor -inline int QDBusMetaTypeId::argument() -{ return qMetaTypeId<QDBusArgument>(); } +Q_DBUS_EXPORT void init(); +}; // namespace QDBusMetaTypeId -inline int QDBusMetaTypeId::variant() -{ return qMetaTypeId<QDBusVariant>(); } +inline QMetaType QDBusMetaTypeId::message() +{ return QMetaType::fromType<QDBusMessage>(); } -inline int QDBusMetaTypeId::objectpath() -{ return qMetaTypeId<QDBusObjectPath>(); } +inline QMetaType QDBusMetaTypeId::argument() +{ return QMetaType::fromType<QDBusArgument>(); } -inline int QDBusMetaTypeId::signature() -{ return qMetaTypeId<QDBusSignature>(); } +inline QMetaType QDBusMetaTypeId::variant() +{ return QMetaType::fromType<QDBusVariant>(); } -inline int QDBusMetaTypeId::error() -#ifdef QT_BOOTSTRAPPED -{ return qDBusRegisterMetaType<QList<QDBusUnixFileDescriptor> >() + 2; } -#else -{ return qMetaTypeId<QDBusError>(); } -#endif +inline QMetaType QDBusMetaTypeId::objectpath() +{ return QMetaType::fromType<QDBusObjectPath>(); } + +inline QMetaType QDBusMetaTypeId::signature() +{ return QMetaType::fromType<QDBusSignature>(); } + +inline QMetaType QDBusMetaTypeId::error() +{ return QMetaType::fromType<QDBusError>(); } -inline int QDBusMetaTypeId::unixfd() -{ return qMetaTypeId<QDBusUnixFileDescriptor>(); } +inline QMetaType QDBusMetaTypeId::unixfd() +{ return QMetaType::fromType<QDBusUnixFileDescriptor>(); } QT_END_NAMESPACE |