History

Coding standard

David Rowe committed 11 years ago

Commit 6c4932f1 parent 40274df1 file · +8 −4Browse files

Showing the changes to interface/src/scripting/GlobalServicesScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

interface/src/scripting/GlobalServicesScriptingInterface.cpp+8−4
@@ -29,7 +29,8 @@ GlobalServicesScriptingInterface::GlobalServicesScriptingInterface() { · 28 unmodified lines
29#endif // HAVE_QXMPP29#endif // HAVE_QXMPP
30 30
31 _downloading = false;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
35GlobalServicesScriptingInterface::~GlobalServicesScriptingInterface() {36GlobalServicesScriptingInterface::~GlobalServicesScriptingInterface() {
@@ -43,14 +44,16 @@ GlobalServicesScriptingInterface::~GlobalServicesScriptingInterface() { · 7 unmodified lines
43 const QXmppClient& qxmppClient = XmppClient::getInstance().getXMPPClient();44 const QXmppClient& qxmppClient = XmppClient::getInstance().getXMPPClient();
44 disconnect(&qxmppClient, &QXmppClient::messageReceived, this, &GlobalServicesScriptingInterface::messageReceived);45 disconnect(&qxmppClient, &QXmppClient::messageReceived, this, &GlobalServicesScriptingInterface::messageReceived);
45 const QXmppMucRoom* publicChatRoom = XmppClient::getInstance().getPublicChatRoom();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#endif // HAVE_QXMPP49#endif // HAVE_QXMPP
48}50}
49 51
50void GlobalServicesScriptingInterface::onConnected() {52void GlobalServicesScriptingInterface::onConnected() {
51#ifdef HAVE_QXMPP53#ifdef HAVE_QXMPP
52 const QXmppMucRoom* publicChatRoom = XmppClient::getInstance().getPublicChatRoom();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#endif // HAVE_QXMPP57#endif // HAVE_QXMPP
55}58}
56 59
@@ -115,7 +118,8 @@ void GlobalServicesScriptingInterface::messageReceived(const QXmppMessage& messa · 58 unmodified lines
115 return;118 return;
116 }119 }
117 const QXmppMucRoom* publicChatRoom = XmppClient::getInstance().getPublicChatRoom();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#endif // HAVE_QXMPP124#endif // HAVE_QXMPP
121 125