diff options
Diffstat (limited to 'src/gui/accessible/linux/qspi_struct_marshallers_p.h')
| -rw-r--r-- | src/gui/accessible/linux/qspi_struct_marshallers_p.h | 88 |
1 files changed, 26 insertions, 62 deletions
diff --git a/src/gui/accessible/linux/qspi_struct_marshallers_p.h b/src/gui/accessible/linux/qspi_struct_marshallers_p.h index 9850058efc..4338b49dd2 100644 --- a/src/gui/accessible/linux/qspi_struct_marshallers_p.h +++ b/src/gui/accessible/linux/qspi_struct_marshallers_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 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) 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 Q_SPI_STRUCT_MARSHALLERS_H @@ -76,7 +40,7 @@ struct QSpiObjectReference QSpiObjectReference(const QDBusConnection& connection, const QDBusObjectPath& path) : service(connection.baseService()), path(path) {} }; -Q_DECLARE_TYPEINFO(QSpiObjectReference, Q_MOVABLE_TYPE); // QDBusObjectPath is movable, even though it +Q_DECLARE_TYPEINFO(QSpiObjectReference, Q_RELOCATABLE_TYPE); // QDBusObjectPath is movable, even though it // cannot be marked that way until Qt 6 QDBusArgument &operator<<(QDBusArgument &argument, const QSpiObjectReference &address); @@ -96,7 +60,7 @@ struct QSpiAccessibleCacheItem QString description; QSpiUIntList state; }; -Q_DECLARE_TYPEINFO(QSpiAccessibleCacheItem, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QSpiAccessibleCacheItem, Q_RELOCATABLE_TYPE); typedef QList<QSpiAccessibleCacheItem> QSpiAccessibleCacheArray; @@ -109,7 +73,7 @@ struct QSpiAction QString description; QString keyBinding; }; -Q_DECLARE_TYPEINFO(QSpiAction, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QSpiAction, Q_RELOCATABLE_TYPE); typedef QList<QSpiAction> QSpiActionArray; @@ -121,7 +85,7 @@ struct QSpiEventListener QString listenerAddress; QString eventName; }; -Q_DECLARE_TYPEINFO(QSpiEventListener, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QSpiEventListener, Q_RELOCATABLE_TYPE); typedef QList<QSpiEventListener> QSpiEventListenerArray; @@ -138,7 +102,7 @@ struct QSpiTextRange { QString contents; QVariant v; }; -Q_DECLARE_TYPEINFO(QSpiTextRange, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QSpiTextRange, Q_RELOCATABLE_TYPE); typedef QList<QSpiTextRange> QSpiTextRangeList; typedef QMap <QString, QString> QSpiAttributeSet; @@ -153,7 +117,7 @@ struct QSpiAppUpdate { int type; /* Is an application added or removed */ QString address; /* D-Bus address of application added or removed */ }; -Q_DECLARE_TYPEINFO(QSpiAppUpdate, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QSpiAppUpdate, Q_RELOCATABLE_TYPE); QDBusArgument &operator<<(QDBusArgument &argument, const QSpiAppUpdate &update); const QDBusArgument &operator>>(const QDBusArgument &argument, QSpiAppUpdate &update); @@ -167,7 +131,7 @@ struct QSpiDeviceEvent { QString text; bool isText; }; -Q_DECLARE_TYPEINFO(QSpiDeviceEvent, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QSpiDeviceEvent, Q_RELOCATABLE_TYPE); QDBusArgument &operator<<(QDBusArgument &argument, const QSpiDeviceEvent &event); const QDBusArgument &operator>>(const QDBusArgument &argument, QSpiDeviceEvent &event); @@ -176,23 +140,23 @@ void qSpiInitializeStructTypes(); QT_END_NAMESPACE -Q_DECLARE_METATYPE(QSpiIntList) -Q_DECLARE_METATYPE(QSpiUIntList) -Q_DECLARE_METATYPE(QSpiObjectReference) -Q_DECLARE_METATYPE(QSpiObjectReferenceArray) -Q_DECLARE_METATYPE(QSpiAccessibleCacheItem) -Q_DECLARE_METATYPE(QSpiAccessibleCacheArray) -Q_DECLARE_METATYPE(QSpiAction) -Q_DECLARE_METATYPE(QSpiActionArray) -Q_DECLARE_METATYPE(QSpiEventListener) -Q_DECLARE_METATYPE(QSpiEventListenerArray) -Q_DECLARE_METATYPE(QSpiRelationArrayEntry) -Q_DECLARE_METATYPE(QSpiRelationArray) -Q_DECLARE_METATYPE(QSpiTextRange) -Q_DECLARE_METATYPE(QSpiTextRangeList) -Q_DECLARE_METATYPE(QSpiAttributeSet) -Q_DECLARE_METATYPE(QSpiAppUpdate) -Q_DECLARE_METATYPE(QSpiDeviceEvent) +QT_DECL_METATYPE_EXTERN(QSpiIntList, /* not exported */) +QT_DECL_METATYPE_EXTERN(QSpiUIntList, /* not exported */) +QT_DECL_METATYPE_EXTERN(QSpiObjectReference, /* not exported */) +QT_DECL_METATYPE_EXTERN(QSpiObjectReferenceArray, /* not exported */) +QT_DECL_METATYPE_EXTERN(QSpiAccessibleCacheItem, /* not exported */) +QT_DECL_METATYPE_EXTERN(QSpiAccessibleCacheArray, /* not exported */) +QT_DECL_METATYPE_EXTERN(QSpiAction, /* not exported */) +QT_DECL_METATYPE_EXTERN(QSpiActionArray, /* not exported */) +QT_DECL_METATYPE_EXTERN(QSpiEventListener, /* not exported */) +QT_DECL_METATYPE_EXTERN(QSpiEventListenerArray, /* not exported */) +QT_DECL_METATYPE_EXTERN(QSpiRelationArrayEntry, /* not exported */) +QT_DECL_METATYPE_EXTERN(QSpiRelationArray, /* not exported */) +QT_DECL_METATYPE_EXTERN(QSpiTextRange, /* not exported */) +QT_DECL_METATYPE_EXTERN(QSpiTextRangeList, /* not exported */) +QT_DECL_METATYPE_EXTERN(QSpiAttributeSet, /* not exported */) +QT_DECL_METATYPE_EXTERN(QSpiAppUpdate, /* not exported */) +QT_DECL_METATYPE_EXTERN(QSpiDeviceEvent, /* not exported */) // For qdbusxml2cpp-generated code QT_USE_NAMESPACE |