diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-27 21:31:57 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-27 21:31:57 +0000 |
| commit | 18fb3c2f6c84e3242df27a8686da95658584f7a8 (patch) | |
| tree | 85b137147f5050862c33afc84bc5fa003606856b /protocols/Xfire/src/packetreader.h | |
| parent | 5d7ce04b05778bdd989b6744b300c0f65ed94624 (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/packetreader.h')
| -rw-r--r-- | protocols/Xfire/src/packetreader.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/protocols/Xfire/src/packetreader.h b/protocols/Xfire/src/packetreader.h index 1a4d99aded..7a91f660a4 100644 --- a/protocols/Xfire/src/packetreader.h +++ b/protocols/Xfire/src/packetreader.h @@ -46,9 +46,9 @@ namespace xfirelib { void initPackets(); void fireListeners( XFirePacket *packet ); - Socket *socket; - std::vector <XFirePacketContent *> *packets; - std::vector <PacketListener *> *packetListeners; + Socket *m_socket; + std::vector <XFirePacketContent *> *m_packets; + std::vector <PacketListener *> *m_packetListeners; }; }; |