- additional operator LPARAM() for _A2T & _T2A;

- we don't need StrConvA anymore;
- code cleaning

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

6 files changed, 9 insertions, 9 deletions

diff --git a/src/modules/chat/clist.cpp b/src/modules/chat/clist.cpp
index 8f8535eea1..4306806568 100644
--- a/src/modules/chat/clist.cpp
+++ b/src/modules/chat/clist.cpp
@@ -93,7 +93,7 @@ BOOL SetAllOffline(BOOL bHide, const char *pszModule)
 			continue;

 		int i = db_get_b(hContact, szProto, "ChatRoom", 0);

 		if (i != 0) {

-			db_set_w(hContact, szProto, "ApparentMode", (LPARAM)(WORD)0);

+			db_set_w(hContact, szProto, "ApparentMode", 0);

 			db_set_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);

 		}

 	}

diff --git a/src/modules/chat/tools.cpp b/src/modules/chat/tools.cpp
index e20b59111f..fd4044515f 100644
--- a/src/modules/chat/tools.cpp
+++ b/src/modules/chat/tools.cpp
@@ -332,7 +332,7 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight
 

 			if (bInactive && !(si->wState & STATE_TALK)) {

 				si->wState |= STATE_TALK;

-				db_set_w(si->hContact, si->pszModule, "ApparentMode", (LPARAM)(WORD)40071);

+				db_set_w(si->hContact, si->pszModule, "ApparentMode", ID_STATUS_OFFLINE);

 			}

 			if (ci.OnFlashWindow)

 				ci.OnFlashWindow(si, bInactive);

diff --git a/src/modules/clist/genmenuopt.cpp b/src/modules/clist/genmenuopt.cpp
index dd5d537c8c..7a2339ed47 100644
--- a/src/modules/clist/genmenuopt.cpp
+++ b/src/modules/clist/genmenuopt.cpp
@@ -355,7 +355,7 @@ public:
 		PD->pos = ((MenuItemOptData *)tvi.lParam)->pos - 1;
 
 		TVINSERTSTRUCT tvis = { 0 };
-		tvis.item.lParam = (LPARAM)(PD);
+		tvis.item.lParam = (LPARAM)PD;
 		tvis.item.pszText = PD->name;
 		tvis.item.iImage = tvis.item.iSelectedImage = 1;
 		tvis.hInsertAfter = hti;
diff --git a/src/modules/protocols/protoaccs.cpp b/src/modules/protocols/protoaccs.cpp
index 06a7268a6f..9e99d22ae5 100644
--- a/src/modules/protocols/protoaccs.cpp
+++ b/src/modules/protocols/protoaccs.cpp
@@ -418,7 +418,7 @@ static INT_PTR stub44(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam)
 

 static INT_PTR stub45(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam)

 {

-	return CallProtoServiceInt(NULL, ppi->m_szModuleName, PS_SETMYAVATARW, wParam, (LPARAM)(LPCTSTR)_A2T((char*)lParam));

+	return CallProtoServiceInt(NULL, ppi->m_szModuleName, PS_SETMYAVATARW, wParam, _A2T((char*)lParam));

 }

 

 static HANDLE CreateProtoServiceEx(const char* szModule, const char* szService, MIRANDASERVICEOBJ pFunc, void* param)

diff --git a/src/modules/protocols/protoint.cpp b/src/modules/protocols/protoint.cpp
index e8c834c45a..6f9624f9f5 100644
--- a/src/modules/protocols/protoint.cpp
+++ b/src/modules/protocols/protoint.cpp
@@ -66,7 +66,7 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE
 		if (m_iVersion > 1)

 			return (int)ProtoCallService(m_szModuleName, PS_AUTHDENY, hDbEvent, (LPARAM)szReason);

 

-		return (int)ProtoCallService(m_szModuleName, PS_AUTHDENY, hDbEvent, (LPARAM)StrConvA(szReason));

+		return (int)ProtoCallService(m_szModuleName, PS_AUTHDENY, hDbEvent, _T2A(szReason));

 	}

 

 	int __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT *evt)

@@ -152,14 +152,14 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE
 		if (m_iVersion > 1)

 			return (HANDLE)ProtoCallService(m_szModuleName, PS_BASICSEARCH, 0, (LPARAM)id);

 

-		return (HANDLE)ProtoCallService(m_szModuleName, PS_BASICSEARCH, 0, (LPARAM)StrConvA(id));

+		return (HANDLE)ProtoCallService(m_szModuleName, PS_BASICSEARCH, 0, _T2A(id));

 	}

 

 	HANDLE __cdecl SearchByEmail(const TCHAR* email)

 	{

 		if (m_iVersion > 1)

 			return (HANDLE)ProtoCallService(m_szModuleName, PS_SEARCHBYEMAIL, 0, (LPARAM)email);

-		return (HANDLE)ProtoCallService(m_szModuleName, PS_SEARCHBYEMAIL, 0, (LPARAM)StrConvA(email));

+		return (HANDLE)ProtoCallService(m_szModuleName, PS_SEARCHBYEMAIL, 0, _T2A(email));

 	}

 

 	HANDLE __cdecl SearchByName(const TCHAR* nick, const TCHAR* firstName, const TCHAR* lastName)

@@ -270,7 +270,7 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE
 	{

 		if (m_iVersion > 1)

 			return (int)ProtoCallService(m_szModuleName, PS_SETAWAYMSG, iStatus, (LPARAM)msg);

-		return (int)ProtoCallService(m_szModuleName, PS_SETAWAYMSG, iStatus, (LPARAM)StrConvA(msg));

+		return (int)ProtoCallService(m_szModuleName, PS_SETAWAYMSG, iStatus, _T2A(msg));

 	}

 

 	int __cdecl UserIsTyping(MCONTACT hContact, int type)

diff --git a/src/modules/protocols/protoopts.cpp b/src/modules/protocols/protoopts.cpp
index 10968a73b2..48cb033202 100644
--- a/src/modules/protocols/protoopts.cpp
+++ b/src/modules/protocols/protoopts.cpp
@@ -355,7 +355,7 @@ static LRESULT CALLBACK AccListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 			mir_subclassWindow(dat->hwndEdit, sttEditSubclassProc);

 			SendMessage(dat->hwndEdit, WM_SETFONT, (WPARAM)parentDat->hfntTitle, 0);

 			SendMessage(dat->hwndEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN | EC_USEFONTINFO, 0);

-			SendMessage(dat->hwndEdit, EM_SETSEL, 0, (LPARAM)(-1));

+			SendMessage(dat->hwndEdit, EM_SETSEL, 0, -1);

 			ShowWindow(dat->hwndEdit, SW_SHOW);

 		}

 		SetFocus(dat->hwndEdit);