From 3e05d92dcb5f6c2017bc462554901ba27816bdb4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 17 Apr 2018 15:56:52 +0300 Subject: MNonCopyable - the common class to avoid declaring fake private constructors --- plugins/Boltun/src/Engine/PerContactData.h | 4 +--- plugins/Boltun/src/Engine/TalkEngine.h | 3 +-- plugins/Boltun/src/Engine/ValueChooser.h | 4 +--- 3 files changed, 3 insertions(+), 8 deletions(-) (limited to 'plugins/Boltun/src/Engine') diff --git a/plugins/Boltun/src/Engine/PerContactData.h b/plugins/Boltun/src/Engine/PerContactData.h index f573423bd3..5eb276ab28 100644 --- a/plugins/Boltun/src/Engine/PerContactData.h +++ b/plugins/Boltun/src/Engine/PerContactData.h @@ -24,10 +24,8 @@ static std::map perContactDataObjects; template -class PerContactData +class PerContactData : private MNonCopyable { - PerContactData& operator=(const PerContactData&); - template struct InternalData { diff --git a/plugins/Boltun/src/Engine/TalkEngine.h b/plugins/Boltun/src/Engine/TalkEngine.h index 3ddeaf87b9..cd54199a90 100644 --- a/plugins/Boltun/src/Engine/TalkEngine.h +++ b/plugins/Boltun/src/Engine/TalkEngine.h @@ -26,9 +26,8 @@ #include "PerContactData.h" #include "UnrecentChooser.h" -class TalkBot +class TalkBot : private MNonCopyable { - TalkBot& operator=(const TalkBot&); public: struct MessageInfo diff --git a/plugins/Boltun/src/Engine/ValueChooser.h b/plugins/Boltun/src/Engine/ValueChooser.h index e442f14530..6ddfc00a5a 100644 --- a/plugins/Boltun/src/Engine/ValueChooser.h +++ b/plugins/Boltun/src/Engine/ValueChooser.h @@ -22,7 +22,7 @@ #define StringChooserH template > -class ValueChooser +class ValueChooser : private MNonCopyable { private: int freeNumbers; @@ -30,8 +30,6 @@ private: const container data; bool notifyOnReset; - ValueChooser& operator=(const ValueChooser&); - public: ValueChooser(const container& vec, bool NotifyOnReset = false) :data(vec), notifyOnReset(NotifyOnReset) -- cgit v1.2.3