- HANDLE hContact => HCONTACT

- GCF_* prefix was added to chat constants to avoid name conflicts

git-svn-id: http://svn.miranda-ng.org/main/trunk@8078 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 48 insertions, 48 deletions

diff --git a/protocols/Xfire/src/buddylist.h b/protocols/Xfire/src/buddylist.h
index 7ab1e26878..ee6f2a22b4 100644
--- a/protocols/Xfire/src/buddylist.h
+++ b/protocols/Xfire/src/buddylist.h
@@ -37,60 +37,60 @@
 
 
 namespace xfirelib {
-  using namespace std;
+	using namespace std;
 
-  struct Client;
-  struct BuddyListEntry;
+	struct Client;
+	struct BuddyListEntry;
 
-  class BuddyList : public PacketListener {
-  public:
-    BuddyList(Client *client);
-    ~BuddyList();
-
-    vector <BuddyListEntry *> * getEntries() { return entries; }
-	vector <BuddyListEntry *> * getEntriesClan() { return entriesClan; }
-
-    void receivedPacket(XFirePacket *packet);
-    BuddyListEntry *getBuddyById(long userid);
-    BuddyListEntry *getBuddyBySid(const char *sid);
-    BuddyListEntry *getBuddyByName(string username);
-  private:
-    void initEntries(BuddyListNamesPacket* buddynames);
-	void initEntriesClan(ClanBuddyListNamesPacket* buddynames);
-    void updateOnlineBuddies(BuddyListOnlinePacket* buddiesOnline);
-    void updateBuddiesGame(BuddyListGamesPacket* buddiesGames);
-	void updateFriendsofFriend(FriendsBuddyListNamesPacket* friends);
-
-    Client *client;
-    vector <BuddyListEntry *> * entries;
-	vector <BuddyListEntry *> * entriesClan;
-  };
+	class BuddyList : public PacketListener {
+	public:
+		BuddyList(Client *client);
+		~BuddyList();
+
+		vector <BuddyListEntry *> * getEntries() { return entries; }
+		vector <BuddyListEntry *> * getEntriesClan() { return entriesClan; }
+
+		void receivedPacket(XFirePacket *packet);
+		BuddyListEntry *getBuddyById(long userid);
+		BuddyListEntry *getBuddyBySid(const char *sid);
+		BuddyListEntry *getBuddyByName(string username);
+	private:
+		void initEntries(BuddyListNamesPacket* buddynames);
+		void initEntriesClan(ClanBuddyListNamesPacket* buddynames);
+		void updateOnlineBuddies(BuddyListOnlinePacket* buddiesOnline);
+		void updateBuddiesGame(BuddyListGamesPacket* buddiesGames);
+		void updateFriendsofFriend(FriendsBuddyListNamesPacket* friends);
+
+		Client *client;
+		vector <BuddyListEntry *> * entries;
+		vector <BuddyListEntry *> * entriesClan;
+	};
 
 
   class BuddyListEntry {
   public:
-    BuddyListEntry();
-	~BuddyListEntry();
-    bool isOnline();
-
-    void setSid(const char *sid);
-
-    long userid;
-    char sid[16];
-    string nick;
-    string username;
-    string statusmsg;
-	string gameinfo;
-    long game;
-    long game2;
-	HANDLE hcontact;
-	int clanid;
-
-	//lastpopup
-	char* lastpopup;
-    
-    XFireGame *gameObj;
-    XFireGame *game2Obj;
+	  BuddyListEntry();
+	  ~BuddyListEntry();
+	  bool isOnline();
+
+	  void setSid(const char *sid);
+
+	  long userid;
+	  char sid[16];
+	  string nick;
+	  string username;
+	  string statusmsg;
+	  string gameinfo;
+	  long game;
+	  long game2;
+	  HCONTACT hcontact;
+	  int clanid;
+
+	  //lastpopup
+	  char* lastpopup;
+
+	  XFireGame *gameObj;
+	  XFireGame *game2Obj;
   };
 
   typedef BuddyListEntry *PBuddyListEntry;