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 /accessibility/inc | |
parent | 18f41dfaf19d656d290c47d196ef2702e169a522 (diff) |
boost::foo_ptr->std::foo_ptr
Change-Id: I9219619b538b6530a89f5932ac51eb3b62eb396a
Diffstat (limited to 'accessibility/inc')
6 files changed, 12 insertions, 16 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx index 74a96adba625..faef86e00e6b 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx @@ -22,11 +22,9 @@ #define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOX_HXX #include <accessibility/extended/AccessibleBrowseBoxBase.hxx> -#include <boost/scoped_ptr.hpp> #include <cppuhelper/weakref.hxx> #include <svtools/accessibletableprovider.hxx> - - +#include <memory> namespace accessibility { @@ -185,7 +183,7 @@ protected: private: // members ---------------------------------------------------------------- - boost::scoped_ptr< AccessibleBrowseBoxImpl > m_pImpl; + std::unique_ptr< AccessibleBrowseBoxImpl > m_xImpl; }; diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx index 8d174d62190e..db50af9ee0a5 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx @@ -22,11 +22,9 @@ #include <accessibility/extended/AccessibleGridControlBase.hxx> #include <accessibility/extended/AccessibleGridControlTable.hxx> -#include <boost/scoped_ptr.hpp> #include <cppuhelper/weakref.hxx> #include <svtools/accessibletable.hxx> - - +#include <memory> namespace accessibility { @@ -173,7 +171,7 @@ protected: private: // members ---------------------------------------------------------------- - boost::scoped_ptr< AccessibleGridControl_Impl > m_pImpl; + std::unique_ptr< AccessibleGridControl_Impl > m_xImpl; }; diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx index b627e9e8ad74..8c7df5fd6464 100644 --- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx @@ -23,7 +23,7 @@ #include <cppuhelper/implbase1.hxx> #include <toolkit/awt/vclxaccessiblecomponent.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> namespace svt { @@ -71,7 +71,7 @@ namespace accessibility virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet ) SAL_OVERRIDE; private: - ::boost::scoped_ptr< AccessibleToolPanelDeck_Impl > m_pImpl; + std::unique_ptr< AccessibleToolPanelDeck_Impl > m_xImpl; }; diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx index 5ea31e7cd741..a1e74e01fcf6 100644 --- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx @@ -23,7 +23,7 @@ #include <cppuhelper/implbase1.hxx> #include <toolkit/awt/vclxaccessiblecomponent.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> namespace svt { @@ -72,7 +72,7 @@ namespace accessibility virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet ) SAL_OVERRIDE; private: - ::boost::scoped_ptr< AccessibleToolPanelTabBar_Impl > m_pImpl; + std::unique_ptr< AccessibleToolPanelTabBar_Impl > m_xImpl; }; diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx index 01749067ec0a..9124c701f380 100644 --- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx @@ -23,7 +23,7 @@ #include <comphelper/accessiblecomponenthelper.hxx> #include <cppuhelper/implbase1.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> namespace svt { @@ -87,7 +87,7 @@ namespace accessibility virtual void SAL_CALL disposing() SAL_OVERRIDE; protected: - ::boost::scoped_ptr< AccessibleToolPanelDeckTabBarItem_Impl > m_pImpl; + std::unique_ptr< AccessibleToolPanelDeckTabBarItem_Impl > m_xImpl; }; diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx index 05c87f08f1df..a24e8c94af77 100644 --- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx @@ -53,7 +53,7 @@ #include <vcl/svapp.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <queue> -#include <boost/scoped_ptr.hpp> +#include <memory> #include <unordered_map> class TextEngine; @@ -655,7 +655,7 @@ private: // All the following members have valid values only after calling init: - boost::scoped_ptr< Paragraphs > m_xParagraphs; + std::unique_ptr< Paragraphs > m_xParagraphs; // m_nViewOffset is from the start of the document (0) to the start of the // current view, and m_nViewHeight is the height of the view: |