Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-09-26 12:49:48 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-09-26 22:04:37 (GMT) |
| commit | 65596031acaf7d4f277bd75758bb1c551501ce86 (patch) | |
| tree | aac3a8bf6dbdccc1d476225b50ba25decf1a46cc /Swift | |
| parent | 05fbe78f5c3b30517f7152b37c157a99120682dc (diff) | |
| download | swift-65596031acaf7d4f277bd75758bb1c551501ce86.zip swift-65596031acaf7d4f277bd75758bb1c551501ce86.tar.bz2 | |
Use const std::unique_ptr for pimpl idiom usage
All our pimpl idiom usage used std::shared_ptr due to being
written in C++03. Now we use C++11 and const std::unique_ptr
is more sensible.
Test-Information:
Builds on macOS 10.12 and unit tests pass.
Change-Id: I1b9b3fbb22e337d53ae71e5a5e03118998cc3376
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/CocoaApplicationActivateHelper.h | 6 | ||||
| -rw-r--r-- | Swift/QtUI/CocoaApplicationActivateHelper.mm | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Swift/QtUI/CocoaApplicationActivateHelper.h b/Swift/QtUI/CocoaApplicationActivateHelper.h index c7aa5b3..83fa886 100644 --- a/Swift/QtUI/CocoaApplicationActivateHelper.h +++ b/Swift/QtUI/CocoaApplicationActivateHelper.h @@ -1,11 +1,13 @@ /* - * Copyright (c) 2012 Isode Limited. + * Copyright (c) 2012-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once +#include <memory> + #include <QObject> namespace Swift { @@ -23,6 +25,6 @@ namespace Swift { private: struct Private; - Private* p; + const std::unique_ptr<Private> p; }; } diff --git a/Swift/QtUI/CocoaApplicationActivateHelper.mm b/Swift/QtUI/CocoaApplicationActivateHelper.mm index 4d4409d..2bd985a 100644 --- a/Swift/QtUI/CocoaApplicationActivateHelper.mm +++ b/Swift/QtUI/CocoaApplicationActivateHelper.mm @@ -6,6 +6,8 @@ #include <Swift/QtUI/CocoaApplicationActivateHelper.h> +#include <memory> + #include <boost/function.hpp> #include <QApplication> @@ -31,8 +33,7 @@ struct CocoaApplicationActivateHelper::Private { bool initialized; }; -CocoaApplicationActivateHelper::CocoaApplicationActivateHelper() { - p = new Private(); +CocoaApplicationActivateHelper::CocoaApplicationActivateHelper() : p(new Private()) { p->delegate = [[CocoaApplicationActivateHelperDelegate alloc] init]; p->initialized = false; qApp->installEventFilter(this); @@ -41,7 +42,6 @@ CocoaApplicationActivateHelper::CocoaApplicationActivateHelper() { CocoaApplicationActivateHelper::~CocoaApplicationActivateHelper() { [[NSAppleEventManager sharedAppleEventManager] removeEventHandlerForEventClass:kCoreEventClass andEventID:kAEReopenApplication]; [p->delegate release]; - delete p; } bool CocoaApplicationActivateHelper::eventFilter(QObject* object, QEvent* event) { |