diff options
Diffstat (limited to 'src/dbus/qdbusextratypes.h')
| -rw-r--r-- | src/dbus/qdbusextratypes.h | 65 |
1 files changed, 16 insertions, 49 deletions
diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index c4e05062c3..1bc0f3086d 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -1,46 +1,10 @@ -/**************************************************************************** -** -** 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 QDBUSEXTRATYPES_H #define QDBUSEXTRATYPES_H -// define some useful types for D-BUS +// define some useful types for D-Bus #include <QtDBus/qtdbusglobal.h> #include <QtCore/qvariant.h> @@ -60,11 +24,11 @@ public: // compiler-generated destructor is ok! inline explicit QDBusObjectPath(const char *path); - inline explicit QDBusObjectPath(QLatin1String path); + inline explicit QDBusObjectPath(QLatin1StringView path); inline explicit QDBusObjectPath(const QString &path); explicit QDBusObjectPath(QString &&p) : m_path(std::move(p)) { doCheck(); } - void swap(QDBusObjectPath &other) noexcept { qSwap(m_path, other.m_path); } + void swap(QDBusObjectPath &other) noexcept { m_path.swap(other.m_path); } inline void setPath(const QString &path); @@ -82,7 +46,7 @@ inline QDBusObjectPath::QDBusObjectPath(const char *objectPath) : m_path(QString::fromLatin1(objectPath)) { doCheck(); } -inline QDBusObjectPath::QDBusObjectPath(QLatin1String objectPath) +inline QDBusObjectPath::QDBusObjectPath(QLatin1StringView objectPath) : m_path(objectPath) { doCheck(); } @@ -105,6 +69,9 @@ inline bool operator<(const QDBusObjectPath &lhs, const QDBusObjectPath &rhs) inline size_t qHash(const QDBusObjectPath &objectPath, size_t seed = 0) { return qHash(objectPath.path(), seed); } +#ifndef QT_NO_DEBUG_STREAM +Q_DBUS_EXPORT QDebug operator<<(QDebug, const QDBusObjectPath &); +#endif class Q_DBUS_EXPORT QDBusSignature { @@ -115,11 +82,11 @@ public: // compiler-generated destructor is ok! inline explicit QDBusSignature(const char *signature); - inline explicit QDBusSignature(QLatin1String signature); + inline explicit QDBusSignature(QLatin1StringView signature); inline explicit QDBusSignature(const QString &signature); explicit QDBusSignature(QString &&sig) : m_signature(std::move(sig)) { doCheck(); } - void swap(QDBusSignature &other) noexcept { qSwap(m_signature, other.m_signature); } + void swap(QDBusSignature &other) noexcept { m_signature.swap(other.m_signature); } inline void setSignature(const QString &signature); @@ -135,7 +102,7 @@ inline QDBusSignature::QDBusSignature(const char *dBusSignature) : m_signature(QString::fromLatin1(dBusSignature)) { doCheck(); } -inline QDBusSignature::QDBusSignature(QLatin1String dBusSignature) +inline QDBusSignature::QDBusSignature(QLatin1StringView dBusSignature) : m_signature(dBusSignature) { doCheck(); } @@ -169,7 +136,7 @@ public: inline explicit QDBusVariant(const QVariant &variant); explicit QDBusVariant(QVariant &&v) noexcept : m_variant(std::move(v)) {} - void swap(QDBusVariant &other) noexcept { qSwap(m_variant, other.m_variant); } + void swap(QDBusVariant &other) noexcept { m_variant.swap(other.m_variant); } inline void setVariant(const QVariant &variant); @@ -189,9 +156,9 @@ inline bool operator==(const QDBusVariant &v1, const QDBusVariant &v2) QT_END_NAMESPACE -Q_DECLARE_METATYPE(QDBusVariant) -Q_DECLARE_METATYPE(QDBusObjectPath) -Q_DECLARE_METATYPE(QDBusSignature) +QT_DECL_METATYPE_EXTERN(QDBusVariant, Q_DBUS_EXPORT) +QT_DECL_METATYPE_EXTERN(QDBusObjectPath, Q_DBUS_EXPORT) +QT_DECL_METATYPE_EXTERN(QDBusSignature, Q_DBUS_EXPORT) #endif // QT_NO_DBUS #endif |