diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-15 20:41:33 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-16 12:54:44 +0000 |
| commit | a1ceacc17e3f30d5e9c06b3218ad8ec26ca2f1b9 (patch) | |
| tree | 56a29f66f75f326a0a677ab1697ce28f1bc9fcbf /include/svx/sidebar | |
| parent | 18f41dfaf19d656d290c47d196ef2702e169a522 (diff) | |
boost::foo_ptr->std::foo_ptr
Change-Id: I9219619b538b6530a89f5932ac51eb3b62eb396a
Diffstat (limited to 'include/svx/sidebar')
| -rw-r--r-- | include/svx/sidebar/Popup.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/svx/sidebar/Popup.hxx b/include/svx/sidebar/Popup.hxx index 2e5d7910fe81..e11e8c1ee6b0 100644 --- a/include/svx/sidebar/Popup.hxx +++ b/include/svx/sidebar/Popup.hxx @@ -24,7 +24,6 @@ #include <tools/link.hxx> #include <boost/function.hpp> -#include <boost/scoped_ptr.hpp> namespace vcl { class Window; } class ToolBox; @@ -77,7 +76,7 @@ public : void SetPopupModeEndHandler (const ::boost::function<void(void)>& rCallback); protected: - ::boost::scoped_ptr<PopupControl> mpControl; + std::unique_ptr<PopupControl> mxControl; /** Make sure that both PopupContainer and PopupControl objects exist. Calls the maControlCreator functor if necessary. @@ -94,7 +93,7 @@ private: ::boost::function<PopupControl*(PopupContainer*)> maControlCreator; ::boost::function<void(void)> maPopupModeEndCallback; const ::rtl::OUString msAccessibleName; - ::boost::scoped_ptr<PopupContainer> mpContainer; + std::unique_ptr<PopupContainer> mxContainer; DECL_LINK(PopupModeEndHandler, void*); }; |