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 --- plugins/UserInfoEx/src/mir_menuitems.cpp | 10 +++++----- plugins/UserInfoEx/src/svc_email.cpp | 2 +- plugins/UserInfoEx/src/svc_homepage.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/UserInfoEx/src') diff --git a/plugins/UserInfoEx/src/mir_menuitems.cpp b/plugins/UserInfoEx/src/mir_menuitems.cpp index d0eaa861ac..24822fa83c 100644 --- a/plugins/UserInfoEx/src/mir_menuitems.cpp +++ b/plugins/UserInfoEx/src/mir_menuitems.cpp @@ -85,7 +85,7 @@ void RebuildContact() RemoveMenuItems(hMenuItem, _countof(hMenuItem)); // support new genmenu style - TMO_MenuItem mi = { 0 }; + CMenuItem mi; switch (flag) { case 3: @@ -172,7 +172,7 @@ void RebuildMain() RemoveMenuItems(hMenuItem, _countof(hMenuItem)); // support new genmenu style - TMO_MenuItem mi = { 0 }; + CMenuItem mi; switch (flag) { case 3: @@ -300,7 +300,7 @@ void RebuildGroup() char text[200]; mir_strcpy(text, "UserInfo"); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.pszService = text; char* tDest = text + mir_strlen(text); @@ -388,7 +388,7 @@ void RebuildSubGroup() char text[200]; mir_strcpy(text, "UserInfo"); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.pszService = text; char* tDest = text + mir_strlen(text); @@ -501,7 +501,7 @@ INT_PTR RebuildAccount(WPARAM wParam, LPARAM lParam) char text[200]; mir_strcpy(text, pcli->menuProtos[i].szProto); - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.pszService = text; char* tDest = text + mir_strlen(text); diff --git a/plugins/UserInfoEx/src/svc_email.cpp b/plugins/UserInfoEx/src/svc_email.cpp index e431bf84bb..3a8128cc62 100644 --- a/plugins/UserInfoEx/src/svc_email.cpp +++ b/plugins/UserInfoEx/src/svc_email.cpp @@ -183,7 +183,7 @@ void SvcEMailRebuildMenu() if (!ghMenuItem) { // insert contact menuitem - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.position = -2000010000; mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_EMAIL); mi.name.a = "&E-mail"; diff --git a/plugins/UserInfoEx/src/svc_homepage.cpp b/plugins/UserInfoEx/src/svc_homepage.cpp index e0a2f9e01b..609eff8649 100644 --- a/plugins/UserInfoEx/src/svc_homepage.cpp +++ b/plugins/UserInfoEx/src/svc_homepage.cpp @@ -153,7 +153,7 @@ void SvcHomepageRebuildMenu() if (!ghMenuItem) { // insert contact menuitem - TMO_MenuItem mi = { 0 }; + CMenuItem mi; mi.position = -2000010000; mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_GOTO); mi.name.a = LPGEN("&Homepage"); -- cgit v1.2.3