summaryrefslogtreecommitdiff
path: root/protocols/Yahoo/src/chat.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-08-28 09:08:29 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-08-28 09:08:29 +0000
commitf056d6596882aa7cfecc21a61e8ef48f2b514460 (patch)
treef5acfc51e9452b765d6c2d581fcbebc7e07c45be /protocols/Yahoo/src/chat.cpp
parent17501083ca15adc9e3f53757b47a961ed2e77e9c (diff)
fix for all remaining warnings like 'blablabla hides blablabla'
git-svn-id: http://svn.miranda-ng.org/main/trunk@15052 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Yahoo/src/chat.cpp')
-rw-r--r--protocols/Yahoo/src/chat.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/protocols/Yahoo/src/chat.cpp b/protocols/Yahoo/src/chat.cpp
index a65041b2be..7daff87be5 100644
--- a/protocols/Yahoo/src/chat.cpp
+++ b/protocols/Yahoo/src/chat.cpp
@@ -113,7 +113,7 @@ void ext_yahoo_chat_join(int, const char*, const char*, const char*, YList *memb
y_list_free(members);
}
-void ext_yahoo_chat_userjoin(int, const char*, const char*, struct yahoo_chat_member*)
+void ext_yahoo_chat_userjoin(int, const char*, const char*, yahoo_chat_member*)
{}
void ext_yahoo_chat_userleave(int, const char*, const char*, const char*)
@@ -301,7 +301,7 @@ int __cdecl CYahooProto::OnGCMenuHook(WPARAM, LPARAM lParam)
if (gcmi == NULL || _stricmp(gcmi->pszModule, m_szModuleName)) return 0;
if (gcmi->Type == MENU_ON_LOG) {
- static const struct gc_item Items[] =
+ static const gc_item Items[] =
{
{ TranslateT("&Invite user..."), 10, MENU_ITEM, FALSE },
{ TranslateT("&Leave chat session"), 20, MENU_ITEM, FALSE }
@@ -312,7 +312,7 @@ int __cdecl CYahooProto::OnGCMenuHook(WPARAM, LPARAM lParam)
else if (gcmi->Type == MENU_ON_NICKLIST) {
char* id = mir_t2a(gcmi->pszUID);
if (!_stricmp(m_yahoo_id, id)) {
- static const struct gc_item Items[] =
+ static const gc_item Items[] =
{
{ TranslateT("User &details"), 10, MENU_ITEM, FALSE },
{ TranslateT("User &history"), 20, MENU_ITEM, FALSE },
@@ -323,7 +323,7 @@ int __cdecl CYahooProto::OnGCMenuHook(WPARAM, LPARAM lParam)
gcmi->Item = (gc_item*)Items;
}
else {
- static const struct gc_item Items[] =
+ static const gc_item Items[] =
{
{ TranslateT("User &details"), 10, MENU_ITEM, FALSE },
{ TranslateT("User &history"), 20, MENU_ITEM, FALSE }
@@ -412,11 +412,11 @@ static void ClistChatPrepare(MCONTACT hItem, HWND hwndList, CYahooProto* ppro)
}
}
-INT_PTR CALLBACK InviteToChatDialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK InviteToChatDialog(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
InviteChatParam* param = (InviteChatParam*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
- switch (msg) {
+ switch (uMsg) {
case WM_INITDIALOG:
TranslateDialogDefault(hwndDlg);
@@ -505,11 +505,11 @@ INT_PTR CALLBACK InviteToChatDialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
/////////////////////////////////////////////////////////////////////////////////////////
// Chat request dialog
-INT_PTR CALLBACK ChatRequestDialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK ChatRequestDialog(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
InviteChatReqParam* param = (InviteChatReqParam*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
- switch (msg) {
+ switch (uMsg) {
case WM_INITDIALOG:
TranslateDialogDefault(hwndDlg);