From b665a90f50f09435aef5bc3b5b9da710e4558690 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 5 Apr 2013 16:54:27 +0000
Subject: various menu items quirks, simplifications & optimization

git-svn-id: http://svn.miranda-ng.org/main/trunk@4319 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/MirOTR/MirOTR/src/dllmain.cpp    | 2 +-
 plugins/MirOTR/MirOTR/src/mirotrmenu.cpp | 4 ++--
 plugins/MirOTR/MirOTR/src/utils.cpp      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins/MirOTR')

diff --git a/plugins/MirOTR/MirOTR/src/dllmain.cpp b/plugins/MirOTR/MirOTR/src/dllmain.cpp
index aae5c5649c..ee1198e2bf 100644
--- a/plugins/MirOTR/MirOTR/src/dllmain.cpp
+++ b/plugins/MirOTR/MirOTR/src/dllmain.cpp
@@ -104,7 +104,7 @@ extern "C" __declspec(dllexport) int Load(void)
 	if(DBGetContactSettingByte(0, MODULENAME, "FilterOrderFix", 0) != 2) {
 		HANDLE hContact = db_find_first();
 		while ( hContact != NULL ) {
-			CallService( MS_PROTO_REMOVEFROMCONTACT, ( WPARAM )hContact, ( LPARAM )MODULENAME );
+			CallService(MS_PROTO_REMOVEFROMCONTACT, (WPARAM)hContact, (LPARAM)MODULENAME);
 			hContact = db_find_next(hContact);
 		}
 		DBWriteContactSettingByte(0, MODULENAME, "FilterOrderFix", 2);
diff --git a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp
index de6b27dc30..03d5f70a39 100644
--- a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp
+++ b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp
@@ -97,7 +97,7 @@ INT_PTR MirOTRMenuCheckService(WPARAM wParam,LPARAM)
 	TrustLevel level = ( TrustLevel )otr_context_get_trust(otrl_context_find_miranda(otr_user_state, hContact));
 	
 	mi.cbSize = sizeof(mi);
-	if ( CallService(MO_GETMENUITEM, ( WPARAM )pcpp->MenuItemHandle, ( LPARAM )&mi ) == 0 ) {
+	if ( CallService(MO_GETMENUITEM, (WPARAM)pcpp->MenuItemHandle, (LPARAM)&mi) == 0) {
 		
 		if ( mi.flags & CMIF_HIDDEN ) return FALSE;
 		if ( mi.flags & CMIF_NOTPRIVATE  && level==TRUST_PRIVATE  ) return FALSE;
@@ -154,7 +154,7 @@ INT_PTR OnAddMenuItemMirOTRMenu (WPARAM wParam, LPARAM lParam)
 	
 	TMO_MenuItem mi;	
 	mi.cbSize = sizeof(mi);
-	if ( CallService(MO_GETMENUITEM, ( WPARAM )lParam, ( LPARAM )&mi ) == 0 ) {
+	if ( CallService(MO_GETMENUITEM, (WPARAM)lParam, (LPARAM)&mi) == 0) {
 		if (mi.flags & CMIF_DISABLED) {
 			mii->fMask |= MIIM_STATE;
 			mii->fState |= MF_DISABLED;
diff --git a/plugins/MirOTR/MirOTR/src/utils.cpp b/plugins/MirOTR/MirOTR/src/utils.cpp
index fcd18ba98e..7877065ccc 100644
--- a/plugins/MirOTR/MirOTR/src/utils.cpp
+++ b/plugins/MirOTR/MirOTR/src/utils.cpp
@@ -132,14 +132,14 @@ char* contact_get_id(HANDLE hContact, bool bNameOnError) {
 		}
 	}
 	if (!pszUniqueID && bNameOnError) {
-		char *name = (char *)CallService( MS_CLIST_GETCONTACTDISPLAYNAME, ( WPARAM )hContact, 0 );
+		char *name = (char *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, 0);
 		if (name) pszUniqueID = mir_strdup(name);
 	}
 	return pszUniqueID;
 }
 
 __inline const TCHAR* contact_get_nameT(HANDLE hContact) {
-	return (TCHAR*)CallService( MS_CLIST_GETCONTACTDISPLAYNAME, ( WPARAM )hContact, GCDNF_TCHAR );
+	return (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR);
 }
 
 __inline const char* contact_get_proto(HANDLE hContact) {
-- 
cgit v1.2.3