mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-07-29 11:12:39 +00:00
Do not use non-static data member initializer.
GCC 4.6 does not support those and initializing it in the ctor is a lot clearer in this case. This was SVN commit r17022.
This commit is contained in:
@@ -68,7 +68,7 @@ IXmppClient* IXmppClient::create(const std::string& sUsername, const std::string
|
||||
* @param regOpt If we are just registering or not.
|
||||
*/
|
||||
XmppClient::XmppClient(const std::string& sUsername, const std::string& sPassword, const std::string& sRoom, const std::string& sNick, const int historyRequestSize, bool regOpt)
|
||||
: m_client(NULL), m_mucRoom(NULL), m_registration(NULL), m_username(sUsername), m_password(sPassword), m_nick(sNick)
|
||||
: m_client(NULL), m_mucRoom(NULL), m_registration(NULL), m_username(sUsername), m_password(sPassword), m_nick(sNick), m_initialLoadComplete(false)
|
||||
{
|
||||
// Read lobby configuration from default.cfg
|
||||
std::string sServer;
|
||||
|
||||
@@ -38,26 +38,26 @@ class XmppClient : public IXmppClient, public glooxwrapper::ConnectionListener,
|
||||
NONCOPYABLE(XmppClient);
|
||||
|
||||
private:
|
||||
//Components
|
||||
// Components
|
||||
glooxwrapper::Client* m_client;
|
||||
glooxwrapper::MUCRoom* m_mucRoom;
|
||||
glooxwrapper::Registration* m_registration;
|
||||
|
||||
//Account infos
|
||||
// Account infos
|
||||
std::string m_username;
|
||||
std::string m_password;
|
||||
std::string m_nick;
|
||||
std::string m_xpartamuppId;
|
||||
|
||||
// State
|
||||
bool m_initialLoadComplete = false;
|
||||
bool m_initialLoadComplete;
|
||||
|
||||
public:
|
||||
//Basic
|
||||
// Basic
|
||||
XmppClient(const std::string& sUsername, const std::string& sPassword, const std::string& sRoom, const std::string& sNick, const int historyRequestSize = 0, const bool regOpt = false);
|
||||
virtual ~XmppClient();
|
||||
|
||||
//Network
|
||||
// Network
|
||||
void connect();
|
||||
void disconnect();
|
||||
void recv();
|
||||
|
||||
Reference in New Issue
Block a user