diff options
Diffstat (limited to 'src/corelib/thread/qexception.h')
| -rw-r--r-- | src/corelib/thread/qexception.h | 78 |
1 files changed, 24 insertions, 54 deletions
diff --git a/src/corelib/thread/qexception.h b/src/corelib/thread/qexception.h index b117d90caf..62b9e70bea 100644 --- a/src/corelib/thread/qexception.h +++ b/src/corelib/thread/qexception.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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) 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 QTCORE_QEXCEPTION_H #define QTCORE_QEXCEPTION_H @@ -52,34 +16,38 @@ QT_REQUIRE_CONFIG(future); QT_BEGIN_NAMESPACE -#if !defined(QT_NO_EXCEPTIONS) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_EXCEPTIONS) || defined(Q_QDOC) class Q_CORE_EXPORT QException : public std::exception { public: - ~QException() -#ifdef Q_COMPILER_NOEXCEPT - noexcept -#else - throw() -#endif - ; + ~QException() noexcept; virtual void raise() const; virtual QException *clone() const; }; -class Q_CORE_EXPORT QUnhandledException : public QException +class QUnhandledExceptionPrivate; +class Q_CORE_EXPORT QUnhandledException final : public QException { public: - ~QUnhandledException() -#ifdef Q_COMPILER_NOEXCEPT - noexcept -#else - throw() -#endif - ; + QUnhandledException(std::exception_ptr exception = nullptr) noexcept; + ~QUnhandledException() noexcept override; + + QUnhandledException(QUnhandledException &&other) noexcept; + QUnhandledException(const QUnhandledException &other) noexcept; + + void swap(QUnhandledException &other) noexcept { d.swap(other.d); } + + QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QUnhandledException) + QUnhandledException &operator=(const QUnhandledException &other) noexcept; + void raise() const override; QUnhandledException *clone() const override; + + std::exception_ptr exception() const; + +private: + QSharedDataPointer<QUnhandledExceptionPrivate> d; }; namespace QtPrivate { @@ -92,6 +60,7 @@ public: bool hasException() const; std::exception_ptr exception() const; void throwPossibleException(); + Q_NORETURN void rethrowException() const; std::exception_ptr exceptionHolder; }; @@ -106,6 +75,7 @@ class Q_CORE_EXPORT ExceptionStore public: ExceptionStore() { } inline void throwPossibleException() {} + inline void rethrowException() const { } }; } // namespace QtPrivate |