Showing the changes to interface/src/scripting/GlobalServicesScriptingInterface.cpp (1 of 1 file). Show all
Unified · Split
| @@ -29,7 +29,8 @@ GlobalServicesScriptingInterface::GlobalServicesScriptingInterface() { · 28 unmodified lines | ||
| 29 | 29 | #endif // HAVE_QXMPP |
| 30 | 30 | |
| 31 | 31 | _downloading = false; |
| 32 | − connect(Application::getInstance(), &Application::renderingInWorldInterface, this, &GlobalServicesScriptingInterface::checkDownloadInfo); | |
| 32 | + connect(Application::getInstance(), &Application::renderingInWorldInterface, | |
| 33 | + this, &GlobalServicesScriptingInterface::checkDownloadInfo); | |
| 33 | 34 | } |
| 34 | 35 | |
| 35 | 36 | GlobalServicesScriptingInterface::~GlobalServicesScriptingInterface() { |
| @@ -43,14 +44,16 @@ GlobalServicesScriptingInterface::~GlobalServicesScriptingInterface() { · 7 unmodified lines | ||
| 43 | 44 | const QXmppClient& qxmppClient = XmppClient::getInstance().getXMPPClient(); |
| 44 | 45 | disconnect(&qxmppClient, &QXmppClient::messageReceived, this, &GlobalServicesScriptingInterface::messageReceived); |
| 45 | 46 | const QXmppMucRoom* publicChatRoom = XmppClient::getInstance().getPublicChatRoom(); |
| 46 | − disconnect(publicChatRoom, &QXmppMucRoom::participantsChanged, this, &GlobalServicesScriptingInterface::participantsChanged); | |
| 47 | + disconnect(publicChatRoom, &QXmppMucRoom::participantsChanged, | |
| 48 | + this, &GlobalServicesScriptingInterface::participantsChanged); | |
| 47 | 49 | #endif // HAVE_QXMPP |
| 48 | 50 | } |
| 49 | 51 | |
| 50 | 52 | void GlobalServicesScriptingInterface::onConnected() { |
| 51 | 53 | #ifdef HAVE_QXMPP |
| 52 | 54 | const QXmppMucRoom* publicChatRoom = XmppClient::getInstance().getPublicChatRoom(); |
| 53 | − connect(publicChatRoom, &QXmppMucRoom::participantsChanged, this, &GlobalServicesScriptingInterface::participantsChanged, Qt::UniqueConnection); | |
| 55 | + connect(publicChatRoom, &QXmppMucRoom::participantsChanged, | |
| 56 | + this, &GlobalServicesScriptingInterface::participantsChanged, Qt::UniqueConnection); | |
| 54 | 57 | #endif // HAVE_QXMPP |
| 55 | 58 | } |
| 56 | 59 | |
| @@ -115,7 +118,8 @@ void GlobalServicesScriptingInterface::messageReceived(const QXmppMessage& messa · 58 unmodified lines | ||
| 115 | 118 | return; |
| 116 | 119 | } |
| 117 | 120 | const QXmppMucRoom* publicChatRoom = XmppClient::getInstance().getPublicChatRoom(); |
| 118 | − emit GlobalServicesScriptingInterface::incomingMessage(message.from().right(message.from().count() - 1 - publicChatRoom->jid().count()), message.body()); | |
| 121 | + QString username = message.from().right(message.from().count() - 1 - publicChatRoom->jid().count()); | |
| 122 | + emit GlobalServicesScriptingInterface::incomingMessage(username, message.body()); | |
| 119 | 123 | } |
| 120 | 124 | #endif // HAVE_QXMPP |
| 121 | 125 | |