- naming conflict;

- 64-bit issues;
- warning fixes;
- code cleaning

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

1 files changed, 9 insertions, 8 deletions

diff --git a/protocols/Xfire/src/sendtypingpacket.cpp b/protocols/Xfire/src/sendtypingpacket.cpp
index df38f5bd5e..58965d8fe2 100644
--- a/protocols/Xfire/src/sendtypingpacket.cpp
+++ b/protocols/Xfire/src/sendtypingpacket.cpp
@@ -49,26 +49,27 @@ namespace xfirelib
 

 	void SendTypingPacket::initIMIndex()

 	{

-		string str_sid(sid);

+		string str_sid(m_sid);

 		if (imindexes.count(str_sid) < 1)

-			imindex = imindexes[str_sid] = 1;

+			m_imindex = imindexes[str_sid] = 1;

 		else

-			imindex = ++imindexes[str_sid];

+			m_imindex = ++imindexes[str_sid];

 

 	}

 	void SendTypingPacket::setSid(const char *sid)

 	{

-		memcpy(this->sid, sid, 16);

+		memcpy(m_sid, sid, 16);

 	}

 

 	int SendTypingPacket::getPacketContent(char *buf)

 	{

-		if (imindex == 0) initIMIndex();

+		if (m_imindex == 0)

+			initIMIndex();

 

 		int index = 0;

 		VariableValue val;

 		val.setName("sid");

-		val.setValue(sid, 16);

+		val.setValue(m_sid, 16);

 

 		index += val.writeName(buf, index);

 		buf[index++] = 3;

@@ -87,7 +88,7 @@ namespace xfirelib
 		index += val.writeValue(buf, index);

 

 		val.setName("imindex");

-		val.setValueFromLong(imindex, 4);

+		val.setValueFromLong(m_imindex, 4);

 		index += val.writeName(buf, index);

 		buf[index++] = 02;

 		index += val.writeValue(buf, index);

@@ -100,4 +101,4 @@ namespace xfirelib
 

 		return index;

 	}

-}
\ No newline at end of file
+}