VKontakte: remove unneeded m_proto

git-svn-id: http://svn.miranda-ng.org/main/trunk@16606 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 5 insertions, 22 deletions

diff --git a/protocols/VKontakte/src/vk_options.cpp b/protocols/VKontakte/src/vk_options.cpp
index f4334d0b1c..22ed05e0e4 100644
--- a/protocols/VKontakte/src/vk_options.cpp
+++ b/protocols/VKontakte/src/vk_options.cpp
@@ -32,9 +32,7 @@ CVkAccMgrForm::CVkAccMgrForm(CVkProto *proto, HWND hwndParent):
 	CVkDlgBase(proto, IDD_ACCMGRUI, false),

 	m_edtLogin(this, IDC_LOGIN),

 	m_edtPassword(this, IDC_PASSWORD),

-	m_hlLink(this, IDC_URL, "https://vk.com/"),

-	m_proto(proto)

-

+	m_hlLink(this, IDC_URL, "https://vk.com/")

 {

 	SetParent(hwndParent);

 

@@ -140,9 +138,7 @@ CVkOptionAccountForm::CVkOptionAccountForm(CVkProto *proto):
 	m_cbSyncHistoryOff(this, IDC_SYNC_OFF),

 	m_cbSyncHistoryAuto(this, IDC_SYNC_AUTO),

 	m_cbSyncHistoryForLast1Day(this, IDC_SYNC_LAST1DAY),

-	m_cbSyncHistoryForLast3Day(this, IDC_SYNC_LAST3DAY),

-	m_proto(proto)

-

+	m_cbSyncHistoryForLast3Day(this, IDC_SYNC_LAST3DAY)

 {

 	CreateLink(m_edtLogin, "Login", _T(""));

 	CreateLink(m_edtGroupName, "ProtoGroup", _T("VKontakte"));

@@ -248,8 +244,7 @@ CVkOptionAdvancedForm::CVkOptionAdvancedForm(CVkProto *proto):
 	m_cbMusicSendBroadcastAndStatus(this, IDC_SEND_MUSIC_BROADCAST_AND_STATUS),

 	m_cbSendMetodBroadcast(this, IDC_SEND_MUSIC_BROADCAST),

 	m_cbMusicSendStatus(this, IDC_SEND_MUSIC_STATUS),

-	m_edtReturnChatMessage(this, IDC_RET_CHAT_MES),

-	m_proto(proto)

+	m_edtReturnChatMessage(this, IDC_RET_CHAT_MES)

 {

 	CreateLink(m_cbHideChats, m_proto->m_vkOptions.bHideChats);

 	CreateLink(m_cbSyncReadMessageStatusFromServer, m_proto->m_vkOptions.bSyncReadMessageStatusFromServer);

@@ -410,8 +405,7 @@ CVkOptionViewForm::CVkOptionViewForm(CVkProto *proto):
 	m_cbBBCForAttachmentsBasic(this, IDC_ATTBBC_BASIC),

 	m_cbBBCForAttachmentsAdvanced(this, IDC_ATTBBC_ADV),

 	m_cbStikersAsSmyles(this, IDC_STICKERS_AS_SMYLES),

-	m_cbShortenLinksForAudio(this, IDC_SHOTEN_LINKS_FOR_AUDIO),

-	m_proto(proto)

+	m_cbShortenLinksForAudio(this, IDC_SHOTEN_LINKS_FOR_AUDIO)

 {

 	CreateLink(m_cbUseBBCOnAttacmentsAsNews, m_proto->m_vkOptions.bUseBBCOnAttacmentsAsNews);

 	CreateLink(m_cbStikersAsSmyles, m_proto->m_vkOptions.bStikersAsSmyles);

@@ -470,8 +464,7 @@ CVkOptionMenuForm::CVkOptionMenuForm(CVkProto *proto):
 	m_cbMenuEnabled3(this, IDC_SHOW_MENU3),

 	m_cbMenuEnabled4(this, IDC_SHOW_MENU4),

 	m_cbMenuEnabled5(this, IDC_SHOW_MENU5),

-	m_cbMenuEnabled6(this, IDC_SHOW_MENU6),

-	m_proto(proto)

+	m_cbMenuEnabled6(this, IDC_SHOW_MENU6)

 {

 	CreateLink(m_cbMenuEnabled0, m_proto->m_vkOptions.bShowProtoMenuItem0);

 	CreateLink(m_cbMenuEnabled1, m_proto->m_vkOptions.bShowProtoMenuItem1);

diff --git a/protocols/VKontakte/src/vk_options.h b/protocols/VKontakte/src/vk_options.h
index 5ce09c91a4..a594668df3 100644
--- a/protocols/VKontakte/src/vk_options.h
+++ b/protocols/VKontakte/src/vk_options.h
@@ -29,8 +29,6 @@ class CVkAccMgrForm : public CVkDlgBase
 	CCtrlEdit m_edtLogin;

 	CCtrlEdit m_edtPassword;

 	CCtrlHyperlink m_hlLink;

-

-	CVkProto *m_proto;

 	

 	pass_ptrT m_ptszOldPass;

 	ptrT m_ptszOldLogin;

@@ -62,8 +60,6 @@ class CVkOptionAccountForm : public CVkDlgBase
 	CCtrlCheck m_cbSyncHistoryForLast1Day;

 	CCtrlCheck m_cbSyncHistoryForLast3Day;

 

-	CVkProto *m_proto;

-

 	pass_ptrT m_ptszOldPass;

 	ptrT m_ptszOldLogin;

 	ptrT m_ptszOldGroup;

@@ -100,8 +96,6 @@ class CVkOptionAdvancedForm : public CVkDlgBase
 

 	CCtrlEdit m_edtReturnChatMessage;

 

-	CVkProto *m_proto;

-

 public:

 	CVkOptionAdvancedForm(CVkProto  *proto);

 	void OnInitDialog();

@@ -174,8 +168,6 @@ class CVkOptionViewForm : public CVkDlgBase
 	CCtrlCheck m_cbStikersAsSmyles;

 	CCtrlCheck m_cbShortenLinksForAudio;

 	

-	CVkProto *m_proto;

-

 public:

 	CVkOptionViewForm(CVkProto *proto);

 	void OnInitDialog();

@@ -194,8 +186,6 @@ class CVkOptionMenuForm : public CVkDlgBase
 	CCtrlCheck m_cbMenuEnabled5;

 	CCtrlCheck m_cbMenuEnabled6;

 

-	CVkProto *m_proto;

-

 public:

 	CVkOptionMenuForm(CVkProto *proto);

 	void OnApply();