From 3e05d92dcb5f6c2017bc462554901ba27816bdb4 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 17 Apr 2018 15:56:52 +0300
Subject: MNonCopyable - the common class to avoid declaring fake private
 constructors

---
 plugins/WinterSpeak/src/AnnounceDialog.h     | 2 --
 plugins/WinterSpeak/src/DialogConfigActive.h | 2 --
 plugins/WinterSpeak/src/DialogConfigEngine.h | 2 --
 plugins/WinterSpeak/src/MirandaDialog.h      | 2 +-
 plugins/WinterSpeak/src/Subject.h            | 8 +-------
 5 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'plugins/WinterSpeak')

diff --git a/plugins/WinterSpeak/src/AnnounceDialog.h b/plugins/WinterSpeak/src/AnnounceDialog.h
index 994e75d524..cc9d5fd94f 100644
--- a/plugins/WinterSpeak/src/AnnounceDialog.h
+++ b/plugins/WinterSpeak/src/AnnounceDialog.h
@@ -4,8 +4,6 @@
 
 class AnnounceDialog : public MirandaDialog
 {
-	AnnounceDialog& operator=(const AnnounceDialog&);
-
 public:
 	AnnounceDialog(AnnounceDatabase &db);
 	~AnnounceDialog();
diff --git a/plugins/WinterSpeak/src/DialogConfigActive.h b/plugins/WinterSpeak/src/DialogConfigActive.h
index 28978787f8..77eae56e07 100644
--- a/plugins/WinterSpeak/src/DialogConfigActive.h
+++ b/plugins/WinterSpeak/src/DialogConfigActive.h
@@ -3,8 +3,6 @@
 
 class DialogConfigActive : public MirandaDialog
 {
-	DialogConfigActive& operator=(const DialogConfigActive&);
-
 public:
 	//--------------------------------------------------------------------------
 	// Description : Initialise
diff --git a/plugins/WinterSpeak/src/DialogConfigEngine.h b/plugins/WinterSpeak/src/DialogConfigEngine.h
index e103ec1003..5d585bf6cf 100644
--- a/plugins/WinterSpeak/src/DialogConfigEngine.h
+++ b/plugins/WinterSpeak/src/DialogConfigEngine.h
@@ -7,8 +7,6 @@ class TextToSpeech;
 
 class DialogConfigEngine : public MirandaDialog
 {
-	DialogConfigEngine& operator=(const DialogConfigEngine&);
-
 public:
 	DialogConfigEngine(ConfigDatabase &db);
 	virtual ~DialogConfigEngine();
diff --git a/plugins/WinterSpeak/src/MirandaDialog.h b/plugins/WinterSpeak/src/MirandaDialog.h
index 22424a6f30..5b66634eb4 100644
--- a/plugins/WinterSpeak/src/MirandaDialog.h
+++ b/plugins/WinterSpeak/src/MirandaDialog.h
@@ -1,5 +1,5 @@
 #pragma once
-class MirandaDialog
+class MirandaDialog : private MNonCopyable
 {
 public:
 	MirandaDialog(void);
diff --git a/plugins/WinterSpeak/src/Subject.h b/plugins/WinterSpeak/src/Subject.h
index f4bba3b075..d3ae97fba6 100644
--- a/plugins/WinterSpeak/src/Subject.h
+++ b/plugins/WinterSpeak/src/Subject.h
@@ -3,7 +3,7 @@
 #include "Observer.h"
 
 #include <list>
-class Subject
+class Subject : private MNonCopyable
 {
 public:
     Subject();
@@ -27,12 +27,6 @@ public:
     void detach(const Observer &observer);
 
   private:
-    //--------------------------------------------------------------------------
-    // Description : Disallow assignment operator and copy constructor
-    //--------------------------------------------------------------------------
-    Subject(const Subject &rhs);
-    const Subject & operator=(const Subject &rhs);
-
     std::list<Observer *> m_observer_list;
 };
 
-- 
cgit v1.2.3