diff options
| author | Edward Welbourne <[email protected]> | 2020-07-21 14:59:47 +0200 |
|---|---|---|
| committer | Edward Welbourne <[email protected]> | 2020-09-14 09:47:50 +0200 |
| commit | c4378b8620453cd4bfaf12e45f623b3bdc1038e2 (patch) | |
| tree | 5ae1681715e28164e2f6e59fe5d8de8eb4005da5 | |
| parent | 6b43b665a8f359f2310851de2e9560091e9726db (diff) | |
Clean up the last of QT6_(NOT_)?VIRTUAL
This follows up on commit d273076b4474bb473d90e996960c4c773745761a
which left a comment asking for the clean-up this finishes.
Task-number: QTBUG-85700
Change-Id: I1c6896a42a09b873302ad7ec8273879f2a4a4ce6
Reviewed-by: Lars Knoll <[email protected]>
| -rw-r--r-- | src/corelib/global/qglobal.h | 6 | ||||
| -rw-r--r-- | src/widgets/graphicsview/qgraphicsscene.h | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qlayout.h | 4 | ||||
| -rw-r--r-- | src/xml/sax/qxml.h | 2 |
4 files changed, 5 insertions, 9 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 62d5c4f037d..418cc2f66bb 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Copyright (C) 2019 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** @@ -77,10 +77,6 @@ #define QT_CONFIG(feature) (1/QT_FEATURE_##feature == 1) #define QT_REQUIRE_CONFIG(feature) Q_STATIC_ASSERT_X(QT_FEATURE_##feature == 1, "Required feature " #feature " for file " __FILE__ " not available.") -// ### Clean those up, once all code is adjusted -#define QT6_VIRTUAL virtual -#define QT6_NOT_VIRTUAL - /* These two macros makes it possible to turn the builtin line expander into a * string literal. */ #define QT_STRINGIFY2(x) #x diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h index a4cf5b40630..0a08acf0f9c 100644 --- a/src/widgets/graphicsview/qgraphicsscene.h +++ b/src/widgets/graphicsview/qgraphicsscene.h @@ -268,7 +268,7 @@ protected: QWidget *widget = nullptr); protected Q_SLOTS: - QT6_VIRTUAL bool focusNextPrevChild(bool next); + virtual bool focusNextPrevChild(bool next); Q_SIGNALS: void changed(const QList<QRectF> ®ion); diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index 2748ebab9f3..1e51ff8fde7 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -123,8 +123,8 @@ public: bool isEmpty() const override; QSizePolicy::ControlTypes controlTypes() const override; - QT6_VIRTUAL QLayoutItem *replaceWidget(QWidget *from, QWidget *to, - Qt::FindChildOptions options = Qt::FindChildrenRecursively); + virtual QLayoutItem *replaceWidget(QWidget *from, QWidget *to, + Qt::FindChildOptions options = Qt::FindChildrenRecursively); int totalHeightForWidth(int w) const; QSize totalMinimumSize() const; diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h index badc5c778d1..6e19be193fb 100644 --- a/src/xml/sax/qxml.h +++ b/src/xml/sax/qxml.h @@ -149,7 +149,7 @@ public: QXmlAttributes &operator=(const QXmlAttributes &) = default; QXmlAttributes &operator=(QXmlAttributes &&) noexcept = default; - QT6_NOT_VIRTUAL ~QXmlAttributes(); + ~QXmlAttributes(); void swap(QXmlAttributes &other) noexcept { |