diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-18 11:47:58 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-18 11:47:58 +0000 |
| commit | 914f4263b866f546311b4f8e3a95ff816770783f (patch) | |
| tree | 2d078d9779b448faca946f48dadf55d120eb4c21 /protocols/MRA/src/MraProto.cpp | |
| parent | d3b77308122587707580ec1f308dbdda38c806ac (diff) | |
- naming conflict;
- warning fixes;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@14985 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MRA/src/MraProto.cpp')
| -rw-r--r-- | protocols/MRA/src/MraProto.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp index 020ebc5c8a..012b3d0247 100644 --- a/protocols/MRA/src/MraProto.cpp +++ b/protocols/MRA/src/MraProto.cpp @@ -233,7 +233,7 @@ int CMraProto::AuthRecv(MCONTACT, PROTORECVEVENT* pre) HANDLE CMraProto::FileAllow(MCONTACT, HANDLE hTransfer, const TCHAR *szPath)
{
if (szPath != NULL)
- if (MraFilesQueueAccept(hFilesQueueHandle, (DWORD)hTransfer, szPath, mir_tstrlen(szPath)) == NO_ERROR)
+ if (MraFilesQueueAccept(hFilesQueueHandle, (DWORD_PTR)hTransfer, szPath, mir_tstrlen(szPath)) == NO_ERROR)
return hTransfer; // Success
return NULL;
@@ -242,7 +242,7 @@ HANDLE CMraProto::FileAllow(MCONTACT, HANDLE hTransfer, const TCHAR *szPath) int CMraProto::FileCancel(MCONTACT hContact, HANDLE hTransfer)
{
if (hContact && hTransfer) {
- MraFilesQueueCancel(hFilesQueueHandle, (DWORD)hTransfer, TRUE);
+ MraFilesQueueCancel(hFilesQueueHandle, (DWORD_PTR)hTransfer, TRUE);
return 0; // Success
}
@@ -536,13 +536,13 @@ HANDLE CMraProto::GetAwayMsg(MCONTACT hContact) return (HANDLE)iRet;
}
-int CMraProto::SetAwayMsg(int m_iStatus, const TCHAR* msg)
+int CMraProto::SetAwayMsg(int iStatus, const TCHAR *msg)
{
if (!m_bLoggedIn)
return 1;
size_t dwStatusDescSize = mir_tstrlen(msg);
- DWORD dwStatus = m_iStatus;
+ DWORD dwStatus = iStatus;
DWORD dwXStatus = m_iXStatus;
// не отправляем новый статусный текст для хстатусов, для хстатусов только эвей сообщения
|