finally CLISTEVENT removed completely

git-svn-id: http://svn.miranda-ng.org/main/trunk@14430 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

8 files changed, 21 insertions, 21 deletions

diff --git a/src/core/stdaway/src/awaymsg.cpp b/src/core/stdaway/src/awaymsg.cpp
index b3c9f95c44..15ac55f682 100644
--- a/src/core/stdaway/src/awaymsg.cpp
+++ b/src/core/stdaway/src/awaymsg.cpp
@@ -167,7 +167,7 @@ int LoadAwayMsgModule(void)
 	hWindowList = WindowList_Create();

 	CreateServiceFunction(MS_AWAYMSG_SHOWAWAYMSG, GetMessageCommand);

 

-	CLISTMENUITEM mi = { 0 };

+	TMO_MenuItem mi = { 0 };

 	mi.position = -2000005000;

 	mi.flags = CMIF_NOTOFFLINE;

 	mi.name.a = LPGEN("Re&ad status message");

diff --git a/src/core/stdemail/src/email.cpp b/src/core/stdemail/src/email.cpp
index 87c505b6ea..42009eb606 100644
--- a/src/core/stdemail/src/email.cpp
+++ b/src/core/stdemail/src/email.cpp
@@ -66,9 +66,9 @@ static int EMailPreBuildMenu(WPARAM hContact, LPARAM)
 

 int LoadSendRecvEMailModule(void)

 {

-	CLISTMENUITEM mi = { 0 };

+	TMO_MenuItem mi = { 0 };

 	mi.position = -2000010000;

-	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_SENDEMAIL);

+	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_SENDEMAIL);

 	mi.name.a = LPGEN("&E-mail");

 	mi.pszService = MS_EMAIL_SENDEMAIL;

 	hEMailMenuItem = Menu_AddContactMenuItem(&mi);

diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp
index 6c0c01c207..397034f2a9 100644
--- a/src/core/stdfile/src/file.cpp
+++ b/src/core/stdfile/src/file.cpp
@@ -336,9 +336,9 @@ static int SRFileProtoAck(WPARAM, LPARAM lParam)
 

 static int SRFileModulesLoaded(WPARAM, LPARAM)

 {

-	CLISTMENUITEM mi = { 0 };

+	TMO_MenuItem mi = { 0 };

 	mi.position = -2000020000;

-	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_FILE);

+	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_EVENT_FILE);

 	mi.name.a = LPGEN("&File");

 	mi.pszService = MS_FILE_SENDFILE;

 	hSRFileMenuItem = Menu_AddContactMenuItem(&mi);

@@ -434,8 +434,8 @@ int LoadSendRecvFileModule(void)
 {

 	CreateServiceFunction("FtMgr/Show", FtMgrShowCommand);

 

-	CLISTMENUITEM mi = { 0 };

-	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_FILE);

+	TMO_MenuItem mi = { 0 };

+	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_EVENT_FILE);

 	mi.position = 1900000000;

 	mi.name.a = LPGEN("File &transfers...");

 	mi.pszService = "FtMgr/Show"; //MS_PROTO_SHOWFTMGR;

diff --git a/src/core/stdhelp/src/help.cpp b/src/core/stdhelp/src/help.cpp
index 300082ee57..d248c24d45 100644
--- a/src/core/stdhelp/src/help.cpp
+++ b/src/core/stdhelp/src/help.cpp
@@ -73,28 +73,28 @@ int LoadHelpModule(void)
 	CreateServiceFunction("Help/WebsiteCommand", WebsiteCommand);

 	CreateServiceFunction("Help/BugCommand", BugCommand);

 

-	CLISTMENUITEM mi = { 0 };

-	mi.hParentMenu = Menu_CreateRoot(MO_MAIN, LPGENT("&Help"), 2000090000);

+	TMO_MenuItem mi = { 0 };

+	mi.root = Menu_CreateRoot(MO_MAIN, LPGENT("&Help"), 2000090000);

 

-	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_MIRANDA);

+	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_MIRANDA);

 	mi.position = 2000090000;

 	mi.name.a = LPGEN("&About...");

 	mi.pszService = "Help/AboutCommand";

 	Menu_AddMainMenuItem(&mi);

 

-	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_HELP);

+	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_HELP);

 	mi.position = -500050000;

 	mi.name.a = LPGEN("&Support");

 	mi.pszService = "Help/IndexCommand";

 	Menu_AddMainMenuItem(&mi);

 

-	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_MIRANDAWEB);

+	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_MIRANDAWEB);

 	mi.position = 2000050000;

 	mi.name.a = LPGEN("&Miranda NG homepage");

 	mi.pszService = "Help/WebsiteCommand";

 	Menu_AddMainMenuItem(&mi);

 

-	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);

+	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);

 	mi.position = 2000040000;

 	mi.name.a = LPGEN("&Report bug");

 	mi.pszService = "Help/BugCommand";

diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index ba2f82ab62..3319d29fb2 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -278,10 +278,10 @@ static int SplitmsgModulesLoaded(WPARAM, LPARAM)
 	RegisterSRMMFonts();

 	LoadMsgLogIcons();

 

-	CLISTMENUITEM mi = { 0 };

+	TMO_MenuItem mi = { 0 };

 	mi.position = -2000090000;

 	mi.flags = CMIF_DEFAULT;

-	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_MESSAGE);

+	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_EVENT_MESSAGE);

 	mi.name.a = LPGEN("&Message");

 	mi.pszService = MS_MSG_SENDMESSAGE;

 	hMsgMenuItem = Menu_AddContactMenuItem(&mi);

diff --git a/src/core/stduihist/src/history.cpp b/src/core/stduihist/src/history.cpp
index 94de89639c..2114cd2e24 100644
--- a/src/core/stduihist/src/history.cpp
+++ b/src/core/stduihist/src/history.cpp
@@ -401,9 +401,9 @@ static int PreShutdownHistoryModule(WPARAM, LPARAM)
 

 int LoadHistoryModule(void)

 {

-	CLISTMENUITEM mi = { 0 };

+	TMO_MenuItem mi = { 0 };

 	mi.position = 1000090000;

-	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY);

+	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY);

 	mi.name.a = LPGEN("View &history");

 	mi.pszService = MS_HISTORY_SHOWCONTACTHISTORY;

 	hContactMenu = Menu_AddContactMenuItem(&mi);

diff --git a/src/core/stdurl/url.cpp b/src/core/stdurl/url.cpp
index e6bbf11e77..ba9bd8bb14 100644
--- a/src/core/stdurl/url.cpp
+++ b/src/core/stdurl/url.cpp
@@ -119,9 +119,9 @@ static int SRUrlPreBuildMenu(WPARAM wParam, LPARAM)
 

 static int SRUrlModulesLoaded(WPARAM, LPARAM)

 {

-	CLISTMENUITEM mi = { 0 };

+	TMO_MenuItem mi = { 0 };

 	mi.position = -2000040000;

-	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);

+	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);

 	mi.name.a = LPGEN("Web page address (&URL)");

 	mi.pszService = MS_URL_SENDURL;

 	hSRUrlMenuItem = Menu_AddContactMenuItem(&mi);

diff --git a/src/core/stduserinfo/src/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp
index 93511c627f..e4019fe568 100644
--- a/src/core/stduserinfo/src/userinfo.cpp
+++ b/src/core/stduserinfo/src/userinfo.cpp
@@ -628,9 +628,9 @@ int LoadUserInfoModule(void)
 	HookEvent(ME_DB_CONTACT_DELETED, UserInfoContactDelete);

 	HookEvent(ME_SYSTEM_PRESHUTDOWN, ShutdownUserInfo);

 

-	CLISTMENUITEM mi = { 0 };

+	TMO_MenuItem mi = { 0 };

 	mi.position = 1000050000;

-	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_USERDETAILS);

+	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_USERDETAILS);

 	mi.name.a = LPGEN("User &details");

 	mi.pszService = MS_USERINFO_SHOWDIALOG;

 	Menu_AddContactMenuItem(&mi);