summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'protocols')
-rw-r--r--protocols/Discord/src/options.cpp2
-rw-r--r--protocols/FacebookRM/src/dialogs.cpp2
-rw-r--r--protocols/Gadu-Gadu/src/options.cpp2
-rw-r--r--protocols/IRCG/src/options.cpp14
-rw-r--r--protocols/IRCG/src/windows.cpp6
-rw-r--r--protocols/IcqOscarJ/src/askauthentication.cpp2
-rw-r--r--protocols/JabberG/src/jabber_agent.cpp4
-rw-r--r--protocols/JabberG/src/jabber_bookmarks.cpp2
-rw-r--r--protocols/JabberG/src/jabber_chat.cpp2
-rw-r--r--protocols/JabberG/src/jabber_console.cpp2
-rw-r--r--protocols/JabberG/src/jabber_disco.cpp2
-rw-r--r--protocols/JabberG/src/jabber_groupchat.cpp4
-rw-r--r--protocols/JabberG/src/jabber_notes.cpp2
-rwxr-xr-xprotocols/JabberG/src/jabber_opt.cpp10
-rw-r--r--protocols/JabberG/src/jabber_privacy.cpp6
-rw-r--r--protocols/JabberG/src/jabber_svc.cpp2
-rw-r--r--protocols/JabberG/src/jabber_xstatus.cpp2
-rwxr-xr-xprotocols/JabberG/src/stdafx.h4
-rw-r--r--protocols/SkypeWeb/src/skype_dialogs.cpp4
-rw-r--r--protocols/SkypeWeb/src/skype_options.cpp2
-rw-r--r--protocols/Steam/src/steam_dialogs.cpp8
-rw-r--r--protocols/Steam/src/steam_options.cpp4
-rw-r--r--protocols/Tox/src/tox_options.cpp4
-rw-r--r--protocols/Tox/src/tox_profile.cpp6
-rw-r--r--protocols/VKontakte/src/vk_dialogs.cpp10
-rw-r--r--protocols/VKontakte/src/vk_options.cpp12
26 files changed, 60 insertions, 60 deletions
diff --git a/protocols/Discord/src/options.cpp b/protocols/Discord/src/options.cpp
index 2ed6333888..12a44b2f5a 100644
--- a/protocols/Discord/src/options.cpp
+++ b/protocols/Discord/src/options.cpp
@@ -27,7 +27,7 @@ class CDiscardAccountOptions : public CProtoDlgBase<CDiscordProto>
public:
CDiscardAccountOptions(CDiscordProto *ppro, int iDlgID) :
- CProtoDlgBase<CDiscordProto>(ppro, iDlgID, false),
+ CProtoDlgBase<CDiscordProto>(ppro, iDlgID),
m_edGroup(this, IDC_GROUP),
m_edUserName(this, IDC_USERNAME),
m_edPassword(this, IDC_PASSWORD),
diff --git a/protocols/FacebookRM/src/dialogs.cpp b/protocols/FacebookRM/src/dialogs.cpp
index b5c1c6645f..7e9447fd02 100644
--- a/protocols/FacebookRM/src/dialogs.cpp
+++ b/protocols/FacebookRM/src/dialogs.cpp
@@ -621,7 +621,7 @@ INT_PTR CALLBACK FBOptionsMessagingProc(HWND hwnd, UINT message, WPARAM wparam,
/////////////////////////////////////////////////////////////////////////////////
CFacebookGuardDialog::CFacebookGuardDialog(FacebookProto *proto, const char *fb_dtsg)
- : CFacebookDlgBase(proto, IDD_GUARD, false),
+ : CFacebookDlgBase(proto, IDD_GUARD),
m_ok(this, IDOK),
m_sms(this, IDC_SEND_SMS),
m_text(this, IDC_TEXT),
diff --git a/protocols/Gadu-Gadu/src/options.cpp b/protocols/Gadu-Gadu/src/options.cpp
index f99a3abc8f..9918d46bba 100644
--- a/protocols/Gadu-Gadu/src/options.cpp
+++ b/protocols/Gadu-Gadu/src/options.cpp
@@ -18,7 +18,7 @@ GaduOptions::GaduOptions(PROTO_INTERFACE *proto) :
GaduOptionsDlgAdvanced::GaduOptionsDlgAdvanced(GaduProto * proto) :
- GaduDlgBase(proto, IDD_OPT_GG_ADVANCED, false),
+ GaduDlgBase(proto, IDD_OPT_GG_ADVANCED),
chkAutoReconnect(this, IDC_ARECONNECT),
chkKeepConnectionAlive(this, IDC_KEEPALIVE),
chkMsgAcknowledge(this, IDC_MSGACK),
diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index bbe588c88a..33a1bc7030 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -285,7 +285,7 @@ struct CServerDlg : public CProtoDlgBase<CIrcProto>
CCtrlCombo m_groupCombo;
CServerDlg(CIrcProto* _pro, CConnectPrefsDlg* _owner, int _action)
- : CProtoDlgBase<CIrcProto>(_pro, IDD_ADDSERVER, false),
+ : CProtoDlgBase<CIrcProto>(_pro, IDD_ADDSERVER),
m_owner(_owner),
m_action(_action),
m_OK(this, IDOK),
@@ -431,7 +431,7 @@ static TDbSetting ConnectSettings[] =
};
CConnectPrefsDlg::CConnectPrefsDlg(CIrcProto* _pro)
- : CProtoDlgBase<CIrcProto>(_pro, IDD_PREFS_CONNECT, false),
+ : CProtoDlgBase<CIrcProto>(_pro, IDD_PREFS_CONNECT),
m_serverCombo(this, IDC_SERVERCOMBO),
m_server(this, IDC_SERVER),
m_port(this, IDC_PORT),
@@ -792,7 +792,7 @@ static TDbSetting CtcpSettings[] =
};
CCtcpPrefsDlg::CCtcpPrefsDlg(CIrcProto* _pro)
- : CProtoDlgBase<CIrcProto>(_pro, IDD_PREFS_CTCP, false),
+ : CProtoDlgBase<CIrcProto>(_pro, IDD_PREFS_CTCP),
m_enableIP(this, IDC_ENABLEIP),
m_fromServer(this, IDC_FROMSERVER),
m_combo(this, IDC_COMBO),
@@ -971,7 +971,7 @@ static LRESULT CALLBACK EditSubclassProc(HWND hwndDlg, UINT msg, WPARAM wParam,
}
COtherPrefsDlg::COtherPrefsDlg(CIrcProto* _pro)
- : CProtoDlgBase<CIrcProto>(_pro, IDD_PREFS_OTHER, false),
+ : CProtoDlgBase<CIrcProto>(_pro, IDD_PREFS_OTHER),
m_url(this, IDC_CUSTOM),
m_performCombo(this, IDC_PERFORMCOMBO),
m_codepage(this, IDC_CODEPAGE),
@@ -1180,7 +1180,7 @@ void COtherPrefsDlg::addPerformComboValue(int idx, const char* szValueName)
// 'add ignore' preferences dialog
CAddIgnoreDlg::CAddIgnoreDlg(CIrcProto* _pro, const wchar_t* mask, CIgnorePrefsDlg* _owner)
- : CProtoDlgBase<CIrcProto>(_pro, IDD_ADDIGNORE, false),
+ : CProtoDlgBase<CIrcProto>(_pro, IDD_ADDIGNORE),
m_Ok(this, IDOK),
m_owner(_owner)
{
@@ -1381,7 +1381,7 @@ void CIrcProto::RewriteIgnoreSettings(void)
}
CIgnorePrefsDlg::CIgnorePrefsDlg(CIrcProto* _pro)
- : CProtoDlgBase<CIrcProto>(_pro, IDD_PREFS_IGNORE, false),
+ : CProtoDlgBase<CIrcProto>(_pro, IDD_PREFS_IGNORE),
m_list(this, IDC_LIST),
m_add(this, IDC_ADD, LoadIconEx(IDI_ADD), LPGEN("Add new ignore")),
m_edit(this, IDC_EDIT, LoadIconEx(IDI_EDIT), LPGEN("Edit this ignore")),
@@ -1725,7 +1725,7 @@ struct CDlgAccMgrUI : public CProtoDlgBase<CIrcProto>
CCtrlEdit m_server, m_port, m_port2, m_pass, m_nick, m_nick2, m_name, m_userID, m_ssl;
CDlgAccMgrUI(CIrcProto* _pro, HWND _owner)
- : CProtoDlgBase<CIrcProto>(_pro, IDD_ACCMGRUI, false),
+ : CProtoDlgBase<CIrcProto>(_pro, IDD_ACCMGRUI),
m_serverCombo(this, IDC_SERVERCOMBO),
m_server(this, IDC_SERVER),
m_port(this, IDC_PORT),
diff --git a/protocols/IRCG/src/windows.cpp b/protocols/IRCG/src/windows.cpp
index 598bb17d69..0529e63153 100644
--- a/protocols/IRCG/src/windows.cpp
+++ b/protocols/IRCG/src/windows.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// Message Box
CMessageBoxDlg::CMessageBoxDlg(CIrcProto *_pro, DCCINFO *_dci)
- : CProtoDlgBase<CIrcProto>(_pro, IDD_MESSAGEBOX, false),
+ : CProtoDlgBase<CIrcProto>(_pro, IDD_MESSAGEBOX),
pdci(_dci),
m_Ok(this, IDOK)
{
@@ -251,7 +251,7 @@ void CNickDlg::OnOk(CCtrlButton*)
#define LIST_TIMER 10
CListDlg::CListDlg(CIrcProto *_pro)
- : CProtoDlgBase<CIrcProto>(_pro, IDD_LIST, false),
+ : CProtoDlgBase<CIrcProto>(_pro, IDD_LIST),
m_Join(this, IDC_JOIN),
m_list(this, IDC_INFO_LISTVIEW),
m_list2(this, IDC_INFO_LISTVIEW2),
@@ -1370,7 +1370,7 @@ void CManagerDlg::InitManager(int mode, const wchar_t* window)
// 'cool' dialog
CCoolIrcDlg::CCoolIrcDlg(CIrcProto* _pro, int dlgId)
- : CProtoDlgBase<CIrcProto>(_pro, dlgId, false)
+ : CProtoDlgBase<CIrcProto>(_pro, dlgId)
{}
void CCoolIrcDlg::OnInitDialog()
diff --git a/protocols/IcqOscarJ/src/askauthentication.cpp b/protocols/IcqOscarJ/src/askauthentication.cpp
index 5634771572..998390767e 100644
--- a/protocols/IcqOscarJ/src/askauthentication.cpp
+++ b/protocols/IcqOscarJ/src/askauthentication.cpp
@@ -34,7 +34,7 @@ class AskAuthProcDlg : public CProtoDlgBase<CIcqProto>
public:
AskAuthProcDlg(CIcqProto *_ppro, MCONTACT _hContact) :
- CProtoDlgBase<CIcqProto>(_ppro, IDD_ASKAUTH, false),
+ CProtoDlgBase<CIcqProto>(_ppro, IDD_ASKAUTH),
m_hContact(_hContact),
m_auth(this, IDC_EDITAUTH),
m_btnOk(this, IDOK)
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<CJabberProto>
{
typedef CProtoDlgBase<CJabberProto> 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)
{
}
diff --git a/protocols/SkypeWeb/src/skype_dialogs.cpp b/protocols/SkypeWeb/src/skype_dialogs.cpp
index a10eaafb62..231b1025d6 100644
--- a/protocols/SkypeWeb/src/skype_dialogs.cpp
+++ b/protocols/SkypeWeb/src/skype_dialogs.cpp
@@ -32,7 +32,7 @@ void CSkypeProto::CloseDialogs()
//CSkypeInvideDlg
CSkypeInviteDlg::CSkypeInviteDlg(CSkypeProto *proto) :
- CSkypeDlgBase(proto, IDD_GC_INVITE, false), m_ok(this, IDOK), m_cancel(this, IDCANCEL), m_combo(this, IDC_CONTACT), m_hContact(NULL)
+ CSkypeDlgBase(proto, IDD_GC_INVITE), m_ok(this, IDOK), m_cancel(this, IDCANCEL), m_combo(this, IDC_CONTACT), m_hContact(NULL)
{
m_ok.OnClick = Callback(this, &CSkypeInviteDlg::btnOk_OnOk);
}
@@ -52,7 +52,7 @@ void CSkypeInviteDlg::btnOk_OnOk(CCtrlButton*)
//CSkypeGCCreateDlg
CSkypeGCCreateDlg::CSkypeGCCreateDlg(CSkypeProto *proto) :
- CSkypeDlgBase(proto, IDD_GC_CREATE, false), m_ok(this, IDOK), m_cancel(this, IDCANCEL), m_clc(this, IDC_CLIST), m_ContactsList(1)
+ CSkypeDlgBase(proto, IDD_GC_CREATE), m_ok(this, IDOK), m_cancel(this, IDCANCEL), m_clc(this, IDC_CLIST), m_ContactsList(1)
{
m_ok.OnClick = Callback(this, &CSkypeGCCreateDlg::btnOk_OnOk);
m_clc.OnListRebuilt = Callback(this, &CSkypeGCCreateDlg::FilterList);
diff --git a/protocols/SkypeWeb/src/skype_options.cpp b/protocols/SkypeWeb/src/skype_options.cpp
index 33a14de790..a8941a18ee 100644
--- a/protocols/SkypeWeb/src/skype_options.cpp
+++ b/protocols/SkypeWeb/src/skype_options.cpp
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdafx.h"
CSkypeOptionsMain::CSkypeOptionsMain(CSkypeProto *proto, int idDialog)
- : CSkypeDlgBase(proto, idDialog, false),
+ : CSkypeDlgBase(proto, idDialog),
m_skypename(this, IDC_SKYPENAME),
m_password(this, IDC_PASSWORD),
m_group(this, IDC_GROUP),
diff --git a/protocols/Steam/src/steam_dialogs.cpp b/protocols/Steam/src/steam_dialogs.cpp
index 080b0b3d6b..569ee3de8f 100644
--- a/protocols/Steam/src/steam_dialogs.cpp
+++ b/protocols/Steam/src/steam_dialogs.cpp
@@ -1,7 +1,7 @@
#include "stdafx.h"
CSteamPasswordEditor::CSteamPasswordEditor(CSteamProto *proto)
- : CSteamDlgBase(proto, IDD_PASSWORD_EDITOR, false), m_ok(this, IDOK),
+ : CSteamDlgBase(proto, IDD_PASSWORD_EDITOR), m_ok(this, IDOK),
m_password(this, IDC_PASSWORD), m_savePermanently(this, IDC_SAVEPERMANENTLY)
{
m_ok.OnClick = Callback(this, &CSteamPasswordEditor::OnOk);
@@ -35,7 +35,7 @@ void CSteamPasswordEditor::OnClose()
/////////////////////////////////////////////////////////////////////////////////
CSteamGuardDialog::CSteamGuardDialog(CSteamProto *proto, const char *domain)
- : CSteamDlgBase(proto, IDD_GUARD, false),
+ : CSteamDlgBase(proto, IDD_GUARD),
m_ok(this, IDOK),
m_text(this, IDC_TEXT),
m_link(this, IDC_GETDOMAIN, domain)
@@ -75,7 +75,7 @@ const char* CSteamGuardDialog::GetGuardCode()
/////////////////////////////////////////////////////////////////////////////////
CSteamTwoFactorDialog::CSteamTwoFactorDialog(CSteamProto *proto)
-: CSteamDlgBase(proto, IDD_TWOFACTOR, false),
+: CSteamDlgBase(proto, IDD_TWOFACTOR),
m_ok(this, IDOK),
m_text(this, IDC_TEXT)
{
@@ -113,7 +113,7 @@ const char* CSteamTwoFactorDialog::GetTwoFactorCode()
/////////////////////////////////////////////////////////////////////////////////
CSteamCaptchaDialog::CSteamCaptchaDialog(CSteamProto *proto, const uint8_t *captchaImage, int captchaImageSize)
- : CSteamDlgBase(proto, IDD_CAPTCHA, false),
+ : CSteamDlgBase(proto, IDD_CAPTCHA),
m_ok(this, IDOK), m_text(this, IDC_TEXT),
m_captchaImage(nullptr)
{
diff --git a/protocols/Steam/src/steam_options.cpp b/protocols/Steam/src/steam_options.cpp
index 88716ca0c9..21ecd18828 100644
--- a/protocols/Steam/src/steam_options.cpp
+++ b/protocols/Steam/src/steam_options.cpp
@@ -1,7 +1,7 @@
#include "stdafx.h"
CSteamOptionsMain::CSteamOptionsMain(CSteamProto *proto, int idDialog, HWND hwndParent)
- : CSteamDlgBase(proto, idDialog, false),
+ : CSteamDlgBase(proto, idDialog),
m_username(this, IDC_USERNAME), m_password(this, IDC_PASSWORD),
m_group(this, IDC_GROUP), m_biggerAvatars(this, IDC_BIGGER_AVATARS),
m_showChatEvents(this, IDC_SHOW_CHAT_EVENTS), m_pollingErrorLimit(this, IDC_POLLINGERRORLIMITSPIN)
@@ -51,7 +51,7 @@ void CSteamOptionsMain::OnApply()
/////////////////////////////////////////////////////////////////////////////////
CSteamOptionsBlockList::CSteamOptionsBlockList(CSteamProto *proto)
- : CSuper(proto, IDD_OPT_BLOCK_LIST, false),
+ : CSuper(proto, IDD_OPT_BLOCK_LIST),
m_list(this, IDC_LIST),
m_contacts(this, IDC_CONTACTS),
m_add(this, IDC_BLOCK)
diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp
index f52202c1eb..dfaa9d528d 100644
--- a/protocols/Tox/src/tox_options.cpp
+++ b/protocols/Tox/src/tox_options.cpp
@@ -1,7 +1,7 @@
#include "stdafx.h"
CToxOptionsMain::CToxOptionsMain(CToxProto *proto, int idDialog)
- : CToxDlgBase(proto, idDialog, false),
+ : CToxDlgBase(proto, idDialog),
m_toxAddress(this, IDC_TOXID), m_toxAddressCopy(this, IDC_CLIPBOARD),
m_profileCreate(this, IDC_PROFILE_NEW), m_profileImport(this, IDC_PROFILE_IMPORT),
m_profileExport(this, IDC_PROFILE_EXPORT), m_nickname(this, IDC_NAME),
@@ -334,7 +334,7 @@ void CToxNodeEditor::OnClose()
/****************************************/
CToxOptionsNodeList::CToxOptionsNodeList(CToxProto *proto)
- : CSuper(proto, IDD_OPTIONS_NODES, false),
+ : CSuper(proto, IDD_OPTIONS_NODES),
m_nodes(this, IDC_NODESLIST), m_addNode(this, IDC_ADDNODE),
m_updateNodes(this, IDC_UPDATENODES)
{
diff --git a/protocols/Tox/src/tox_profile.cpp b/protocols/Tox/src/tox_profile.cpp
index 76f59202d8..4458e0e6c7 100644
--- a/protocols/Tox/src/tox_profile.cpp
+++ b/protocols/Tox/src/tox_profile.cpp
@@ -193,7 +193,7 @@ INT_PTR CToxProto::OnRemovePassword(WPARAM, LPARAM)
/* ENTER PASSWORD */
CToxEnterPasswordDlg::CToxEnterPasswordDlg(CToxProto *proto)
- : CToxDlgBase(proto, IDD_PASSWORD_ENTER, false),
+ : CToxDlgBase(proto, IDD_PASSWORD_ENTER),
m_password(this, IDC_PASSWORD),
m_ok(this, IDOK)
{
@@ -220,7 +220,7 @@ void CToxEnterPasswordDlg::OnOk(CCtrlButton*)
/* CREATE PASSWORD */
CToxCreatePasswordDlg::CToxCreatePasswordDlg(CToxProto *proto)
- : CToxDlgBase(proto, IDD_PASSWORD_CREATE, false),
+ : CToxDlgBase(proto, IDD_PASSWORD_CREATE),
m_newPassword(this, IDC_PASSWORD_NEW),
m_confirmPassword(this, IDC_PASSWORD_CONFIRM),
m_passwordValidation(this, IDC_PASSWORD_VALIDATION),
@@ -272,7 +272,7 @@ void CToxCreatePasswordDlg::OnOk(CCtrlButton*)
/* CHANGE PASSWORD */
CToxChangePasswordDlg::CToxChangePasswordDlg(CToxProto *proto)
- : CToxDlgBase(proto, IDD_PASSWORD_CHANGE, false),
+ : CToxDlgBase(proto, IDD_PASSWORD_CHANGE),
m_oldPassword(this, IDC_PASSWORD),
m_newPassword(this, IDC_PASSWORD_NEW),
m_confirmPassword(this, IDC_PASSWORD_CONFIRM),
diff --git a/protocols/VKontakte/src/vk_dialogs.cpp b/protocols/VKontakte/src/vk_dialogs.cpp
index 5985cb390f..fafc0bcd69 100644
--- a/protocols/VKontakte/src/vk_dialogs.cpp
+++ b/protocols/VKontakte/src/vk_dialogs.cpp
@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
////////////////////////////////// IDD_CAPTCHAFORM ////////////////////////////////////////
CVkCaptchaForm::CVkCaptchaForm(CVkProto *proto, CAPTCHA_FORM_PARAMS *param) :
- CVkDlgBase(proto, IDD_CAPTCHAFORM, false),
+ CVkDlgBase(proto, IDD_CAPTCHAFORM),
m_instruction(this, IDC_INSTRUCTION),
m_edtValue(this, IDC_VALUE),
m_btnOpenInBrowser(this, IDOPENBROWSER),
@@ -103,7 +103,7 @@ void CVkCaptchaForm::On_edtValue_Change(CCtrlEdit*)
////////////////////////////////// IDD_WALLPOST ///////////////////////////////////////////
CVkWallPostForm::CVkWallPostForm(CVkProto *proto, WALLPOST_FORM_PARAMS *param) :
- CVkDlgBase(proto, IDD_WALLPOST, false),
+ CVkDlgBase(proto, IDD_WALLPOST),
m_edtMsg(this, IDC_ED_MSG),
m_edtUrl(this, IDC_ED_URL),
m_cbOnlyForFriends(this, IDC_ONLY_FRIENDS),
@@ -147,7 +147,7 @@ void CVkWallPostForm::On_edtValue_Change(CCtrlEdit*)
////////////////////////////////// IDD_INVITE /////////////////////////////////////////////
CVkInviteChatForm::CVkInviteChatForm(CVkProto *proto) :
- CVkDlgBase(proto, IDD_INVITE, false),
+ CVkDlgBase(proto, IDD_INVITE),
m_btnOk(this, IDOK),
m_cbxCombo(this, IDC_CONTACT),
m_hContact(0)
@@ -171,7 +171,7 @@ void CVkInviteChatForm::btnOk_OnOk(CCtrlButton*)
////////////////////////////////// IDD_GC_CREATE //////////////////////////////////////////
CVkGCCreateForm::CVkGCCreateForm(CVkProto *proto) :
- CVkDlgBase(proto, IDD_GC_CREATE, false),
+ CVkDlgBase(proto, IDD_GC_CREATE),
m_btnOk(this, IDOK),
m_clCList(this, IDC_CLIST),
m_edtTitle(this, IDC_TITLE)
@@ -243,7 +243,7 @@ void CVkGCCreateForm::ResetListOptions(CCtrlClc *clCList)
////////////////////////////////// IDD_CONTACTDELETE //////////////////////////////////////
CVkContactDeleteForm::CVkContactDeleteForm(CVkProto *proto, CONTACTDELETE_FORM_PARAMS *param) :
- CVkDlgBase(proto, IDD_CONTACTDELETE, false),
+ CVkDlgBase(proto, IDD_CONTACTDELETE),
m_btnOk(this, IDOK),
m_stText(this, IDC_STATIC_TXT),
m_cbDeleteFromFriendlist(this, IDC_CH_REMOVE_FROM_FRIEND),
diff --git a/protocols/VKontakte/src/vk_options.cpp b/protocols/VKontakte/src/vk_options.cpp
index c8848e2e07..93ff35c579 100644
--- a/protocols/VKontakte/src/vk_options.cpp
+++ b/protocols/VKontakte/src/vk_options.cpp
@@ -29,7 +29,7 @@ INT_PTR CVkProto::SvcCreateAccMgrUI(WPARAM, LPARAM lParam)
//////////////////////////////////////////////////////////////////////////////
CVkAccMgrForm::CVkAccMgrForm(CVkProto *proto, HWND hwndParent) :
- CVkDlgBase(proto, IDD_ACCMGRUI, false),
+ CVkDlgBase(proto, IDD_ACCMGRUI),
m_edtLogin(this, IDC_LOGIN),
m_edtPassword(this, IDC_PASSWORD),
m_hlLink(this, IDC_URL, "https://vk.com/")
@@ -136,7 +136,7 @@ static CVKMarkMsgRead vkMarkMsgAsReadMethods[] =
};
CVkOptionAccountForm::CVkOptionAccountForm(CVkProto *proto) :
- CVkDlgBase(proto, IDD_OPT_MAIN, false),
+ CVkDlgBase(proto, IDD_OPT_MAIN),
m_edtLogin(this, IDC_LOGIN),
m_edtPassword(this, IDC_PASSWORD),
m_hlLink(this, IDC_URL, "https://vk.com/"),
@@ -225,7 +225,7 @@ void CVkOptionAccountForm::OnApply()
////////////////////// Advanced page /////////////////////////////////////////
CVkOptionAdvancedForm::CVkOptionAdvancedForm(CVkProto *proto) :
- CVkDlgBase(proto, IDD_OPT_ADV, false),
+ CVkDlgBase(proto, IDD_OPT_ADV),
m_cbHideChats(this, IDC_HIDECHATS),
m_cbSyncReadMessageStatusFromServer(this, IDC_SYNC_MSG_STATUS),
m_cbMesAsUnread(this, IDC_MESASUREAD),
@@ -308,7 +308,7 @@ void CVkOptionAdvancedForm::On_cbSendVKLinksAsAttachmentsChange(CCtrlCheck *)
////////////////////// News and notifications ////////////////////////////////
CVkOptionFeedsForm::CVkOptionFeedsForm(CVkProto *proto) :
- CVkDlgBase(proto, IDD_OPT_FEEDS, false),
+ CVkDlgBase(proto, IDD_OPT_FEEDS),
m_cbNewsEnabled(this, IDC_NEWS_ENBL),
m_edtNewsInterval(this, IDC_ED_INT_NEWS),
m_spNewsInterval(this, IDC_SPIN_INT_NEWS),
@@ -412,7 +412,7 @@ void CVkOptionFeedsForm::On_cbNotificationsEnabledChange(CCtrlCheck*)
////////////////////// View page /////////////////////////////////////////////
CVkOptionViewForm::CVkOptionViewForm(CVkProto *proto) :
- CVkDlgBase(proto, IDD_OPT_VIEW, false),
+ CVkDlgBase(proto, IDD_OPT_VIEW),
m_cbIMGBBCSupportOff(this, IDC_IMG_OFF),
m_cbIMGBBCSupportFullSize(this, IDC_IMG_FULLSIZE),
m_cbIMGBBCSupport130(this, IDC_IMG_130),
@@ -481,7 +481,7 @@ void CVkOptionViewForm::OnApply()
////////////////////// Menu page /////////////////////////////////////////////
CVkOptionMenuForm::CVkOptionMenuForm(CVkProto *proto) :
- CVkDlgBase(proto, IDD_OPT_MENU, false),
+ CVkDlgBase(proto, IDD_OPT_MENU),
m_cbMenuEnabled0(this, IDC_SHOW_MENU0),
m_cbMenuEnabled1(this, IDC_SHOW_MENU1),
m_cbMenuEnabled2(this, IDC_SHOW_MENU2),