diff options
Diffstat (limited to 'src/dbus/qdbusmessage.h')
-rw-r--r-- | src/dbus/qdbusmessage.h | 59 |
1 files changed, 10 insertions, 49 deletions
diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h index 41845317c4..f6db3bc21e 100644 --- a/src/dbus/qdbusmessage.h +++ b/src/dbus/qdbusmessage.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 QDBUSMESSAGE_H #define QDBUSMESSAGE_H @@ -45,7 +9,7 @@ #include <QtCore/qlist.h> #include <QtCore/qvariant.h> -#ifndef QT_NO_DBUS +#if !defined(QT_NO_DBUS) && !defined(QT_BOOTSTRAPPED) #if defined(Q_OS_WIN) && defined(interface) # undef interface @@ -53,7 +17,6 @@ QT_BEGIN_NAMESPACE - class QDBusMessagePrivate; class Q_DBUS_EXPORT QDBusMessage { @@ -72,7 +35,7 @@ public: QDBusMessage &operator=(const QDBusMessage &other); ~QDBusMessage(); - void swap(QDBusMessage &other) noexcept { qSwap(d_ptr, other.d_ptr); } + void swap(QDBusMessage &other) noexcept { qt_ptr_swap(d_ptr, other.d_ptr); } static QDBusMessage createSignal(const QString &path, const QString &interface, const QString &name); @@ -87,14 +50,9 @@ public: { return createError(QDBusError::errorString(type), msg); } QDBusMessage createReply(const QList<QVariant> &arguments = QList<QVariant>()) const; - inline QDBusMessage createReply(const QVariant &argument) const - { return createReply(QList<QVariant>() << argument); } + QDBusMessage createReply(const QVariant &argument) const; -#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) QDBusMessage createErrorReply(const QString &name, const QString &msg) const; -#else - QDBusMessage createErrorReply(const QString name, const QString &msg) const; -#endif inline QDBusMessage createErrorReply(const QDBusError &err) const { return createErrorReply(err.name(), err.message()); } QDBusMessage createErrorReply(QDBusError::ErrorType type, const QString &msg) const; @@ -126,10 +84,11 @@ public: QDBusMessage &operator<<(const QVariant &arg); private: + explicit QDBusMessage(QDBusMessagePrivate &dd); friend class QDBusMessagePrivate; QDBusMessagePrivate *d_ptr; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusMessage) +Q_DECLARE_SHARED(QDBusMessage) #ifndef QT_NO_DEBUG_STREAM Q_DBUS_EXPORT QDebug operator<<(QDebug, const QDBusMessage &); @@ -137,8 +96,10 @@ Q_DBUS_EXPORT QDebug operator<<(QDebug, const QDBusMessage &); QT_END_NAMESPACE -Q_DECLARE_METATYPE(QDBusMessage) +QT_DECL_METATYPE_EXTERN(QDBusMessage, Q_DBUS_EXPORT) +#else +class Q_DBUS_EXPORT QDBusMessage {}; // dummy class for moc #endif // QT_NO_DBUS #endif |