name conflicts resolved

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

1 files changed, 9 insertions, 9 deletions

diff --git a/protocols/Xfire/src/Xfire_avatar_loader.h b/protocols/Xfire/src/Xfire_avatar_loader.h
index 6250d6b4f1..74c3627256 100644
--- a/protocols/Xfire/src/Xfire_avatar_loader.h
+++ b/protocols/Xfire/src/Xfire_avatar_loader.h
@@ -36,21 +36,21 @@
 using namespace xfirelib;

 

 struct Xfire_avatar_process {

-	MCONTACT hcontact;

-	char username[128];

-	unsigned int userid;

+	MCONTACT m_hcontact;

+	char m_username[128];

+	unsigned int m_userid;

 };

 

 class Xfire_avatar_loader : public Xfire_base {

 private:

 	static void loadThread(LPVOID lparam);

-	xfirelib::Client *client;

-	mir_cs avatarMutex;

+	xfirelib::Client *m_client;

+	mir_cs m_avatarMutex;

 public:

-	vector<Xfire_avatar_process> list;

-	BOOL threadrunning;

-	BOOL loadAvatar(MCONTACT hcontact, char*username, unsigned int userid);

-	Xfire_avatar_loader(xfirelib::Client* client);

+	vector<Xfire_avatar_process> m_list;

+	BOOL m_threadrunning;

+	BOOL loadAvatar(MCONTACT hcontact, char *username, unsigned int userid);

+	Xfire_avatar_loader(xfirelib::Client *client);

 	~Xfire_avatar_loader();

 };