diff --git a/src/plugins/valgrind/callgrindcostview.cpp b/src/plugins/valgrind/callgrindcostview.cpp index 412d96c900d..5bd1a10743b 100644 --- a/src/plugins/valgrind/callgrindcostview.cpp +++ b/src/plugins/valgrind/callgrindcostview.cpp @@ -46,24 +46,10 @@ using namespace Valgrind::Callgrind; namespace Valgrind { namespace Internal { -class CostView::Private -{ -public: - explicit Private(CostView *qq); - - CostDelegate *m_costDelegate; - NameDelegate *m_nameDelegate; -}; - -CostView::Private::Private(CostView *qq) - : m_costDelegate(new CostDelegate(qq)) - , m_nameDelegate(new NameDelegate(qq)) -{} - - CostView::CostView(QWidget *parent) : Utils::BaseTreeView(parent) - , d(new Private(this)) + , m_costDelegate(new CostDelegate(this)) + , m_nameDelegate(new NameDelegate(this)) { setSelectionMode(QAbstractItemView::ExtendedSelection); setSelectionBehavior(QAbstractItemView::SelectRows); @@ -77,7 +63,6 @@ CostView::CostView(QWidget *parent) CostView::~CostView() { - delete d; } void CostView::setModel(QAbstractItemModel *model) @@ -86,36 +71,35 @@ void CostView::setModel(QAbstractItemModel *model) forever { QAbstractProxyModel *proxy = qobject_cast(model); - if (proxy) - model = proxy->sourceModel(); - else + if (!proxy) break; + model = proxy->sourceModel(); } setItemDelegate(new QStyledItemDelegate(this)); if (qobject_cast(model)) { - setItemDelegateForColumn(CallModel::CalleeColumn, d->m_nameDelegate); - setItemDelegateForColumn(CallModel::CallerColumn, d->m_nameDelegate); - setItemDelegateForColumn(CallModel::CostColumn, d->m_costDelegate); + setItemDelegateForColumn(CallModel::CalleeColumn, m_nameDelegate); + setItemDelegateForColumn(CallModel::CallerColumn, m_nameDelegate); + setItemDelegateForColumn(CallModel::CostColumn, m_costDelegate); } else if (qobject_cast(model)) { - setItemDelegateForColumn(DataModel::InclusiveCostColumn, d->m_costDelegate); - setItemDelegateForColumn(DataModel::NameColumn, d->m_nameDelegate); - setItemDelegateForColumn(DataModel::SelfCostColumn, d->m_costDelegate); + setItemDelegateForColumn(DataModel::InclusiveCostColumn, m_costDelegate); + setItemDelegateForColumn(DataModel::NameColumn, m_nameDelegate); + setItemDelegateForColumn(DataModel::SelfCostColumn, m_costDelegate); } - d->m_costDelegate->setModel(model); + m_costDelegate->setModel(model); } void CostView::setCostFormat(CostDelegate::CostFormat format) { - d->m_costDelegate->setFormat(format); + m_costDelegate->setFormat(format); viewport()->update(); } CostDelegate::CostFormat CostView::costFormat() const { - return d->m_costDelegate->format(); + return m_costDelegate->format(); } void CostView::contextMenuEvent(QContextMenuEvent *ev) diff --git a/src/plugins/valgrind/callgrindcostview.h b/src/plugins/valgrind/callgrindcostview.h index 5a49b276861..4988366e6a6 100644 --- a/src/plugins/valgrind/callgrindcostview.h +++ b/src/plugins/valgrind/callgrindcostview.h @@ -37,6 +37,9 @@ namespace Valgrind { namespace Internal { +class CostDelegate; +class NameDelegate; + class CostView : public Utils::BaseTreeView { Q_OBJECT @@ -60,8 +63,8 @@ public: void contextMenuEvent(QContextMenuEvent *ev); private: - class Private; - Private *d; + CostDelegate *m_costDelegate; + NameDelegate *m_nameDelegate; }; } // namespace Internal