diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-24 18:15:42 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-25 08:40:12 +0200 |
commit | 43c47c610556b0bbd4f22c317d6e58c543109c12 (patch) | |
tree | 092acbcbc99b29b02591022a0e11a01f2b309e93 /include | |
parent | c91dec0dad6b0da5bfe15d0597bfc069df26f343 (diff) |
connectivity: std::auto_ptr -> std::unique_ptr
Change-Id: I796dc05d1846f140a56b5a6f14a69a239324ae5b
Diffstat (limited to 'include')
-rw-r--r-- | include/connectivity/TTableHelper.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/dbmetadata.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/formattedcolumnvalue.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/paramwrapper.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/sdbcx/VCollection.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/sqliterator.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/sqlparse.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/statementcomposer.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/virtualdbtools.hxx | 2 | ||||
-rw-r--r-- | include/svx/dbtoolsclient.hxx | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx index a125222a0cf2..43d5fd7695d1 100644 --- a/include/connectivity/TTableHelper.hxx +++ b/include/connectivity/TTableHelper.hxx @@ -81,7 +81,7 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OTableHelper : public OTable_TYPEDEF { - ::std::auto_ptr<OTableHelperImpl> m_pImpl; + ::std::unique_ptr<OTableHelperImpl> m_pImpl; void refreshPrimaryKeys(TStringVector& _rKeys); void refreshForeignKeys(TStringVector& _rKeys); diff --git a/include/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx index 7d7e3bf6da7b..148763d9dfe5 100644 --- a/include/connectivity/dbmetadata.hxx +++ b/include/connectivity/dbmetadata.hxx @@ -49,7 +49,7 @@ namespace dbtools class OOO_DLLPUBLIC_DBTOOLS DatabaseMetaData { private: - ::std::auto_ptr< DatabaseMetaData_Impl > m_pImpl; + ::std::unique_ptr< DatabaseMetaData_Impl > m_pImpl; public: DatabaseMetaData(); diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx index 85f7ec5f0d83..085233df21a4 100644 --- a/include/connectivity/formattedcolumnvalue.hxx +++ b/include/connectivity/formattedcolumnvalue.hxx @@ -97,7 +97,7 @@ namespace dbtools virtual OUString getFormattedValue() const; private: - ::std::auto_ptr< FormattedColumnValue_Data > m_pData; + ::std::unique_ptr< FormattedColumnValue_Data > m_pData; }; diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx index 60ff2cc72f95..c38f5a615797 100644 --- a/include/connectivity/paramwrapper.hxx +++ b/include/connectivity/paramwrapper.hxx @@ -72,7 +72,7 @@ namespace param /// the component taking the value ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters > m_xValueDestination; /// helper for implementing XPropertySetInfo - ::std::auto_ptr< ::cppu::OPropertyArrayHelper > m_pInfoHelper; + ::std::unique_ptr< ::cppu::OPropertyArrayHelper > m_pInfoHelper; public: diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx index 95ef85e2ecae..7573b5a462d5 100644 --- a/include/connectivity/sdbcx/VCollection.hxx +++ b/include/connectivity/sdbcx/VCollection.hxx @@ -92,7 +92,7 @@ namespace connectivity public OCollectionBase { protected: - ::std::auto_ptr<IObjectCollection> m_pElements; + ::std::unique_ptr<IObjectCollection> m_pElements; ::cppu::OInterfaceContainerHelper m_aContainerListeners; ::cppu::OInterfaceContainerHelper m_aRefreshListeners; diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx index ef792db83017..785c821337fc 100644 --- a/include/connectivity/sqliterator.hxx +++ b/include/connectivity/sqliterator.hxx @@ -67,7 +67,7 @@ namespace connectivity ::rtl::Reference<OSQLColumns> m_aOrderColumns; // the order by columns ::rtl::Reference<OSQLColumns> m_aCreateColumns; // the columns for Create table clause - ::std::auto_ptr< OSQLParseTreeIteratorImpl > m_pImpl; + ::std::unique_ptr< OSQLParseTreeIteratorImpl > m_pImpl; void traverseParameter(const OSQLParseNode* _pParseNode,const OSQLParseNode* _pColumnRef,const OUString& _aColumnName, OUString& _aTableRange, const OUString& _rColumnAlias); // inserts a table into the map diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx index 5afe259a5658..8240be502c38 100644 --- a/include/connectivity/sqlparse.hxx +++ b/include/connectivity/sqlparse.hxx @@ -151,7 +151,7 @@ namespace connectivity // information on the current parse action const IParseContext* m_pContext; OSQLParseNode* m_pParseTree; // result from parsing - ::std::auto_ptr< OSQLParser_Data > + ::std::unique_ptr< OSQLParser_Data > m_pData; OUString m_sFieldName; // current field name for a predicate OUString m_sErrorMessage;// current error msg diff --git a/include/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx index 39ead8407760..d53f3903b94d 100644 --- a/include/connectivity/statementcomposer.hxx +++ b/include/connectivity/statementcomposer.hxx @@ -41,7 +41,7 @@ namespace dbtools */ class OOO_DLLPUBLIC_DBTOOLS StatementComposer : public ::boost::noncopyable { - ::std::auto_ptr< StatementComposer_Data > m_pData; + ::std::unique_ptr< StatementComposer_Data > m_pData; public: /** constructs an instance diff --git a/include/connectivity/virtualdbtools.hxx b/include/connectivity/virtualdbtools.hxx index 26dc62e8de31..7735f519a9b2 100644 --- a/include/connectivity/virtualdbtools.hxx +++ b/include/connectivity/virtualdbtools.hxx @@ -347,7 +347,7 @@ namespace connectivity /// creates a helper which can be used to access the static methods in dbtools.hxx virtual ::rtl::Reference< IDataAccessTools > getDataAccessTools() = 0; - virtual ::std::auto_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue( + virtual ::std::unique_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn diff --git a/include/svx/dbtoolsclient.hxx b/include/svx/dbtoolsclient.hxx index 6064e35ffb20..7888b0ac876b 100644 --- a/include/svx/dbtoolsclient.hxx +++ b/include/svx/dbtoolsclient.hxx @@ -158,7 +158,7 @@ namespace svxform DBToolsObjectFactory(); virtual ~DBToolsObjectFactory(); - ::std::auto_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue( + ::std::unique_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue( const css::uno::Reference<css::uno::XComponentContext>& _rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn |