From ee3100701b64a1a34e8e5b3069219c7c5a201d8a Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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/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 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'protocols/Gadu-Gadu/src')

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;
 	
-- 
cgit v1.2.3