From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Jul 2016 09:20:25 +0000 Subject: less TCHARs: - TCHAR is replaced with wchar_t everywhere; - LPGENT replaced with either LPGENW or LPGEN; - fixes for ANSI plugins that improperly used _t functions; - TCHAR *t removed from MAllStrings; - ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz* git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/AimOscar/src/proto.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'protocols/AimOscar/src/proto.h') diff --git a/protocols/AimOscar/src/proto.h b/protocols/AimOscar/src/proto.h index 7afb407100..79980483eb 100755 --- a/protocols/AimOscar/src/proto.h +++ b/protocols/AimOscar/src/proto.h @@ -21,7 +21,7 @@ along with this program. If not, see . struct CAimProto : public PROTO { - CAimProto(const char*, const TCHAR*); + CAimProto(const char*, const wchar_t*); ~CAimProto(); //==================================================================================== @@ -30,28 +30,28 @@ struct CAimProto : public PROTO virtual MCONTACT __cdecl AddToList( int flags, PROTOSEARCHRESULT* psr ); - virtual int __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage ); + virtual int __cdecl AuthRequest(MCONTACT hContact, const wchar_t* szMessage ); - virtual HANDLE __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath ); + virtual HANDLE __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const wchar_t* szPath ); virtual int __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer ); - virtual int __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szReason ); - virtual int __cdecl FileResume( HANDLE hTransfer, int* action, const TCHAR** szFilename ); + virtual int __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const wchar_t* szReason ); + virtual int __cdecl FileResume( HANDLE hTransfer, int* action, const wchar_t** szFilename ); virtual DWORD_PTR __cdecl GetCaps( int type, MCONTACT hContact = NULL ); - virtual HANDLE __cdecl SearchBasic( const TCHAR* id ); - virtual HANDLE __cdecl SearchByEmail( const TCHAR* email ); + virtual HANDLE __cdecl SearchBasic( const wchar_t* id ); + virtual HANDLE __cdecl SearchByEmail( const wchar_t* email ); virtual int __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT* ); - virtual HANDLE __cdecl SendFile(MCONTACT hContact, const TCHAR* szDescription, TCHAR** ppszFiles); + virtual HANDLE __cdecl SendFile(MCONTACT hContact, const wchar_t* szDescription, wchar_t** ppszFiles); virtual int __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg ); virtual int __cdecl SetStatus( int iNewStatus ); virtual HANDLE __cdecl GetAwayMsg(MCONTACT hContact ); virtual int __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt ); - virtual int __cdecl SetAwayMsg( int m_iStatus, const TCHAR* msg ); + virtual int __cdecl SetAwayMsg( int m_iStatus, const wchar_t* msg ); virtual int __cdecl UserIsTyping(MCONTACT hContact, int type ); @@ -196,7 +196,7 @@ struct CAimProto : public PROTO void avatar_request_handler(MCONTACT hContact, char* hash, unsigned char type); void avatar_retrieval_handler(const char* sn, const char* hash, const char* data, int data_len); - int get_avatar_filename(MCONTACT hContact, TCHAR* pszDest, size_t cbLen, const TCHAR *ext); + int get_avatar_filename(MCONTACT hContact, wchar_t* pszDest, size_t cbLen, const wchar_t *ext); ////////////////////////////////////////////////////////////////////////////////////// // away.cpp @@ -217,7 +217,7 @@ struct CAimProto : public PROTO void chat_register(void); void chat_start(const char* id, unsigned short exchange); - void chat_event(const char* id, const char* sn, int evt, const TCHAR* msg = NULL); + void chat_event(const char* id, const char* sn, int evt, const wchar_t* msg = NULL); void chat_leave(const char* id); chat_list_item* find_chat_by_cid(unsigned short cid); @@ -321,7 +321,7 @@ struct CAimProto : public PROTO int sending_file(file_transfer *ft, HANDLE hServerPacketRecver, NETLIBPACKETRECVER &packetRecv); int receiving_file(file_transfer *ft, HANDLE hServerPacketRecver, NETLIBPACKETRECVER &packetRecv); - void report_file_error(TCHAR* fname); + void report_file_error(wchar_t* fname); void shutdown_file_transfers(void); ////////////////////////////////////////////////////////////////////////////////////// @@ -413,7 +413,7 @@ struct CAimProto : public PROTO void offline_contact(MCONTACT hContact, bool remove_settings); unsigned short get_default_port(void); - int open_contact_file(const char* sn, const TCHAR* file, const char* mode, TCHAR* &path, bool contact_dir); + int open_contact_file(const char* sn, const wchar_t* file, const char* mode, wchar_t* &path, bool contact_dir); void write_away_message(const char* sn, const char* msg, bool utf); void write_profile(const char* sn, const char* msg, bool utf); -- cgit v1.2.3