summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-04-01 17:23:49 (GMT)
committerTobias Markmann <tm@ayena.de>2016-04-04 08:28:23 (GMT)
commit741c45b74d5f634622eb5f757c49323274fb8937 (patch)
treeb9cfa6c2fe2e79e03cc8cb7c1ca1e9cf45aa5328 /Swiften/Chat/UnitTest
parenteddd92ed76ae68cb1e202602fd3ebd11b69191a2 (diff)
downloadswift-741c45b74d5f634622eb5f757c49323274fb8937.zip
swift-741c45b74d5f634622eb5f757c49323274fb8937.tar.bz2
Modernize code to use C++11 shared_ptr instead of Boost's
This change was done by applying the following 'gsed' replacement calls to all source files: 's/\#include <boost\/shared_ptr\.hpp>/\#include <memory>/g' 's/\#include <boost\/enable_shared_from_this\.hpp>/\#include <memory>/g' 's/\#include <boost\/smart_ptr\/make_shared\.hpp>/\#include <memory>/g' 's/\#include <boost\/make_shared\.hpp>/\#include <memory>/g' 's/\#include <boost\/weak_ptr\.hpp>/\#include <memory>/g' 's/boost::make_shared/std::make_shared/g' 's/boost::dynamic_pointer_cast/std::dynamic_pointer_cast/g' 's/boost::shared_ptr/std::shared_ptr/g' 's/boost::weak_ptr/std::weak_ptr/g' 's/boost::enable_shared_from_this/std::enable_shared_from_this/g' The remaining issues have been fixed manually. Test-Information: Code builds on OS X 10.11.4 and unit tests pass. Change-Id: Ia7ae34eab869fb9ad6387a1348426b71ae4acd5f
Diffstat (limited to 'Swiften/Chat/UnitTest')
-rw-r--r--Swiften/Chat/UnitTest/ChatStateNotifierTest.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/Chat/UnitTest/ChatStateNotifierTest.cpp b/Swiften/Chat/UnitTest/ChatStateNotifierTest.cpp
index af43ced..278068a 100644
--- a/Swiften/Chat/UnitTest/ChatStateNotifierTest.cpp
+++ b/Swiften/Chat/UnitTest/ChatStateNotifierTest.cpp
@@ -70,21 +70,21 @@ public:
void testContactShouldReceiveStates_CapsOnly() {
setContactHas85Caps();
- boost::shared_ptr<Message> message(new Message());
+ std::shared_ptr<Message> message(new Message());
notifier_->addChatStateRequest(message);
CPPUNIT_ASSERT(message->getPayload<ChatState>());
CPPUNIT_ASSERT_EQUAL(ChatState::Active, message->getPayload<ChatState>()->getChatState());
}
void testContactShouldReceiveStates_CapsNorActive() {
- boost::shared_ptr<Message> message(new Message());
+ std::shared_ptr<Message> message(new Message());
notifier_->addChatStateRequest(message);
CPPUNIT_ASSERT(!message->getPayload<ChatState>());
}
void testContactShouldReceiveStates_ActiveOverrideOn() {
notifier_->receivedMessageFromContact(true);
- boost::shared_ptr<Message> message(new Message());
+ std::shared_ptr<Message> message(new Message());
notifier_->addChatStateRequest(message);
CPPUNIT_ASSERT(message->getPayload<ChatState>());
CPPUNIT_ASSERT_EQUAL(ChatState::Active, message->getPayload<ChatState>()->getChatState());
@@ -97,7 +97,7 @@ public:
* thought this should check for false, but I later found it was OPTIONAL
* (MAY) behaviour only for if you didn't receive caps.
*/
- boost::shared_ptr<Message> message(new Message());
+ std::shared_ptr<Message> message(new Message());
notifier_->addChatStateRequest(message);
CPPUNIT_ASSERT(message->getPayload<ChatState>());
CPPUNIT_ASSERT_EQUAL(ChatState::Active, message->getPayload<ChatState>()->getChatState());
@@ -142,7 +142,7 @@ public:
int getComposingCount() const {
int result = 0;
- foreach(boost::shared_ptr<Stanza> stanza, stanzaChannel->sentStanzas) {
+ foreach(std::shared_ptr<Stanza> stanza, stanzaChannel->sentStanzas) {
if (stanza->getPayload<ChatState>() && stanza->getPayload<ChatState>()->getChatState() == ChatState::Composing) {
result++;
}
@@ -152,7 +152,7 @@ public:
int getActiveCount() const {
int result = 0;
- foreach(boost::shared_ptr<Stanza> stanza, stanzaChannel->sentStanzas) {
+ foreach(std::shared_ptr<Stanza> stanza, stanzaChannel->sentStanzas) {
if (stanza->getPayload<ChatState>() && stanza->getPayload<ChatState>()->getChatState() == ChatState::Active) {
result++;
}