QtWidgets: clean up API removals

As suggested by Peppe and Lars, use one file per module to hold the
removed functions, not one per major version and subdir. Also, make
the remove macro more like QT_DEPRECATED_SINCE.

Change-Id: I2ade51ccc8cb8720ece493936775dfd3b5d438d7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

3 files changed, 2 insertions, 104 deletions

diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h
index 7d502f9f1b..68481308fb 100644
--- a/src/widgets/widgets/qmenu.h
+++ b/src/widgets/widgets/qmenu.h
@@ -76,7 +76,7 @@ public:
     ~QMenu();
 
     using QWidget::addAction;
-#ifdef QT_BUILD_FUNCTIONS_REMOVED_IN_6_3
+#if QT_REMOVED_SINCE(6, 3)
     QAction *addAction(const QString &text);
     QAction *addAction(const QIcon &icon, const QString &text);
 #if !QT_CONFIG(shortcut)
diff --git a/src/widgets/widgets/qtoolbar.h b/src/widgets/widgets/qtoolbar.h
index caca716d2e..09f639d3e7 100644
--- a/src/widgets/widgets/qtoolbar.h
+++ b/src/widgets/widgets/qtoolbar.h
@@ -90,7 +90,7 @@ public:
     void clear();
 
     using QWidget::addAction;
-#ifdef QT_BUILD_FUNCTIONS_REMOVED_IN_6_3
+#if QT_REMOVED_SINCE(6, 3)
     QAction *addAction(const QString &text);
     QAction *addAction(const QIcon &icon, const QString &text);
     QAction *addAction(const QString &text, const QObject *receiver, const char* member);
diff --git a/src/widgets/widgets/qtwidgets_widgets_removed_functions_in_6_3.cpp b/src/widgets/widgets/qtwidgets_widgets_removed_functions_in_6_3.cpp
deleted file mode 100644
index 535aec8ce4..0000000000
--- a/src/widgets/widgets/qtwidgets_widgets_removed_functions_in_6_3.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** 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_FUNCTIONS_REMOVED_IN_6_3
-
-#include "qglobal.h"
-
-QT_USE_NAMESPACE
-
-#if QT_DEPRECATED_SINCE(6, 3)
-
-#include "qmenu.h"
-
-QAction *QMenu::addAction(const QString &text)
-{
-    return QWidget::addAction(text);
-}
-
-QAction *QMenu::addAction(const QIcon &icon, const QString &text)
-{
-    return QWidget::addAction(icon, text);
-}
-
-#if !QT_CONFIG(shortcut)
-// the overloads taking QKeySequence as a trailing argument are deprecated, not removed,
-// so remained in qmenu.cpp
-QAction *QMenu::addAction(const QString &text, const QObject *receiver, const char* member)
-{
-    return QWidget::addAction(text, receiver, member);
-}
-
-QAction *QMenu::addAction(const QIcon &icon, const QString &text,
-                          const QObject *receiver, const char* member)
-{
-    return QWidget::addAction(icon, text, receiver, member);
-}
-#endif
-
-#include "qtoolbar.h"
-
-QAction *QToolBar::addAction(const QString &text)
-{
-    return QWidget::addAction(text);
-}
-
-QAction *QToolBar::addAction(const QIcon &icon, const QString &text)
-{
-    return QWidget::addAction(icon, text);
-}
-
-QAction *QToolBar::addAction(const QString &text,
-                             const QObject *receiver, const char* member)
-{
-    return QWidget::addAction(text, receiver, member);
-}
-
-QAction *QToolBar::addAction(const QIcon &icon, const QString &text,
-                             const QObject *receiver, const char* member)
-{
-    return QWidget::addAction(icon, text, receiver, member);
-}
-
-// #include <qotherheader.h>
-// // implement removed functions from qotherheader.h
-
-#endif // QT_DEPRECATED_SINCE(6, 3)