diff options
Diffstat (limited to 'src/widgets/dialogs/qdialog_p.h')
-rw-r--r-- | src/widgets/dialogs/qdialog_p.h | 55 |
1 files changed, 10 insertions, 45 deletions
diff --git a/src/widgets/dialogs/qdialog_p.h b/src/widgets/dialogs/qdialog_p.h index 74f775a0bd..bac33bdea9 100644 --- a/src/widgets/dialogs/qdialog_p.h +++ b/src/widgets/dialogs/qdialog_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets 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 QDIALOG_P_H #define QDIALOG_P_H @@ -87,10 +51,11 @@ public: {} ~QDialogPrivate(); + virtual void setVisible(bool visible); + QWindow *transientParentWindow() const; bool setNativeDialogVisible(bool visible); QVariant styleHint(QPlatformDialogHelper::StyleHint hint) const; - void deletePlatformHelper(); #if QT_CONFIG(pushbutton) QPointer<QPushButton> mainDef; @@ -122,8 +87,10 @@ public: QPlatformDialogHelper *platformHelper() const; virtual bool canBeNativeDialog() const; - void hide(int resultCode); - void finalize(int resultCode, int dialogCode); + void close(int resultCode); + +protected: + virtual int dialogCode() const { return rescode; } private: virtual void initHelper(QPlatformDialogHelper *) {} @@ -137,16 +104,14 @@ private: template <typename T> class QAutoPointer { QPointer<T> o; - struct internal { void func() {} }; - typedef void (internal::*RestrictedBool)(); public: - explicit QAutoPointer(T *t) noexcept : o(t) {} + Q_NODISCARD_CTOR explicit QAutoPointer(T *t) noexcept : o(t) {} ~QAutoPointer() { delete o; } T *operator->() const noexcept { return get(); } T *get() const noexcept { return o; } T &operator*() const { return *get(); } - operator RestrictedBool() const noexcept { return o ? &internal::func : nullptr; } + explicit operator bool() const noexcept { return !o.isNull(); } bool operator!() const noexcept { return !o; } private: Q_DISABLE_COPY(QAutoPointer); |