Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-10-24 12:10:44 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-10-24 12:15:24 (GMT) |
| commit | b107bdd08df9ae3a978ad8f966a26eb8d551bd13 (patch) | |
| tree | ad1c4d6550f323a19dffd699c98513aa68acddaf /Swift/Controllers | |
| parent | cfa314bd0b6f6ed9285c7167948899184f6a8c12 (diff) | |
| download | swift-b107bdd08df9ae3a978ad8f966a26eb8d551bd13.zip swift-b107bdd08df9ae3a978ad8f966a26eb8d551bd13.tar.bz2 | |
Creating abstract XMPPRoster base class.
Diffstat (limited to 'Swift/Controllers')
4 files changed, 12 insertions, 12 deletions
diff --git a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp index 46b5580..9f38bb8 100644 --- a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp +++ b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp @@ -25,7 +25,7 @@ #include "Swiften/VCards/VCardManager.h" #include "Swiften/VCards/VCardMemoryStorage.h" #include "Swift/Controllers/NickResolver.h" -#include "Swiften/Roster/XMPPRoster.h" +#include "Swiften/Roster/XMPPRosterImpl.h" #include "Swift/Controllers/UnitTest/MockChatWindow.h" #include "Swiften/Client/DummyStanzaChannel.h" #include "Swiften/Queries/DummyIQChannel.h" @@ -66,7 +66,7 @@ public: capsProvider_ = new DummyCapsProvider(); eventController_ = new EventController(); chatWindowFactory_ = mocks_->InterfaceMock<ChatWindowFactory>(); - xmppRoster_ = new XMPPRoster(); + xmppRoster_ = new XMPPRosterImpl(); mucRegistry_ = new MUCRegistry(); nickResolver_ = new NickResolver(jid_.toBare(), xmppRoster_, NULL, mucRegistry_); presenceOracle_ = new PresenceOracle(stanzaChannel_); @@ -323,7 +323,7 @@ private: PresenceOracle* presenceOracle_; AvatarManager* avatarManager_; boost::shared_ptr<DiscoInfo> serverDiscoInfo_; - XMPPRoster* xmppRoster_; + XMPPRosterImpl* xmppRoster_; PresenceSender* presenceSender_; MockRepository* mocks_; UIEventStream* uiEventStream_; diff --git a/Swift/Controllers/UnitTest/NickResolverTest.cpp b/Swift/Controllers/UnitTest/NickResolverTest.cpp index 1608731..2b1e49c 100644 --- a/Swift/Controllers/UnitTest/NickResolverTest.cpp +++ b/Swift/Controllers/UnitTest/NickResolverTest.cpp @@ -9,7 +9,7 @@ #include "Swift/Controllers/NickResolver.h" #include "Swiften/MUC/MUCRegistry.h" -#include "Swiften/Roster/XMPPRoster.h" +#include "Swiften/Roster/XMPPRosterImpl.h" #include "Swiften/VCards/VCardManager.h" #include "Swiften/VCards/VCardMemoryStorage.h" #include "Swiften/Queries/IQRouter.h" @@ -35,7 +35,7 @@ class NickResolverTest : public CppUnit::TestFixture { public: void setUp() { ownJID_ = JID("kev@wonderland.lit"); - xmppRoster_ = new XMPPRoster(); + xmppRoster_ = new XMPPRosterImpl(); stanzaChannel_ = new DummyStanzaChannel(); iqRouter_ = new IQRouter(stanzaChannel_); vCardStorage_ = new VCardMemoryStorage(); @@ -136,7 +136,7 @@ class NickResolverTest : public CppUnit::TestFixture { private: std::vector<String> groups_; - XMPPRoster* xmppRoster_; + XMPPRosterImpl* xmppRoster_; VCardStorage* vCardStorage_; IQRouter* iqRouter_; DummyStanzaChannel* stanzaChannel_; diff --git a/Swift/Controllers/UnitTest/PresenceNotifierTest.cpp b/Swift/Controllers/UnitTest/PresenceNotifierTest.cpp index 9addab2..5ebd5df 100644 --- a/Swift/Controllers/UnitTest/PresenceNotifierTest.cpp +++ b/Swift/Controllers/UnitTest/PresenceNotifierTest.cpp @@ -14,7 +14,7 @@ #include "SwifTools/Notifier/LoggingNotifier.h" #include "Swiften/Client/DummyStanzaChannel.h" #include "Swiften/MUC/MUCRegistry.h" -#include "Swiften/Roster/XMPPRoster.h" +#include "Swiften/Roster/XMPPRosterImpl.h" #include "Swiften/Presence/PresenceOracle.h" #include "Swiften/Avatars/DummyAvatarManager.h" #include "Swiften/Network/DummyTimerFactory.h" @@ -52,7 +52,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture { user1 = JID("user1@bar.com/bla"); user2 = JID("user2@foo.com/baz"); avatarManager = new DummyAvatarManager(); - roster = new XMPPRoster(); + roster = new XMPPRosterImpl(); nickResolver = new NickResolver(JID("foo@bar.com"), roster, NULL, mucRegistry); presenceOracle = new PresenceOracle(stanzaChannel); timerFactory = new DummyTimerFactory(); @@ -303,7 +303,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture { LoggingNotifier* notifier; MUCRegistry* mucRegistry; DummyAvatarManager* avatarManager; - XMPPRoster* roster; + XMPPRosterImpl* roster; NickResolver* nickResolver; PresenceOracle* presenceOracle; DummyTimerFactory* timerFactory; diff --git a/Swift/Controllers/UnitTest/RosterControllerTest.cpp b/Swift/Controllers/UnitTest/RosterControllerTest.cpp index 82611f7..92336f6 100644 --- a/Swift/Controllers/UnitTest/RosterControllerTest.cpp +++ b/Swift/Controllers/UnitTest/RosterControllerTest.cpp @@ -16,7 +16,7 @@ #include "Swiften/Queries/DummyIQChannel.h" #include "Swiften/Client/DummyStanzaChannel.h" #include "Swiften/Queries/IQRouter.h" -#include "Swiften/Roster/XMPPRoster.h" +#include "Swiften/Roster/XMPPRosterImpl.h" #include "Swiften/Roster/Roster.h" #include "Swiften/Roster/GroupRosterItem.h" #include "Swiften/Roster/ContactRosterItem.h" @@ -50,7 +50,7 @@ class RosterControllerTest : public CppUnit::TestFixture void setUp() { jid_ = JID("testjid@swift.im/swift"); - xmppRoster_ = new XMPPRoster(); + xmppRoster_ = new XMPPRosterImpl(); avatarManager_ = new NullAvatarManager(); mainWindowFactory_ = new MockMainWindowFactory(); mucRegistry_ = new MUCRegistry(); @@ -196,7 +196,7 @@ class RosterControllerTest : public CppUnit::TestFixture private: JID jid_; - XMPPRoster* xmppRoster_; + XMPPRosterImpl* xmppRoster_; MUCRegistry* mucRegistry_; AvatarManager* avatarManager_; MockMainWindowFactory* mainWindowFactory_; |