summaryrefslogtreecommitdiff
path: root/protocols/Xfire/src/sendmessagepacket.h
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-08-27 21:31:57 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-08-27 21:31:57 +0000
commit18fb3c2f6c84e3242df27a8686da95658584f7a8 (patch)
tree85b137147f5050862c33afc84bc5fa003606856b /protocols/Xfire/src/sendmessagepacket.h
parent5d7ce04b05778bdd989b6744b300c0f65ed94624 (diff)
name conflicts resolved
git-svn-id: http://svn.miranda-ng.org/main/trunk@15050 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Xfire/src/sendmessagepacket.h')
-rw-r--r--protocols/Xfire/src/sendmessagepacket.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/Xfire/src/sendmessagepacket.h b/protocols/Xfire/src/sendmessagepacket.h
index 7ca5943599..da677ea93c 100644
--- a/protocols/Xfire/src/sendmessagepacket.h
+++ b/protocols/Xfire/src/sendmessagepacket.h
@@ -35,7 +35,7 @@ namespace xfirelib {
class SendMessagePacket : public XFireSendPacketContent {
public:
SendMessagePacket() {
- imindex = 0;
+ m_imindex = 0;
}
virtual ~SendMessagePacket() { }
@@ -52,16 +52,16 @@ namespace xfirelib {
/**
* SID of the user to who the message should be sent.
*/
- char sid[16];
+ char m_sid[16];
/**
* A running counter for each buddy. (will be initialized to 0 by default.. and..
* shouldn't be a problem to leave it 0)
*/
- long imindex;
+ long m_imindex;
/**
* Message body to be sent.
*/
- std::string message;
+ std::string m_message;
protected:
void initIMIndex();