diff options
author | Remko Tronçon <git@el-tramo.be> | 2013-08-02 18:49:56 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2013-08-02 18:49:56 (GMT) |
commit | f7e0c20b5a1596d1adcc8b0c688ca005522fe0f1 (patch) | |
tree | 3b78baa28457f43c775a32d6b4f5da9517e4256a /Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp | |
parent | db698bbb6d8c7e878e2cb997e18e572f3646e11d (diff) | |
download | swift-f7e0c20b5a1596d1adcc8b0c688ca005522fe0f1.zip swift-f7e0c20b5a1596d1adcc8b0c688ca005522fe0f1.tar.bz2 |
Small style fixes for the previous patch.
Change-Id: I0c9a0865e25a9b0cdc760998dadc7026df16dbfe
Diffstat (limited to 'Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp')
-rw-r--r-- | Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp index 06c1b84..77a1cda 100644 --- a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp +++ b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp @@ -111,8 +111,7 @@ public: mocks_->ExpectCall(chatListWindowFactory_, ChatListWindowFactory::createChatListWindow).With(uiEventStream_).Return(chatListWindow_); clientBlockListManager_ = new ClientBlockListManager(iqRouter_); - emoticons_ = new std::map<std::string, std::string>(); - manager_ = new ChatsManager(jid_, stanzaChannel_, iqRouter_, eventController_, chatWindowFactory_, joinMUCWindowFactory_, nickResolver_, presenceOracle_, directedPresenceSender_, uiEventStream_, chatListWindowFactory_, true, NULL, mucRegistry_, entityCapsManager_, mucManager_, mucSearchWindowFactory_, profileSettings_, ftOverview_, xmppRoster_, false, settings_, NULL, wbManager_, highlightManager_, clientBlockListManager_, emoticons_); + manager_ = new ChatsManager(jid_, stanzaChannel_, iqRouter_, eventController_, chatWindowFactory_, joinMUCWindowFactory_, nickResolver_, presenceOracle_, directedPresenceSender_, uiEventStream_, chatListWindowFactory_, true, NULL, mucRegistry_, entityCapsManager_, mucManager_, mucSearchWindowFactory_, profileSettings_, ftOverview_, xmppRoster_, false, settings_, NULL, wbManager_, highlightManager_, clientBlockListManager_, &emoticons_); manager_->setAvatarManager(avatarManager_); } @@ -489,7 +488,7 @@ private: WhiteboardManager* wbManager_; HighlightManager* highlightManager_; ClientBlockListManager* clientBlockListManager_; - std::map<std::string, std::string>* emoticons_; + std::map<std::string, std::string> emoticons_; }; CPPUNIT_TEST_SUITE_REGISTRATION(ChatsManagerTest); |