Showing the changes to interface/src/XmppClient.cpp (1 of 7 files). Show all
Unified · Split
| @@ -34,12 +34,13 @@ XmppClient& XmppClient::getInstance() { · 33 unmodified lines | |||
| 34 | 34 | ||
| 35 | void XmppClient::xmppConnected() { | 35 | void XmppClient::xmppConnected() { |
| 36 | _publicChatRoom = _xmppMUCManager.addRoom(DEFAULT_CHAT_ROOM); | 36 | _publicChatRoom = _xmppMUCManager.addRoom(DEFAULT_CHAT_ROOM); |
| 37 | _publicChatRoom->setNickName(AccountManager::getInstance().getUsername()); | 37 | _publicChatRoom->setNickName(AccountManager::getInstance().getAccountInfo().getUsername()); |
| 38 | _publicChatRoom->join(); | 38 | _publicChatRoom->join(); |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | void XmppClient::xmppError(QXmppClient::Error error) { | 41 | void XmppClient::xmppError(QXmppClient::Error error) { |
| 42 | qDebug() << "Error connnecting to XMPP for user " << AccountManager::getInstance().getUsername() << ": " << error; | 42 | qDebug() << "Error connnecting to XMPP for user " |
| 43 | << AccountManager::getInstance().getAccountInfo().getUsername() << ": " << error; | ||
| 43 | } | 44 | } |
| 44 | 45 | ||
| 45 | void XmppClient::connectToServer() { | 46 | void XmppClient::connectToServer() { |
| @@ -50,8 +51,8 @@ void XmppClient::connectToServer() { · 4 unmodified lines | |||
| 50 | connect(&_xmppClient, SIGNAL(error(QXmppClient::Error)), this, SLOT(xmppError(QXmppClient::Error))); | 51 | connect(&_xmppClient, SIGNAL(error(QXmppClient::Error)), this, SLOT(xmppError(QXmppClient::Error))); |
| 51 | } | 52 | } |
| 52 | AccountManager& accountManager = AccountManager::getInstance(); | 53 | AccountManager& accountManager = AccountManager::getInstance(); |
| 53 | QString user = accountManager.getUsername(); | 54 | QString user = accountManager.getAccountInfo().getUsername(); |
| 54 | const QString& password = accountManager.getXMPPPassword(); | 55 | const QString& password = accountManager.getAccountInfo().getXMPPPassword(); |
| 55 | _xmppClient.connectToServer(user + "@" + DEFAULT_XMPP_SERVER, password); | 56 | _xmppClient.connectToServer(user + "@" + DEFAULT_XMPP_SERVER, password); |
| 56 | } | 57 | } |
| 57 | 58 | ||