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

QGIM: initialize function pointers when constructing base class

Browse Source 
Initialize them as part of the base-class constructor rather than
through an explicit init-call.

Coverity-Id: 478630
Change-Id: Ibd97630418650f72668be20ca3cff7f24eec8387
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Volker Hilsheimer 2025-03-24 11:56:47 +01:00
parent a79d5b8d08
commit cd870ed5eb
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/itemmodels/qgenericitemmodel.h
View File

@ -149,10 +149,9 @@ protected:
>;
public:
explicit QGenericItemModelImpl(Range &&model, QGenericItemModel *itemModel)
: QGenericItemModelImplBase(itemModel)
: QGenericItemModelImplBase(itemModel, static_cast<const Self*>(nullptr))
, m_data{std::forward<Range>(model)}
{
initFrom(this);
}
// static interface, called by QGenericItemModelImplBase

12
src/corelib/itemmodels/qgenericitemmodel_impl.h
View File

@ -326,8 +326,9 @@ private:
CallTupleFN *call_fn;
protected:
explicit QGenericItemModelImplBase(QGenericItemModel *itemModel)
: m_itemModel(itemModel)
template <typename Impl> // type deduction
explicit QGenericItemModelImplBase(QGenericItemModel *itemModel, const Impl *)
: callConst_fn(&Impl::callConst), call_fn(&Impl::call), m_itemModel(itemModel)
{}
~QGenericItemModelImplBase() = default;
@ -346,13 +347,6 @@ protected:
inline void beginRemoveRows(const QModelIndex &parent, int start, int count);
inline void endRemoveRows();
template <typename Impl>
void initFrom(Impl *)
{
callConst_fn = &Impl::callConst;
call_fn = &Impl::call;
}
public:
template <typename Ret, typename ...Args>
Ret callConst(ConstOp op, const Args &...args) const