From 684ffeb671ee5b02aa548849bcfc7ac1432c7405 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Mon, 17 Dec 2018 16:47:38 +0000 Subject: [PATCH] Fixed clazy warnings: rule of zero/three/five. --- src/blackgui/models/actionitem.h | 6 ++++++ src/blackmisc/dictionary.h | 3 +++ src/blackmisc/variantmap.h | 3 +++ 3 files changed, 12 insertions(+) diff --git a/src/blackgui/models/actionitem.h b/src/blackgui/models/actionitem.h index 3887fd237..898002971 100644 --- a/src/blackgui/models/actionitem.h +++ b/src/blackgui/models/actionitem.h @@ -33,6 +33,12 @@ namespace BlackGui //! Destructor ~CActionItem(); + //! Not copyable + //! @{ + CActionItem(const CActionItem &) = delete; + CActionItem &operator =(const CActionItem &) = delete; + //! @} + //! Append a new child void appendChild(CActionItem *child); diff --git a/src/blackmisc/dictionary.h b/src/blackmisc/dictionary.h index ea75ac66d..127d1ef0a 100644 --- a/src/blackmisc/dictionary.h +++ b/src/blackmisc/dictionary.h @@ -297,6 +297,9 @@ namespace BlackMisc //! Move constructor CDictionary(CDictionary &&other) noexcept : m_impl(std::move(other.m_impl)) {} + //! Destructor + ~CDictionary() = default; + //! Returns iterator at the beginning of the dictionary iterator begin() { return m_impl.begin(); } diff --git a/src/blackmisc/variantmap.h b/src/blackmisc/variantmap.h index 56f9a8feb..3dfb53a49 100644 --- a/src/blackmisc/variantmap.h +++ b/src/blackmisc/variantmap.h @@ -58,6 +58,9 @@ namespace BlackMisc //! Move assignment operator. CVariantMap &operator =(CVariantMap &&other) noexcept { CDictionary::operator =(std::move(other)); return *this; } + //! Destructor. + ~CVariantMap() = default; + //! Insert values from this map into an existing JSON object. QJsonObject &mergeToJson(QJsonObject &json) const;