diff options
Diffstat (limited to 'src/corelib/io/qstorageinfo.h')
-rw-r--r-- | src/corelib/io/qstorageinfo.h | 59 |
1 files changed, 8 insertions, 51 deletions
diff --git a/src/corelib/io/qstorageinfo.h b/src/corelib/io/qstorageinfo.h index d441915a9e..3784fe8e47 100644 --- a/src/corelib/io/qstorageinfo.h +++ b/src/corelib/io/qstorageinfo.h @@ -1,46 +1,11 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Ivan Komissarov <ABBAPOH@gmail.com> -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore 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) 2014 Ivan Komissarov <ABBAPOH@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QSTORAGEINFO_H #define QSTORAGEINFO_H #include <QtCore/qbytearray.h> +#include <QtCore/qcompare.h> #include <QtCore/qdir.h> #include <QtCore/qlist.h> #include <QtCore/qmetatype.h> @@ -65,7 +30,7 @@ public: QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QStorageInfo) inline void swap(QStorageInfo &other) noexcept - { qSwap(d, other.d); } + { d.swap(other.d); } void setPath(const QString &path); @@ -92,18 +57,10 @@ public: static QStorageInfo root(); private: + explicit QStorageInfo(QStorageInfoPrivate &dd); friend class QStorageInfoPrivate; - friend inline bool operator==(const QStorageInfo &first, const QStorageInfo &second) - { - if (first.d == second.d) - return true; - return first.device() == second.device() && first.rootPath() == second.rootPath(); - } - - friend inline bool operator!=(const QStorageInfo &first, const QStorageInfo &second) - { - return !(first == second); - } + friend Q_CORE_EXPORT bool comparesEqual(const QStorageInfo &lhs, const QStorageInfo &rhs); + Q_DECLARE_EQUALITY_COMPARABLE(QStorageInfo) friend Q_CORE_EXPORT QDebug operator<<(QDebug, const QStorageInfo &); QExplicitlySharedDataPointer<QStorageInfoPrivate> d; @@ -120,6 +77,6 @@ Q_CORE_EXPORT QDebug operator<<(QDebug debug, const QStorageInfo &); QT_END_NAMESPACE -Q_DECLARE_METATYPE(QStorageInfo) +QT_DECL_METATYPE_EXTERN(QStorageInfo, Q_CORE_EXPORT) #endif // QSTORAGEINFO_H |