diff options
Diffstat (limited to 'src/dbus/qdbuserror.h')
| -rw-r--r-- | src/dbus/qdbuserror.h | 50 |
1 files changed, 7 insertions, 43 deletions
diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h index 8964f20415..292f967acb 100644 --- a/src/dbus/qdbuserror.h +++ b/src/dbus/qdbuserror.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 QDBUSERROR_H #define QDBUSERROR_H @@ -97,7 +61,7 @@ public: QDBusError(); #ifndef QT_BOOTSTRAPPED explicit QDBusError(const DBusError *error); - /*implicit*/ QDBusError(const QDBusMessage& msg); + Q_IMPLICIT QDBusError(const QDBusMessage& msg); #endif QDBusError(ErrorType error, const QString &message); QDBusError(const QDBusError &other); @@ -112,9 +76,9 @@ public: void swap(QDBusError &other) noexcept { - qSwap(code, other.code); - qSwap(msg, other.msg); - qSwap(nm, other.nm); + std::swap(code, other.code); + msg.swap(other.msg); + nm.swap(other.nm); } ErrorType type() const; @@ -140,7 +104,7 @@ Q_DBUS_EXPORT QDebug operator<<(QDebug, const QDBusError &); QT_END_NAMESPACE -Q_DECLARE_METATYPE(QDBusError) +QT_DECL_METATYPE_EXTERN(QDBusError, Q_DBUS_EXPORT) #else QT_BEGIN_NAMESPACE class Q_DBUS_EXPORT QDBusError {}; // dummy class for moc |