MNonCopyable - the common class to avoid declaring fake private constructors

6 files changed, 5 insertions, 23 deletions

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index b449c2a281..e85f2d2561 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -387,9 +387,7 @@ ProtoGetAvatarFormatByMimeType @400
 ProtoGetAvatarMimeType @401

 ?set_uin@DB_AUTH_BLOB@@QAEXK@Z @402 NONAME

 ??0CSrmmBaseDialog@@IAE@PAUHINSTANCE__@@HPAUSESSION_INFO@@@Z @403 NONAME

-??0CSrmmBaseDialog@@AAE@ABV0@@Z @404 NONAME

 ??1CSrmmBaseDialog@@UAE@XZ @405 NONAME

-??4CSrmmBaseDialog@@AAEAAV0@ABV0@@Z @406 NONAME

 ??_7CSrmmBaseDialog@@6B@ @407 NONAME

 ?DlgProc@CSrmmBaseDialog@@MAEHIIJ@Z @408 NONAME

 ??2CSrmmBaseDialog@@SAPAXI@Z @409 NONAME

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index bd05a3184e..62f9fe8672 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -387,9 +387,7 @@ ProtoGetAvatarFormatByMimeType @400
 ProtoGetAvatarMimeType @401

 ?set_uin@DB_AUTH_BLOB@@QEAAXK@Z @402 NONAME

 ??0CSrmmBaseDialog@@IEAA@PEAUHINSTANCE__@@HPEAUSESSION_INFO@@@Z @403 NONAME

-??0CSrmmBaseDialog@@AEAA@AEBV0@@Z @404 NONAME

 ??1CSrmmBaseDialog@@UEAA@XZ @405 NONAME

-??4CSrmmBaseDialog@@AEAAAEAV0@AEBV0@@Z @406 NONAME

 ??_7CSrmmBaseDialog@@6B@ @407 NONAME

 ?DlgProc@CSrmmBaseDialog@@MEAA_JI_K_J@Z @408 NONAME

 ??2CSrmmBaseDialog@@SAPEAX_K@Z @409 NONAME

diff --git a/src/mir_app/src/options.cpp b/src/mir_app/src/options.cpp
index 22ca38c0a0..b370c80072 100644
--- a/src/mir_app/src/options.cpp
+++ b/src/mir_app/src/options.cpp
@@ -385,7 +385,7 @@ class COptionsDlg : public CDlgBase
 	CCtrlCombo m_keywordFilter;

 	CCtrlButton m_btnApply, m_btnCancel;

 

-	COptionsDlg& operator=(const COptionsDlg&);

+	COptionsDlg& operator=(const COptionsDlg&) = delete;

 

 	HTREEITEM FindNamedTreeItem(HTREEITEM hParent, const wchar_t *name)

 	{

diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp
index 0275fb1c04..76d653ad52 100644
--- a/src/mir_app/src/srmm_base.cpp
+++ b/src/mir_app/src/srmm_base.cpp
@@ -28,8 +28,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "skin.h"
 #include <m_history.h>
 
-CSrmmBaseDialog::CSrmmBaseDialog(HINSTANCE hInst, int idDialog, SESSION_INFO *si)
-	: CDlgBase(hInst, idDialog),
+CSrmmBaseDialog::CSrmmBaseDialog(HINSTANCE hInst, int idDialog, SESSION_INFO *si) :
+	CDlgBase(hInst, idDialog),
 	m_log(this, IDC_SRMM_LOG),
 	m_message(this, IDC_SRMM_MESSAGE),
 	m_nickList(this, IDC_SRMM_NICKLIST),
@@ -80,20 +80,6 @@ CSrmmBaseDialog::CSrmmBaseDialog(HINSTANCE hInst, int idDialog, SESSION_INFO *si
 	}
 }
 
-CSrmmBaseDialog::CSrmmBaseDialog(const CSrmmBaseDialog&) :
-	CDlgBase(nullptr, 0),
-	m_btnColor(nullptr, 0), m_btnBkColor(nullptr, 0),
-	m_btnBold(nullptr, 0), m_btnItalic(nullptr, 0), m_btnUnderline(nullptr, 0),
-	m_btnFilter(nullptr, 0), m_btnChannelMgr(nullptr, 0), m_btnHistory(nullptr, 0), m_btnNickList(nullptr, 0),
-	m_nickList(nullptr, 0), m_log(nullptr, 0), m_message(nullptr, 0)
-{
-}
-
-CSrmmBaseDialog& CSrmmBaseDialog::operator=(const CSrmmBaseDialog&)
-{
-	return *this;
-}
-
 void CSrmmBaseDialog::RunUserMenu(HWND hwndOwner, USERINFO *ui, const POINT &pt)
 {
 	USERINFO uinew;
diff --git a/src/mir_app/src/xmlParser.cpp b/src/mir_app/src/xmlParser.cpp
index 26add898ee..fbacef5451 100644
--- a/src/mir_app/src/xmlParser.cpp
+++ b/src/mir_app/src/xmlParser.cpp
@@ -2260,7 +2260,7 @@ void XMLNode::invalidateInnerText()
 	d->pInnerText = nullptr;
 }
 
-XMLNode& XMLNode::operator = (const XMLNode& A)
+XMLNode& XMLNode::operator=(const XMLNode& A)
 {
 	// shallow copy
 	if (this != &A)
diff --git a/src/mir_app/src/xmlParser.h b/src/mir_app/src/xmlParser.h
index eeeabf7d0a..0f1e477fe9 100644
--- a/src/mir_app/src/xmlParser.h
+++ b/src/mir_app/src/xmlParser.h
@@ -317,7 +317,7 @@ public:
 

 	~XMLNode();

 	XMLNode(const XMLNode &A);                                     ///< to allow shallow/fast copy:

-	XMLNode& operator = (const XMLNode& A);                        ///< to allow shallow/fast copy:

+	XMLNode& operator=(const XMLNode& A);                        ///< to allow shallow/fast copy:

 

 	XMLNode(): d(nullptr) {};

 	static XMLNode emptyXMLNode;