From dbea26b974e438eb60a86ee6a0530418f1c835f7 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 21 Jan 2020 10:15:24 +0000 Subject: [PATCH] plug QAbstractItemModelPrivate::defaultRoleNames() memory Signed-off-by: Ivailo Monev --- src/core/kernel/qabstractitemmodel.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/core/kernel/qabstractitemmodel.cpp b/src/core/kernel/qabstractitemmodel.cpp index 193dc5dd2..c7c6ff1fc 100644 --- a/src/core/kernel/qabstractitemmodel.cpp +++ b/src/core/kernel/qabstractitemmodel.cpp @@ -466,20 +466,19 @@ QAbstractItemModel *QAbstractItemModelPrivate::staticEmptyModel() struct DefaultRoleNames : public QHash { DefaultRoleNames() { - (*this)[Qt::DisplayRole] = "display"; - (*this)[Qt::DecorationRole] = "decoration"; - (*this)[Qt::EditRole] = "edit"; - (*this)[Qt::ToolTipRole] = "toolTip"; - (*this)[Qt::StatusTipRole] = "statusTip"; - (*this)[Qt::WhatsThisRole] = "whatsThis"; + insert(Qt::DisplayRole, "display"); + insert(Qt::DecorationRole, "decoration"); + insert(Qt::EditRole, "edit"); + insert(Qt::ToolTipRole, "toolTip"); + insert(Qt::StatusTipRole, "statusTip"); + insert(Qt::WhatsThisRole, "whatsThis"); } }; -Q_GLOBAL_STATIC(DefaultRoleNames, qDefaultRoleNames) - const QHash &QAbstractItemModelPrivate::defaultRoleNames() { - return *qDefaultRoleNames(); + static const DefaultRoleNames qDefaultRoleNames; + return qDefaultRoleNames; } -- 2.11.0