summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/relationdesign
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-06-18 12:14:29 +0200
committerNoel Grandin <noel@peralex.com>2014-06-24 11:34:21 +0200
commite2080e70fe8b085f18e868e46340454720fa94ca (patch)
tree4038d1d57b41b68a47d5ebbbe6ad390648ec6303 /dbaccess/source/ui/relationdesign
parentf910280b8704ed9c289150a4ca3c8d60e15d0d97 (diff)
new compilerplugin returnbyref
Find places where we are returning a pointer to something, where we can be returning a reference. e.g. class A { struct X x; public X* getX() { return &x; } } which can be: public X& getX() { return x; } Change-Id: I796fd23fd36a18aedf6e36bc28f8fab4f518c6c7
Diffstat (limited to 'dbaccess/source/ui/relationdesign')
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnection.cxx6
-rw-r--r--dbaccess/source/ui/relationdesign/RelationDesignView.cxx2
-rw-r--r--dbaccess/source/ui/relationdesign/RelationTableView.cxx34
3 files changed, 21 insertions, 21 deletions
diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
index c05f561c2515..03a9b56c8826 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
@@ -65,9 +65,9 @@ void ORelationTableConnection::Draw( const Rectangle& rRect )
long nTemp;
const OConnectionLine* pTopLine = NULL;
- const ::std::vector<OConnectionLine*>* pConnLineList = GetConnLineList();
- ::std::vector<OConnectionLine*>::const_iterator aIter = pConnLineList->begin();
- ::std::vector<OConnectionLine*>::const_iterator aEnd = pConnLineList->end();
+ const ::std::vector<OConnectionLine*>& rConnLineList = GetConnLineList();
+ ::std::vector<OConnectionLine*>::const_iterator aIter = rConnLineList.begin();
+ ::std::vector<OConnectionLine*>::const_iterator aEnd = rConnLineList.end();
for(;aIter != aEnd;++aIter)
{
if( (*aIter)->IsValid() )
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index 469f4e27b3d9..02a826e88dd5 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -87,7 +87,7 @@ bool ORelationDesignView::PreNotify( NotifyEvent& rNEvt )
void ORelationDesignView::GetFocus()
{
OJoinDesignView::GetFocus();
- if ( m_pTableView && m_pTableView->IsVisible() && !m_pTableView->GetTabWinMap()->empty() )
+ if ( m_pTableView && m_pTableView->IsVisible() && !m_pTableView->GetTabWinMap().empty() )
m_pTableView->GrabTabWinFocus();
}
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index 477e9e9dbcef..e54dcc6add61 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -94,9 +94,9 @@ void ORelationTableView::ReSync()
::std::vector< OUString> arrInvalidTables;
// create and insert windows
- TTableWindowData* pTabWinDataList = m_pView->getController().getTableWindowData();
- TTableWindowData::reverse_iterator aIter = pTabWinDataList->rbegin();
- for(;aIter != pTabWinDataList->rend();++aIter)
+ TTableWindowData& rTabWinDataList = m_pView->getController().getTableWindowData();
+ TTableWindowData::reverse_iterator aIter = rTabWinDataList.rbegin();
+ for(;aIter != rTabWinDataList.rend();++aIter)
{
TTableWindowData::value_type pData = *aIter;
OTableWindow* pTabWin = createWindow(pData);
@@ -109,11 +109,11 @@ void ORelationTableView::ReSync()
delete pTabWin;
arrInvalidTables.push_back(pData->GetTableName());
- pTabWinDataList->erase( ::std::remove(pTabWinDataList->begin(),pTabWinDataList->end(),*aIter) ,pTabWinDataList->end());
+ rTabWinDataList.erase( ::std::remove(rTabWinDataList.begin(), rTabWinDataList.end(), *aIter), rTabWinDataList.end());
continue;
}
- (*GetTabWinMap())[pData->GetComposedName()] = pTabWin; // insert at the beginning, as the Datalist is walked through backward
+ GetTabWinMap()[pData->GetComposedName()] = pTabWin; // insert at the beginning, as the Datalist is walked through backward
// if there's no position or size contained in the data -> Default
if (!pData->HasPosition() && !pData->HasSize())
SetDefaultTabWinPosSize(pTabWin);
@@ -122,10 +122,10 @@ void ORelationTableView::ReSync()
}
// insert connection
- TTableConnectionData* pTabConnDataList = m_pView->getController().getTableConnectionData();
- TTableConnectionData::reverse_iterator aConIter = pTabConnDataList->rbegin();
+ TTableConnectionData& rTabConnDataList = m_pView->getController().getTableConnectionData();
+ TTableConnectionData::reverse_iterator aConIter = rTabConnDataList.rbegin();
- for(;aConIter != pTabConnDataList->rend();++aConIter)
+ for(;aConIter != rTabConnDataList.rend();++aConIter)
{
ORelationTableConnectionData* pTabConnData = static_cast<ORelationTableConnectionData*>(aConIter->get());
if ( !arrInvalidTables.empty() )
@@ -139,7 +139,7 @@ void ORelationTableView::ReSync()
if (bInvalid)
{
// no -> bad luck, the connection is gone
- pTabConnDataList->erase( ::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter),pTabConnDataList->end() );
+ rTabConnDataList.erase( ::std::remove(rTabConnDataList.begin(), rTabConnDataList.end(), *aConIter), rTabConnDataList.end() );
continue;
}
}
@@ -147,8 +147,8 @@ void ORelationTableView::ReSync()
addConnection( new ORelationTableConnection(this, *aConIter), false ); // don't add the data again
}
- if ( !GetTabWinMap()->empty() )
- GetTabWinMap()->begin()->second->GrabFocus();
+ if ( !GetTabWinMap().empty() )
+ GetTabWinMap().begin()->second->GrabFocus();
}
bool ORelationTableView::IsAddAllowed()
@@ -164,8 +164,8 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const
OTableWindow* pSourceWin = jxdSource.pListBox->GetTabWin();
OTableWindow* pDestWin = jxdDest.pListBox->GetTabWin();
- ::std::vector<OTableConnection*>::const_iterator aIter = getTableConnections()->begin();
- ::std::vector<OTableConnection*>::const_iterator aEnd = getTableConnections()->end();
+ ::std::vector<OTableConnection*>::const_iterator aIter = getTableConnections().begin();
+ ::std::vector<OTableConnection*>::const_iterator aEnd = getTableConnections().end();
for(;aIter != aEnd;++aIter)
{
OTableConnection* pFirst = *aIter;
@@ -277,9 +277,9 @@ bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_
void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUString& rWinName, bool /*bNewTable*/)
{
OSL_ENSURE(!_rComposedName.isEmpty(),"There must be a table name supplied!");
- OJoinTableView::OTableWindowMap::iterator aIter = GetTabWinMap()->find(_rComposedName);
+ OJoinTableView::OTableWindowMap::iterator aIter = GetTabWinMap().find(_rComposedName);
- if(aIter != GetTabWinMap()->end())
+ if(aIter != GetTabWinMap().end())
{
aIter->second->SetZOrder(NULL, WINDOW_ZORDER_FIRST);
aIter->second->GrabFocus();
@@ -296,9 +296,9 @@ void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUStrin
OTableWindow* pNewTabWin = createWindow( pNewTabWinData );
if(pNewTabWin->Init())
{
- m_pView->getController().getTableWindowData()->push_back( pNewTabWinData);
+ m_pView->getController().getTableWindowData().push_back( pNewTabWinData);
// when we already have a table with this name insert the full qualified one instead
- (*GetTabWinMap())[_rComposedName] = pNewTabWin;
+ GetTabWinMap()[_rComposedName] = pNewTabWin;
SetDefaultTabWinPosSize( pNewTabWin );
pNewTabWin->Show();