From 81c8606dd9aa39067353354aa4523be84ef51fd1 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 18 May 2018 14:17:28 +0300
Subject: CDlgBase::CDlgBase now receives a reference to CMPlugin instead of
 HINSTANCE

---
 src/core/stdidle/src/options.cpp     | 2 +-
 src/core/stdmsg/src/chat_options.cpp | 6 +++---
 src/core/stdmsg/src/msgoptions.cpp   | 8 ++++----
 src/core/stdmsg/src/msgs.cpp         | 2 +-
 src/core/stdmsg/src/tabs.cpp         | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/core')

diff --git a/src/core/stdidle/src/options.cpp b/src/core/stdidle/src/options.cpp
index 6f8732223b..5da1144b09 100644
--- a/src/core/stdidle/src/options.cpp
+++ b/src/core/stdidle/src/options.cpp
@@ -57,7 +57,7 @@ class COptionsDlg : public CPluginDlgBase
 
 public:
 	COptionsDlg() :
-		CPluginDlgBase(g_plugin.getInst(), IDD_OPT_IDLE, IDLEMOD),
+		CPluginDlgBase(g_plugin, IDD_OPT_IDLE, IDLEMOD),
 		edt1sttime(this, IDC_IDLE1STTIME),
 		spinIdle(this, IDC_IDLESPIN),
 		cmbAAStatus(this, IDC_AASTATUS),
diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp
index 6f9dcc88db..778d8f1af8 100644
--- a/src/core/stdmsg/src/chat_options.cpp
+++ b/src/core/stdmsg/src/chat_options.cpp
@@ -332,7 +332,7 @@ class COptMainDlg : public CDlgBase
 
 public:
 	COptMainDlg()
-		: CDlgBase(g_plugin.getInst(), IDD_OPTIONS1),
+		: CDlgBase(g_plugin, IDD_OPTIONS1),
 		checkBoxes(this, IDC_CHECKBOXES)
 	{
 		checkBoxes.OnItemChanged = Callback(this, &COptMainDlg::onChange_Tree);
@@ -433,7 +433,7 @@ class COptLogDlg : public CDlgBase
 
 public:
 	COptLogDlg() :
-		CDlgBase(g_plugin.getInst(), IDD_OPTIONS2),
+		CDlgBase(g_plugin, IDD_OPTIONS2),
 		spin2(this, IDC_SPIN2),
 		spin3(this, IDC_SPIN3),
 		spin4(this, IDC_SPIN4),
@@ -596,7 +596,7 @@ class COptPopupDlg : public CDlgBase
 
 public:
 	COptPopupDlg()
-		: CDlgBase(g_plugin.getInst(), IDD_OPTIONSPOPUP),
+		: CDlgBase(g_plugin, IDD_OPTIONSPOPUP),
 		chkRadio1(this, IDC_RADIO1),
 		chkRadio2(this, IDC_RADIO2),
 		chkRadio3(this, IDC_RADIO3)
diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index 101c07cf46..204f34eaff 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -193,7 +193,7 @@ class COptionMainDlg : public CPluginDlgBase
 
 public:
 	COptionMainDlg() :
-		CPluginDlgBase(g_plugin.getInst(), IDD_OPT_MSGDLG, SRMMMOD),
+		CPluginDlgBase(g_plugin, IDD_OPT_MSGDLG, SRMMMOD),
 		tree(this, IDC_POPLIST),
 		edtSecs(this, IDC_SECONDS),
 		edtNFlash(this, IDC_NFLASHES),
@@ -315,7 +315,7 @@ class COptionLogDlg : public CPluginDlgBase
 
 public:
 	COptionLogDlg() :
-		CPluginDlgBase(g_plugin.getInst(), IDD_OPT_MSGLOG, SRMMMOD),
+		CPluginDlgBase(g_plugin, IDD_OPT_MSGLOG, SRMMMOD),
 		chkSecs(this, IDC_SHOWSECS),
 		chkDate(this, IDC_SHOWDATES),
 		chkTime(this, IDC_SHOWTIMES),
@@ -418,7 +418,7 @@ class COptionTypingDlg : public CPluginDlgBase
 
 public:
 	COptionTypingDlg() :
-		CPluginDlgBase(g_plugin.getInst(), IDD_OPT_MSGTYPE, SRMMMOD),
+		CPluginDlgBase(g_plugin, IDD_OPT_MSGTYPE, SRMMMOD),
 		clist(this, IDC_CLIST),
 		chkType(this, IDC_SHOWNOTIFY),
 		chkTypeWin(this, IDC_TYPEWIN),
@@ -529,7 +529,7 @@ class COptionsTabDlg : public CDlgBase
 
 public:
 	COptionsTabDlg() :
-		CDlgBase(g_plugin.getInst(), IDD_OPT_TABS),
+		CDlgBase(g_plugin, IDD_OPT_TABS),
 		m_chkTabs(this, IDC_USETABS),
 		m_chkTabsBottom(this, IDC_TABSBOTTOM),
 		m_chkTabsClose(this, IDC_CLOSETABS),
diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index 9b9ad4fe75..0b982e5892 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 /////////////////////////////////////////////////////////////////////////////////////////
 
 CMsgDialog::CMsgDialog(int iDialogId, SESSION_INFO *si)
-	: CSuper(g_plugin.getInst(), iDialogId, si),
+	: CSuper(g_plugin, iDialogId, si),
 	m_btnOk(this, IDOK)
 {
 	m_autoClose = 0;
diff --git a/src/core/stdmsg/src/tabs.cpp b/src/core/stdmsg/src/tabs.cpp
index 234ff9a657..a1d28f215a 100644
--- a/src/core/stdmsg/src/tabs.cpp
+++ b/src/core/stdmsg/src/tabs.cpp
@@ -163,7 +163,7 @@ static LRESULT CALLBACK TabSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
 /////////////////////////////////////////////////////////////////////////////////////////
 
 CTabbedWindow::CTabbedWindow() :
-	CDlgBase(g_plugin.getInst(), IDD_CONTAINER),
+	CDlgBase(g_plugin, IDD_CONTAINER),
 	m_tab(this, IDC_TAB)
 {
 }
-- 
cgit v1.2.3