AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QStandardItem: enable NRVO for gcc

Browse Source 
Change-Id: I5a5ad039e1df8f040b77ff783a4f0e1213a0f286
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Anton Kudryavtsev 2016-07-15 11:41:08 +03:00
parent 13c198cedb
commit b75fe73700
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/itemmodels/qstandarditemmodel.cpp
View File

@ -1805,11 +1805,12 @@ QStandardItem *QStandardItem::takeChild(int row, int column)
QList<QStandardItem*> QStandardItem::takeRow(int row) QList<QStandardItem*> QStandardItem::takeRow(int row)
{ {
Q_D(QStandardItem); Q_D(QStandardItem);
QList<QStandardItem*> items;
if ((row < 0) || (row >= rowCount())) if ((row < 0) || (row >= rowCount()))
return QList<QStandardItem*>(); return items;
if (d->model) if (d->model)
d->model->d_func()->rowsAboutToBeRemoved(this, row, row); d->model->d_func()->rowsAboutToBeRemoved(this, row, row);
QList<QStandardItem*> items;
int index = d->childIndex(row, 0); // Will return -1 if there are no columns int index = d->childIndex(row, 0); // Will return -1 if there are no columns
if (index != -1) { if (index != -1) {
int col_count = d->columnCount(); int col_count = d->columnCount();
@ -1838,11 +1839,11 @@ QList<QStandardItem*> QStandardItem::takeRow(int row)
QList<QStandardItem*> QStandardItem::takeColumn(int column) QList<QStandardItem*> QStandardItem::takeColumn(int column)
{ {
Q_D(QStandardItem); Q_D(QStandardItem);
QList<QStandardItem*> items;
if ((column < 0) || (column >= columnCount())) if ((column < 0) || (column >= columnCount()))
return QList<QStandardItem*>(); return items;
if (d->model) if (d->model)
d->model->d_func()->columnsAboutToBeRemoved(this, column, column); d->model->d_func()->columnsAboutToBeRemoved(this, column, column);
QList<QStandardItem*> items;
const int rowCount = d->rowCount(); const int rowCount = d->rowCount();
items.reserve(rowCount); items.reserve(rowCount);