From c207d9fda896e759a2ffdffc0d46608040c1ac65 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 31 May 2015 19:17:51 +0000 Subject: another bunch of crutches buried in a trash can: PROTOCHAR & PROTOFILEEVENT glory, glory, hallelujah git-svn-id: http://svn.miranda-ng.org/main/trunk@13949 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Tox/src/tox_proto.cpp | 12 ++++++------ protocols/Tox/src/tox_proto.h | 18 +++++++++--------- protocols/Tox/src/tox_transfer.cpp | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'protocols/Tox') diff --git a/protocols/Tox/src/tox_proto.cpp b/protocols/Tox/src/tox_proto.cpp index da29ff9e02..b3e4ff4a7f 100644 --- a/protocols/Tox/src/tox_proto.cpp +++ b/protocols/Tox/src/tox_proto.cpp @@ -91,13 +91,13 @@ int CToxProto::AuthRecv(MCONTACT, PROTORECVEVENT* pre) return Proto_AuthRecv(m_szModuleName, pre); } -int CToxProto::AuthRequest(MCONTACT hContact, const PROTOCHAR *szMessage) +int CToxProto::AuthRequest(MCONTACT hContact, const TCHAR *szMessage) { ptrA reason(mir_utf8encodeW(szMessage)); return OnRequestAuth(hContact, (LPARAM)reason); } -HANDLE CToxProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR *tszPath) +HANDLE CToxProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR *tszPath) { return OnFileAllow(hContact, hTransfer, tszPath); } @@ -107,12 +107,12 @@ int CToxProto::FileCancel(MCONTACT hContact, HANDLE hTransfer) return OnFileCancel(hContact, hTransfer); } -int CToxProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR*) +int CToxProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR*) { return FileCancel(hContact, hTransfer); } -int CToxProto::FileResume(HANDLE hTransfer, int *action, const PROTOCHAR **szFilename) +int CToxProto::FileResume(HANDLE hTransfer, int *action, const TCHAR **szFilename) { return OnFileResume(hTransfer, action, szFilename); } @@ -137,7 +137,7 @@ int CToxProto::SendMsg(MCONTACT hContact, int, const char *msg) return OnSendMessage(hContact, msg); } -HANDLE CToxProto::SendFile(MCONTACT hContact, const PROTOCHAR *msg, PROTOCHAR **ppszFiles) +HANDLE CToxProto::SendFile(MCONTACT hContact, const TCHAR *msg, TCHAR **ppszFiles) { return OnSendFile(hContact, msg, ppszFiles); } @@ -212,7 +212,7 @@ int CToxProto::SetStatus(int iNewStatus) HANDLE CToxProto::GetAwayMsg(MCONTACT) { return 0; } -int CToxProto::SetAwayMsg(int, const PROTOCHAR *msg) +int CToxProto::SetAwayMsg(int, const TCHAR *msg) { if (IsOnline()) { diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h index c92424f11e..481bfabebf 100644 --- a/protocols/Tox/src/tox_proto.h +++ b/protocols/Tox/src/tox_proto.h @@ -25,12 +25,12 @@ public: virtual int __cdecl Authorize(MEVENT hDbEvent); virtual int __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*); - virtual int __cdecl AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage); + virtual int __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage); - virtual HANDLE __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* tszPath); + virtual HANDLE __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* tszPath); virtual int __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer); - virtual int __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* tszReason); - virtual int __cdecl FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** tszFilename); + virtual int __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* tszReason); + virtual int __cdecl FileResume(HANDLE hTransfer, int* action, const TCHAR** tszFilename); virtual DWORD_PTR __cdecl GetCaps(int type, MCONTACT hContact = NULL); @@ -40,12 +40,12 @@ public: virtual int __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*); virtual int __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg); - virtual HANDLE __cdecl SendFile(MCONTACT hContact, const PROTOCHAR*, PROTOCHAR **ppszFiles); + virtual HANDLE __cdecl SendFile(MCONTACT hContact, const TCHAR*, TCHAR **ppszFiles); virtual int __cdecl SetStatus(int iNewStatus); virtual HANDLE __cdecl GetAwayMsg(MCONTACT hContact); - virtual int __cdecl SetAwayMsg(int iStatus, const PROTOCHAR* msg); + virtual int __cdecl SetAwayMsg(int iStatus, const TCHAR* msg); virtual int __cdecl UserIsTyping(MCONTACT hContact, int type); @@ -222,10 +222,10 @@ private: // transfer - HANDLE OnFileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR *tszPath); - int OnFileResume(HANDLE hTransfer, int *action, const PROTOCHAR **szFilename); + HANDLE OnFileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR *tszPath); + int OnFileResume(HANDLE hTransfer, int *action, const TCHAR **szFilename); int OnFileCancel(MCONTACT hContact, HANDLE hTransfer); - HANDLE OnSendFile(MCONTACT hContact, const PROTOCHAR*, PROTOCHAR **ppszFiles); + HANDLE OnSendFile(MCONTACT hContact, const TCHAR*, TCHAR **ppszFiles); static void OnFileRequest(Tox *tox, uint32_t friendNumber, uint32_t fileNumber, TOX_FILE_CONTROL control, void *arg); static void OnFriendFile(Tox *tox, uint32_t friendNumber, uint32_t fileNumber, uint32_t kind, uint64_t fileSize, const uint8_t *fileName, size_t filenameLength, void *arg); diff --git a/protocols/Tox/src/tox_transfer.cpp b/protocols/Tox/src/tox_transfer.cpp index 2586dcfee4..63495eb883 100644 --- a/protocols/Tox/src/tox_transfer.cpp +++ b/protocols/Tox/src/tox_transfer.cpp @@ -63,7 +63,7 @@ void CToxProto::OnFriendFile(Tox*, uint32_t friendNumber, uint32_t fileNumber, u } // file request is allowed -HANDLE CToxProto::OnFileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR *tszPath) +HANDLE CToxProto::OnFileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR *tszPath) { FileTransferParam *transfer = (FileTransferParam*)hTransfer; transfer->pfts.tszWorkingDir = mir_tstrdup(tszPath); @@ -87,7 +87,7 @@ HANDLE CToxProto::OnFileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCH } // if file is exists -int CToxProto::OnFileResume(HANDLE hTransfer, int *action, const PROTOCHAR **szFilename) +int CToxProto::OnFileResume(HANDLE hTransfer, int *action, const TCHAR **szFilename) { FileTransferParam *transfer = (FileTransferParam*)hTransfer; @@ -182,7 +182,7 @@ void CToxProto::OnDataReceiving(Tox*, uint32_t friendNumber, uint32_t fileNumber /* FILE SENDING */ // outcoming file flow -HANDLE CToxProto::OnSendFile(MCONTACT hContact, const PROTOCHAR*, PROTOCHAR **ppszFiles) +HANDLE CToxProto::OnSendFile(MCONTACT hContact, const TCHAR*, TCHAR **ppszFiles) { int32_t friendNumber = GetToxFriendNumber(hContact); if (friendNumber == UINT32_MAX) -- cgit v1.2.3