diff options
author | Kai Koehne <kai.koehne@qt.io> | 2019-03-27 17:26:48 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2019-03-27 18:42:57 +0000 |
commit | 133bd37a7ee08ebf997811981b3e533f1840ead2 (patch) | |
tree | b09e22c8f884c09d1ff16b2d05c4d5c707b2a891 | |
parent | 689eb95e94736e4d1aba1fe5bca4193413ddd4f8 (diff) | |
download | qttools-133bd37a7ee08ebf997811981b3e533f1840ead2.tar.gz |
assistant: Mark QCompressedHelpInfo, QHelpFilterdata as final
These are value classes that are not supposed to be inherited.
Mark them as final and remove any virtual destructors.
Change-Id: I86d42f8340e6c7b6013c6ed135079ecd9bd44cfb
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r-- | src/assistant/help/qcompressedhelpinfo.h | 4 | ||||
-rw-r--r-- | src/assistant/help/qhelpfilterdata.cpp | 4 | ||||
-rw-r--r-- | src/assistant/help/qhelpfilterdata.h | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/assistant/help/qcompressedhelpinfo.h b/src/assistant/help/qcompressedhelpinfo.h index 4e9185145..c392bb74c 100644 --- a/src/assistant/help/qcompressedhelpinfo.h +++ b/src/assistant/help/qcompressedhelpinfo.h @@ -49,13 +49,13 @@ QT_BEGIN_NAMESPACE class QVersionNumber; class QCompressedHelpInfoPrivate; -class QHELP_EXPORT QCompressedHelpInfo +class QHELP_EXPORT QCompressedHelpInfo final { public: QCompressedHelpInfo(); QCompressedHelpInfo(const QCompressedHelpInfo &other); QCompressedHelpInfo(QCompressedHelpInfo &&other); - virtual ~QCompressedHelpInfo(); + ~QCompressedHelpInfo(); QCompressedHelpInfo &operator=(const QCompressedHelpInfo &other); QCompressedHelpInfo &operator=(QCompressedHelpInfo &&other); diff --git a/src/assistant/help/qhelpfilterdata.cpp b/src/assistant/help/qhelpfilterdata.cpp index 0e3a28574..37b209541 100644 --- a/src/assistant/help/qhelpfilterdata.cpp +++ b/src/assistant/help/qhelpfilterdata.cpp @@ -93,9 +93,7 @@ QHelpFilterData::QHelpFilterData(QHelpFilterData &&) = default; /*! Destroys the filter. */ -QHelpFilterData::~QHelpFilterData() -{ -} +QHelpFilterData::~QHelpFilterData() = default; /*! Assigns \a other to this filter and returns a reference to this filter. diff --git a/src/assistant/help/qhelpfilterdata.h b/src/assistant/help/qhelpfilterdata.h index 5f69aaa63..b51ee495b 100644 --- a/src/assistant/help/qhelpfilterdata.h +++ b/src/assistant/help/qhelpfilterdata.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE class QVersionNumber; class QHelpFilterDataPrivate; -class QHELP_EXPORT QHelpFilterData +class QHELP_EXPORT QHelpFilterData final { public: QHelpFilterData(); |