From a0da15f2c991008ea82408840beea34995d4dea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= <jan-arve.saether@qt.io>
Date: Mon, 10 Feb 2020 15:17:05 +0100
Subject: Remove comments about destructors needing to be empty
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Not important, but removes some ### Qt6 comments from my radar

Change-Id: Ifd1bf44c44ece8fa1314d3c7e0e95d1bd37ae0ea
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
---
 src/corelib/plugin/qfactoryinterface.cpp     |  1 -
 src/corelib/thread/qrunnable.cpp             |  1 -
 src/gui/accessible/qaccessible.cpp           | 17 -----------------
 src/gui/kernel/qevent.cpp                    |  1 -
 src/gui/text/qabstracttextdocumentlayout.cpp |  1 -
 5 files changed, 21 deletions(-)

diff --git a/src/corelib/plugin/qfactoryinterface.cpp b/src/corelib/plugin/qfactoryinterface.cpp
index 353c2478f4..b503c245c5 100644
--- a/src/corelib/plugin/qfactoryinterface.cpp
+++ b/src/corelib/plugin/qfactoryinterface.cpp
@@ -43,7 +43,6 @@ QT_BEGIN_NAMESPACE
 
 QFactoryInterface::~QFactoryInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/thread/qrunnable.cpp b/src/corelib/thread/qrunnable.cpp
index bd0a32b53d..b355ca605f 100644
--- a/src/corelib/thread/qrunnable.cpp
+++ b/src/corelib/thread/qrunnable.cpp
@@ -43,7 +43,6 @@ QT_BEGIN_NAMESPACE
 
 QRunnable::~QRunnable()
 {
-    // Must be empty until ### Qt 6
 }
 
 /*!
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index a789e65284..6edcd7befa 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -619,7 +619,6 @@ QAccessible::RootObjectHandler QAccessible::installRootObjectHandler(RootObjectH
 
 QAccessible::ActivationObserver::~ActivationObserver()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -1334,7 +1333,6 @@ QColor QAccessibleInterface::backgroundColor() const
 */
 QAccessibleEvent::~QAccessibleEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 /*! \fn QAccessible::Event QAccessibleEvent::type() const
@@ -1414,7 +1412,6 @@ QAccessible::Id QAccessibleEvent::uniqueId() const
 */
 QAccessibleValueChangeEvent::~QAccessibleValueChangeEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -1458,7 +1455,6 @@ QAccessibleValueChangeEvent::~QAccessibleValueChangeEvent()
 */
 QAccessibleStateChangeEvent::~QAccessibleStateChangeEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -1538,7 +1534,6 @@ QAccessibleStateChangeEvent::~QAccessibleStateChangeEvent()
 */
 QAccessibleTableModelChangeEvent::~QAccessibleTableModelChangeEvent()
 {
-    // must be empty until ### Qt 6
 }
 /*!
     \class QAccessibleTextCursorEvent
@@ -1567,7 +1562,6 @@ QAccessibleTableModelChangeEvent::~QAccessibleTableModelChangeEvent()
 */
 QAccessibleTextCursorEvent::~QAccessibleTextCursorEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 
@@ -1608,7 +1602,6 @@ QAccessibleTextCursorEvent::~QAccessibleTextCursorEvent()
 */
 QAccessibleTextInsertEvent::~QAccessibleTextInsertEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 
@@ -1651,7 +1644,6 @@ QAccessibleTextInsertEvent::~QAccessibleTextInsertEvent()
 */
 QAccessibleTextRemoveEvent::~QAccessibleTextRemoveEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -1713,7 +1705,6 @@ QAccessibleTextRemoveEvent::~QAccessibleTextRemoveEvent()
 */
 QAccessibleTextUpdateEvent::~QAccessibleTextUpdateEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 
@@ -1748,7 +1739,6 @@ QAccessibleTextUpdateEvent::~QAccessibleTextUpdateEvent()
 */
 QAccessibleTextSelectionEvent::~QAccessibleTextSelectionEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 
@@ -1978,7 +1968,6 @@ QDebug operator<<(QDebug d, const QAccessibleEvent &ev)
 */
 QAccessibleTextInterface::~QAccessibleTextInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -2367,7 +2356,6 @@ QString QAccessibleTextInterface::textAtOffset(int offset, QAccessible::TextBoun
 */
 QAccessibleEditableTextInterface::~QAccessibleEditableTextInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -2412,7 +2400,6 @@ QAccessibleEditableTextInterface::~QAccessibleEditableTextInterface()
 */
 QAccessibleValueInterface::~QAccessibleValueInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -2476,7 +2463,6 @@ QAccessibleValueInterface::~QAccessibleValueInterface()
 */
 QAccessibleImageInterface::~QAccessibleImageInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -2496,7 +2482,6 @@ QAccessibleImageInterface::~QAccessibleImageInterface()
 */
 QAccessibleTableCellInterface::~QAccessibleTableCellInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -2564,7 +2549,6 @@ QAccessibleTableCellInterface::~QAccessibleTableCellInterface()
 */
 QAccessibleTableInterface::~QAccessibleTableInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -2740,7 +2724,6 @@ QAccessibleTableInterface::~QAccessibleTableInterface()
 */
 QAccessibleActionInterface::~QAccessibleActionInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 663573b640..c2dac71e0d 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -2063,7 +2063,6 @@ QInputMethodEvent::QInputMethodEvent(const QInputMethodEvent &other)
 
 QInputMethodEvent::~QInputMethodEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp
index 8528f59844..bfce38797a 100644
--- a/src/gui/text/qabstracttextdocumentlayout.cpp
+++ b/src/gui/text/qabstracttextdocumentlayout.cpp
@@ -53,7 +53,6 @@ QAbstractTextDocumentLayoutPrivate::~QAbstractTextDocumentLayoutPrivate()
 
 QTextObjectInterface::~QTextObjectInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
-- 
cgit v1.2.3