Kaydet (Commit) d9884a62 authored tarafından Noel Grandin's avatar Noel Grandin

new loplugin: useuniqueptr: connectivity

Change-Id: I016f6a62814f1e93373dc70f59893fa38361464b
Reviewed-on: https://gerrit.libreoffice.org/33149Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 33f43bd7
......@@ -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) );
}
......
......@@ -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) );
}
......
......@@ -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()
......
......@@ -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) );
}
......
......@@ -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()
......
......@@ -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()
......
......@@ -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()
......
......@@ -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()
......
......@@ -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;
}
......
......@@ -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 );
......
......@@ -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
......
......@@ -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();
}
......
......@@ -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)
......
......@@ -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)
......
......@@ -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();
}
......
......@@ -55,7 +55,7 @@ namespace connectivity
public ODescriptor
{
protected:
OUsers* m_pUsers;
std::unique_ptr<OUsers> m_pUsers;
using OGroup_BASE::rBHelper;
......
......@@ -56,7 +56,7 @@ namespace connectivity
bool m_IsPrimaryKeyIndex;
bool m_IsClustered;
OCollection* m_pColumns;
std::unique_ptr<OCollection> m_pColumns;
using ODescriptor_BASE::rBHelper;
virtual void refreshColumns() override;
......
......@@ -69,7 +69,7 @@ namespace connectivity
{
protected:
std::shared_ptr<KeyProperties> m_aProps;
OCollection* m_pColumns;
std::unique_ptr<OCollection> m_pColumns;
using ODescriptor_BASE::rBHelper;
// OPropertyArrayUsageHelper
......
......@@ -52,7 +52,7 @@ namespace connectivity
public ODescriptor
{
protected:
OGroups* m_pGroups;
std::unique_ptr<OGroups> m_pGroups;
using OUser_BASE::rBHelper;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment