From f531ff887729783a7fe7a3e12ad12f658eefc7b0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 4 Jun 2020 17:03:28 +0300 Subject: UI classes: - CDlgBase::m_bSucceeded variable introduced to check whether IDOK was pressed or not; - unused/useless buttons with id=IDOK or IDCANCEL removed; - brnOk.OnClick replaced with OnApply calls; - unused/useless calls of EndDialog/EndModal removed; - minor code cleaning --- protocols/Tox/src/stdafx.h | 1 - protocols/Tox/src/tox_options.cpp | 151 ++++++++++--------- protocols/Tox/src/tox_options.h | 28 ---- protocols/Tox/src/tox_profile.cpp | 307 +++++++++++++++++++++----------------- protocols/Tox/src/tox_profile.h | 69 --------- protocols/Tox/src/tox_proto.h | 10 +- 6 files changed, 255 insertions(+), 311 deletions(-) delete mode 100644 protocols/Tox/src/tox_profile.h (limited to 'protocols/Tox/src') diff --git a/protocols/Tox/src/stdafx.h b/protocols/Tox/src/stdafx.h index 9dbf24a568..8e7afcb0be 100644 --- a/protocols/Tox/src/stdafx.h +++ b/protocols/Tox/src/stdafx.h @@ -83,7 +83,6 @@ struct CToxProto; #include "tox_menus.h" #include "tox_address.h" #include "tox_dialogs.h" -#include "tox_profile.h" #include "tox_options.h" #include "tox_transfer.h" #include "tox_proto.h" diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp index 3f7777e56a..781c279d7e 100644 --- a/protocols/Tox/src/tox_options.cpp +++ b/protocols/Tox/src/tox_options.cpp @@ -253,91 +253,102 @@ bool CToxOptionsMain::OnApply() ///////////////////////////////////////////////////////////////////////////////// -CToxNodeEditor::CToxNodeEditor(int iItem, CCtrlListView *m_nodes) - : CSuper(g_plugin, IDD_NODE_EDITOR), - m_ipv4(this, IDC_IPV4), m_ipv6(this, IDC_IPV6), - m_port(this, IDC_PORT), m_pkey(this, IDC_PKEY), - m_ok(this, IDOK), m_iItem(iItem) +class CToxNodeEditor : public CDlgBase { - m_autoClose = CLOSE_ON_CANCEL; - m_list = m_nodes; - m_ok.OnClick = Callback(this, &CToxNodeEditor::OnOk); -} + typedef CDlgBase CSuper; + + int m_iItem; + CCtrlListView *m_list; + + CCtrlEdit m_ipv4; + CCtrlEdit m_ipv6; + CCtrlEdit m_port; + CCtrlEdit m_pkey; + +public: + CToxNodeEditor(int iItem, CCtrlListView *m_nodes) : + CSuper(g_plugin, IDD_NODE_EDITOR), + m_ipv4(this, IDC_IPV4), m_ipv6(this, IDC_IPV6), + m_port(this, IDC_PORT), m_pkey(this, IDC_PKEY), + m_iItem(iItem) + { + m_autoClose = CLOSE_ON_CANCEL; + m_list = m_nodes; + } -bool CToxNodeEditor::OnInitDialog() -{ - SetWindowText(m_hwnd, m_iItem == -1 ? TranslateT("Add node") : TranslateT("Change node")); + bool OnInitDialog() override + { + SetWindowText(m_hwnd, m_iItem == -1 ? TranslateT("Add node") : TranslateT("Change node")); - if (m_iItem > -1) { - LVITEM lvi = { 0 }; - lvi.mask = LVIF_TEXT; - lvi.iItem = m_iItem; - lvi.cchTextMax = MAX_PATH; - lvi.pszText = (wchar_t*)alloca(MAX_PATH * sizeof(wchar_t)); + if (m_iItem > -1) { + LVITEM lvi = { 0 }; + lvi.mask = LVIF_TEXT; + lvi.iItem = m_iItem; + lvi.cchTextMax = MAX_PATH; + lvi.pszText = (wchar_t *)alloca(MAX_PATH * sizeof(wchar_t)); - lvi.iSubItem = 0; - m_list->GetItem(&lvi); - m_ipv4.SetText(lvi.pszText); + lvi.iSubItem = 0; + m_list->GetItem(&lvi); + m_ipv4.SetText(lvi.pszText); - lvi.iSubItem = 1; - m_list->GetItem(&lvi); - m_ipv6.SetText(lvi.pszText); + lvi.iSubItem = 1; + m_list->GetItem(&lvi); + m_ipv6.SetText(lvi.pszText); - lvi.iSubItem = 2; - m_list->GetItem(&lvi); - m_port.SetText(lvi.pszText); + lvi.iSubItem = 2; + m_list->GetItem(&lvi); + m_port.SetText(lvi.pszText); - lvi.iSubItem = 3; - m_list->GetItem(&lvi); - m_pkey.SetText(lvi.pszText); + lvi.iSubItem = 3; + m_list->GetItem(&lvi); + m_pkey.SetText(lvi.pszText); + } + + Utils_RestoreWindowPositionNoSize(m_hwnd, NULL, MODULE, "EditNodeDlg"); + return true; } - Utils_RestoreWindowPositionNoSize(m_hwnd, NULL, MODULE, "EditNodeDlg"); - return true; -} + bool OnApply() override + { + ptrW ipv4(m_ipv4.GetText()); + if (!ipv4) { + MessageBox(m_hwnd, TranslateT("Enter IPv4"), TranslateT("Error"), MB_OK); + return false; + } -void CToxNodeEditor::OnOk(CCtrlBase*) -{ - ptrW ipv4(m_ipv4.GetText()); - if (!ipv4) { - MessageBox(m_hwnd, TranslateT("Enter IPv4"), TranslateT("Error"), MB_OK); - return; - } + ptrW port(m_port.GetText()); + if (!port) { + MessageBox(m_hwnd, TranslateT("Enter port"), TranslateT("Error"), MB_OK); + return false; + } - ptrW port(m_port.GetText()); - if (!port) { - MessageBox(m_hwnd, TranslateT("Enter port"), TranslateT("Error"), MB_OK); - return; - } + ptrW pubKey(m_pkey.GetText()); + if (!pubKey) { + MessageBox(m_hwnd, TranslateT("Enter public key"), TranslateT("Error"), MB_OK); + return false; + } - ptrW pubKey(m_pkey.GetText()); - if (!pubKey) { - MessageBox(m_hwnd, TranslateT("Enter public key"), TranslateT("Error"), MB_OK); - return; + if (m_iItem == -1) { + m_iItem = m_list->AddItem(ipv4, -1, NULL, 1); + m_list->SetItemState(m_iItem, LVIS_FOCUSED | LVIS_SELECTED, 0x000F); + m_list->EnsureVisible(m_iItem, TRUE); + } + else + m_list->SetItem(m_iItem, 0, ipv4); + m_list->SetItem(m_iItem, 2, port); + m_list->SetItem(m_iItem, 3, pubKey); + m_list->SetItem(m_iItem, 4, L"", 0); + m_list->SetItem(m_iItem, 5, L"", 1); + + SendMessage(GetParent(GetParent(m_list->GetHwnd())), PSM_CHANGED, 0, 0); + return true; } - if (m_iItem == -1) { - m_iItem = m_list->AddItem(ipv4, -1, NULL, 1); - m_list->SetItemState(m_iItem, LVIS_FOCUSED | LVIS_SELECTED, 0x000F); - m_list->EnsureVisible(m_iItem, TRUE); + void OnDestroy() override + { + Utils_SaveWindowPosition(m_hwnd, NULL, MODULE, "EditNodeDlg"); } - else - m_list->SetItem(m_iItem, 0, ipv4); - m_list->SetItem(m_iItem, 2, port); - m_list->SetItem(m_iItem, 3, pubKey); - m_list->SetItem(m_iItem, 4, L"", 0); - m_list->SetItem(m_iItem, 5, L"", 1); - - SendMessage(GetParent(GetParent(m_list->GetHwnd())), PSM_CHANGED, 0, 0); - - EndDialog(m_hwnd, 1); -} - -bool CToxNodeEditor::OnClose() -{ - Utils_SaveWindowPosition(m_hwnd, NULL, MODULE, "EditNodeDlg"); - return true; -} +}; /****************************************/ diff --git a/protocols/Tox/src/tox_options.h b/protocols/Tox/src/tox_options.h index 374bfbb5af..fdc8ea7402 100644 --- a/protocols/Tox/src/tox_options.h +++ b/protocols/Tox/src/tox_options.h @@ -57,34 +57,6 @@ public: static CDlgBase *CreateOptionsPage(void *param) { return new CToxOptionsMain((CToxProto*)param, IDD_OPTIONS_MAIN); } }; -///////////////////////////////////////////////////////////////////////////////// - -class CToxNodeEditor : public CDlgBase -{ -private: - typedef CDlgBase CSuper; - - int m_iItem; - CCtrlListView *m_list; - - CCtrlEdit m_ipv4; - CCtrlEdit m_ipv6; - CCtrlEdit m_port; - CCtrlEdit m_pkey; - - CCtrlButton m_ok; - -protected: - bool OnInitDialog() override; - bool OnClose() override; - - void OnOk(CCtrlBase*); - -public: - CToxNodeEditor(int iItem, CCtrlListView *m_list); -}; - - /****************************************/ class CToxOptionsNodeList : public CToxDlgBase diff --git a/protocols/Tox/src/tox_profile.cpp b/protocols/Tox/src/tox_profile.cpp index 2b8ef857c5..d414f75a8d 100644 --- a/protocols/Tox/src/tox_profile.cpp +++ b/protocols/Tox/src/tox_profile.cpp @@ -16,6 +16,42 @@ wchar_t* CToxProto::GetToxProfilePath(const wchar_t *accountName) return profilePath; } +///////////////////////////////////////////////////////////////////////////////////////// +// ENTER PASSWORD + +class CToxEnterPasswordDlg : public CToxDlgBase +{ + CCtrlEdit m_password; + + CCtrlButton m_ok; + +public: + CToxEnterPasswordDlg(CToxProto *proto) : + CToxDlgBase(proto, IDD_PASSWORD_ENTER), + m_password(this, IDC_PASSWORD), + m_ok(this, IDOK) + { + m_password.OnChange = Callback(this, &CToxEnterPasswordDlg::Password_OnChange); + } + + bool OnInitDialog() override + { + m_ok.Disable(); + return true; + } + + bool OnApply() override + { + m_proto->setWString(TOX_SETTINGS_PASSWORD, pass_ptrW(m_password.GetText())); + return true; + } + + void Password_OnChange(CCtrlBase *) + { + m_ok.Enable(GetWindowTextLength(m_password.GetHwnd()) != 0); + } +}; + static INT_PTR CALLBACK EnterPassword(void *param) { CToxProto *proto = (CToxProto*)param; @@ -163,172 +199,167 @@ INT_PTR CToxProto::OnCopyToxID(WPARAM, LPARAM) return 0; } -INT_PTR CToxProto::OnCreatePassword(WPARAM, LPARAM) -{ - pass_ptrW password(getWStringA(TOX_SETTINGS_PASSWORD)); - CToxCreatePasswordDlg passwordDlg(this); - passwordDlg.DoModal(); - return 0; -} +///////////////////////////////////////////////////////////////////////////////////////// +// CREATE PASSWORD -INT_PTR CToxProto::OnChangePassword(WPARAM, LPARAM) +class CToxCreatePasswordDlg : public CToxDlgBase { - CToxChangePasswordDlg passwordDlg(this); - passwordDlg.DoModal(); - return 0; -} + CCtrlEdit m_newPassword; + CCtrlEdit m_confirmPassword; + CCtrlBase m_passwordValidation; + CCtrlButton m_ok; + +public: + CToxCreatePasswordDlg(CToxProto *proto) : + CToxDlgBase(proto, IDD_PASSWORD_CREATE), + m_ok(this, IDOK), + m_newPassword(this, IDC_PASSWORD_NEW), + m_confirmPassword(this, IDC_PASSWORD_CONFIRM), + m_passwordValidation(this, IDC_PASSWORD_VALIDATION) + { + m_newPassword.OnChange = Callback(this, &CToxCreatePasswordDlg::Password_OnChange); + m_confirmPassword.OnChange = Callback(this, &CToxCreatePasswordDlg::Password_OnChange); + } -INT_PTR CToxProto::OnRemovePassword(WPARAM, LPARAM) -{ - const wchar_t *message = TranslateT("Removing the password will lead to decryption of the profile.\r\nAre you sure to remove password?"); - int result = MessageBox(nullptr, message, TranslateT("Remove password"), MB_YESNO | MB_ICONQUESTION); - if (result == IDYES) { - delSetting(TOX_SETTINGS_PASSWORD); - SaveToxProfile(m_tox); + bool OnInitDialog() override + { + LOGFONT lf; + HFONT hFont = (HFONT)m_passwordValidation.SendMsg(WM_GETFONT, 0, 0); + GetObject(hFont, sizeof(lf), &lf); + lf.lfWeight = FW_BOLD; + m_passwordValidation.SendMsg(WM_SETFONT, (WPARAM)CreateFontIndirect(&lf), 0); + + m_ok.Disable(); + return true; } - return 0; -} -/* ENTER PASSWORD */ + bool OnApply() override + { + m_proto->setWString(TOX_SETTINGS_PASSWORD, pass_ptrW(m_newPassword.GetText())); + m_proto->SaveToxProfile(m_proto->m_tox); + return true; + } -CToxEnterPasswordDlg::CToxEnterPasswordDlg(CToxProto *proto) - : CToxDlgBase(proto, IDD_PASSWORD_ENTER), - m_password(this, IDC_PASSWORD), - m_ok(this, IDOK) -{ - m_password.OnChange = Callback(this, &CToxEnterPasswordDlg::Password_OnChange); - m_ok.OnClick = Callback(this, &CToxEnterPasswordDlg::OnOk); -} + void Password_OnChange(CCtrlBase *) + { + pass_ptrW newPassword(m_newPassword.GetText()); + if (mir_wstrlen(newPassword) == 0) { + m_ok.Disable(); + m_passwordValidation.SetText(TranslateT("New password is empty")); + return; + } -bool CToxEnterPasswordDlg::OnInitDialog() -{ - m_ok.Disable(); - return true; -} + pass_ptrW confirmPassword(m_confirmPassword.GetText()); + if (mir_wstrcmp(newPassword, confirmPassword) != 0) { + m_ok.Disable(); + m_passwordValidation.SetText(TranslateT("New password is not equal to confirmation")); + return; + } -void CToxEnterPasswordDlg::Password_OnChange(CCtrlBase*) -{ - m_ok.Enable(GetWindowTextLength(m_password.GetHwnd()) != 0); -} + m_passwordValidation.SetText(L""); + m_ok.Enable(); + } +}; -void CToxEnterPasswordDlg::OnOk(CCtrlButton*) +INT_PTR CToxProto::OnCreatePassword(WPARAM, LPARAM) { - m_proto->setWString(TOX_SETTINGS_PASSWORD, pass_ptrW(m_password.GetText())); - EndDialog(m_hwnd, 1); + pass_ptrW password(getWStringA(TOX_SETTINGS_PASSWORD)); + CToxCreatePasswordDlg(this).DoModal(); + return 0; } -/* CREATE PASSWORD */ +///////////////////////////////////////////////////////////////////////////////////////// +// CHANGE PASSWORD -CToxCreatePasswordDlg::CToxCreatePasswordDlg(CToxProto *proto) - : CToxDlgBase(proto, IDD_PASSWORD_CREATE), - m_newPassword(this, IDC_PASSWORD_NEW), - m_confirmPassword(this, IDC_PASSWORD_CONFIRM), - m_passwordValidation(this, IDC_PASSWORD_VALIDATION), - m_ok(this, IDOK) +class CToxChangePasswordDlg : public CToxDlgBase { - m_newPassword.OnChange = Callback(this, &CToxCreatePasswordDlg::Password_OnChange); - m_confirmPassword.OnChange = Callback(this, &CToxCreatePasswordDlg::Password_OnChange); - m_ok.OnClick = Callback(this, &CToxCreatePasswordDlg::OnOk); -} + CCtrlEdit m_oldPassword; + + CCtrlEdit m_newPassword; + CCtrlEdit m_confirmPassword; + + CCtrlBase m_passwordValidation; + + CCtrlButton m_ok; + +public: + CToxChangePasswordDlg(CToxProto *proto) : + CToxDlgBase(proto, IDD_PASSWORD_CHANGE), + m_oldPassword(this, IDC_PASSWORD), + m_newPassword(this, IDC_PASSWORD_NEW), + m_confirmPassword(this, IDC_PASSWORD_CONFIRM), + m_passwordValidation(this, IDC_PASSWORD_VALIDATION), + m_ok(this, IDOK) + { + m_oldPassword.OnChange = Callback(this, &CToxChangePasswordDlg::Password_OnChange); + m_newPassword.OnChange = Callback(this, &CToxChangePasswordDlg::Password_OnChange); + m_confirmPassword.OnChange = Callback(this, &CToxChangePasswordDlg::Password_OnChange); + } -bool CToxCreatePasswordDlg::OnInitDialog() -{ - LOGFONT lf; - HFONT hFont = (HFONT)m_passwordValidation.SendMsg(WM_GETFONT, 0, 0); - GetObject(hFont, sizeof(lf), &lf); - lf.lfWeight = FW_BOLD; - m_passwordValidation.SendMsg(WM_SETFONT, (WPARAM)CreateFontIndirect(&lf), 0); - - m_ok.Disable(); - return true; -} + bool OnInitDialog() override + { + LOGFONT lf; + HFONT hFont = (HFONT)m_passwordValidation.SendMsg(WM_GETFONT, 0, 0); + GetObject(hFont, sizeof(lf), &lf); + lf.lfWeight = FW_BOLD; + m_passwordValidation.SendMsg(WM_SETFONT, (WPARAM)CreateFontIndirect(&lf), 0); -void CToxCreatePasswordDlg::Password_OnChange(CCtrlBase*) -{ - pass_ptrW newPassword(m_newPassword.GetText()); - if (mir_wstrlen(newPassword) == 0) { m_ok.Disable(); - m_passwordValidation.SetText(TranslateT("New password is empty")); - return; + return true; } - pass_ptrW confirmPassword(m_confirmPassword.GetText()); - if (mir_wstrcmp(newPassword, confirmPassword) != 0) { - m_ok.Disable(); - m_passwordValidation.SetText(TranslateT("New password is not equal to confirmation")); - return; + bool OnApply() override + { + m_proto->setWString(TOX_SETTINGS_PASSWORD, pass_ptrW(m_newPassword.GetText())); + m_proto->SaveToxProfile(m_proto->m_tox); + return true; } - m_passwordValidation.SetText(L""); - m_ok.Enable(); -} + void Password_OnChange(CCtrlBase *) + { + pass_ptrW dbPassword(m_proto->getWStringA(TOX_SETTINGS_PASSWORD)); + pass_ptrW oldPassword(m_oldPassword.GetText()); + if (mir_wstrlen(dbPassword) > 0 && mir_wstrcmp(dbPassword, oldPassword) != 0) { + m_ok.Disable(); + m_passwordValidation.SetText(TranslateT("Old password is not valid")); + return; + } -void CToxCreatePasswordDlg::OnOk(CCtrlButton*) -{ - m_proto->setWString(TOX_SETTINGS_PASSWORD, pass_ptrW(m_newPassword.GetText())); - m_proto->SaveToxProfile(m_proto->m_tox); - EndDialog(m_hwnd, 1); -} + pass_ptrW newPassword(m_newPassword.GetText()); + if (mir_wstrlen(newPassword) == 0) { + m_ok.Disable(); + m_passwordValidation.SetText(TranslateT("New password is empty")); + return; + } -/* CHANGE PASSWORD */ + pass_ptrW confirmPassword(m_confirmPassword.GetText()); + if (mir_wstrcmp(newPassword, confirmPassword) != 0) { + m_ok.Disable(); + m_passwordValidation.SetText(TranslateT("New password is not equal to confirmation")); + return; + } -CToxChangePasswordDlg::CToxChangePasswordDlg(CToxProto *proto) - : CToxDlgBase(proto, IDD_PASSWORD_CHANGE), - m_oldPassword(this, IDC_PASSWORD), - m_newPassword(this, IDC_PASSWORD_NEW), - m_confirmPassword(this, IDC_PASSWORD_CONFIRM), - m_passwordValidation(this, IDC_PASSWORD_VALIDATION), - m_ok(this, IDOK) -{ - m_oldPassword.OnChange = Callback(this, &CToxChangePasswordDlg::Password_OnChange); - m_newPassword.OnChange = Callback(this, &CToxChangePasswordDlg::Password_OnChange); - m_confirmPassword.OnChange = Callback(this, &CToxChangePasswordDlg::Password_OnChange); - m_ok.OnClick = Callback(this, &CToxChangePasswordDlg::OnOk); -} + m_passwordValidation.SetText(L""); + m_ok.Enable(); + } +}; -bool CToxChangePasswordDlg::OnInitDialog() +INT_PTR CToxProto::OnChangePassword(WPARAM, LPARAM) { - LOGFONT lf; - HFONT hFont = (HFONT)m_passwordValidation.SendMsg(WM_GETFONT, 0, 0); - GetObject(hFont, sizeof(lf), &lf); - lf.lfWeight = FW_BOLD; - m_passwordValidation.SendMsg(WM_SETFONT, (WPARAM)CreateFontIndirect(&lf), 0); - - m_ok.Disable(); - return true; + CToxChangePasswordDlg passwordDlg(this); + passwordDlg.DoModal(); + return 0; } -void CToxChangePasswordDlg::Password_OnChange(CCtrlBase*) -{ - pass_ptrW dbPassword(m_proto->getWStringA(TOX_SETTINGS_PASSWORD)); - pass_ptrW oldPassword(m_oldPassword.GetText()); - if (mir_wstrlen(dbPassword) > 0 && mir_wstrcmp(dbPassword, oldPassword) != 0) { - m_ok.Disable(); - m_passwordValidation.SetText(TranslateT("Old password is not valid")); - return; - } +///////////////////////////////////////////////////////////////////////////////////////// - pass_ptrW newPassword(m_newPassword.GetText()); - if (mir_wstrlen(newPassword) == 0) { - m_ok.Disable(); - m_passwordValidation.SetText(TranslateT("New password is empty")); - return; - } - - pass_ptrW confirmPassword(m_confirmPassword.GetText()); - if (mir_wstrcmp(newPassword, confirmPassword) != 0) { - m_ok.Disable(); - m_passwordValidation.SetText(TranslateT("New password is not equal to confirmation")); - return; - } - - m_passwordValidation.SetText(L""); - m_ok.Enable(); -} - -void CToxChangePasswordDlg::OnOk(CCtrlButton*) +INT_PTR CToxProto::OnRemovePassword(WPARAM, LPARAM) { - m_proto->setWString(TOX_SETTINGS_PASSWORD, pass_ptrW(m_newPassword.GetText())); - m_proto->SaveToxProfile(m_proto->m_tox); - EndDialog(m_hwnd, 1); + const wchar_t *message = TranslateT("Removing the password will lead to decryption of the profile.\r\nAre you sure to remove password?"); + int result = MessageBox(nullptr, message, TranslateT("Remove password"), MB_YESNO | MB_ICONQUESTION); + if (result == IDYES) { + delSetting(TOX_SETTINGS_PASSWORD); + SaveToxProfile(m_tox); + } + return 0; } diff --git a/protocols/Tox/src/tox_profile.h b/protocols/Tox/src/tox_profile.h deleted file mode 100644 index fd23665c90..0000000000 --- a/protocols/Tox/src/tox_profile.h +++ /dev/null @@ -1,69 +0,0 @@ -#ifndef _TOX_PROFILE_H_ -#define _TOX_PROFILE_H_ - -/* ENTER PASSWORD */ - -class CToxEnterPasswordDlg : public CToxDlgBase -{ -private: - CCtrlEdit m_password; - - CCtrlButton m_ok; - -protected: - bool OnInitDialog() override; - - void Password_OnChange(CCtrlBase*); - void OnOk(CCtrlButton*); - -public: - CToxEnterPasswordDlg(CToxProto *proto); -}; - -/* CREATE PASSWORD */ - -class CToxCreatePasswordDlg : public CToxDlgBase -{ -private: - CCtrlEdit m_newPassword; - CCtrlEdit m_confirmPassword; - - CCtrlBase m_passwordValidation; - - CCtrlButton m_ok; - -protected: - bool OnInitDialog() override; - - void Password_OnChange(CCtrlBase*); - void OnOk(CCtrlButton*); - -public: - CToxCreatePasswordDlg(CToxProto *proto); -}; - -/* CHANGE PASSWORD */ - -class CToxChangePasswordDlg : public CToxDlgBase -{ -private: - CCtrlEdit m_oldPassword; - - CCtrlEdit m_newPassword; - CCtrlEdit m_confirmPassword; - - CCtrlBase m_passwordValidation; - - CCtrlButton m_ok; - -protected: - bool OnInitDialog() override; - - void Password_OnChange(CCtrlBase*); - void OnOk(CCtrlButton*); - -public: - CToxChangePasswordDlg(CToxProto *proto); -}; - -#endif //_TOX_PROFILE_H_ \ No newline at end of file diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h index f78985f42b..681df6dcab 100644 --- a/protocols/Tox/src/tox_proto.h +++ b/protocols/Tox/src/tox_proto.h @@ -3,11 +3,11 @@ struct CToxProto : public PROTO { - friend CToxEnterPasswordDlg; - friend CToxCreatePasswordDlg; - friend CToxChangePasswordDlg; - friend CToxOptionsMain; - friend CToxOptionsNodeList; + friend class CToxEnterPasswordDlg; + friend class CToxCreatePasswordDlg; + friend class CToxChangePasswordDlg; + friend class CToxOptionsMain; + friend class CToxOptionsNodeList; public: ////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3