From 8f6650583ad1d12a081a1676275d8f527af33351 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 18 Apr 2018 12:59:15 +0300 Subject: this feature was never used and only causes problems --- protocols/JabberG/src/jabber_agent.cpp | 4 ++-- protocols/JabberG/src/jabber_bookmarks.cpp | 2 +- protocols/JabberG/src/jabber_chat.cpp | 2 +- protocols/JabberG/src/jabber_console.cpp | 2 +- protocols/JabberG/src/jabber_disco.cpp | 2 +- protocols/JabberG/src/jabber_groupchat.cpp | 4 ++-- protocols/JabberG/src/jabber_notes.cpp | 2 +- protocols/JabberG/src/jabber_opt.cpp | 10 +++++----- protocols/JabberG/src/jabber_privacy.cpp | 6 +++--- protocols/JabberG/src/jabber_svc.cpp | 2 +- protocols/JabberG/src/jabber_xstatus.cpp | 2 +- protocols/JabberG/src/stdafx.h | 4 ++-- 12 files changed, 21 insertions(+), 21 deletions(-) (limited to 'protocols/JabberG/src') diff --git a/protocols/JabberG/src/jabber_agent.cpp b/protocols/JabberG/src/jabber_agent.cpp index 945640d6b5..80f51ae354 100644 --- a/protocols/JabberG/src/jabber_agent.cpp +++ b/protocols/JabberG/src/jabber_agent.cpp @@ -35,7 +35,7 @@ class CAgentRegProgressDlg : public CJabberDlgBase public: CAgentRegProgressDlg(CJabberProto *_ppro, HWND _owner) : - CJabberDlgBase(_ppro, IDD_OPT_REGISTER, false), + CJabberDlgBase(_ppro, IDD_OPT_REGISTER), m_ok(this, IDOK) { SetParent(_owner); @@ -88,7 +88,7 @@ class CAgentRegDlg : public CJabberDlgBase public: CAgentRegDlg(CJabberProto *_ppro, wchar_t *_jid) : - CJabberDlgBase(_ppro, IDD_FORM, false), + CJabberDlgBase(_ppro, IDD_FORM), m_submit(this, IDC_SUBMIT), m_jid(_jid), m_agentRegIqNode(nullptr) diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp index 0c3846b21a..56f1faa408 100644 --- a/protocols/JabberG/src/jabber_bookmarks.cpp +++ b/protocols/JabberG/src/jabber_bookmarks.cpp @@ -247,7 +247,7 @@ private: }; CJabberDlgBookmarks::CJabberDlgBookmarks(CJabberProto *proto) : - CSuper(proto, IDD_BOOKMARKS, nullptr), + CSuper(proto, IDD_BOOKMARKS), m_btnAdd(this, IDC_ADD, SKINICON_OTHER_ADDCONTACT, LPGEN("Add")), m_btnEdit(this, IDC_EDIT, SKINICON_OTHER_RENAME, LPGEN("Edit")), m_btnRemove(this, IDC_REMOVE, SKINICON_OTHER_DELETE, LPGEN("Remove")), diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index 50cfa1acae..ce0f6ba36e 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -689,7 +689,7 @@ class CGroupchatInviteDlg : public CJabberDlgBase public: CGroupchatInviteDlg(CJabberProto *ppro, const wchar_t *room) : - CSuper(ppro, IDD_GROUPCHAT_INVITE, nullptr), + CSuper(ppro, IDD_GROUPCHAT_INVITE), m_newJids(1), m_btnInvite(this, IDC_INVITE), m_txtNewJid(this, IDC_NEWJID), diff --git a/protocols/JabberG/src/jabber_console.cpp b/protocols/JabberG/src/jabber_console.cpp index 32ba0492f0..094b4555e0 100644 --- a/protocols/JabberG/src/jabber_console.cpp +++ b/protocols/JabberG/src/jabber_console.cpp @@ -328,7 +328,7 @@ protected: }; CJabberDlgConsole::CJabberDlgConsole(CJabberProto *proto): - CJabberDlgBase(proto, IDD_CONSOLE, nullptr) + CJabberDlgBase(proto, IDD_CONSOLE) { } diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp index 8939d14367..e6d123e7fd 100644 --- a/protocols/JabberG/src/jabber_disco.cpp +++ b/protocols/JabberG/src/jabber_disco.cpp @@ -609,7 +609,7 @@ private: }; CJabberDlgDiscovery::CJabberDlgDiscovery(CJabberProto *proto, wchar_t *jid) : - CJabberDlgBase(proto, IDD_SERVICE_DISCOVERY, nullptr), + CJabberDlgBase(proto, IDD_SERVICE_DISCOVERY), m_jid(jid), m_btnViewAsTree(this, IDC_BTN_VIEWTREE, proto->LoadIconEx("sd_view_tree"), "View as tree"), m_btnViewAsList(this, IDC_BTN_VIEWLIST, proto->LoadIconEx("sd_view_list"), "View as list"), diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp index 1b88b6486e..89c1f215ed 100644 --- a/protocols/JabberG/src/jabber_groupchat.cpp +++ b/protocols/JabberG/src/jabber_groupchat.cpp @@ -401,7 +401,7 @@ protected: }; CJabberDlgGcJoin::CJabberDlgGcJoin(CJabberProto *proto, wchar_t *jid) : - CSuper(proto, IDD_GROUPCHAT_JOIN, nullptr), + CSuper(proto, IDD_GROUPCHAT_JOIN), btnOk(this, IDOK), m_jid(mir_wstrdup(jid)) { @@ -1140,7 +1140,7 @@ class CGroupchatInviteAcceptDlg : public CJabberDlgBase public: CGroupchatInviteAcceptDlg(CJabberProto *ppro, const wchar_t *roomJid, const wchar_t *from, const wchar_t *reason, const wchar_t *password) : - CSuper(ppro, IDD_GROUPCHAT_INVITE_ACCEPT, nullptr), + CSuper(ppro, IDD_GROUPCHAT_INVITE_ACCEPT), m_roomJid(roomJid), m_from(from), m_reason(reason), m_password(password), m_accept(this, IDC_ACCEPT) { diff --git a/protocols/JabberG/src/jabber_notes.cpp b/protocols/JabberG/src/jabber_notes.cpp index f38eae0285..07784b7ad7 100644 --- a/protocols/JabberG/src/jabber_notes.cpp +++ b/protocols/JabberG/src/jabber_notes.cpp @@ -610,7 +610,7 @@ private: }; CJabberDlgNotes::CJabberDlgNotes(CJabberProto *proto) : - CSuper(proto, IDD_NOTEBOOK, nullptr), + CSuper(proto, IDD_NOTEBOOK), m_btnAdd(this, IDC_ADD, SKINICON_OTHER_ADDCONTACT, LPGEN("Add")), m_btnEdit(this, IDC_EDIT, SKINICON_OTHER_RENAME, LPGEN("Edit")), m_btnRemove(this, IDC_REMOVE, SKINICON_OTHER_DELETE, LPGEN("Remove")), diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index 13b694adf4..049e11a2c2 100755 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -229,7 +229,7 @@ class CJabberDlgRegister : public CJabberDlgBase typedef CJabberDlgBase CSuper; public: CJabberDlgRegister(CJabberProto *proto, HWND hwndParent, JABBER_CONN_DATA *regInfo) : - CJabberDlgBase(proto, IDD_OPT_REGISTER, false), + CJabberDlgBase(proto, IDD_OPT_REGISTER), m_bProcessStarted(false), m_regInfo(regInfo), m_btnOk(this, IDOK) @@ -363,7 +363,7 @@ class CDlgOptAccount : public CJabberDlgBase public: CDlgOptAccount(CJabberProto *proto) : - CJabberDlgBase(proto, IDD_OPT_JABBER, false), + CJabberDlgBase(proto, IDD_OPT_JABBER), m_txtUsername(this, IDC_EDIT_USERNAME), m_txtPassword(this, IDC_EDIT_PASSWORD), m_txtPriority(this, IDC_PRIORITY), @@ -764,7 +764,7 @@ class CDlgOptAdvanced : public CJabberDlgBase public: CDlgOptAdvanced(CJabberProto *proto) : - CJabberDlgBase(proto, IDD_OPT_JABBER2, false), + CJabberDlgBase(proto, IDD_OPT_JABBER2), m_chkDirect(this, IDC_DIRECT), m_chkDirectManual(this, IDC_DIRECT_MANUAL), m_chkProxy(this, IDC_PROXY_MANUAL), @@ -897,7 +897,7 @@ class CDlgOptGc : public CJabberDlgBase public: CDlgOptGc(CJabberProto *proto) : - CJabberDlgBase(proto, IDD_OPT_JABBER4, false), + CJabberDlgBase(proto, IDD_OPT_JABBER4), m_txtAltNick(this, IDC_TXT_ALTNICK), m_txtSlap(this, IDC_TXT_SLAP), m_txtQuit(this, IDC_TXT_QUIT), @@ -1537,7 +1537,7 @@ class CJabberDlgAccMgrUI : public CJabberDlgBase public: CJabberDlgAccMgrUI(CJabberProto *proto, HWND hwndParent) : - CJabberDlgBase(proto, IDD_ACCMGRUI, false), + CJabberDlgBase(proto, IDD_ACCMGRUI), m_cbType(this, IDC_CB_TYPE), m_txtUsername(this, IDC_EDIT_USERNAME), m_txtPassword(this, IDC_EDIT_PASSWORD), diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index 4496d76659..addd488905 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -301,7 +301,7 @@ public: wchar_t szLine[512]; CJabberDlgPrivacyAddList(CJabberProto *proto, HWND hwndParent): - CJabberDlgBase(proto, IDD_PRIVACY_ADD_LIST, false), + CJabberDlgBase(proto, IDD_PRIVACY_ADD_LIST), m_txtName(this, IDC_EDIT_NAME), m_btnOk(this, IDOK), m_btnCancel(this, IDCANCEL) @@ -343,7 +343,7 @@ public: CPrivacyListRule *m_pRule; CJabberDlgPrivacyRule(CJabberProto *proto, HWND hwndParent, CPrivacyListRule *pRule): - CJabberDlgBase(proto, IDD_PRIVACY_RULE, false), + CJabberDlgBase(proto, IDD_PRIVACY_RULE), m_btnOk(this, IDOK), m_btnCancel(this, IDCANCEL), m_cbType(this, IDC_COMBO_TYPE) @@ -713,7 +713,7 @@ int CJabberDlgPrivacyLists::idAdvancedControls[] = }; CJabberDlgPrivacyLists::CJabberDlgPrivacyLists(CJabberProto *proto): - CSuper(proto, IDD_PRIVACY_LISTS, nullptr), + CSuper(proto, IDD_PRIVACY_LISTS), m_btnSimple(this, IDC_BTN_SIMPLE, proto->LoadIconEx("group"), LPGEN("Simple mode")), m_btnAdvanced(this, IDC_BTN_ADVANCED, proto->LoadIconEx("sd_view_list"), LPGEN("Advanced mode")), m_btnAddJid(this, IDC_ADDJID, proto->LoadIconEx("addroster"), LPGEN("Add JID")), diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp index 025cfde623..928ff04025 100644 --- a/protocols/JabberG/src/jabber_svc.cpp +++ b/protocols/JabberG/src/jabber_svc.cpp @@ -567,7 +567,7 @@ class CJabberDlgHttpAuth: public CJabberDlgBase public: CJabberDlgHttpAuth(CJabberProto *proto, HWND hwndParent, CJabberHttpAuthParams *pParams): - CSuper(proto, IDD_HTTP_AUTH, true), + CSuper(proto, IDD_HTTP_AUTH), m_txtInfo(this, IDC_EDIT_HTTP_AUTH_INFO), m_btnAuth(this, IDOK), m_btnDeny(this, IDCANCEL), diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp index 76952ded88..f71bc05754 100644 --- a/protocols/JabberG/src/jabber_xstatus.cpp +++ b/protocols/JabberG/src/jabber_xstatus.cpp @@ -54,7 +54,7 @@ private: }; CJabberDlgPepBase::CJabberDlgPepBase(CJabberProto *proto, int id) : - CJabberDlgBase(proto, id, nullptr), + CJabberDlgBase(proto, id), m_btnOk(this, IDOK), m_btnCancel(this, IDCANCEL), m_time(5) diff --git a/protocols/JabberG/src/stdafx.h b/protocols/JabberG/src/stdafx.h index 6edf05c6aa..464d3e8259 100755 --- a/protocols/JabberG/src/stdafx.h +++ b/protocols/JabberG/src/stdafx.h @@ -115,8 +115,8 @@ class CJabberDlgBase : public CProtoDlgBase { typedef CProtoDlgBase CSuper; protected: - __inline CJabberDlgBase(CJabberProto *proto, int idDialog, bool show_label=true) : - CSuper(proto, idDialog, show_label) + __inline CJabberDlgBase(CJabberProto *proto, int idDialog) : + CSuper(proto, idDialog) { } -- cgit v1.2.3