Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-01 17:23:49 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-04-04 08:28:23 (GMT) |
| commit | 741c45b74d5f634622eb5f757c49323274fb8937 (patch) | |
| tree | b9cfa6c2fe2e79e03cc8cb7c1ca1e9cf45aa5328 /SwifTools/Notifier | |
| parent | eddd92ed76ae68cb1e202602fd3ebd11b69191a2 (diff) | |
| download | swift-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 'SwifTools/Notifier')
| -rw-r--r-- | SwifTools/Notifier/GrowlNotifier.h | 4 | ||||
| -rw-r--r-- | SwifTools/Notifier/GrowlNotifier.mm | 4 | ||||
| -rw-r--r-- | SwifTools/Notifier/NotificationCenterNotifier.h | 4 | ||||
| -rw-r--r-- | SwifTools/Notifier/NotificationCenterNotifier.mm | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/SwifTools/Notifier/GrowlNotifier.h b/SwifTools/Notifier/GrowlNotifier.h index b4c4eba..cbfe3e9 100644 --- a/SwifTools/Notifier/GrowlNotifier.h +++ b/SwifTools/Notifier/GrowlNotifier.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2011 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -36,6 +36,6 @@ namespace Swift { private: class Private; - boost::shared_ptr<Private> p; + std::shared_ptr<Private> p; }; } diff --git a/SwifTools/Notifier/GrowlNotifier.mm b/SwifTools/Notifier/GrowlNotifier.mm index e9ffff7..1356805 100644 --- a/SwifTools/Notifier/GrowlNotifier.mm +++ b/SwifTools/Notifier/GrowlNotifier.mm @@ -6,7 +6,7 @@ #include <SwifTools/Notifier/GrowlNotifier.h> -#include <boost/smart_ptr/make_shared.hpp> +#include <memory> #include <set> #include <SwifTools/Notifier/GrowlNotifierDelegate.h> @@ -33,7 +33,7 @@ class GrowlNotifier::Private { }; GrowlNotifier::GrowlNotifier(const std::string& name) { - p = boost::make_shared<Private>(); + p = std::make_shared<Private>(); p->delegate = boost::intrusive_ptr<GrowlNotifierDelegate>([[GrowlNotifierDelegate alloc] init], false); p->delegate.get().notifier = this; p->delegate.get().name = std2NSString(name); diff --git a/SwifTools/Notifier/NotificationCenterNotifier.h b/SwifTools/Notifier/NotificationCenterNotifier.h index 75b4df7..19eb944 100644 --- a/SwifTools/Notifier/NotificationCenterNotifier.h +++ b/SwifTools/Notifier/NotificationCenterNotifier.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Isode Limited. + * Copyright (c) 2015-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -32,7 +32,7 @@ public: private: class Private; - boost::shared_ptr<Private> p; + std::shared_ptr<Private> p; }; } diff --git a/SwifTools/Notifier/NotificationCenterNotifier.mm b/SwifTools/Notifier/NotificationCenterNotifier.mm index 57b9a4b..35c740a 100644 --- a/SwifTools/Notifier/NotificationCenterNotifier.mm +++ b/SwifTools/Notifier/NotificationCenterNotifier.mm @@ -9,7 +9,7 @@ #include <map> #include <string> -#include <boost/smart_ptr/make_shared.hpp> +#include <memory> #include <Swiften/Base/Log.h> @@ -35,12 +35,12 @@ namespace Swift { class NotificationCenterNotifier::Private { public: - std::map<std::string, boost::shared_ptr<Context> > callbacksForNotifications; + std::map<std::string, std::shared_ptr<Context> > callbacksForNotifications; boost::intrusive_ptr<NotificationCenterNotifierDelegate> delegate; }; NotificationCenterNotifier::NotificationCenterNotifier() { - p = boost::make_shared<Private>(); + p = std::make_shared<Private>(); p->delegate = boost::intrusive_ptr<NotificationCenterNotifierDelegate>([[NotificationCenterNotifierDelegate alloc] init], false); [p->delegate.get() setNotifier: this]; @@ -73,7 +73,7 @@ void NotificationCenterNotifier::showMessage(Type type, const std::string& subje /// \todo Currently the elements are only removed on application exit. Ideally the notifications not required anymore /// are removed from the map; e.g. when visiting a chat view, all notifications from that view can be removed from /// the map and the NSUserNotificationCenter. - p->callbacksForNotifications[ns2StdString(notification.identifier)] = boost::make_shared<Context>(callback); + p->callbacksForNotifications[ns2StdString(notification.identifier)] = std::make_shared<Context>(callback); [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification]; [notification release]; } |