From e5029063057c38297f188ccfefef7b1bcd781a76 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Fri, 21 Jan 2022 11:32:13 +0100 Subject: Add a note for making ResultStoreBase's internal members private MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's no class inheriting from ResultStoreBase (and likely won't be), so the destructor was marked to be made non-virtual in Qt 7. For the same reason, the internal members don't need to be protected, and the class shouldn't have "Base" in its name. Add a note about it. Task-number: QTBUG-99883 Change-Id: I00d7a96d99d2c326d29bd421235a15d68b4d4e5c Reviewed-by: MÃ¥rten Nordheim --- src/corelib/thread/qresultstore.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/corelib/thread') diff --git a/src/corelib/thread/qresultstore.h b/src/corelib/thread/qresultstore.h index a2a14f3de2..758331a9f0 100644 --- a/src/corelib/thread/qresultstore.h +++ b/src/corelib/thread/qresultstore.h @@ -136,7 +136,8 @@ public: ResultIteratorBase resultAt(int index) const; bool contains(int index) const; int count() const; - // ### Qt 7: 'virtual' isn't required, can be removed + // ### Qt 7: 'virtual' isn't required, can be removed, along with renaming + // the class to ResultStore and changing the members below to be private. virtual ~ResultStoreBase(); protected: -- cgit v1.2.3