diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-17 19:38:42 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-17 19:38:42 +0000 |
| commit | d0ceb5768ff3146499a0318ffe03c867c0845592 (patch) | |
| tree | 984da5102d6a820e670323c47edd8187a37a0b33 /protocols/JabberG/src/stdafx.h | |
| parent | 98ac258dc34b281e8441de847e37408c36c7415d (diff) | |
- numerous name conflicts resolved;
- funny code that loads resource #102 from miranda32.exe removed;
- massive mir_sntprintf code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@14979 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/stdafx.h')
| -rw-r--r-- | protocols/JabberG/src/stdafx.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/JabberG/src/stdafx.h b/protocols/JabberG/src/stdafx.h index 02eb632d1d..bab4c80f57 100644 --- a/protocols/JabberG/src/stdafx.h +++ b/protocols/JabberG/src/stdafx.h @@ -428,7 +428,7 @@ typedef enum { FT_CONNECTING, FT_INITIALIZING, FT_RECEIVING, FT_DONE, FT_ERROR, struct filetransfer
{
- filetransfer(CJabberProto* proto);
+ filetransfer(CJabberProto *proto);
~filetransfer();
void close();
@@ -595,7 +595,7 @@ extern struct CountryListEntry* g_countries; extern FI_INTERFACE *FIP;
extern HANDLE hExtListInit, hDiscoInfoResult;
-extern int bSecureIM, bMirOTR, bNewGPG, bPlatform;
+extern bool bSecureIM, bMirOTR, bNewGPG, bPlatform;
/*******************************************************************
* Function declarations
@@ -686,7 +686,7 @@ struct CJabberAdhocStartupParams TCHAR *m_szNode;
CJabberProto *m_pProto;
- CJabberAdhocStartupParams(CJabberProto* proto, TCHAR* szJid, TCHAR* szNode = NULL)
+ CJabberAdhocStartupParams(CJabberProto *proto, TCHAR* szJid, TCHAR* szNode = NULL)
{
m_pProto = proto;
m_szJid = mir_tstrdup(szJid);
@@ -701,7 +701,7 @@ struct CJabberAdhocStartupParams struct JabberAdHocData
{
- CJabberProto* proto;
+ CJabberProto *proto;
int CurrentHeight;
int curPos;
int frameHeight;
|