From fdc5bdfae8a4a70cfd91ec0a8554005a3c0bbae2 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 13 Apr 2016 15:08:47 +0000
Subject: sorted lists are used now in Jabber instead of linear database lookup

git-svn-id: http://svn.miranda-ng.org/main/trunk@16642 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/JabberG/src/jabber_list.h | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'protocols/JabberG/src/jabber_list.h')

diff --git a/protocols/JabberG/src/jabber_list.h b/protocols/JabberG/src/jabber_list.h
index 6d8352ac95..6537179c50 100644
--- a/protocols/JabberG/src/jabber_list.h
+++ b/protocols/JabberG/src/jabber_list.h
@@ -28,7 +28,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "jabber_caps.h"
 
-typedef enum {
+enum JABBER_LIST
+{
 	LIST_ROSTER,        // Roster list
 	LIST_CHATROOM,      // Groupchat room currently joined
 	LIST_ROOM,          // Groupchat room list to show on the Jabber groupchat dialog
@@ -38,35 +39,39 @@ typedef enum {
 	LIST_BOOKMARK,
 	LIST_VCARD_TEMP,
 	LIST_FTIQID
-} JABBER_LIST;
+};
 
-typedef enum {
+enum JABBER_SUBSCRIPTION
+{
 	SUB_NONE,
 	SUB_TO,
 	SUB_FROM,
 	SUB_BOTH
-} JABBER_SUBSCRIPTION;
+};
 
-typedef enum {
+enum JABBER_GC_AFFILIATION
+{
 	AFFILIATION_NONE,
 	AFFILIATION_OUTCAST,
 	AFFILIATION_MEMBER,
 	AFFILIATION_ADMIN,
 	AFFILIATION_OWNER
-} JABBER_GC_AFFILIATION;
+};
 
-typedef enum {
+enum JABBER_GC_ROLE
+{
 	ROLE_NONE,
 	ROLE_VISITOR,
 	ROLE_PARTICIPANT,
 	ROLE_MODERATOR
-} JABBER_GC_ROLE;
+};
 
-typedef enum {			// initial default to RSMODE_LASTSEEN
+enum JABBER_RESOURCE_MODE // initial default to RSMODE_LASTSEEN
+{
 	RSMODE_SERVER,		// always let server decide (always send correspondence without resouce name)
 	RSMODE_LASTSEEN,	// use the last seen resource (or let server decide if haven't seen anything yet)
 	RSMODE_MANUAL		// specify resource manually (see the defaultResource field - must not be NULL)
-} JABBER_RESOURCE_MODE;
+};
 
 class JABBER_RESOURCE_STATUS : public MZeroedObject
 {
@@ -146,6 +151,7 @@ struct JABBER_LIST_ITEM : public MZeroedObject
 
 	JABBER_LIST list;
 	TCHAR* jid;
+	MCONTACT hContact;
 
 	// LIST_ROSTER
 	// jid = jid of the contact
@@ -201,10 +207,10 @@ struct JABBER_LIST_ITEM : public MZeroedObject
 	//LIST_BOOKMARK
 	// jid = room JID
 	TCHAR* password;	// password for room
-	BOOL bAutoJoin;
+	bool bAutoJoin;
 
-	BOOL bUseResource;
-	BOOL bHistoryRead;
+	bool bUseResource;
+	bool bHistoryRead;
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3