diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 18:02:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 18:37:51 +0200 |
| commit | b48e90799d85e25092fa07ee47bb5a94588d4c82 (patch) | |
| tree | e8f3d600f7aa73c2fa23c8ded05e70cf70fe1542 | |
| parent | 0b23ac2c9d36c89137feeb82d0aed7a8628a53b7 (diff) | |
vcl: std::auto_ptr -> std::unique_ptr
Change-Id: I5a08186b465b15311c63784506a0ca0e119286e2
| -rw-r--r-- | include/vcl/mnemonicengine.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/quickselectionengine.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/threadex.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/textlayout.hxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/mnemonicengine.hxx b/include/vcl/mnemonicengine.hxx index c8c40009f468..f1769b5138f3 100644 --- a/include/vcl/mnemonicengine.hxx +++ b/include/vcl/mnemonicengine.hxx @@ -121,7 +121,7 @@ namespace vcl struct MnemonicEngine_Data; class VCL_DLLPUBLIC MnemonicEngine { - ::std::auto_ptr< MnemonicEngine_Data > m_pData; + ::std::unique_ptr< MnemonicEngine_Data > m_pData; public: MnemonicEngine( IMnemonicEntryList& _rEntryList ); diff --git a/include/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx index 08d1fa384b46..138a7883f891 100644 --- a/include/vcl/quickselectionengine.hxx +++ b/include/vcl/quickselectionengine.hxx @@ -76,7 +76,7 @@ namespace vcl void SetEnabled( const bool& b ); private: - ::std::auto_ptr< QuickSelectionEngine_Data > m_pData; + ::std::unique_ptr< QuickSelectionEngine_Data > m_pData; bool bEnabled; private: diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx index f25a3cc63c46..b2f24d65dcec 100644 --- a/include/vcl/threadex.hxx +++ b/include/vcl/threadex.hxx @@ -71,7 +71,7 @@ public: static ResultT exec( FuncT const& func ) { typedef GenericSolarThreadExecutor<FuncT, ResultT> ExecutorT; - ::std::auto_ptr<ExecutorT> const pExecutor( new ExecutorT(func) ); + ::std::unique_ptr<ExecutorT> const pExecutor( new ExecutorT(func) ); pExecutor->execute(); if (pExecutor->m_exc.hasValue()) ::cppu::throwException( pExecutor->m_exc ); @@ -108,7 +108,7 @@ public: static void exec( FuncT const& func ) { typedef GenericSolarThreadExecutor<FuncT, void> ExecutorT; - ::std::auto_ptr<ExecutorT> const pExecutor( new ExecutorT(func) ); + ::std::unique_ptr<ExecutorT> const pExecutor( new ExecutorT(func) ); pExecutor->execute(); if (pExecutor->m_exc.hasValue()) ::cppu::throwException( pExecutor->m_exc ); diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx index 14980218d90a..3ba4d6012f9e 100644 --- a/vcl/inc/textlayout.hxx +++ b/vcl/inc/textlayout.hxx @@ -102,7 +102,7 @@ namespace vcl ControlTextRenderer& operator=( const ControlTextRenderer& ); // never implemented private: - ::std::auto_ptr< ReferenceDeviceTextLayout > m_pImpl; + ::std::unique_ptr< ReferenceDeviceTextLayout > m_pImpl; }; } // namespace vcl |