diff options
author | George Hazan <george.hazan@gmail.com> | 2013-09-21 16:26:45 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2013-09-21 16:26:45 +0000 |
commit | d8850660bcbec0677f4b550f716b9d2632e4d970 (patch) | |
tree | 3d827873697d32cbc1460acdac46055876c61d65 /protocols/JabberG/src/jabber_list.h | |
parent | e3ec1c46bc13ec4423ce51f36939121e6128d791 (diff) |
- variables/fields names' conflict resolved;
- members names standardization;
- code cleaning;
git-svn-id: http://svn.miranda-ng.org/main/trunk@6162 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_list.h')
-rw-r--r-- | protocols/JabberG/src/jabber_list.h | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/protocols/JabberG/src/jabber_list.h b/protocols/JabberG/src/jabber_list.h index 88b646c1c0..38f22a79ef 100644 --- a/protocols/JabberG/src/jabber_list.h +++ b/protocols/JabberG/src/jabber_list.h @@ -84,32 +84,33 @@ public: void AddRef();
void Release();
- int status;
- TCHAR* resourceName;
- TCHAR* nick;
- TCHAR* statusMessage;
- TCHAR* software;
- TCHAR* version;
- TCHAR* system;
- signed char priority; // resource priority, -128..+127
- time_t idleStartTime;// XEP-0012 support
- JABBER_GC_AFFILIATION affiliation;
- JABBER_GC_ROLE role;
- TCHAR* szRealJid; // real jid for jabber conferences
+ int m_iStatus;
+ ptrT m_tszResourceName;
+ ptrT m_tszStatusMessage;
+ int m_iPriority; // resource priority, -128..+127
+ time_t m_dwIdleStartTime;// XEP-0012 support
+
+ // groupchat support
+ JABBER_GC_AFFILIATION m_affiliation;
+ JABBER_GC_ROLE m_role;
+ ptrT m_tszNick;
+ ptrT m_tszRealJid; // real jid for jabber conferences
// XEP-0115 support
- TCHAR* szCapsNode;
- TCHAR* szCapsVer;
- TCHAR* szCapsExt;
- DWORD dwVersionRequestTime;
- DWORD dwDiscoInfoRequestTime;
- JabberCapsBits jcbCachedCaps;
- JabberCapsBits jcbManualDiscoveredCaps;
+ ptrT m_tszCapsNode;
+ ptrT m_tszCapsVer;
+ ptrT m_tszCapsExt;
+ ptrT m_tszSoftware;
+ ptrT m_tszVersion;
+ ptrT m_tszSystem;
+ DWORD m_dwVersionRequestTime, m_dwDiscoInfoRequestTime;
+ JabberCapsBits m_jcbCachedCaps;
+ JabberCapsBits m_jcbManualDiscoveredCaps;
// XEP-0085 gone event support
- BOOL bMessageSessionActive;
+ BOOL m_bMessageSessionActive;
- JABBER_XEP0232_SOFTWARE_INFO* pSoftwareInfo;
+ JABBER_XEP0232_SOFTWARE_INFO *m_pSoftwareInfo;
};
class pResourceStatus
@@ -160,9 +161,9 @@ struct JABBER_LIST_ITEM : public MZeroedObject JABBER_RESOURCE_MODE resourceMode;
LIST<JABBER_RESOURCE_STATUS> arResources; // array of resources
JABBER_RESOURCE_STATUS
- *pLastSeenResource, // resource which was last seen active
- *pManualResource, // manually set resource
- *m_pItemResource; // resource for jids without /resource node
+ *m_pLastSeenResource, // resource which was last seen active
+ *m_pManualResource, // manually set resource
+ *m_pItemResource; // resource for jids without /resource node
JABBER_SUBSCRIPTION subscription;
TCHAR* group;
|