diff options
Diffstat (limited to 'src/widgets/compat/removed_api.cpp')
| -rw-r--r-- | src/widgets/compat/removed_api.cpp | 77 |
1 files changed, 33 insertions, 44 deletions
diff --git a/src/widgets/compat/removed_api.cpp b/src/widgets/compat/removed_api.cpp index 32f4e7c806..5fcbdba47b 100644 --- a/src/widgets/compat/removed_api.cpp +++ b/src/widgets/compat/removed_api.cpp @@ -1,50 +1,15 @@ -/**************************************************************************** -** -** Copyright (C) 2021 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com> -** Contact: http://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$ -** -****************************************************************************/ - -#define QT_BUILD_REMOVED_API - -#include "qglobal.h" +// Copyright (C) 2021 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +#define QT_WIDGETS_BUILD_REMOVED_API + +#include "qtwidgetsglobal.h" QT_USE_NAMESPACE -#if QT_REMOVED_SINCE(6, 3) +#if QT_WIDGETS_REMOVED_SINCE(6, 3) +#if QT_CONFIG(menu) #include "qmenu.h" QAction *QMenu::addAction(const QString &text) @@ -56,6 +21,7 @@ QAction *QMenu::addAction(const QIcon &icon, const QString &text) { return QWidget::addAction(icon, text); } +#endif #if !QT_CONFIG(shortcut) // the overloads taking QKeySequence as a trailing argument are deprecated, not removed, @@ -72,6 +38,7 @@ QAction *QMenu::addAction(const QIcon &icon, const QString &text, } #endif +#if QT_CONFIG(toolbar) #include "qtoolbar.h" QAction *QToolBar::addAction(const QString &text) @@ -95,7 +62,9 @@ QAction *QToolBar::addAction(const QIcon &icon, const QString &text, { return QWidget::addAction(icon, text, receiver, member); } +#endif +#if QT_CONFIG(menubar) #include "qmenubar.h" QAction *QMenuBar::addAction(const QString &text) @@ -107,8 +76,28 @@ QAction *QMenuBar::addAction(const QString &text, const QObject *receiver, const { return QWidget::addAction(text, receiver, member); } +#endif + +#endif // QT_WIDGETS_REMOVED_SINCE(6, 3) + +#if QT_WIDGETS_REMOVED_SINCE(6, 7) + + +#if QT_CONFIG(filedialog) +#include "qfiledialog.h" + +void QFileDialog::getOpenFileContent(const QString &nameFilter, const std::function<void(const QString &, const QByteArray &)> &fileOpenCompleted) +{ + QFileDialog::getOpenFileContent(nameFilter, fileOpenCompleted, nullptr); +} + +void QFileDialog::saveFileContent(const QByteArray &fileContent, const QString &fileNameHint) +{ + saveFileContent(fileContent, fileNameHint, nullptr); +} +#endif // #include <qotherheader.h> // // implement removed functions from qotherheader.h -#endif // QT_REMOVED_SINCE(6, 3) +#endif // QT_WIDGETS_REMOVED_SINCE(6, 7) |