diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-16 09:21:14 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-17 06:34:31 +0000 |
commit | d9884a62a23b2a410e5b364308e06c37a67f9422 (patch) | |
tree | 6a33a1289733518d880436273a4bbf2baa38ab4a /connectivity/source | |
parent | 33f43bd7742a0a8803eb19dd4de7de2c7a0c8c78 (diff) |
new loplugin: useuniqueptr: connectivity
Change-Id: I016f6a62814f1e93373dc70f59893fa38361464b
Reviewed-on: https://gerrit.libreoffice.org/33149
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity/source')
-rw-r--r-- | connectivity/source/commontools/TIndex.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/commontools/TKey.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/AGroup.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/AIndex.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/AKey.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/AUser.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/dbase/DIndex.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/dbase/dindexnode.cxx | 3 | ||||
-rw-r--r-- | connectivity/source/drivers/mork/MDatabaseMetaData.cxx | 3 | ||||
-rw-r--r-- | connectivity/source/drivers/mork/MDatabaseMetaData.hxx | 3 | ||||
-rw-r--r-- | connectivity/source/inc/dbase/dindexnode.hxx | 3 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VGroup.cxx | 3 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VIndex.cxx | 3 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VKey.cxx | 3 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VUser.cxx | 3 |
15 files changed, 19 insertions, 23 deletions
diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx index 88f5d687fa3b..0adbc7031a48 100644 --- a/connectivity/source/commontools/TIndex.cxx +++ b/connectivity/source/commontools/TIndex.cxx @@ -37,7 +37,7 @@ OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex { construct(); ::std::vector< OUString> aVector; - m_pColumns = new OIndexColumns(this,m_aMutex,aVector); + m_pColumns.reset( new OIndexColumns(this,m_aMutex,aVector) ); } OIndexHelper::OIndexHelper( OTableHelper* _pTable, @@ -93,7 +93,7 @@ void OIndexHelper::refreshColumns() if(m_pColumns) m_pColumns->reFill(aVector); else - m_pColumns = new OIndexColumns(this,m_aMutex,aVector); + m_pColumns.reset( new OIndexColumns(this,m_aMutex,aVector) ); } diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx index 057dce0e9df5..783aa533ad92 100644 --- a/connectivity/source/commontools/TKey.cxx +++ b/connectivity/source/commontools/TKey.cxx @@ -98,9 +98,9 @@ void OTableKeyHelper::refreshColumns() if ( m_pColumns ) - m_pColumns ->reFill(aVector); + m_pColumns->reFill(aVector); else - m_pColumns = new OKeyColumnsHelper(this,m_aMutex,aVector); + m_pColumns.reset( new OKeyColumnsHelper(this,m_aMutex,aVector) ); } diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx index 2ff16b1d929c..ab1eb1f3a9c0 100644 --- a/connectivity/source/drivers/ado/AGroup.cxx +++ b/connectivity/source/drivers/ado/AGroup.cxx @@ -79,7 +79,7 @@ void OAdoGroup::refreshUsers() if(m_pUsers) m_pUsers->reFill(aVector); else - m_pUsers = new OUsers(m_pCatalog,m_aMutex,aVector,aUsers,isCaseSensitive()); + m_pUsers.reset( new OUsers(m_pCatalog,m_aMutex,aVector,aUsers,isCaseSensitive()) ); } Sequence< sal_Int8 > OAdoGroup::getUnoTunnelImplementationId() diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx index d5b441714504..b907873cd443 100644 --- a/connectivity/source/drivers/ado/AIndex.cxx +++ b/connectivity/source/drivers/ado/AIndex.cxx @@ -68,7 +68,7 @@ void OAdoIndex::refreshColumns() if ( m_pColumns ) m_pColumns->reFill(aVector); else - m_pColumns = new OColumns(*this,m_aMutex,aVector,aColumns,isCaseSensitive(),m_pConnection); + m_pColumns.reset( new OColumns(*this,m_aMutex,aVector,aColumns,isCaseSensitive(),m_pConnection) ); } diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx index 8c3657dc835e..cc1e13c1e5e8 100644 --- a/connectivity/source/drivers/ado/AKey.cxx +++ b/connectivity/source/drivers/ado/AKey.cxx @@ -64,7 +64,7 @@ void OAdoKey::refreshColumns() if(m_pColumns) m_pColumns->reFill(aVector); else - m_pColumns = new OColumns(*this,m_aMutex,aVector,aColumns,isCaseSensitive(),m_pConnection); + m_pColumns.reset( new OColumns(*this,m_aMutex,aVector,aColumns,isCaseSensitive(),m_pConnection) ); } Sequence< sal_Int8 > OAdoKey::getUnoTunnelImplementationId() diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx index 38943071b885..d874eb2638b6 100644 --- a/connectivity/source/drivers/ado/AUser.cxx +++ b/connectivity/source/drivers/ado/AUser.cxx @@ -63,7 +63,7 @@ void OAdoUser::refreshGroups() if(m_pGroups) m_pGroups->reFill(aVector); else - m_pGroups = new OGroups(m_pCatalog,m_aMutex,aVector,aGroups,isCaseSensitive()); + m_pGroups.reset( new OGroups(m_pCatalog,m_aMutex,aVector,aGroups,isCaseSensitive()) ); } Sequence< sal_Int8 > OAdoUser::getUnoTunnelImplementationId() diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index 5498b982c7dc..416ad8d6653f 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -103,7 +103,7 @@ void ODbaseIndex::refreshColumns() if(m_pColumns) m_pColumns->reFill(aVector); else - m_pColumns = new ODbaseIndexColumns(this,m_aMutex,aVector); + m_pColumns.reset( new ODbaseIndexColumns(this,m_aMutex,aVector) ); } Sequence< sal_Int8 > ODbaseIndex::getUnoTunnelImplementationId() diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index d9b156e302f5..171906d947ec 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -75,12 +75,11 @@ ONDXPage::ONDXPage(ODbaseIndex& rInd, sal_uInt32 nPos, ONDXPage* pParent) , ppNodes(nullptr) { sal_uInt16 nT = rIndex.getHeader().db_maxkeys; - ppNodes = new ONDXNode[nT]; + ppNodes.reset( new ONDXNode[nT] ); } ONDXPage::~ONDXPage() { - delete[] ppNodes; } void ONDXPage::ReleaseRef() diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index debc9272a8b0..9dfdcc364d43 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -39,14 +39,13 @@ namespace connectivity ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) : ::connectivity::ODatabaseMetaDataBase(_pCon,_pCon->getConnectionInfo()) ,m_pConnection(_pCon) + ,m_pMetaDataHelper(new MDatabaseMetaDataHelper) { OSL_ENSURE(m_pConnection,"ODatabaseMetaData::ODatabaseMetaData: No connection set!"); - m_pMetaDataHelper = new MDatabaseMetaDataHelper(); } ODatabaseMetaData::~ODatabaseMetaData() { - delete m_pMetaDataHelper; } diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx index 74c7b8ecc1b0..2c991d01734c 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx @@ -24,7 +24,8 @@ namespace connectivity class ODatabaseMetaData : public ODatabaseMetaDataBase { OConnection* m_pConnection; - MDatabaseMetaDataHelper* m_pMetaDataHelper; + std::unique_ptr<MDatabaseMetaDataHelper> + m_pMetaDataHelper; ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern ) throw( css::sdbc::SQLException ); diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx index 7adf900173d4..4e19f19f0f91 100644 --- a/connectivity/source/inc/dbase/dindexnode.hxx +++ b/connectivity/source/inc/dbase/dindexnode.hxx @@ -129,7 +129,8 @@ namespace connectivity ONDXPagePtr aParent, // Parent page aChild; // Pointer to the right child page ODbaseIndex& rIndex; - ONDXNode* ppNodes; // Array of nodes + std::unique_ptr<ONDXNode[]> + ppNodes; // Array of nodes public: // Node operations diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx index 21ac50470a2c..e1f9ea34e20d 100644 --- a/connectivity/source/sdbcx/VGroup.cxx +++ b/connectivity/source/sdbcx/VGroup.cxx @@ -52,7 +52,6 @@ OGroup::OGroup(const OUString& Name, bool _bCase) : OGroup_BASE(m_aMutex) OGroup::~OGroup() { - delete m_pUsers; } Any SAL_CALL OGroup::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) @@ -108,7 +107,7 @@ Reference< XNameAccess > SAL_CALL OGroup::getUsers( ) throw(RuntimeException, s // allowed } - return m_pUsers; + return m_pUsers.get(); } diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx index a0dacf137503..120222b9d1b4 100644 --- a/connectivity/source/sdbcx/VIndex.cxx +++ b/connectivity/source/sdbcx/VIndex.cxx @@ -88,7 +88,6 @@ OIndex::OIndex( const OUString& Name, OIndex::~OIndex( ) { - delete m_pColumns; } ::cppu::IPropertyArrayHelper* OIndex::createArrayHelper( sal_Int32 /*_nId*/ ) const @@ -163,7 +162,7 @@ Reference< css::container::XNameAccess > SAL_CALL OIndex::getColumns( ) throw(R OSL_FAIL( "OIndex::getColumns: caught an exception!" ); } - return m_pColumns; + return m_pColumns.get(); } Reference< XPropertySet > SAL_CALL OIndex::createDataDescriptor( ) throw(RuntimeException, std::exception) diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx index 8eaf5e784792..a3c15cd83427 100644 --- a/connectivity/source/sdbcx/VKey.cxx +++ b/connectivity/source/sdbcx/VKey.cxx @@ -92,7 +92,6 @@ OKey::OKey(const OUString& Name,const std::shared_ptr<KeyProperties>& _rProps, b OKey::~OKey( ) { - delete m_pColumns; } Any SAL_CALL OKey::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) @@ -171,7 +170,7 @@ Reference< css::container::XNameAccess > SAL_CALL OKey::getColumns( ) throw(Run // allowed } - return m_pColumns; + return m_pColumns.get(); } Reference< XPropertySet > SAL_CALL OKey::createDataDescriptor( ) throw(RuntimeException, std::exception) diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx index 88e7cb296e2f..e77b55b9509a 100644 --- a/connectivity/source/sdbcx/VUser.cxx +++ b/connectivity/source/sdbcx/VUser.cxx @@ -53,7 +53,6 @@ OUser::OUser(const OUString& Name, bool _bCase) : OUser_BASE(m_aMutex) OUser::~OUser( ) { - delete m_pGroups; } void OUser::disposing() @@ -117,7 +116,7 @@ Reference< XNameAccess > SAL_CALL OUser::getGroups( ) throw(RuntimeException, s // allowed } - return m_pGroups; + return m_pGroups.get(); } |