From ee3100701b64a1a34e8e5b3069219c7c5a201d8a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 29 Jun 2015 19:30:51 +0000 Subject: - unified menu creation using wrapper class CMenuItem; - duplicated hLangpack field removed from TMO_IntMenuItem; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@14440 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/AimOscar/src/theme.cpp | 6 +++--- protocols/FacebookRM/src/theme.cpp | 6 +++--- protocols/GTalkExt/src/menu.cpp | 4 ++-- protocols/Gadu-Gadu/src/gg.cpp | 4 ++-- protocols/Gadu-Gadu/src/groupchat.cpp | 2 +- protocols/Gadu-Gadu/src/image.cpp | 2 +- protocols/Gadu-Gadu/src/import.cpp | 2 +- protocols/Gadu-Gadu/src/links.cpp | 4 ++-- protocols/Gadu-Gadu/src/sessions.cpp | 2 +- protocols/IRCG/src/services.cpp | 6 +++--- protocols/IcqOscarJ/src/icq_menu.cpp | 2 +- protocols/IcqOscarJ/src/icq_xstatus.cpp | 4 ++-- protocols/JabberG/src/jabber_menu.cpp | 33 +++++++++++++++-------------- protocols/JabberG/src/jabber_privacy.cpp | 4 ++-- protocols/JabberG/src/jabber_xstatus.cpp | 2 +- protocols/MRA/src/Mra_menus.cpp | 12 +++++------ protocols/MSN/src/msn_menu.cpp | 4 ++-- protocols/Sametime/src/conference.cpp | 2 +- protocols/Sametime/src/sametime_session.cpp | 2 +- protocols/SkypeWeb/src/skype_menus.cpp | 6 +++--- protocols/Steam/src/steam_menus.cpp | 6 +++--- protocols/Tlen/src/tlen.cpp | 2 +- protocols/Tox/src/tox_menus.cpp | 6 +++--- protocols/Twitter/src/proto.cpp | 2 +- protocols/Twitter/src/theme.cpp | 2 +- protocols/VKontakte/src/vk_proto.cpp | 2 +- protocols/WhatsApp/src/theme.cpp | 4 ++-- protocols/Xfire/src/Xfire_game.cpp | 2 +- protocols/Xfire/src/Xfire_gamelist.cpp | 2 +- protocols/Xfire/src/main.cpp | 2 +- protocols/Yahoo/src/services.cpp | 5 ++--- 31 files changed, 72 insertions(+), 72 deletions(-) (limited to 'protocols') diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp index 7a36990d79..de5f0a4220 100644 --- a/protocols/AimOscar/src/theme.cpp +++ b/protocols/AimOscar/src/theme.cpp @@ -211,7 +211,7 @@ void CAimProto::InitMainMenus(void) { HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName); if (hRoot == NULL) { - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; mi.hIcolibItem = GetIconHandle("aim"); mi.name.t = m_tszUserName; @@ -225,7 +225,7 @@ void CAimProto::InitMainMenus(void) } } - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.root = hRoot; mi.pszService = "/ManageAccount"; @@ -252,7 +252,7 @@ void CAimProto::InitMainMenus(void) void CAimProto::InitContactMenus(void) { - TMO_MenuItem mi = { 0 }; + CMenuItem mi; CreateProtoService("/GetHTMLAwayMsg",&CAimProto::GetHTMLAwayMsg); mi.pszService = "/GetHTMLAwayMsg"; diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp index 3a4cbbf803..12109dfe9c 100644 --- a/protocols/FacebookRM/src/theme.cpp +++ b/protocols/FacebookRM/src/theme.cpp @@ -107,7 +107,7 @@ void InitContactMenus() { HookEvent(ME_CLIST_PREBUILDCONTACTMENU, PrebuildContactMenu); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.position = -2000006000; mi.hIcolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL); mi.name.a = LPGEN("Visit profile"); @@ -210,7 +210,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM) { HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName); if (hRoot == NULL) { - TMO_MenuItem miRoot = { 0 }; + CMenuItem miRoot; miRoot.position = 500085000; miRoot.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | (this->isOnline() ? 0 : CMIF_GRAYED); miRoot.hIcolibItem = GetIconHandle("facebook"); @@ -224,7 +224,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM) } } - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.flags = (this->isOnline() ? 0 : CMIF_GRAYED); mi.position = 201001; mi.root = hRoot; diff --git a/protocols/GTalkExt/src/menu.cpp b/protocols/GTalkExt/src/menu.cpp index 549619069d..a4721aa652 100644 --- a/protocols/GTalkExt/src/menu.cpp +++ b/protocols/GTalkExt/src/menu.cpp @@ -37,14 +37,14 @@ INT_PTR OpenMailboxMenuHandler(WPARAM, LPARAM, LPARAM param) int InitMenus(WPARAM wParam, LPARAM lParam) { - GoogleTalkAcc* pga = isGoogle(lParam); + GoogleTalkAcc *pga = isGoogle(lParam); if (pga != NULL) { LPCSTR szModuleName = pga->m_japi->GetModuleName(); char szServiceName[100]; mir_snprintf(szServiceName, _countof(szServiceName), "%s/%s", szModuleName, MS_GTALKEXT_OPENMAILBOX); CreateServiceFunctionParam(szServiceName, OpenMailboxMenuHandler, (LPARAM)szModuleName); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.root = HGENMENU(wParam); mi.hIcolibItem = g_hPopupIcon; mi.position = 200101; diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp index 3c496a0263..cdcca1a571 100644 --- a/protocols/Gadu-Gadu/src/gg.cpp +++ b/protocols/Gadu-Gadu/src/gg.cpp @@ -235,7 +235,7 @@ INT_PTR GGPROTO::blockuser(WPARAM hContact, LPARAM lParam) #define GGS_BLOCKUSER "/BlockUser" void GGPROTO::block_init() { - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.position = -500050000; mi.hIcolibItem = iconList[8].hIcolib; mi.name.a = LPGEN("&Block"); @@ -257,7 +257,7 @@ void GGPROTO::block_uninit() // Menus initialization void GGPROTO::menus_init() { - TMO_MenuItem mi = { 0 }; + CMenuItem mi; HGENMENU hGCRoot, hCLRoot, hRoot = Menu_GetProtocolRoot(m_szModuleName); if (hRoot == NULL) { diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp index 5f1b0ec623..b76e4816cd 100644 --- a/protocols/Gadu-Gadu/src/groupchat.cpp +++ b/protocols/Gadu-Gadu/src/groupchat.cpp @@ -57,7 +57,7 @@ int GGPROTO::gc_init() void GGPROTO::gc_menus_init(HGENMENU hRoot) { if (gc_enabled) { - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.flags = CMIF_TCHAR; mi.root = hRoot; diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp index 860cc2f965..8f03d5bd26 100644 --- a/protocols/Gadu-Gadu/src/image.cpp +++ b/protocols/Gadu-Gadu/src/image.cpp @@ -69,7 +69,7 @@ int gg_img_remove(GGIMAGEDLGDATA *dat); int GGPROTO::img_init() { // Send image contact menu item - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.position = -2000010000; mi.hIcolibItem = iconList[11].hIcolib; mi.name.a = LPGEN("&Image"); diff --git a/protocols/Gadu-Gadu/src/import.cpp b/protocols/Gadu-Gadu/src/import.cpp index c44e098383..3e8ba768a2 100644 --- a/protocols/Gadu-Gadu/src/import.cpp +++ b/protocols/Gadu-Gadu/src/import.cpp @@ -514,7 +514,7 @@ INT_PTR GGPROTO::export_server(WPARAM wParam, LPARAM lParam) void GGPROTO::import_init(HGENMENU hRoot) { - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.flags = CMIF_TCHAR; mi.root = hRoot; diff --git a/protocols/Gadu-Gadu/src/links.cpp b/protocols/Gadu-Gadu/src/links.cpp index f8f04874d1..5a5b75df90 100644 --- a/protocols/Gadu-Gadu/src/links.cpp +++ b/protocols/Gadu-Gadu/src/links.cpp @@ -97,7 +97,7 @@ void gg_links_instancemenu_init() CreateServiceFunction(GGS_MENUCHOOSE, gg_menuchoose); hInstanceMenu = Menu_AddObject("GGAccountChooser", LPGEN("Gadu-Gadu account chooser"), 0, GGS_MENUCHOOSE); - TMO_MenuItem mi = {0}; + CMenuItem mi; mi.name.a = "Cancel"; mi.position = 9999999; mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE); @@ -115,7 +115,7 @@ void gg_links_init() void GGPROTO::links_instance_init() { if (ServiceExists(MS_ASSOCMGR_ADDNEWURLTYPE)) { - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.flags = CMIF_TCHAR; mi.ownerdata = this; mi.position = g_Instances.getCount(); diff --git a/protocols/Gadu-Gadu/src/sessions.cpp b/protocols/Gadu-Gadu/src/sessions.cpp index 6364386820..640aec001d 100644 --- a/protocols/Gadu-Gadu/src/sessions.cpp +++ b/protocols/Gadu-Gadu/src/sessions.cpp @@ -416,7 +416,7 @@ BOOL GGPROTO::sessions_closedlg() void GGPROTO::sessions_menus_init(HGENMENU hRoot) { - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.flags = CMIF_TCHAR; mi.root = hRoot; diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index f77fa7312f..83f25fec4b 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -26,7 +26,7 @@ void CIrcProto::InitMainMenus(void) HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName); if (hRoot == NULL) { // Root popupmenuitem - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.name.t = m_tszUserName; mi.position = -1999901010; mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; @@ -40,7 +40,7 @@ void CIrcProto::InitMainMenus(void) } } - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.root = hRoot; mi.name.a = LPGEN("&Quick connect"); @@ -135,7 +135,7 @@ void InitContactMenus(void) char temp[MAXMODULELABELLENGTH]; char *d = temp + mir_snprintf(temp, _countof(temp), "IRC"); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.pszService = temp; mi.name.a = LPGEN("Channel &settings"); diff --git a/protocols/IcqOscarJ/src/icq_menu.cpp b/protocols/IcqOscarJ/src/icq_menu.cpp index 055ab5ecde..b058bac425 100644 --- a/protocols/IcqOscarJ/src/icq_menu.cpp +++ b/protocols/IcqOscarJ/src/icq_menu.cpp @@ -111,7 +111,7 @@ void g_MenuInit(void) char str[MAXMODULELABELLENGTH], *pszDest = str + 3; mir_strcpy(str, "ICQ"); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.pszService = str; // "Request authorization" diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp index 725eb5ca87..abdcbb0400 100644 --- a/protocols/IcqOscarJ/src/icq_xstatus.cpp +++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp @@ -853,14 +853,14 @@ void CIcqProto::InitXStatusItems(BOOL bAllowStatus) TCHAR szItem[MAX_PATH + 64]; mir_sntprintf(szItem, _countof(szItem), TranslateT("%s Custom Status"), m_tszUserName); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.root = Menu_GetProtocolRoot(m_szModuleName); mi.name.t = szItem; mi.position = 10001; hRoot = Menu_AddStatusMenuItem(&mi); } - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.position = 2000040000; mi.root = hRoot; diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index ebf46c4838..11b651c68e 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -188,17 +188,18 @@ void g_MenuInit(void) CreateServiceFunction("Jabber/MenuChoose", JabberMenuChooseService); hChooserMenu = Menu_AddObject("JabberAccountChooser", LPGEN("Jabber account chooser"), 0, "Jabber/MenuChoose"); - - TMO_MenuItem tmi = { sizeof(tmi) }; - tmi.name.a = "Cancel"; - tmi.position = 9999999; - tmi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE); - Menu_AddItem(hChooserMenu, &tmi); + { + CMenuItem mi; + mi.name.a = "Cancel"; + mi.position = 9999999; + mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE); + Menu_AddItem(hChooserMenu, &mi); + } ////////////////////////////////////////////////////////////////////////////////////// // Contact menu initialization - TMO_MenuItem mi = { 0 }; + CMenuItem mi; // "Request authorization" mi.name.a = LPGEN("Request authorization"); @@ -417,7 +418,7 @@ int CJabberProto::OnPrebuildContactMenu(WPARAM hContact, LPARAM) } char text[256]; - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.pszService = text; CMString szTmp; @@ -580,7 +581,7 @@ void CJabberProto::MenuInit() { HGENMENU hJabberRoot = Menu_GetProtocolRoot(m_szModuleName); if (hJabberRoot == NULL) { - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.name.t = m_tszUserName; mi.position = -1999901006; mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; @@ -594,7 +595,7 @@ void CJabberProto::MenuInit() } } - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.root = hJabberRoot; // "Bookmarks..." @@ -781,12 +782,12 @@ void CJabberProto::GlobalMenuInit() ////////////////////////////////////////////////////////////////////////////////////// // Account chooser menu - TMO_MenuItem tmi = { sizeof(tmi) }; - tmi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; - tmi.ownerdata = this; - tmi.position = iChooserMenuPos++; - tmi.name.t = m_tszUserName; - m_hChooseMenuItem = Menu_AddItem(hChooserMenu, &tmi); + CMenuItem mi; + mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; + mi.ownerdata = this; + mi.position = iChooserMenuPos++; + mi.name.t = m_tszUserName; + m_hChooseMenuItem = Menu_AddItem(hChooserMenu, &mi); ////////////////////////////////////////////////////////////////////////////////////// // Hotkeys diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index f102978ef8..35fdcde2f6 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -2090,7 +2090,7 @@ INT_PTR __cdecl CJabberProto::menuSetPrivacyList(WPARAM, LPARAM, LPARAM iList) void CJabberProto::BuildPrivacyMenu() { - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.position = 200005; mi.hIcolibItem = GetIconHandle(IDI_AGENTS); mi.flags = CMIF_HIDDEN; @@ -2120,7 +2120,7 @@ void CJabberProto::BuildPrivacyListsMenu(bool bDeleteOld) char srvFce[MAX_PATH + 64]; - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.position = 2000040000; mi.flags = CMIF_TCHAR; mi.root = m_hPrivacyMenuRoot; diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp index a9454ec559..f28aa0abc4 100644 --- a/protocols/JabberG/src/jabber_xstatus.cpp +++ b/protocols/JabberG/src/jabber_xstatus.cpp @@ -465,7 +465,7 @@ void CPepGuiService::RebuildMenu() char szService[128]; mir_snprintf(szService, "/AdvStatusSet/%s", m_name); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.root = hJabberRoot; mi.pszService = szService; mi.position = 200010; diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp index 41563e74bb..32c6eeda27 100644 --- a/protocols/MRA/src/Mra_menus.cpp +++ b/protocols/MRA/src/Mra_menus.cpp @@ -284,14 +284,14 @@ int CMraProto::MraRebuildStatusMenu(WPARAM, LPARAM) TCHAR szItem[MAX_PATH + 64]; mir_sntprintf(szItem, _countof(szItem), _T("%s Custom Status"), m_tszUserName); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.root = Menu_GetProtocolRoot(m_szModuleName); mi.name.t = szItem; mi.position = 10001; hRoot = Menu_AddStatusMenuItem(&mi); } - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.position = 2000060000; mi.root = hRoot; mi.flags = CMIF_UNICODE; @@ -332,9 +332,9 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI char szServiceFunction[MAX_PATH]; - TMO_MenuItem mi = { 0 }; + CMenuItem mi; - HGENMENU hRootMenu, (__stdcall *fnAddFunc)(TMO_MenuItem*, const char*, int); + HGENMENU hRootMenu, (__stdcall *fnAddFunc)(TMO_MenuItem*, const char*); if (bIsMain) { fnAddFunc = Menu_AddProtoMenuItem; @@ -357,7 +357,7 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI mi.flags = 0; mi.name.a = LPGEN("Services..."); mi.hIcolibItem = g_hMainIcon; - hRootMenu = fnAddFunc(&mi, m_szModuleName, hLangpack); + hRootMenu = fnAddFunc(&mi, m_szModuleName); mi.root = hRootMenu; mi.pszService = szServiceFunction; @@ -367,7 +367,7 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI mi.position = int(lPosition + i); mi.hIcolibItem = pgdiItems[i].hIcolib; mi.name.a = pgdiItems[i].szDescr; - hResult[i] = fnAddFunc(&mi, m_szModuleName, hLangpack); + hResult[i] = fnAddFunc(&mi, m_szModuleName); Menu_ConfigureItem(hResult[i], MCI_OPT_EXECPARAM, lPopupPosition); } diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp index 877c5a2f5d..2458b7aeb1 100644 --- a/protocols/MSN/src/msn_menu.cpp +++ b/protocols/MSN/src/msn_menu.cpp @@ -268,7 +268,7 @@ INT_PTR CMsnProto::SetNicknameUI(WPARAM, LPARAM) void CMsnProto::MsnInitMainMenu(void) { - TMO_MenuItem mi = { 0 }; + CMenuItem mi; HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName); if (hRoot == NULL) { @@ -398,7 +398,7 @@ void MSN_InitContactMenu(void) mir_strcpy(servicefunction, "MSN"); char* tDest = servicefunction + mir_strlen(servicefunction); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.pszService = servicefunction; mir_strcpy(tDest, MSN_BLOCK); diff --git a/protocols/Sametime/src/conference.cpp b/protocols/Sametime/src/conference.cpp index 0eebe780b6..4aaf949a27 100644 --- a/protocols/Sametime/src/conference.cpp +++ b/protocols/Sametime/src/conference.cpp @@ -508,7 +508,7 @@ void CSametimeProto::InitConferenceMenu() CreateProtoService(MS_SAMETIME_MENULEAVECHAT, &CSametimeProto::onMenuLeaveChat); CreateProtoService(MS_SAMETIME_MENUCREATECHAT, &CSametimeProto::onMenuCreateChat); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.flags = CMIF_TCHAR | CMIF_NOTOFFLINE; mi.name.t = LPGENT("Leave conference"); diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp index 4b49c436ea..74fede1541 100644 --- a/protocols/Sametime/src/sametime_session.cpp +++ b/protocols/Sametime/src/sametime_session.cpp @@ -560,7 +560,7 @@ void CSametimeProto::InitSessionMenu() CreateProtoService(MS_SAMETIME_MENUANNOUNCESESSION, &CSametimeProto::SessionAnnounce); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.flags = CMIF_TCHAR; mi.position = 2000060000; mi.name.t = LPGENT("Send announcement..."); diff --git a/protocols/SkypeWeb/src/skype_menus.cpp b/protocols/SkypeWeb/src/skype_menus.cpp index 8400cc483a..47c9138cd4 100644 --- a/protocols/SkypeWeb/src/skype_menus.cpp +++ b/protocols/SkypeWeb/src/skype_menus.cpp @@ -60,7 +60,7 @@ void CSkypeProto::InitMenus() //hChooserMenu = Menu_AddObject("SkypeAccountChooser", LPGEN("Skype menu chooser"), 0, "Skype/MenuChoose"); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.flags = CMIF_TCHAR; // Request authorization @@ -111,7 +111,7 @@ int CSkypeProto::OnInitStatusMenu() HGENMENU hStatusMenuRoot = Menu_GetProtocolRoot(m_szModuleName); if (!hStatusMenuRoot) { - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.name.t = m_tszUserName; mi.position = -1999901006; mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; @@ -119,7 +119,7 @@ int CSkypeProto::OnInitStatusMenu() hStatusMenuRoot = Menu_AddProtoMenuItem(&mi); } - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.root = hStatusMenuRoot; mi.pszService = "/CreateNewChat"; diff --git a/protocols/Steam/src/steam_menus.cpp b/protocols/Steam/src/steam_menus.cpp index 9675edfde3..d975b21872 100644 --- a/protocols/Steam/src/steam_menus.cpp +++ b/protocols/Steam/src/steam_menus.cpp @@ -98,7 +98,7 @@ void CSteamProto::OnInitStatusMenu() { HGENMENU hSteamRoot = Menu_GetProtocolRoot(m_szModuleName); if (!hSteamRoot) { - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.name.t = m_tszUserName; mi.position = -1999901006; mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; @@ -109,7 +109,7 @@ void CSteamProto::OnInitStatusMenu() m_hMenuRoot = NULL; } - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.flags = CMIF_TCHAR; mi.root = hSteamRoot; @@ -127,7 +127,7 @@ void CSteamProto::InitMenus() ////////////////////////////////////////////////////////////////////////////////////// // Contact menu initialization - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.flags = CMIF_TCHAR; // "Request authorization" diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp index da55e2f5f2..b7d055cfb9 100644 --- a/protocols/Tlen/src/tlen.cpp +++ b/protocols/Tlen/src/tlen.cpp @@ -264,7 +264,7 @@ void TlenProtocol::initMenuItems() strncpy_s(text, m_szModuleName, _TRUNCATE); char *pSvcName = text + mir_strlen(text); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.root = hMenuRoot = Menu_CreateRoot(MO_MAIN, m_tszUserName, -1999901009, GetIconHandle(IDI_TLEN)); mi.pszService = text; diff --git a/protocols/Tox/src/tox_menus.cpp b/protocols/Tox/src/tox_menus.cpp index 78f372e9be..c7c77ba163 100644 --- a/protocols/Tox/src/tox_menus.cpp +++ b/protocols/Tox/src/tox_menus.cpp @@ -41,7 +41,7 @@ void CToxProto::InitMenus() //hChooserMenu = Menu_AddObject("SkypeAccountChooser", LPGEN("Skype menu chooser"), 0, "Skype/MenuChoose"); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.flags = CMIF_TCHAR; // Request authorization @@ -78,7 +78,7 @@ int CToxProto::OnInitStatusMenu() HGENMENU hStatusMenuRoot = Menu_GetProtocolRoot(m_szModuleName); if (!hStatusMenuRoot) { - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.name.t = m_tszUserName; mi.position = -1999901006; mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; @@ -86,7 +86,7 @@ int CToxProto::OnInitStatusMenu() hStatusMenuRoot = Menu_AddProtoMenuItem(&mi); } - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.flags = CMIF_TCHAR; mi.root = hStatusMenuRoot; diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index d94037fb64..bc95f7deda 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -256,7 +256,7 @@ int TwitterProto::OnBuildStatusMenu(WPARAM, LPARAM) if (hRoot == NULL) return 0; - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.root = hRoot; mi.flags = CMIF_TCHAR; mi.position = 1001; diff --git a/protocols/Twitter/src/theme.cpp b/protocols/Twitter/src/theme.cpp index 30e88a23b0..05fd48fae8 100644 --- a/protocols/Twitter/src/theme.cpp +++ b/protocols/Twitter/src/theme.cpp @@ -86,7 +86,7 @@ void InitContactMenus() { g_hMenuEvts[0] = HookEvent(ME_CLIST_PREBUILDCONTACTMENU, PrebuildContactMenu); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.flags = CMIF_NOTOFFLINE | CMIF_TCHAR; mi.position = -2000006000; diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp index bd1bf48bd5..de2aeb5825 100644 --- a/protocols/VKontakte/src/vk_proto.cpp +++ b/protocols/VKontakte/src/vk_proto.cpp @@ -191,7 +191,7 @@ void CVkProto::InitMenus() CreateProtoService(PS_SETSTATUSMSG, &CVkProto::SvcSetStatusMsg); CreateProtoService(PS_WALLPOST, &CVkProto::SvcWallPost); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.root = Menu_GetProtocolRoot(m_szModuleName); // Proto menu diff --git a/protocols/WhatsApp/src/theme.cpp b/protocols/WhatsApp/src/theme.cpp index 90d82bb60d..1a11414f4b 100644 --- a/protocols/WhatsApp/src/theme.cpp +++ b/protocols/WhatsApp/src/theme.cpp @@ -49,7 +49,7 @@ int WhatsAppProto::OnBuildStatusMenu(WPARAM wParam, LPARAM lParam) { HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName); if (hRoot == NULL) { - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.position = 500085000; mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | (isOnline() ? 0 : CMIF_GRAYED); mi.hIcolibItem = GetIconHandle("whatsApp"); @@ -63,7 +63,7 @@ int WhatsAppProto::OnBuildStatusMenu(WPARAM wParam, LPARAM lParam) } } - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.flags = (isOnline() ? 0 : CMIF_GRAYED); mi.position = 201001; diff --git a/protocols/Xfire/src/Xfire_game.cpp b/protocols/Xfire/src/Xfire_game.cpp index 2ae07c6912..c954230cad 100644 --- a/protocols/Xfire/src/Xfire_game.cpp +++ b/protocols/Xfire/src/Xfire_game.cpp @@ -436,7 +436,7 @@ void Xfire_game::createMenuitem(unsigned int pos, int dbid) if (dbid < 0) dbid = pos; - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.root = Menu_CreateRoot(MO_MAIN, LPGENT("Start game"), 500084000); mir_snprintf(temp, _countof(temp), servicefunction, this->id); diff --git a/protocols/Xfire/src/Xfire_gamelist.cpp b/protocols/Xfire/src/Xfire_gamelist.cpp index a417177ad3..7c5663464f 100644 --- a/protocols/Xfire/src/Xfire_gamelist.cpp +++ b/protocols/Xfire/src/Xfire_gamelist.cpp @@ -241,7 +241,7 @@ void Xfire_gamelist::clearGamelist() { //erstellt ein dummyeintrag void Xfire_gamelist::createDummyMenuItem() { - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.root = Menu_CreateRoot(MO_MAIN, LPGENT("Start game"), 500084000); mi.position = 500090001; mi.name.a = Translate("Please wait..."); diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp index e14629a20e..b4d234d3c1 100644 --- a/protocols/Xfire/src/main.cpp +++ b/protocols/Xfire/src/main.cpp @@ -1113,7 +1113,7 @@ extern "C" __declspec(dllexport) int Load(void) CreateDirectoryA(AvatarsFolder, NULL); // erweiterte Kontextmenüpunkte - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.position = 500090000; mi.name.a = protocolname; mi.root = Menu_AddContactMenuItem(&mi, protocolname); diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp index a0094138e9..49cdb8b93d 100644 --- a/protocols/Yahoo/src/services.cpp +++ b/protocols/Yahoo/src/services.cpp @@ -358,7 +358,7 @@ INT_PTR __cdecl CYahooProto::GetUnreadEmailCount(WPARAM, LPARAM) void CYahooProto::MenuMainInit(void) { - TMO_MenuItem mi = { 0 }; + CMenuItem mi; HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName); if (hRoot == NULL) { @@ -437,11 +437,10 @@ void CYahooProto::MenuMainInit(void) void CYahooProto::MenuContactInit(void) { - TMO_MenuItem mi = { 0 }; - // Show Profile CreateProtoService(YAHOO_SHOW_PROFILE, &CYahooProto::OnShowProfileCommand); + CMenuItem mi; mi.pszService = YAHOO_SHOW_PROFILE; mi.position = -2000006000; mi.hIcolibItem = GetIconHandle(IDI_PROFILE); -- cgit v1.2.3