name conflicts resolved

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

1 files changed, 18 insertions, 18 deletions

diff --git a/protocols/Xfire/src/buddylist.h b/protocols/Xfire/src/buddylist.h
index 3405441f2d..4ed5c34dc7 100644
--- a/protocols/Xfire/src/buddylist.h
+++ b/protocols/Xfire/src/buddylist.h
@@ -44,8 +44,8 @@ namespace xfirelib {
 		BuddyList(Client *client);
 		~BuddyList();
 
-		vector <BuddyListEntry *> * getEntries() { return entries; }
-		vector <BuddyListEntry *> * getEntriesClan() { return entriesClan; }
+		vector <BuddyListEntry *> * getEntries() { return m_entries; }
+		vector <BuddyListEntry *> * getEntriesClan() { return m_entriesClan; }
 
 		void receivedPacket(XFirePacket *packet);
 		BuddyListEntry *getBuddyById(long userid);
@@ -58,9 +58,9 @@ namespace xfirelib {
 		void updateBuddiesGame(BuddyListGamesPacket* buddiesGames);
 		void updateFriendsofFriend(FriendsBuddyListNamesPacket* friends);
 
-		Client *client;
-		vector <BuddyListEntry *> * entries;
-		vector <BuddyListEntry *> * entriesClan;
+		Client *m_client;
+		vector <BuddyListEntry *> *m_entries;
+		vector <BuddyListEntry *> *m_entriesClan;
 	};
 
 
@@ -72,22 +72,22 @@ namespace xfirelib {
 
 		void setSid(const char *sid);
 
-		long userid;
-		char sid[16];
-		string nick;
-		string username;
-		string statusmsg;
-		string gameinfo;
-		long game;
-		long game2;
-		MCONTACT hcontact;
-		int clanid;
+		long m_userid;
+		char m_sid[16];
+		string m_nick;
+		string m_username;
+		string m_statusmsg;
+		string m_gameinfo;
+		long m_game;
+		long m_game2;
+		MCONTACT m_hcontact;
+		int m_clanid;
 
 		//lastpopup
-		char* lastpopup;
+		char* m_lastpopup;
 
-		XFireGame *gameObj;
-		XFireGame *game2Obj;
+		XFireGame *m_gameObj;
+		XFireGame *m_game2Obj;
 	};
 
 	typedef BuddyListEntry *PBuddyListEntry;