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

QItemSelectionModel: remove some redundant code

Browse Source 
QObject::disconnect(connection) already sets connection.d_ptr to
nullptr, and the default constructor only does that:
QMetaObject::Connection::Connection() : d_ptr(nullptr) {}

So calling disconnect() suffices in this case.

Pick-to: 6.5 6.2
Change-Id: Icd5f9a15c83939eeecd9efb474ac3b38c0f2dfe4
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit 3bac47336483d720c1d7376ea053c03a4e80173c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ahmad Samir 2023-09-22 00:44:13 +03:00 committed by Qt Cherry-pick Bot
parent 8da777fa6a
commit 411a213f65
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/itemmodels/qitemselectionmodel.cpp
View File

@ -595,10 +595,8 @@ void QItemSelectionModelPrivate::initModel(QAbstractItemModel *m)
void QItemSelectionModelPrivate::disconnectModel() void QItemSelectionModelPrivate::disconnectModel()
{ {
for (auto &connection : connections) { for (auto &connection : connections)
QObject::disconnect(connection); QObject::disconnect(connection);
connection = QMetaObject::Connection();
}
} }
/*! /*!