1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dont' return a const ref to QModelIndex

Browse Source 
The conversion operator from QPMI to QModelIndex should return by
value, to hide implementation details and so that we don't have to
rely on a static empty QModelIndex.

Change-Id: I92b3f8451422f2b69bf31f28b387a124fd24ec46
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
(cherry picked from commit 0cd2935ed9d772f0eb06d03201baabd60764ec80)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Lars Knoll 2020-12-02 15:40:14 +01:00 committed by Qt Cherry-pick Bot
parent 2f747bb57c
commit 6bc1a1ec2f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/itemmodels/qabstractitemmodel.cpp
View File

@ -488,17 +488,16 @@ QPersistentModelIndex &QPersistentModelIndex::operator=(const QModelIndex &other
} }
/*! /*!
\fn QPersistentModelIndex::operator const QModelIndex&() const \fn QPersistentModelIndex::operator QModelIndex() const
Cast operator that returns a const QModelIndex&. Cast operator that returns a QModelIndex.
*/ */
QPersistentModelIndex::operator const QModelIndex&() const QPersistentModelIndex::operator QModelIndex() const
{ {
static const QModelIndex invalid;
if (d) if (d)
return d->index; return d->index;
return invalid; return QModelIndex();
} }
/*! /*!

2
src/corelib/itemmodels/qabstractitemmodel.h
View File

@ -226,7 +226,7 @@ public:
bool operator==(const QModelIndex &other) const; bool operator==(const QModelIndex &other) const;
bool operator!=(const QModelIndex &other) const; bool operator!=(const QModelIndex &other) const;
QPersistentModelIndex &operator=(const QModelIndex &other); QPersistentModelIndex &operator=(const QModelIndex &other);
operator const QModelIndex&() const; operator QModelIndex() const;
int row() const; int row() const;
int column() const; int column() const;
void *internalPointer() const; void *internalPointer() const;